mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
Use gnuregex library in the base system instead of the old one provided
by the port. Also cleanup all warning messages when compiling with -Wall. PR: 17035 Submitted by: Mario Sergio Fujikawa Ferreira <lioux@linf.unb.br>
This commit is contained in:
Steve Price
parent
48463defd7
commit
14fd2072a9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=28186
@ -1,6 +1,7 @@
|
||||
--- Makefile.orig Fri Feb 5 22:52:56 1999
|
||||
+++ Makefile Fri Feb 5 22:53:25 1999
|
||||
@@ -8,7 +8,7 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/Makefile ./Makefile
|
||||
--- /usr/ports/www/ijb/work/ijb20/Makefile Mon Feb 28 02:35:10 2000
|
||||
+++ ./Makefile Mon Feb 28 02:37:39 2000
|
||||
@@ -8,10 +8,11 @@
|
||||
PROG = junkbuster
|
||||
O = o
|
||||
RM = rm -f
|
||||
@ -9,7 +10,11 @@
|
||||
|
||||
# use this for Solaris 2.x
|
||||
#LDFLAGS = -lnsl -lsocket
|
||||
@@ -47,7 +47,7 @@
|
||||
+LDFLAGS += -lgnuregex
|
||||
|
||||
# use these for SunOS 4.x
|
||||
#LDFLAGS = -nsl
|
||||
@@ -47,10 +48,10 @@
|
||||
#MORE_CFLAGS = -relax_pointers
|
||||
#LDFLAGS = -map junkbuster.xMAP
|
||||
|
||||
@ -17,4 +22,8 @@
|
||||
+CFLAGS += $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
|
||||
|
||||
OBJS = jcc.$(O) parsers.$(O) filters.$(O) loaders.$(O) bind.$(O) conn.$(O) \
|
||||
encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O)
|
||||
- encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O)
|
||||
+ encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) win32.$(O)
|
||||
|
||||
$(PROG): $(OBJS)
|
||||
$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
|
||||
|
||||
12
www/junkbuster-zlib/files/patch-ab
Normal file
12
www/junkbuster-zlib/files/patch-ab
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/acl.c ./acl.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/acl.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./acl.c Mon Feb 28 02:31:06 2000
|
||||
@@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster-zlib/files/patch-ac
Normal file
12
www/junkbuster-zlib/files/patch-ac
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/conn.c ./conn.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/conn.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./conn.c Mon Feb 28 02:31:06 2000
|
||||
@@ -34,7 +34,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster-zlib/files/patch-ad
Normal file
12
www/junkbuster-zlib/files/patch-ad
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/encode.c ./encode.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/encode.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./encode.c Mon Feb 28 02:31:06 2000
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster-zlib/files/patch-ae
Normal file
12
www/junkbuster-zlib/files/patch-ae
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/filters.c ./filters.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/filters.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./filters.c Mon Feb 28 02:31:06 2000
|
||||
@@ -15,7 +15,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster-zlib/files/patch-af
Normal file
12
www/junkbuster-zlib/files/patch-af
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/gnu_regex.c ./gnu_regex.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/gnu_regex.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./gnu_regex.c Mon Feb 28 02:31:06 2000
|
||||
@@ -131,7 +131,7 @@
|
||||
#endif /* not emacs */
|
||||
|
||||
/* Get the interface, including the syntax bits. */
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
|
||||
/* isalpha etc. are used for the character classes. */
|
||||
#include <ctype.h>
|
||||
13
www/junkbuster-zlib/files/patch-ag
Normal file
13
www/junkbuster-zlib/files/patch-ag
Normal file
@ -0,0 +1,13 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/jcc.c ./jcc.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/jcc.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./jcc.c Mon Feb 28 02:31:06 2000
|
||||
@@ -39,7 +39,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
Binary files /usr/ports/www/ijb/work/ijb20/junkbuster and ./junkbuster differ
|
||||
38
www/junkbuster-zlib/files/patch-ah
Normal file
38
www/junkbuster-zlib/files/patch-ah
Normal file
@ -0,0 +1,38 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/loaders.c ./loaders.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/loaders.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./loaders.c Mon Feb 28 02:34:29 2000
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
#include <ctype.h>
|
||||
@@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
@@ -1160,7 +1160,7 @@
|
||||
|
||||
extern char *acl_rcs, *bind_rcs, *conn_rcs, *encode_rcs,
|
||||
*jcc_rcs, *loaders_rcs, *parsers_rcs, *filters_rcs,
|
||||
- *socks4_rcs, *ssplit_rcs, *gnu_regex_rcs, *win32_rcs;
|
||||
+ *socks4_rcs, *ssplit_rcs, *win32_rcs;
|
||||
|
||||
b = strsav(b, "<h2>Source versions:</h2>\n");
|
||||
b = strsav(b, "<pre>");
|
||||
@@ -1174,7 +1174,6 @@
|
||||
sprintf(buf, "%s\n", socks4_rcs ); b = strsav(b, buf);
|
||||
sprintf(buf, "%s\n", ssplit_rcs ); b = strsav(b, buf);
|
||||
sprintf(buf, "%s\n", acl_rcs ); b = strsav(b, buf);
|
||||
- sprintf(buf, "%s\n", gnu_regex_rcs ); b = strsav(b, buf);
|
||||
sprintf(buf, "%s\n", win32_rcs ); b = strsav(b, buf);
|
||||
b = strsav(b, "</pre>");
|
||||
|
||||
10
www/junkbuster-zlib/files/patch-ai
Normal file
10
www/junkbuster-zlib/files/patch-ai
Normal file
@ -0,0 +1,10 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/loaders.h ./loaders.h
|
||||
--- /usr/ports/www/ijb/work/ijb20/loaders.h Wed Dec 31 21:00:00 1969
|
||||
+++ ./loaders.h Mon Feb 28 02:22:47 2000
|
||||
@@ -0,0 +1,6 @@
|
||||
+#ifndef __LOADERS_H_INCLUDE__
|
||||
+#define __LOADERS_H_INCLUDE__
|
||||
+
|
||||
+void * zalloc(int);
|
||||
+
|
||||
+#endif /* __LOADERS_H_INCLUDE__ */
|
||||
12
www/junkbuster-zlib/files/patch-aj
Normal file
12
www/junkbuster-zlib/files/patch-aj
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/parsers.c ./parsers.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/parsers.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./parsers.c Mon Feb 28 02:31:06 2000
|
||||
@@ -15,7 +15,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
27
www/junkbuster-zlib/files/patch-ak
Normal file
27
www/junkbuster-zlib/files/patch-ak
Normal file
@ -0,0 +1,27 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/socks4.c ./socks4.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/socks4.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./socks4.c Mon Feb 28 02:31:06 2000
|
||||
@@ -19,11 +19,13 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
|
||||
+#define DEFAULT_FALLBACK_HTTP_PORT 80
|
||||
+
|
||||
#define SOCKS_REQUEST_GRANTED 90
|
||||
#define SOCKS_REQUEST_REJECT 91
|
||||
#define SOCKS_REQUEST_IDENT_FAILED 92
|
||||
@@ -56,7 +58,7 @@
|
||||
unsigned char sbuf[BUFSIZ];
|
||||
struct socks_op *c = (struct socks_op *)cbuf;
|
||||
struct socks_reply *s = (struct socks_reply *)sbuf;
|
||||
- int web_server_addr;
|
||||
+ int web_server_addr = DEFAULT_FALLBACK_HTTP_PORT;
|
||||
int n, csiz, sfd, target_port;
|
||||
int err = 0;
|
||||
char *errstr, *target_host;
|
||||
12
www/junkbuster-zlib/files/patch-al
Normal file
12
www/junkbuster-zlib/files/patch-al
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/ssplit.c ./ssplit.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/ssplit.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./ssplit.c Mon Feb 28 02:31:06 2000
|
||||
@@ -18,6 +18,8 @@
|
||||
* l = flag indicating whether to ignore leading field separators
|
||||
*/
|
||||
|
||||
+#include "loaders.h"
|
||||
+#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
int ssplit(char *s, char *c, char *v[], int n, int m, int l)
|
||||
12
www/junkbuster-zlib/files/patch-am
Normal file
12
www/junkbuster-zlib/files/patch-am
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/win32.c ./win32.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/win32.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./win32.c Mon Feb 28 02:31:06 2000
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
#include "jcc.h"
|
||||
#include <windows.h>
|
||||
@ -1,6 +1,7 @@
|
||||
--- Makefile.orig Fri Feb 5 22:52:56 1999
|
||||
+++ Makefile Fri Feb 5 22:53:25 1999
|
||||
@@ -8,7 +8,7 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/Makefile ./Makefile
|
||||
--- /usr/ports/www/ijb/work/ijb20/Makefile Mon Feb 28 02:35:10 2000
|
||||
+++ ./Makefile Mon Feb 28 02:37:39 2000
|
||||
@@ -8,10 +8,11 @@
|
||||
PROG = junkbuster
|
||||
O = o
|
||||
RM = rm -f
|
||||
@ -9,7 +10,11 @@
|
||||
|
||||
# use this for Solaris 2.x
|
||||
#LDFLAGS = -lnsl -lsocket
|
||||
@@ -47,7 +47,7 @@
|
||||
+LDFLAGS += -lgnuregex
|
||||
|
||||
# use these for SunOS 4.x
|
||||
#LDFLAGS = -nsl
|
||||
@@ -47,10 +48,10 @@
|
||||
#MORE_CFLAGS = -relax_pointers
|
||||
#LDFLAGS = -map junkbuster.xMAP
|
||||
|
||||
@ -17,4 +22,8 @@
|
||||
+CFLAGS += $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
|
||||
|
||||
OBJS = jcc.$(O) parsers.$(O) filters.$(O) loaders.$(O) bind.$(O) conn.$(O) \
|
||||
encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O)
|
||||
- encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O)
|
||||
+ encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) win32.$(O)
|
||||
|
||||
$(PROG): $(OBJS)
|
||||
$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
|
||||
|
||||
12
www/junkbuster/files/patch-ab
Normal file
12
www/junkbuster/files/patch-ab
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/acl.c ./acl.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/acl.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./acl.c Mon Feb 28 02:31:06 2000
|
||||
@@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster/files/patch-ac
Normal file
12
www/junkbuster/files/patch-ac
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/conn.c ./conn.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/conn.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./conn.c Mon Feb 28 02:31:06 2000
|
||||
@@ -34,7 +34,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster/files/patch-ad
Normal file
12
www/junkbuster/files/patch-ad
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/encode.c ./encode.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/encode.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./encode.c Mon Feb 28 02:31:06 2000
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster/files/patch-ae
Normal file
12
www/junkbuster/files/patch-ae
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/filters.c ./filters.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/filters.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./filters.c Mon Feb 28 02:31:06 2000
|
||||
@@ -15,7 +15,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
12
www/junkbuster/files/patch-af
Normal file
12
www/junkbuster/files/patch-af
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/gnu_regex.c ./gnu_regex.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/gnu_regex.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./gnu_regex.c Mon Feb 28 02:31:06 2000
|
||||
@@ -131,7 +131,7 @@
|
||||
#endif /* not emacs */
|
||||
|
||||
/* Get the interface, including the syntax bits. */
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
|
||||
/* isalpha etc. are used for the character classes. */
|
||||
#include <ctype.h>
|
||||
13
www/junkbuster/files/patch-ag
Normal file
13
www/junkbuster/files/patch-ag
Normal file
@ -0,0 +1,13 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/jcc.c ./jcc.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/jcc.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./jcc.c Mon Feb 28 02:31:06 2000
|
||||
@@ -39,7 +39,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
Binary files /usr/ports/www/ijb/work/ijb20/junkbuster and ./junkbuster differ
|
||||
38
www/junkbuster/files/patch-ah
Normal file
38
www/junkbuster/files/patch-ah
Normal file
@ -0,0 +1,38 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/loaders.c ./loaders.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/loaders.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./loaders.c Mon Feb 28 02:34:29 2000
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
#include <ctype.h>
|
||||
@@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
@@ -1160,7 +1160,7 @@
|
||||
|
||||
extern char *acl_rcs, *bind_rcs, *conn_rcs, *encode_rcs,
|
||||
*jcc_rcs, *loaders_rcs, *parsers_rcs, *filters_rcs,
|
||||
- *socks4_rcs, *ssplit_rcs, *gnu_regex_rcs, *win32_rcs;
|
||||
+ *socks4_rcs, *ssplit_rcs, *win32_rcs;
|
||||
|
||||
b = strsav(b, "<h2>Source versions:</h2>\n");
|
||||
b = strsav(b, "<pre>");
|
||||
@@ -1174,7 +1174,6 @@
|
||||
sprintf(buf, "%s\n", socks4_rcs ); b = strsav(b, buf);
|
||||
sprintf(buf, "%s\n", ssplit_rcs ); b = strsav(b, buf);
|
||||
sprintf(buf, "%s\n", acl_rcs ); b = strsav(b, buf);
|
||||
- sprintf(buf, "%s\n", gnu_regex_rcs ); b = strsav(b, buf);
|
||||
sprintf(buf, "%s\n", win32_rcs ); b = strsav(b, buf);
|
||||
b = strsav(b, "</pre>");
|
||||
|
||||
10
www/junkbuster/files/patch-ai
Normal file
10
www/junkbuster/files/patch-ai
Normal file
@ -0,0 +1,10 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/loaders.h ./loaders.h
|
||||
--- /usr/ports/www/ijb/work/ijb20/loaders.h Wed Dec 31 21:00:00 1969
|
||||
+++ ./loaders.h Mon Feb 28 02:22:47 2000
|
||||
@@ -0,0 +1,6 @@
|
||||
+#ifndef __LOADERS_H_INCLUDE__
|
||||
+#define __LOADERS_H_INCLUDE__
|
||||
+
|
||||
+void * zalloc(int);
|
||||
+
|
||||
+#endif /* __LOADERS_H_INCLUDE__ */
|
||||
12
www/junkbuster/files/patch-aj
Normal file
12
www/junkbuster/files/patch-aj
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/parsers.c ./parsers.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/parsers.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./parsers.c Mon Feb 28 02:31:06 2000
|
||||
@@ -15,7 +15,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
27
www/junkbuster/files/patch-ak
Normal file
27
www/junkbuster/files/patch-ak
Normal file
@ -0,0 +1,27 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/socks4.c ./socks4.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/socks4.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./socks4.c Mon Feb 28 02:31:06 2000
|
||||
@@ -19,11 +19,13 @@
|
||||
#endif
|
||||
|
||||
#ifdef REGEX
|
||||
-#include <gnu_regex.h>
|
||||
+#include <gnuregex.h>
|
||||
#endif
|
||||
|
||||
#include "jcc.h"
|
||||
|
||||
+#define DEFAULT_FALLBACK_HTTP_PORT 80
|
||||
+
|
||||
#define SOCKS_REQUEST_GRANTED 90
|
||||
#define SOCKS_REQUEST_REJECT 91
|
||||
#define SOCKS_REQUEST_IDENT_FAILED 92
|
||||
@@ -56,7 +58,7 @@
|
||||
unsigned char sbuf[BUFSIZ];
|
||||
struct socks_op *c = (struct socks_op *)cbuf;
|
||||
struct socks_reply *s = (struct socks_reply *)sbuf;
|
||||
- int web_server_addr;
|
||||
+ int web_server_addr = DEFAULT_FALLBACK_HTTP_PORT;
|
||||
int n, csiz, sfd, target_port;
|
||||
int err = 0;
|
||||
char *errstr, *target_host;
|
||||
12
www/junkbuster/files/patch-al
Normal file
12
www/junkbuster/files/patch-al
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/ssplit.c ./ssplit.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/ssplit.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./ssplit.c Mon Feb 28 02:31:06 2000
|
||||
@@ -18,6 +18,8 @@
|
||||
* l = flag indicating whether to ignore leading field separators
|
||||
*/
|
||||
|
||||
+#include "loaders.h"
|
||||
+#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
int ssplit(char *s, char *c, char *v[], int n, int m, int l)
|
||||
12
www/junkbuster/files/patch-am
Normal file
12
www/junkbuster/files/patch-am
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruN /usr/ports/www/ijb/work/ijb20/win32.c ./win32.c
|
||||
--- /usr/ports/www/ijb/work/ijb20/win32.c Mon Feb 28 02:35:10 2000
|
||||
+++ ./win32.c Mon Feb 28 02:31:06 2000
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#ifdef REGEX
|
||||
-#include "gnu_regex.h"
|
||||
+#include "gnuregex.h"
|
||||
#endif
|
||||
#include "jcc.h"
|
||||
#include <windows.h>
|
||||
Loading…
Reference in New Issue
Block a user