ports/158871: Update of ports/net/dante to Dante 1.3.1
Ralf Wenk
IZ-FreeBSD0701 at hs-karlsruhe.de
Wed Jul 13 14:00:24 UTC 2011
>Number: 158871
>Category: ports
>Synopsis: Update of ports/net/dante to Dante 1.3.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 13 14:00:20 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ralf Wenk
>Release: FreeBSD 8.2-STABLE i386
>Organization:
Hochschule Karlsruhe, University of Applied Sciences
>Environment:
FreeBSD IZ-FreeBSD1 8.2-STABLE FreeBSD 8.2-STABLE #25: Mon Jun 27 11:36:31 CEST 2011 wera0003 at IZ-FreeBSD1:/usr/obj/usr/src/sys/diskless-I686 i386
>Description:
Update from version 1.1.19 to current official version 1.3.1.
I have changed the ports files to use Dante 1.3.1 as a base.
As far as I can tell, files/patch-sockd-getifa.c is no longer needed.
The file is gone and sockd/getoutaddr.c looks very similar to the patch now.
>How-To-Repeat:
>Fix:
Save the attached file into ports/net/dante.
Use "sh diffs.txt" to change the port.
Done.
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# Makefile.diff
# distinfo.diff
# patch-configure.diff
# patch-ltmain.sh.diff
# pkg-plist.diff
#
echo x - Makefile.diff
sed 's/^X//' >Makefile.diff << 'ad2ded6500d2f53baa2cfd8297bb8250'
X--- Makefile.old 2009-01-26 12:25:47.000000000 +0100
X+++ Makefile 2011-07-13 14:10:17.029740293 +0200
X@@ -6,12 +6,11 @@
X #
X
X PORTNAME= dante
X-PORTVERSION= 1.1.19
X+PORTVERSION= 1.3.1
X PORTREVISION= 1
X CATEGORIES= net security
X MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \
X- ftp://ftp.nuug.no/pub/anders/distfiles/ \
X- http://atreides.freenix.no/~anders/
X+ ftp://ftp.inet.no/pub/socks/old/
X
X MAINTAINER= anders at FreeBSD.org
X COMMENT= A circuit-level firewall/proxy
X@@ -28,6 +27,7 @@
X
X USE_RC_SUBR= sockd.sh
X
X+MAN1= socksify.1
X MAN5= sockd.conf.5 socks.conf.5
X MAN8= sockd.8
X
X@@ -38,8 +38,7 @@
X ${INSTALL} -d -m 555 ${DOCSDIR}
X @${INSTALL_DATA} ${WRKSRC}/doc/README* ${DOCSDIR}
X @${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${DOCSDIR}
X- @${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4.protocol ${DOCSDIR}
X- @${INSTALL_DATA} ${WRKSRC}/doc/faq.tex ${DOCSDIR}
X+ @${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${DOCSDIR}
X .endif
X
X .include <bsd.port.mk>
ad2ded6500d2f53baa2cfd8297bb8250
echo x - distinfo.diff
sed 's/^X//' >distinfo.diff << '3038c4af90eef3001be56db806b0e5a9'
X--- distinfo.old 2011-03-21 15:21:52.562348000 +0100
X+++ distinfo 2011-07-13 13:59:45.456731813 +0200
X@@ -1,2 +1,2 @@
X-SHA256 (dante-1.1.19.tar.gz) = b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
X-SIZE (dante-1.1.19.tar.gz) = 895713
X+SHA256 (dante-1.3.1.tar.gz) = da75c1f8506f06c463d51031baa2cf4b612c42dfd9c39e78d6ae37829d4129bd
X+SIZE (dante-1.3.1.tar.gz) = 943704
3038c4af90eef3001be56db806b0e5a9
echo x - patch-configure.diff
sed 's/^X//' >patch-configure.diff << 'fb3d9504c92358fa05560430d25cd6ba'
X--- files/patch-configure.old 2006-09-17 07:08:40.000000000 +0200
X+++ files/patch-configure 2011-07-12 15:51:04.752764240 +0200
X@@ -1,90 +1,11 @@
X-Index: configure
X-diff -u configure.orig configure
X---- configure.orig Mon Jan 16 20:49:45 2006
X-+++ configure Sun Sep 3 20:35:01 2006
X-@@ -25195,6 +25195,76 @@
X- #include <unistd.h>
X+--- configure.orig 2011-06-20 18:01:06.000000000 +0200
X++++ configure 2011-07-12 15:49:45.602728013 +0200
X+@@ -33876,7 +33876,7 @@
X
X- struct hostent *
X-+gethostbyaddr( const void *, int, int
X-+);
X-+int
X-+main ()
X-+{
X-+
X-+ ;
X-+ return 0;
X-+}
X-+_ACEOF
X-+rm -f conftest.$ac_objext
X-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
X-+ (eval $ac_compile) 2>conftest.er1
X-+ ac_status=$?
X-+ grep -v '^ *+' conftest.er1 >conftest.err
X-+ rm -f conftest.er1
X-+ cat conftest.err >&5
X-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
X-+ (exit $ac_status); } &&
X-+ { ac_try='test -z "$ac_c_werror_flag"
X-+ || test ! -s conftest.err'
X-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
X-+ (eval $ac_try) 2>&5
X-+ ac_status=$?
X-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
X-+ (exit $ac_status); }; } &&
X-+ { ac_try='test -s conftest.$ac_objext'
X-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
X-+ (eval $ac_try) 2>&5
X-+ ac_status=$?
X-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
X-+ (exit $ac_status); }; }; then
X-+
X-+cat >>confdefs.h <<_ACEOF
X-+#define HAVE_PROT_GETHOSTBYADDR_0 struct hostent *
X-+_ACEOF
X-+
X-+cat >>confdefs.h <<_ACEOF
X-+#define HAVE_PROT_GETHOSTBYADDR_1 const void *
X-+_ACEOF
X-+
X-+cat >>confdefs.h <<_ACEOF
X-+#define HAVE_PROT_GETHOSTBYADDR_2 int
X-+_ACEOF
X-+
X-+cat >>confdefs.h <<_ACEOF
X-+#define HAVE_PROT_GETHOSTBYADDR_3 int
X-+_ACEOF
X-+
X-+ echo "$as_me:$LINENO: result: ok" >&5
X-+echo "${ECHO_T}ok" >&6
X-+else
X-+ echo "$as_me: failed program was:" >&5
X-+sed 's/^/| /' conftest.$ac_ext >&5
X-+
X-+cat >conftest.$ac_ext <<_ACEOF
X-+
X-+ /* confdefs.h. */
X-+_ACEOF
X-+cat confdefs.h >>conftest.$ac_ext
X-+cat >>conftest.$ac_ext <<_ACEOF
X-+/* end confdefs.h. */
X-+
X-+#include <sys/types.h>
X-+#include <sys/socket.h>
X-+#include <sys/uio.h>
X-+#include <netdb.h>
X-+#include <unistd.h>
X-+
X-+struct hostent *
X- gethostbyaddr( const void *, socklen_t, int
X- );
X- int
X-@@ -25253,6 +25323,8 @@
X- echo "$as_me:$LINENO: result: failure" >&5
X- echo "${ECHO_T}failure" >&6
X- failproto=t
X-+fi
X-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
X- fi
X- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
X- fi
X+
X+
X+-for ac_header in gssapi.h gssapi/gssapi.h gssapi/gssapi_ext.h
X++for ac_header in gssapi/gssapi.h gssapi/gssapi_ext.h
X+ do
X+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
X+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
fb3d9504c92358fa05560430d25cd6ba
echo x - patch-ltmain.sh.diff
sed 's/^X//' >patch-ltmain.sh.diff << '6dd5b9a7e5fa198467caa9f4449a3f9e'
X--- files/patch-ltmain.sh.old 2005-03-16 22:14:26.000000000 +0100
X+++ files/patch-ltmain.sh 2011-07-12 16:02:14.305766212 +0200
X@@ -1,14 +1,14 @@
X---- ltmain.sh.orig Wed Mar 16 21:57:42 2005
X-+++ ltmain.sh Wed Mar 16 21:59:55 2005
X-@@ -5540,10 +5540,12 @@
X+--- ltmain.sh.orig 2008-08-12 19:06:26.000000000 +0200
X++++ ltmain.sh 2011-07-12 16:01:37.595732703 +0200
X+@@ -6115,10 +6115,12 @@
X fi
X
X # Install the pseudo-library for information purposes.
X + if /usr/bin/false; then
X name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X+ $show "$install_prog $extra_mode $instname $destdir/$name"
X+ $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
X + fi
X
X # Maybe install the static library, too.
6dd5b9a7e5fa198467caa9f4449a3f9e
echo x - pkg-plist.diff
sed 's/^X//' >pkg-plist.diff << '84f29b29c7d390b3b6be4070c0769d29'
X--- pkg-plist.old 2006-09-11 08:45:52.000000000 +0200
X+++ pkg-plist 2011-07-13 13:56:36.566733873 +0200
X@@ -1,19 +1,25 @@
X @unexec %D/etc/rc.d/sockd.sh forcestop 2>/dev/null || true
X bin/socksify
X+etc/rc.d/sockd
X etc/sockd.conf.example
X etc/socks.conf.example
X include/socks.h
X lib/libdsocks.so
X-lib/libdsocks.so.1
X lib/libsocks.a
X lib/libsocks.so
X lib/libsocks.so.1
X+man/man1/socksify.1.gz
X+man/man5/sockd.conf.5.gz
X+man/man5/socks.conf.5.gz
X+man/man8/sockd.8.gz
X sbin/sockd
X %%PORTDOCS%%%%DOCSDIR%%/README.socksify
X %%PORTDOCS%%%%DOCSDIR%%/README.survey
X %%PORTDOCS%%%%DOCSDIR%%/README.usage
X %%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol
X+%%PORTDOCS%%%%DOCSDIR%%/SOCKS4A.protocol
X %%PORTDOCS%%%%DOCSDIR%%/rfc1928.txt
X %%PORTDOCS%%%%DOCSDIR%%/rfc1929.txt
X+%%PORTDOCS%%%%DOCSDIR%%/rfc1961.txt
X %%PORTDOCS%%%%DOCSDIR%%/faq.tex
X %%PORTDOCS%%@dirrm %%DOCSDIR%%
84f29b29c7d390b3b6be4070c0769d29
echo patching
for f in *.diff
do
patch < ${f}
done
echo cleaning up
rm files/patch-sockd-getifa.c
rm *.diff *.orig files/*.orig diffs.txt
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list