update to 1.3.2
please review, test.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/dante/Makefile,v
retrieving revision 1.37
diff -N -u -p Makefile
--- Makefile 20 Nov 2010 17:22:43 -0000 1.37
+++ Makefile 6 Sep 2012 05:22:44 -0000
@@ -2,8 +2,7 @@
COMMENT= SOCKS client and server
-DISTNAME= dante-1.1.19
-REVISION = 0
+DISTNAME= dante-1.3.2
CATEGORIES= security
SHARED_LIBS= dsocks 1.1 \
@@ -37,7 +36,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/README.* ${PREFIX}/share/doc/dante
${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4.* ${PREFIX}/share/doc/dante
${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${PREFIX}/share/doc/dante
- ${INSTALL_DATA} ${WRKSRC}/doc/faq.ps ${PREFIX}/share/doc/dante
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dante
${INSTALL_DATA} ${WRKSRC}/example/*.conf ${PREFIX}/share/examples/dante
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/dante/distinfo,v
retrieving revision 1.10
diff -N -u -p distinfo
--- distinfo 5 Apr 2007 17:26:06 -0000 1.10
+++ distinfo 6 Sep 2012 05:22:44 -0000
@@ -1,5 +1,2 @@
-MD5 (dante-1.1.19.tar.gz) = WLVtHpZPPwGG8+7tPZXZpA==
-RMD160 (dante-1.1.19.tar.gz) = NkkgewYblf3VsJUOoezpIZ64r0w=
-SHA1 (dante-1.1.19.tar.gz) = 42amCogM7/YgX3zYcknHMiuETTw=
-SHA256 (dante-1.1.19.tar.gz) = tJ8JNigqFMQaA81wFY0aEeavNWShjUszN/KR+22uCTY=
-SIZE (dante-1.1.19.tar.gz) = 895713
+SHA256 (dante-1.3.2.tar.gz) = a3NvMuxYuJnCTPFL4CSRoGMad444UxQ3DV3qS69ILvs=
+SIZE (dante-1.3.2.tar.gz) = 949049
Index: patches/patch-bin_socksify_in
===================================================================
RCS file: /cvs/ports/security/dante/patches/patch-bin_socksify_in,v
retrieving revision 1.1
diff -N -u -p patches/patch-bin_socksify_in
--- patches/patch-bin_socksify_in 21 May 2005 06:51:55 -0000 1.1
+++ patches/patch-bin_socksify_in 6 Sep 2012 05:22:44 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-bin_socksify_in,v 1.1 2005/05/21 06:51:55 jakob Exp $
---- bin/socksify.in.orig Mon Jan 24 02:24:18 2005
-+++ bin/socksify.in Fri May 20 19:26:06 2005
-@@ -52,7 +52,7 @@ SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD
- LIBDIR="@LIBRARY_PREFIX@"
+--- bin/socksify.in.orig Sat Jul 30 07:35:26 2011
++++ bin/socksify.in Thu Sep 6 00:52:44 2012
+@@ -66,7 +66,7 @@ else
+ fi
- #XXX shared library name should be generated too (possibly including version)
--LIBRARY="${SOCKS_LIBRARY-${LIBDIR}/libdsocks.@SOLIB_POSTFIX@}"
-+LIBRARY="${SOCKS_LIBRARY-${LIBDIR}/libdsocks.@[email protected]}"
+ #dlib/Makefile.am libtool flags should produce a predictable library name
+-LIBRARY="${SOCKS_LIBRARY:-${FULLPATH}libdsocks.@SOLIB_POSTFIX@}"
++LIBRARY="${SOCKS_LIBRARY:-${FULLPATH}libdsocks.@[email protected]}"
- PRELOAD_SEPERATOR="@PRELOAD_SEPERATOR@"
- PRELOAD_POSTFIX="@PRELOAD_POSTFIX@"
+ if test x"$FULLPATH" != x -a ! -s "$LIBRARY" -o \
+ x"$FULLPATH" = x -a ! -s "$SOCKS_LIBDIR/$LIBRARY"; then
Index: patches/patch-sockd_auth_password_c
===================================================================
RCS file: /cvs/ports/security/dante/patches/patch-sockd_auth_password_c,v
retrieving revision 1.1
diff -N -u -p patches/patch-sockd_auth_password_c
--- patches/patch-sockd_auth_password_c 18 Sep 2007 22:15:11 -0000 1.1
+++ /dev/null 6 Sep 2012 04:57:01 -0000
@@ -1,44 +0,0 @@
-$OpenBSD: patch-sockd_auth_password_c,v 1.1 2007/09/18 22:15:11 jakob Exp $
---- sockd/auth_password.c.orig Wed Jun 8 08:34:54 2005
-+++ sockd/auth_password.c Tue Sep 18 17:27:00 2007
-@@ -57,29 +57,33 @@ passwordcheck(name, clearpassword, emsg,
- struct passwd *pw;
- char *salt, *password;
- uid_t euid;
-+ int retval = -1; /* default return value */
-
- socks_seteuid(&euid, sockscf.uid.privileged);
- pw = socks_getpwnam(name);
-- socks_reseteuid(sockscf.uid.privileged, euid);
-
- if (pw == NULL) {
- snprintfn(emsg, emsglen, "system username/password failed");
-- return -1;
-+ retval = -1;
- }
-
-- if (clearpassword != NULL) {
-+ else if (clearpassword != NULL) {
- salt = pw->pw_passwd;
- password = pw->pw_passwd;
-
- if (strcmp(crypt(clearpassword, salt), password) == 0)
-- return 0;
-+ retval = 0;
- else {
- snprintfn(emsg, emsglen, "system password
userauthentication failed");
-- return -1;
-+ retval = -1;
- }
- }
- else
-- return 0;
-+ retval = 0;
-
-- return -1;
-+ /* reset after checking pw because on OpenBSD pw->pw_passwd
-+ resets to stars after euid is no longer 0 */
-+ socks_reseteuid(sockscf.uid.privileged, euid);
-+
-+ return retval;
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/dante/pkg/PLIST,v
retrieving revision 1.14
diff -N -u -p pkg/PLIST
--- pkg/PLIST 21 Jan 2006 11:14:44 -0000 1.14
+++ pkg/PLIST 6 Sep 2012 05:22:44 -0000
@@ -2,22 +2,22 @@
@conflict socks5-*
bin/socksify
include/socks.h
-lib/libdsocks.a
lib/libdsocks.la
lib/libsocks.a
lib/libsocks.la
+@man man/man1/socksify.1
@man man/man5/sockd.conf.5
@man man/man5/socks.conf.5
@man man/man8/sockd.8
-sbin/sockd
+@bin sbin/sockd
share/doc/dante/
share/doc/dante/README.socksify
share/doc/dante/README.survey
share/doc/dante/README.usage
share/doc/dante/SOCKS4.protocol
-share/doc/dante/faq.ps
share/doc/dante/rfc1928.txt
share/doc/dante/rfc1929.txt
+share/doc/dante/rfc1961.txt
share/examples/dante/
share/examples/dante/sockd-basic.conf
share/examples/dante/sockd-chaining.conf
