Hi, Update for Balance to 3.54:
* A bug with hash_fold() regarding incoming IPv4 and IPv6 source addresses has been fixed. The "hash" group mechanism is now working as expected. * Buffering has been disabled for interactive shell IO. A new "assign" command has been added to allow changing of the host:port assignment of a channel (only if disabled). A locking bug has been fixed. * A new option -6 has been added to force IPv6 bind. * Problems with setting IPV6_V6ONLY socket option are now handled more nicely with a syslog warning message. * Balance now compiles also on systems where IPV6_V6ONLY is undefined (like some Solaris systems). * IPv6 support on the listening side has been added. MAXCHANNELS in balance.h has been increased to 64. While here GROFF is not needed. Ok? Coments? Cheers. -- Sending from my VCR...
Index: Makefile =================================================================== RCS file: /cvs/ports/net/balance/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile 15 Oct 2012 15:18:32 -0000 1.15 +++ Makefile 30 Nov 2012 20:15:17 -0000 @@ -2,9 +2,8 @@ COMMENT= tcp proxy with load balancing and failover mechanisms -DISTNAME= balance-3.35 -REVISION= 1 -CATEGORIES= net +DISTNAME= balance-3.54 +CATEGORIES= net HOMEPAGE= http://www.inlab.de/balance.html @@ -13,6 +12,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= c MASTER_SITES= http://www.inlab.de/ @@ -20,7 +20,6 @@ MASTER_SITES= http://www.inlab.de/ MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" ALL_TARGET= balance -USE_GROFF = Yes NO_REGRESS= Yes do-install: Index: distinfo =================================================================== RCS file: /cvs/ports/net/balance/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 29 May 2007 18:56:24 -0000 1.4 +++ distinfo 30 Nov 2012 20:15:17 -0000 @@ -1,5 +1,2 @@ -MD5 (balance-3.35.tar.gz) = dx+FI/ek7hGUYef3H4onXw== -RMD160 (balance-3.35.tar.gz) = hnQeuV2MHoxm7NY5ahBKW2mTwtE= -SHA1 (balance-3.35.tar.gz) = ZyuJE4NVkSeAM4M5idJewdBYFM0= -SHA256 (balance-3.35.tar.gz) = GNxK/UcKoRWJH4u5vmdOkhYjFmYVLI8Fp36zoFuv6F0= -SIZE (balance-3.35.tar.gz) = 32903 +SHA256 (balance-3.54.tar.gz) = FwsaXdYKVmp4W3Kv3kKjSeIP4B9TJj2xJ59x7xiO/kU= +SIZE (balance-3.54.tar.gz) = 35166 Index: patches/patch-balance_c =================================================================== RCS file: /cvs/ports/net/balance/patches/patch-balance_c,v retrieving revision 1.7 diff -u -p -r1.7 patch-balance_c --- patches/patch-balance_c 29 May 2007 18:56:24 -0000 1.7 +++ patches/patch-balance_c 30 Nov 2012 20:15:17 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-balance_c,v 1.7 2007/05/29 18:56:24 rui Exp $ ---- balance.c.orig Sun May 27 18:49:46 2007 -+++ balance.c Sun May 27 18:55:58 2007 -@@ -809,11 +809,13 @@ void initialize_release_variables(void) +--- balance.c.orig Fri Dec 3 09:50:22 2010 ++++ balance.c Fri Nov 30 17:07:52 2012 +@@ -945,11 +945,13 @@ void initialize_release_variables(void) char *version; char *revision_copy; char *token; @@ -17,7 +17,7 @@ $OpenBSD: patch-balance_c,v 1.7 2007/05/ token = strtok(revision_copy, " "); token = strtok(NULL, " "); version = token != NULL ? token : "0.0"; -@@ -1136,7 +1138,8 @@ int shell(char *argument) +@@ -1276,7 +1278,8 @@ int shell(char *argument) printf("syntax error\n"); } } else if (mycmp(command, "group")) { @@ -27,25 +27,3 @@ $OpenBSD: patch-balance_c,v 1.7 2007/05/ if ((arg = strtok(NULL, " \t\n")) != NULL) { n = atoi(arg); if (n >= MAXGROUPS || n < 0) { -@@ -1472,10 +1475,10 @@ int main(int argc, char *argv[]) - serv_addr.sin_family = AF_INET; - if (bindhost != NULL) { - setipaddress(&serv_addr.sin_addr, bindhost); -- sprintf(bindhost_address, inet_ntoa(serv_addr.sin_addr)); -+ snprintf(bindhost_address, sizeof(bindhost_address), inet_ntoa(serv_addr.sin_addr)); - } else { - serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); -- sprintf(bindhost_address, "0.0.0.0"); -+ snprintf(bindhost_address, sizeof(bindhost_address), "0.0.0.0"); - } - serv_addr.sin_port = htons(source_port); - -@@ -1493,7 +1496,7 @@ int main(int argc, char *argv[]) - } - umask(old); - } -- sprintf(rendezvousfile, "%sbalance.%d.%s", SHMDIR, source_port, -+ snprintf(rendezvousfile, sizeof(rendezvousfile), "%sbalance.%d.%s", SHMDIR, source_port, - bindhost_address); - - if (stat(rendezvousfile, &buffer) == -1) { Index: patches/patch-balance_h =================================================================== RCS file: /cvs/ports/net/balance/patches/patch-balance_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-balance_h --- patches/patch-balance_h 29 May 2007 18:56:24 -0000 1.1 +++ patches/patch-balance_h 30 Nov 2012 20:15:17 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-balance_h,v 1.1 2007/05/29 18:56:24 rui Exp $ ---- balance.h.orig Tue May 29 18:10:23 2007 -+++ balance.h Tue May 29 18:11:05 2007 +--- balance.h.orig Fri Dec 3 09:50:22 2010 ++++ balance.h Fri Nov 30 17:07:52 2012 @@ -66,7 +66,7 @@ * this should be a directory that isn't cleaned up periodically, or at * reboot of the machine (/tmp is cleaned at reboot on many OS versions) @@ -9,4 +9,4 @@ $OpenBSD: patch-balance_h,v 1.1 2007/05/ +#define SHMDIR "/var/balance/" #define SHMFILESUFFIX ".shm" - #define MAXCHANNELS 16 /* max channels in group */ + #define MAXCHANNELS 64 /* max channels in group */ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/balance/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 29 May 2007 18:56:24 -0000 1.4 +++ pkg/PLIST 30 Nov 2012 20:15:17 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.4 2007/05/29 18:56:24 rui Exp $ -bin/balance +@bin bin/balance @man man/man1/balance.1 share/doc/balance/ share/doc/balance/balance.pdf
