[42325] trunk/dports/www/privoxy
blb at macports.org
blb at macports.org
Wed Nov 19 00:09:28 PST 2008
Revision: 42325
http://trac.macports.org/changeset/42325
Author: blb at macports.org
Date: 2008-11-19 00:09:21 -0800 (Wed, 19 Nov 2008)
Log Message:
-----------
www/privoxy - version update to 3.0.10, ticket #16825 (socks5 variant removed as it is now part of privoxy itself)
Modified Paths:
--------------
trunk/dports/www/privoxy/Portfile
Removed Paths:
-------------
trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff
trunk/dports/www/privoxy/files/patch-socks5.diff
Modified: trunk/dports/www/privoxy/Portfile
===================================================================
--- trunk/dports/www/privoxy/Portfile 2008-11-19 07:51:39 UTC (rev 42324)
+++ trunk/dports/www/privoxy/Portfile 2008-11-19 08:09:21 UTC (rev 42325)
@@ -2,8 +2,7 @@
PortSystem 1.0
name privoxy
-version 3.0.8
-revision 1
+version 3.0.10
categories www security net
maintainers nomaintainer
description Advanced filtering web proxy
@@ -21,9 +20,9 @@
master_sites sourceforge:ijbswa
distname ${name}-${version}-stable-src
-checksums md5 252c0e085218fb930c4bc7563e9cedd9 \
- sha1 7fe2b7afde4066ef1f170f5f11850cf9da428a42 \
- rmd160 604dd61a22dc74d06d4adaa4b3c87e4d5da5149b
+checksums md5 01281017f28be2c7133124d1768da364 \
+ sha1 0ce51a8dc938fe6412daa7f6edf159b98fd66d54 \
+ rmd160 91c8d56b71a5c606554bf509827197d689d8fc10
worksrcdir ${name}-${version}-stable
@@ -32,12 +31,6 @@
set privoxyGroup privoxy
set privoxyUser privoxy
-patchfiles patch-GNUmakefile.in.diff
-
-variant socks5 description {Support for SOCKS5 (experimental)} {
- patchfiles-append patch-socks5.diff
-}
-
pre-configure {
addgroup ${privoxyGroup}
adduser ${privoxyUser} gid=[existsgroup ${privoxyGroup}]
@@ -46,10 +39,11 @@
}
use_autoconf yes
-configure.args --disable-dynamic-pcrs --with-user=${privoxyUser} \
+configure.args --with-user=${privoxyUser} \
--with-group=${privoxyGroup} \
--sysconfdir=${prefix}/etc/${name} \
--mandir=${prefix}/share/man \
+ --enable-dynamic-pcre \
--enable-zlib
destroot.keepdirs ${destroot}${prefix}/var/log/privoxy \
Deleted: trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff
===================================================================
--- trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff 2008-11-19 07:51:39 UTC (rev 42324)
+++ trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff 2008-11-19 08:09:21 UTC (rev 42325)
@@ -1,125 +0,0 @@
---- GNUmakefile.in.orig 2007-12-11 15:29:25.000000000 -0600
-+++ GNUmakefile.in 2008-02-10 16:05:25.000000000 -0600
-@@ -67,6 +67,8 @@
- LOGS_DEST = $(VAR_DEST)/log/privoxy
- PIDS_DEST = $(VAR_DEST)/run
-
-+DESTDIR=
-+
- # if $prefix = /usr/local then the default CONFDEST change from
- # CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy
- # by the target rule CONF_DEST
-@@ -1095,23 +1097,23 @@
-
- @$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
- $(CHMOD) $(DIR_MODE) $(MKDIR)
-- @$(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \
-- $(LOG_DEST) $(PID_DEST)
-+ @$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
-+ $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
- @# Install the executable binary, strip if invoked as install-strip
- @test -n "$(STRIP)" &&\
-- $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
-- $(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST)
-- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST)
-+ $(ECHO) Installing $(PROGRAM) stripped executable to $(DESTDIR)$(SBIN_DEST) ||\
-+ $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
-+ $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
-
- @# Install the DOCS and man page. install-sh only does one file at a time.
- @# FIXME: only handles jpegs.
- - at if [ $(check_doc) = 0 ]; then \
-- DOC=$(DOC_DEST) ;\
-+ DOC=$(DESTDIR)$(DOC_DEST) ;\
- else \
-- DOC=$(prefix)/doc/privoxy ;\
-+ DOC=$(DESTDIR)$(prefix)/doc/privoxy ;\
- fi;\
- $(MKDIR) $$DOC $$DOC/user-manual $$DOC/faq $$DOC/developer-manual \
-- $$DOC/man-page $$DOC/images $(MAN_DEST) ;\
-+ $$DOC/man-page $$DOC/images $(DESTDIR)$(MAN_DEST) ;\
- if [ -d "$(DOK_WEB)" ]; then \
- $(ECHO) Installing FAQ, Manual, and other docs to $$DOC;\
- for i in user-manual developer-manual faq; do \
-@@ -1132,8 +1134,8 @@
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
- fi
- @# Not all platforms support gzipped man pages.
-- @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
-- -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1
-+ @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.1
-+ -$(INSTALL) $(INSTALL_T) privoxy.1 $(DESTDIR)$(MAN_DEST)/privoxy.1
-
- @# Change the config file default directories according to the configured ones
- @$(ECHO) Rewriting config for this installation
-@@ -1154,9 +1156,9 @@
- @# Install the config support files. Test for root install, and abort
- @# if there is no privoxy user, and no other user was enabled during
- @# configure. Later, install init script if appropriate.
-- @$(ECHO) Installing templates to $(CONF_DEST)/templates
-+ @$(ECHO) Installing templates to $(DESTDIR)$(CONF_DEST)/templates
- @for i in `find templates -type f`; do \
-- $(INSTALL) $(INSTALL_T) $$i $(CONF_DEST)/templates ;\
-+ $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
- done
-
- @# FIXME: group/user validation is overly convoluted.
-@@ -1194,36 +1196,36 @@
- fi ;\
- INSTALL_CONF="$(INSTALL_R)" ;\
- fi ;\
-- $(ECHO) Installing configuration files to $(CONF_DEST);\
-+ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
- for i in $(CONFIGS); do \
- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
-- $(RM) $(CONF_DEST)/$$i ;\
-+ $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
- $(ECHO) Installing fresh $$i;\
-- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
-- elif [ -s "$(CONF_DEST)/$$i" ]; then \
-+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-+ elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
- $(ECHO) Installing $$i as $$i.new ;\
-- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\
-+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
- NEW=1;\
- else \
-- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
-+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- fi ;\
- done ;\
- if [ -n "$$NEW" ]; then \
-- $(CHMOD) $(RWD_MODE) $(CONF_DEST)/*.new || exit 1 ;\
-+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
- fi ;\
-- [ ! -f $(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(LOG_DEST) || \
-- $(ECHO) Checking logfiles in $(LOG_DEST) ;\
-- $(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
-+ [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
-+ $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
-+ $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || exit 1 ;\
- if [ x$$USER != x ]; then \
-- $(CHOWN) $$USER $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
-+ $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
- fi ;\
- if [ x$$GROUP_T != x ]; then \
-- $(CHGRP) $$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
-+ $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
- fi ;\
-- $(CHMOD) $(RWD_MODE) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
-+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || exit 1 ;\
- if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
- if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
- $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
-@@ -1254,7 +1256,7 @@
- $(RM) config.base config.tmp
- @# mmmmm, good.
- @$(ECHO) "$(PROGRAM_V) installation succeeded!"
-- @$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)"
-+ @$(ECHO) "The Privoxy configuration files have been installed in $(DESTDIR)$(CONF_DEST)"
-
- # rmdir is used as a precaution since it will not remove non-empty
- # directories. RH init script creates lock file and pid file.
Deleted: trunk/dports/www/privoxy/files/patch-socks5.diff
===================================================================
--- trunk/dports/www/privoxy/files/patch-socks5.diff 2008-11-19 07:51:39 UTC (rev 42324)
+++ trunk/dports/www/privoxy/files/patch-socks5.diff 2008-11-19 08:09:21 UTC (rev 42325)
@@ -1,356 +0,0 @@
-diff -r 6ce92f2e919b config
---- config 2008-01-17 19:17:15.000000000 +0100
-+++ config 2008-02-12 21:00:08.000000000 +0100
-@@ -1097,7 +1097,7 @@
- #
- #
- #
--# 5.2. forward-socks4 and forward-socks4a
-+# 5.2. forward-socks4, forward-socks4a and forward-socks5
- #
- # Specifies:
- #
-@@ -1128,10 +1128,12 @@
- # Multiple lines are OK, they are checked in sequence, and the
- # last match wins.
- #
--# The difference between forward-socks4 and forward-socks4a
--# is that in the SOCKS 4A protocol, the DNS resolution of the
--# target hostname happens on the SOCKS server, while in SOCKS 4
--# it happens locally.
-+
-+# The difference between forward-socks4 and either
-+# forward-socks4a or forward-socks5 is that in the SOCKS 4A and
-+# SOCKS 5 protocols, the DNS resolution of the target hostname
-+# happens on the SOCKS server, while in SOCKS 4 it happens
-+# locally.
- #
- # If http_parent is ".", then requests are not forwarded to another
- # HTTP proxy but are made (HTTP-wise) directly to the web servers,
-@@ -1153,6 +1155,17 @@
- #
- # forward-socks4 / socks-gw.example.com:1080 .
- #
-+# ssh dynamic forwarding can handle either SOCKS 4 or SOCKS 5
-+# requests. But name lookups on the server can only be done with
-+# SOCKS 5. To chain Privoxy and ssh dynamic forwarding using
-+# SOCKS5 when they are both running on the same system, you
-+# should use the rule:
-+#
-+# forward-socks5 / 127.0.0.1:3129 .
-+#
-+# This presumes, of course, that you've configured your ssh
-+# connection with 'DynamicForward 3129'.
-+#
- #
- # To chain Privoxy and Tor, both running on the same system,
- # you would use something like:
-diff -r 6ce92f2e919b gateway.c
---- gateway.c 2007-07-28 14:30:03.000000000 +0200
-+++ gateway.c 2008-02-12 20:54:42.000000000 +0100
-@@ -176,11 +176,25 @@
- int target_port,
- struct client_state *csp);
-
-+static jb_socket socks5_connect(const struct forward_spec * fwd,
-+ const char * target_host,
-+ int target_port,
-+ struct client_state *csp);
-+
-
- #define SOCKS_REQUEST_GRANTED 90
- #define SOCKS_REQUEST_REJECT 91
- #define SOCKS_REQUEST_IDENT_FAILED 92
- #define SOCKS_REQUEST_IDENT_CONFLICT 93
-+#define SOCKS5_REQUEST_GRANTED 0
-+#define SOCKS5_REQUEST_FAILED 1
-+#define SOCKS5_REQUEST_DENIED 2
-+#define SOCKS5_REQUEST_NETWORK_UNREACHABLE 3
-+#define SOCKS5_REQUEST_HOST_UNREACHABLE 4
-+#define SOCKS5_REQUEST_CONNECTION_REFUSEDD 5
-+#define SOCKS5_REQUEST_TTL_EXPIRED 6
-+#define SOCKS5_REQUEST_PROTOCOL_ERROR 7
-+#define SOCKS5_REQUEST_BAD_ADDRESS_TYPE 8
-
- /* structure of a socks client operation */
- struct socks_op {
-@@ -250,6 +264,9 @@
- case SOCKS_4A:
- return (socks4_connect(fwd, dest_host, dest_port, csp));
-
-+ case SOCKS_5:
-+ return (socks5_connect(fwd, dest_host, dest_port, csp));
-+
- default:
- /* Should never get here */
- log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type.");
-@@ -454,6 +471,200 @@
- }
-
-
-+/*********************************************************************
-+ *
-+ * Function : socks4_connect
-+ *
-+ * Description : Connect to the SOCKS server, and connect through
-+ * it to the specified server. This handles
-+ * all the SOCKS negotiation, and returns a file
-+ * descriptor for a socket which can be treated as a
-+ * normal (non-SOCKS) socket.
-+ *
-+ * Parameters :
-+ * 1 : fwd = Specifies the SOCKS proxy to use.
-+ * 2 : target_host = The final server to connect to.
-+ * 3 : target_port = The final port to connect to.
-+ * 4 : csp = Current client state (buffers, headers, etc...)
-+ *
-+ * Returns : JB_INVALID_SOCKET => failure, else a socket file descriptor.
-+ *
-+ *********************************************************************/
-+static jb_socket socks5_connect(const struct forward_spec * fwd,
-+ const char * target_host,
-+ int target_port,
-+ struct client_state *csp)
-+{
-+ int err = 0;
-+ char cbuf[BUFFER_SIZE];
-+ char sbuf[BUFFER_SIZE];
-+ size_t client_pos = 0;
-+ ssize_t server_size = 0;
-+ size_t hostlen = 0;
-+ jb_socket sfd;
-+
-+ if ((fwd->gateway_host == NULL) || (*fwd->gateway_host == '\0'))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "socks5_connect: NULL gateway host specified");
-+ err = 1;
-+ }
-+
-+ if (fwd->gateway_port <= 0)
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "socks5_connect: invalid gateway port specified");
-+ err = 1;
-+ }
-+
-+ hostlen = strlen(target_host);
-+ if (hostlen > 0xff)
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "socks5_connect: target host name is longer than 255 characters.");
-+ err = 1;
-+ }
-+
-+ if (fwd->type != SOCKS_5)
-+ {
-+ /* Should never get here */
-+ log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type.");
-+ err = 1;
-+ }
-+
-+ if (err)
-+ {
-+ errno = EINVAL;
-+ return(JB_INVALID_SOCKET);
-+ }
-+
-+ /* pass the request to the socks server */
-+ sfd = connect_to(fwd->gateway_host, fwd->gateway_port, csp);
-+
-+ if (sfd == JB_INVALID_SOCKET)
-+ {
-+ return(JB_INVALID_SOCKET);
-+ }
-+
-+ cbuf[client_pos++] = '\x05'; // Version
-+ cbuf[client_pos++] = '\x01'; // One authentication method supported
-+ cbuf[client_pos++] = '\x00'; // The no authentication authentication method
-+
-+ if (write_socket(sfd, cbuf, client_pos))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation write failed...");
-+ close_socket(sfd);
-+ return(JB_INVALID_SOCKET);
-+ }
-+
-+ if (read_socket(sfd, sbuf, sizeof(sbuf)) != 2)
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation read failed...");
-+ err = 1;
-+ }
-+
-+ if (!err && (sbuf[0] != '\x05'))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation protocol version error");
-+ err = 1;
-+ }
-+
-+ if (!err && (sbuf[1] == '\xff'))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 authentication required");
-+ err = 1;
-+ }
-+
-+ if (!err && (sbuf[1] != '\x00'))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation protocol error");
-+ err = 1;
-+ }
-+
-+ if (err)
-+ {
-+ close_socket(sfd);
-+ errno = EINVAL;
-+ return(JB_INVALID_SOCKET);
-+ }
-+
-+ client_pos = 0;
-+ cbuf[client_pos++] = '\x05'; // Version
-+ cbuf[client_pos++] = '\x01'; // TCP connect
-+ cbuf[client_pos++] = '\x00'; // Reserved, must be 0x00
-+ cbuf[client_pos++] = '\x03'; // Address is domain name
-+ cbuf[client_pos++] = (char)(hostlen & 0xffu);
-+ strncpy(cbuf + client_pos, target_host, 0xffu);
-+ client_pos += (hostlen & 0xffu);
-+ cbuf[client_pos++] = (char)((target_port >> 8) & 0xffu);
-+ cbuf[client_pos++] = (char)((target_port ) & 0xffu);
-+
-+ if (write_socket(sfd, cbuf, client_pos))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation write failed...");
-+ close_socket(sfd);
-+ errno = EINVAL;
-+ return(JB_INVALID_SOCKET);
-+ }
-+
-+ server_size = read_socket(sfd, sbuf, sizeof(sbuf));
-+ if (server_size < 3)
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation read failed...");
-+ err = 1;
-+ }
-+
-+ if (!err && (sbuf[0] != '\x05'))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation protocol version error");
-+ err = 1;
-+ }
-+
-+ if (!err && (sbuf[2] != '\x00'))
-+ {
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation protocol error");
-+ err = 1;
-+ }
-+
-+ if (!err)
-+ {
-+ switch (sbuf[1]) {
-+ case SOCKS5_REQUEST_GRANTED:
-+ return(sfd);
-+ break;
-+ case SOCKS5_REQUEST_FAILED:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request failed");
-+ break;
-+ case SOCKS5_REQUEST_DENIED:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request denied");
-+ break;
-+ case SOCKS5_REQUEST_NETWORK_UNREACHABLE:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request - network unreachable");
-+ break;
-+ case SOCKS5_REQUEST_HOST_UNREACHABLE:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request - host unreachable");
-+ break;
-+ case SOCKS5_REQUEST_CONNECTION_REFUSEDD:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request - connection refused");
-+ break;
-+ case SOCKS5_REQUEST_TTL_EXPIRED:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request - TTL expired");
-+ break;
-+ case SOCKS5_REQUEST_PROTOCOL_ERROR:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request - client protocol error");
-+ break;
-+ case SOCKS5_REQUEST_BAD_ADDRESS_TYPE:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 request - domain names unsupported");
-+ break;
-+ default:
-+ log_error(LOG_LEVEL_CONNECT, "SOCKS5 negotiation protocol error");
-+ break;
-+ }
-+ err = 1;
-+ }
-+
-+ close_socket(sfd);
-+ errno = EINVAL;
-+ return(JB_INVALID_SOCKET);
-+}
-+
- /*
- Local Variables:
- tab-width: 3
-diff -r 6ce92f2e919b loadcfg.c
---- loadcfg.c 2007-12-23 16:24:56.000000000 +0100
-+++ loadcfg.c 2008-02-12 21:01:39.000000000 +0100
-@@ -535,6 +535,7 @@
- #define hash_forward 2029845ul /* "forward" */
- #define hash_forward_socks4 3963965521ul /* "forward-socks4" */
- #define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */
-+#define hash_forward_socks5 3963965522ul /* "forward-socks5" */
- #define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */
- #define hash_jarfile 2046641ul /* "jarfile" */
- #define hash_listen_address 1255650842ul /* "listen-address" */
-@@ -774,6 +775,7 @@
- struct forward_spec *cur_fwd;
- int vec_count;
- char *vec[3];
-+ unsigned long int directive_hash = 0ul;
-
- strlcpy(tmp, buf, sizeof(tmp));
-
-@@ -814,7 +816,8 @@
- savearg(cmd, arg, config);
-
-
-- switch( hash_string( cmd ) )
-+ directive_hash = hash_string( cmd );
-+ switch( directive_hash )
- {
- /* *************************************************************************
- * actionsfile actions-file-name
-@@ -1203,6 +1206,7 @@
- * forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
- * *************************************************************************/
- case hash_forward_socks4a:
-+ case hash_forward_socks5:
- vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
-
- if (vec_count != 3)
-@@ -1224,7 +1228,11 @@
- continue;
- }
-
-+ if (directive_hash == hash_forward_socks4a) {
- cur_fwd->type = SOCKS_4A;
-+ } else {
-+ cur_fwd->type = SOCKS_5;
-+ }
-
- /* Save the URL pattern */
- if (create_url_spec(cur_fwd->url, vec[0]))
-diff -r 6ce92f2e919b project.h
---- project.h 2007-12-07 19:29:23.000000000 +0100
-+++ project.h 2008-02-12 20:54:42.000000000 +0100
-@@ -1474,6 +1474,7 @@
- #define SOCKS_NONE 0 /**< Don't use a SOCKS server */
- #define SOCKS_4 40 /**< original SOCKS 4 protocol */
- #define SOCKS_4A 41 /**< as modified for hosts w/o external DNS */
-+#define SOCKS_5 50 /**< as modified for hosts w/o external DNS */
-
-
- /**
-@@ -1484,7 +1485,7 @@
- /** URL pattern that this forward_spec is for. */
- struct url_spec url[1];
-
-- /** Connection type. Must be SOCKS_NONE, SOCKS_4, or SOCKS_4A. */
-+ /** Connection type. Must be SOCKS_NONE, SOCKS_4, SOCKS_4A or SOCKS_5. */
- int type;
-
- /** SOCKS server hostname. Only valid if "type" is SOCKS_4 or SOCKS_4A. */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081119/1f6324fc/attachment-0001.html>
More information about the macports-changes
mailing list