Attachment 143982 Details for Bug 191232 – patch

[patch] patch

dante.diff (text/plain), 6.36 KB, created by mp39590 on 2014-06-21 04:18:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mp39590

Created: 2014-06-21 04:18:12 UTC

Size: 6.36 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 358634)
>+++ Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	dante
>-PORTVERSION=	1.3.2
>-CATEGORIES=	net security
>+PORTVERSION=	1.4.0
>+CATEGORIES=	net security ipv6
> MASTER_SITES=	ftp://ftp.inet.no/pub/socks/ \
> 		ftp://ftp.nuug.no/pub/anders/distfiles/ \
> 		http://atreides.freenix.no/~anders/ \
>@@ -12,6 +12,8 @@
> MAINTAINER=	anders@FreeBSD.org
> COMMENT=	A circuit-level firewall/proxy
> 
>+LICENSE=	BSD
>+
> CONFLICTS=	socks5-[0-9]*
> 
> GNU_CONFIGURE=	yes
>@@ -22,23 +24,40 @@
> 
> USE_LDCONFIG=	yes
> 
>+USES=	libtool
>+
> USE_RC_SUBR=	sockd
> 
>-LICENSE=	BSD
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-MAN1=	socksify.1
>-MAN5=	sockd.conf.5 socks.conf.5
>-MAN8=	sockd.8
>+.include <bsd.port.pre.mk>
> 
>-NO_STAGE=	yes
>+.if ${OSVERSION} >= 1000044
>+CONFIGURE_ARGS+=	--with-libc=libc.so.7
>+.endif
>+
>+.include <bsd.port.options.mk>
>+
> post-install:
>-	@${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${PREFIX}/etc/socks.conf.example
>-	@${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${PREFIX}/etc/sockd.conf.example
>-.if !defined(NOPORTDOCS)
>-	${INSTALL} -d -m 555 ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/doc/README* ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${STAGEDIR}${PREFIX}/etc/socks.conf.sample
>+	@${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${STAGEDIR}${PREFIX}/etc/sockd.conf.sample
>+
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+	${INSTALL} -d -m 555 ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/example/sockd-basic.conf ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/example/sockd-chaining.conf ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/example/socks-simple-withoutnameserver.conf ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/example/socks-simple.conf ${STAGEDIR}${EXAMPLESDIR}
> .endif
> 
>-.include <bsd.port.mk>
>+.if ${PORT_OPTIONS:MDOCS}
>+	${INSTALL} -d -m 555 ${STAGEDIR}${DOCSDIR}
>+	${INSTALL} -d -m 555 ${STAGEDIR}${DOCSDIR}/contrib
>+	@${INSTALL_DATA} ${WRKSRC}/doc/README* ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/UPGRADE ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/contrib/sockd-stat.awk ${STAGEDIR}${DOCSDIR}/contrib/sockd-stat.awk
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 358634)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (dante-1.3.2.tar.gz) = 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb
>-SIZE (dante-1.3.2.tar.gz) = 949049
>+SHA256 (dante-1.4.0.tar.gz) = 55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b
>+SIZE (dante-1.4.0.tar.gz) = 1253458
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 358634)
>+++ files/patch-configure	(working copy)
>@@ -1,11 +0,0 @@
>---- configure.orig	2011-06-20 18:01:06.000000000 +0200
>-+++ configure	2011-07-12 15:49:45.602728013 +0200
>-@@ -33876,7 +33876,7 @@
>- 
>- 
>- 
>--for ac_header in gssapi.h gssapi/gssapi.h gssapi/gssapi_ext.h
>-+for ac_header in gssapi/gssapi.h gssapi/gssapi_ext.h
>- do
>- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>Index: files/patch-ltmain.sh
>===================================================================
>--- files/patch-ltmain.sh	(revision 358634)
>+++ files/patch-ltmain.sh	(working copy)
>@@ -1,15 +0,0 @@
>---- ltmain.sh.orig	2008-08-12 19:06:26.000000000 +0200
>-+++ ltmain.sh	2011-07-12 16:01:37.595732703 +0200
>-@@ -6115,10 +6115,12 @@
>- 	fi
>- 
>- 	# Install the pseudo-library for information purposes.
>-+	if /usr/bin/false; then
>- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>- 	instname="$dir/$name"i
>- 	$show "$install_prog $extra_mode $instname $destdir/$name"
>- 	$run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
>-+	fi
>- 
>- 	# Maybe install the static library, too.
>- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 0)
>+++ pkg-message	(working copy)
>@@ -0,0 +1,12 @@
>+
>+******************* IMPORTANT UPGRADE NOTIFICATION *******************
>+
>+If you're upgrading from earlier release to 1.4.x, please read UPGRADE
>+document, which is installed in docs folder, or check it online:
>+
>+http://www.inet.no/dante/doc/1.4.x/config/upgrade.html
>+
>+The 1.4.x release has syntax changes and various new functionality
>+additions.
>+
>+******************* IMPORTANT UPGRADE NOTIFICATION *******************
>
>Property changes on: pkg-message
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 358634)
>+++ pkg-plist	(working copy)
>@@ -1,19 +1,32 @@
> @unexec %D/etc/rc.d/sockd.sh forcestop 2>/dev/null || true
> bin/socksify
>-etc/sockd.conf.example
>-etc/socks.conf.example
>+@sample etc/sockd.conf.sample
>+@sample etc/socks.conf.sample
> include/socks.h
> lib/libdsocks.so
> lib/libsocks.a
> lib/libsocks.so
>-lib/libsocks.so.1
>+lib/libsocks.so.0
>+lib/libsocks.so.0.1.1
> sbin/sockd
>+man/man1/socksify.1.gz
>+man/man5/sockd.conf.5.gz
>+man/man5/socks.conf.5.gz
>+man/man8/sockd.8.gz
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-basic.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-chaining.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks-simple-withoutnameserver.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks-simple.conf
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
> %%PORTDOCS%%%%DOCSDIR%%/README.socksify
> %%PORTDOCS%%%%DOCSDIR%%/README.survey
> %%PORTDOCS%%%%DOCSDIR%%/README.usage
> %%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol
> %%PORTDOCS%%%%DOCSDIR%%/SOCKS4A.protocol
>+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
>+%%PORTDOCS%%%%DOCSDIR%%/contrib/sockd-stat.awk
> %%PORTDOCS%%%%DOCSDIR%%/rfc1928.txt
> %%PORTDOCS%%%%DOCSDIR%%/rfc1929.txt
> %%PORTDOCS%%%%DOCSDIR%%/rfc1961.txt
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
> %%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 191232: 143982