diff options
Diffstat (limited to 'net/bsdproxy')
-rw-r--r-- | net/bsdproxy/Makefile | 6 | ||||
-rw-r--r-- | net/bsdproxy/distinfo | 6 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-accept_client.c | 13 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-proxy.c | 13 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-proxy_deinit.c | 12 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-proxy_init.c | 11 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-proxy_protos.h | 12 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-proxy_util.c | 12 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-read_data.c | 31 | ||||
-rw-r--r-- | net/bsdproxy/files/patch-write_data.c | 12 | ||||
-rw-r--r-- | net/bsdproxy/pkg-plist | 5 |
11 files changed, 125 insertions, 8 deletions
diff --git a/net/bsdproxy/Makefile b/net/bsdproxy/Makefile index 4921b16ce240..95bb1cdea252 100644 --- a/net/bsdproxy/Makefile +++ b/net/bsdproxy/Makefile @@ -6,8 +6,7 @@ # PORTNAME= bsdproxy -PORTVERSION= 0.03 -PORTREVISION= 1 +PORTVERSION= 0.04 CATEGORIES= net MASTER_SITES= http://daveb.net/bsdproxy/ @@ -16,8 +15,9 @@ COMMENT= A TCP proxy, demonstrating use of the kevent(2)/kqueue(2) API GNU_CONFIGURE= yes USE_GNOME= glib12 +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -DOCS= README +DOCS= ChangeLog README .if !defined(NOPORTDOCS) post-install: diff --git a/net/bsdproxy/distinfo b/net/bsdproxy/distinfo index 094d3da64dfd..dadec3718973 100644 --- a/net/bsdproxy/distinfo +++ b/net/bsdproxy/distinfo @@ -1,3 +1,3 @@ -MD5 (bsdproxy-0.03.tar.gz) = 9ce70ef35ad3c9c9a626c2b8da885f11 -SHA256 (bsdproxy-0.03.tar.gz) = d5a7f86b1b8f43c626ff59f47a52e6b9f00706873ddb361a19c069475ef9e50f -SIZE (bsdproxy-0.03.tar.gz) = 67059 +MD5 (bsdproxy-0.04.tar.gz) = 7ed3eca10c099e99970a0759ee632d2d +SHA256 (bsdproxy-0.04.tar.gz) = 00f1e6bf966bf944af27e466c1f0bc3858958f3e605dab9f1663ef6590ff2ab7 +SIZE (bsdproxy-0.04.tar.gz) = 87273 diff --git a/net/bsdproxy/files/patch-accept_client.c b/net/bsdproxy/files/patch-accept_client.c new file mode 100644 index 000000000000..ea93c2b79d2f --- /dev/null +++ b/net/bsdproxy/files/patch-accept_client.c @@ -0,0 +1,13 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/accept_client.c ./accept_client.c +--- ../../branches/vendor/bsdproxy/accept_client.c 2008-06-08 22:30:53.000000000 +0300 ++++ ./accept_client.c 2008-06-08 22:53:22.000000000 +0300 +@@ -14,9 +14,6 @@ + #include <errno.h> + #include "proxy_protos.h" + +-extern int errno; +- +- + void + accept_client ( struct kevent *ke, struct mdata *md ) + { diff --git a/net/bsdproxy/files/patch-proxy.c b/net/bsdproxy/files/patch-proxy.c new file mode 100644 index 000000000000..54ef3df887bb --- /dev/null +++ b/net/bsdproxy/files/patch-proxy.c @@ -0,0 +1,13 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/proxy.c ./proxy.c +--- ../../branches/vendor/bsdproxy/proxy.c 2008-06-08 22:30:53.000000000 +0300 ++++ ./proxy.c 2008-06-08 22:54:00.000000000 +0300 +@@ -16,9 +16,6 @@ + #include "config.h" + #include "proxy_protos.h" + +-extern char *optarg; +-extern int optind; +- + static int sig; + + /* usage() */ diff --git a/net/bsdproxy/files/patch-proxy_deinit.c b/net/bsdproxy/files/patch-proxy_deinit.c new file mode 100644 index 000000000000..38c0a210f78c --- /dev/null +++ b/net/bsdproxy/files/patch-proxy_deinit.c @@ -0,0 +1,12 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/proxy_deinit.c ./proxy_deinit.c +--- ../../branches/vendor/bsdproxy/proxy_deinit.c 2008-06-08 22:30:53.000000000 +0300 ++++ ./proxy_deinit.c 2008-06-08 22:35:09.000000000 +0300 +@@ -21,7 +21,7 @@ + + if ( md ) { + +- logmsg(md,"deinit_mdata(%p)",md); ++ log_msg(md,"deinit_mdata(%p)",md); + + if ( md->r ) { + diff --git a/net/bsdproxy/files/patch-proxy_init.c b/net/bsdproxy/files/patch-proxy_init.c new file mode 100644 index 000000000000..7824d1ed63ce --- /dev/null +++ b/net/bsdproxy/files/patch-proxy_init.c @@ -0,0 +1,11 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/proxy_init.c ./proxy_init.c +--- ../../branches/vendor/bsdproxy/proxy_init.c 2008-06-08 22:30:53.000000000 +0300 ++++ ./proxy_init.c 2008-06-08 23:01:32.000000000 +0300 +@@ -10,6 +10,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <netdb.h> ++#include <string.h> + #include <unistd.h> + #include <time.h> + #include "config.h" diff --git a/net/bsdproxy/files/patch-proxy_protos.h b/net/bsdproxy/files/patch-proxy_protos.h new file mode 100644 index 000000000000..c0238aff159a --- /dev/null +++ b/net/bsdproxy/files/patch-proxy_protos.h @@ -0,0 +1,12 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/proxy_protos.h ./proxy_protos.h +--- ../../branches/vendor/bsdproxy/proxy_protos.h 2008-06-08 22:30:53.000000000 +0300 ++++ ./proxy_protos.h 2008-06-08 22:55:52.000000000 +0300 +@@ -52,7 +52,7 @@ + + /* proxy_util.c */ + +-void log_msg ( struct mdata *md, char *fmt, ... ); ++void log_msg ( struct mdata *md, const char *fmt, ... ); + void print_stats ( struct mdata * ); + float diff_timeval ( struct timeval *t_start, struct timeval *t_finish ); + diff --git a/net/bsdproxy/files/patch-proxy_util.c b/net/bsdproxy/files/patch-proxy_util.c new file mode 100644 index 000000000000..6e368b3d5c06 --- /dev/null +++ b/net/bsdproxy/files/patch-proxy_util.c @@ -0,0 +1,12 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/proxy_util.c ./proxy_util.c +--- ../../branches/vendor/bsdproxy/proxy_util.c 2008-06-08 22:30:53.000000000 +0300 ++++ ./proxy_util.c 2008-06-08 23:00:09.000000000 +0300 +@@ -16,7 +16,7 @@ + */ + + void +-log_msg ( struct mdata *md, char *fmt, ... ) ++log_msg ( struct mdata *md, const char *fmt, ... ) + { + va_list ap; + char bt[256]; diff --git a/net/bsdproxy/files/patch-read_data.c b/net/bsdproxy/files/patch-read_data.c new file mode 100644 index 000000000000..074a5a5f8652 --- /dev/null +++ b/net/bsdproxy/files/patch-read_data.c @@ -0,0 +1,31 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/read_data.c ./read_data.c +--- ../../branches/vendor/bsdproxy/read_data.c 2008-06-08 22:30:53.000000000 +0300 ++++ ./read_data.c 2008-06-08 23:01:22.000000000 +0300 +@@ -12,9 +12,6 @@ + #include <sys/socket.h> + #include "proxy_protos.h" + +-extern int errno; +- +- + void + read_data ( struct kevent *ke, struct mdata *md ) + { +@@ -27,7 +24,7 @@ + struct kevent sk; + struct sockaddr_in sa; + socklen_t sl; +- char *fr[2] = { "CLIENT", "SERVER" }; ++ const char *fr[2] = { "CLIENT", "SERVER" }; + + /* + if this is the first data we're reading over this connection, +@@ -54,7 +51,7 @@ + if it fails with errno = ENOTCONN, we're not connected yet. + */ + +- fd = (from == CLIENT) ? r : ke->ident; ++ fd = (from == CLIENT) ? r : (int)ke->ident; + + if ( md->r[ke->ident].bytes_read == 0 && + md->r[fd].status == FD_CLOSE ) { diff --git a/net/bsdproxy/files/patch-write_data.c b/net/bsdproxy/files/patch-write_data.c new file mode 100644 index 000000000000..5ba4212d247d --- /dev/null +++ b/net/bsdproxy/files/patch-write_data.c @@ -0,0 +1,12 @@ +diff -urN -x .svn ../../branches/vendor/bsdproxy/write_data.c ./write_data.c +--- ../../branches/vendor/bsdproxy/write_data.c 2008-06-08 22:30:53.000000000 +0300 ++++ ./write_data.c 2008-06-08 23:01:18.000000000 +0300 +@@ -19,7 +19,7 @@ + int rm = 0; + int qe = 0; + GSList *l; +- char *ct[2] = { "CLIENT", "SERVER" }; ++ const char *ct[2] = { "CLIENT", "SERVER" }; + + /* + if this is the first data we're reading over this connection, diff --git a/net/bsdproxy/pkg-plist b/net/bsdproxy/pkg-plist index 2f2e9991c72d..80ff84c05723 100644 --- a/net/bsdproxy/pkg-plist +++ b/net/bsdproxy/pkg-plist @@ -1,3 +1,4 @@ bin/bsdproxy -%%PORTDOCS%%share/doc/bsdproxy/README -%%PORTDOCS%%@dirrm share/doc/bsdproxy +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% |