Attachment #143982 for bug #191232

View | Details | Raw Unified | Return to bug 191232
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-15 / +34 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dante	4	PORTNAME= dante
5	PORTVERSION= 1.3.2	5	PORTVERSION= 1.4.0
6	CATEGORIES= net security	6	CATEGORIES= net security ipv6
7	MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \	7	MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \
8	ftp://ftp.nuug.no/pub/anders/distfiles/ \	8	ftp://ftp.nuug.no/pub/anders/distfiles/ \
9	http://atreides.freenix.no/~anders/ \	9	http://atreides.freenix.no/~anders/ \
Lines 12-17 Link Here
12	MAINTAINER= anders@FreeBSD.org	12	MAINTAINER= anders@FreeBSD.org
13	COMMENT= A circuit-level firewall/proxy	13	COMMENT= A circuit-level firewall/proxy
14		14
		15	LICENSE= BSD
		16
15	CONFLICTS= socks5-[0-9]*	17	CONFLICTS= socks5-[0-9]*
16		18
17	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
Lines 22-44 Link Here
22		24
23	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
24		26
		27	USES= libtool
		28
25	USE_RC_SUBR= sockd	29	USE_RC_SUBR= sockd
26		30
27	LICENSE= BSD	31	OPTIONS_DEFINE= DOCS EXAMPLES
28		32
29	MAN1= socksify.1	33	.include <bsd.port.pre.mk>
30	MAN5= sockd.conf.5 socks.conf.5
31	MAN8= sockd.8
32		34
33	NO_STAGE= yes	35	.if ${OSVERSION} >= 1000044
		36	CONFIGURE_ARGS+= --with-libc=libc.so.7
		37	.endif
		38
		39	.include <bsd.port.options.mk>
		40
34	post-install:	41	post-install:
35	@${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${PREFIX}/etc/socks.conf.example	42	@${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${STAGEDIR}${PREFIX}/etc/socks.conf.sample
36	@${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${PREFIX}/etc/sockd.conf.example	43	@${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${STAGEDIR}${PREFIX}/etc/sockd.conf.sample
37	.if !defined(NOPORTDOCS)	44
38	${INSTALL} -d -m 555 ${DOCSDIR}	45	.if ${PORT_OPTIONS:MEXAMPLES}
39	@${INSTALL_DATA} ${WRKSRC}/doc/README* ${DOCSDIR}	46	${INSTALL} -d -m 555 ${STAGEDIR}${EXAMPLESDIR}
40	@${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${DOCSDIR}	47	@${INSTALL_DATA} ${WRKSRC}/example/sockd-basic.conf ${STAGEDIR}${EXAMPLESDIR}
41	@${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${DOCSDIR}	48	@${INSTALL_DATA} ${WRKSRC}/example/sockd-chaining.conf ${STAGEDIR}${EXAMPLESDIR}
		49	@${INSTALL_DATA} ${WRKSRC}/example/socks-simple-withoutnameserver.conf ${STAGEDIR}${EXAMPLESDIR}
		50	@${INSTALL_DATA} ${WRKSRC}/example/socks-simple.conf ${STAGEDIR}${EXAMPLESDIR}
42	.endif	51	.endif
43		52
44	.include <bsd.port.mk>	53	.if ${PORT_OPTIONS:MDOCS}
		54	${INSTALL} -d -m 555 ${STAGEDIR}${DOCSDIR}
		55	${INSTALL} -d -m 555 ${STAGEDIR}${DOCSDIR}/contrib
		56	@${INSTALL_DATA} ${WRKSRC}/doc/README* ${STAGEDIR}${DOCSDIR}
		57	@${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${STAGEDIR}${DOCSDIR}
		58	@${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${STAGEDIR}${DOCSDIR}
		59	@${INSTALL_DATA} ${WRKSRC}/UPGRADE ${STAGEDIR}${DOCSDIR}
		60	@${INSTALL_DATA} ${WRKSRC}/contrib/sockd-stat.awk ${STAGEDIR}${DOCSDIR}/contrib/sockd-stat.awk
		61	.endif
		62
		63	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (dante-1.3.2.tar.gz) = 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb	1	SHA256 (dante-1.4.0.tar.gz) = 55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b
2	SIZE (dante-1.3.2.tar.gz) = 949049	2	SIZE (dante-1.4.0.tar.gz) = 1253458

Lines 1-11 Link Here

(-)files/patch-configure (-11 lines)
1	--- configure.orig 2011-06-20 18:01:06.000000000 +0200
2	+++ configure 2011-07-12 15:49:45.602728013 +0200
3	@@ -33876,7 +33876,7 @@
4
5
6
7	-for ac_header in gssapi.h gssapi/gssapi.h gssapi/gssapi_ext.h
8	+for ac_header in gssapi/gssapi.h gssapi/gssapi_ext.h
9	do
10	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then




--- 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"





******************* 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 *******************




@unexec %D/etc/rc.d/sockd.sh forcestop 2>/dev/null || true
bin/socksify
@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.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%%

Return to bug 191232

Lines 1-15 Link Here

(-)files/patch-ltmain.sh (-15 lines)
1	--- ltmain.sh.orig 2008-08-12 19:06:26.000000000 +0200
2	+++ ltmain.sh 2011-07-12 16:01:37.595732703 +0200
3	@@ -6115,10 +6115,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
9	instname="$dir/$name"i
10	$show "$install_prog $extra_mode $instname $destdir/$name"
11	$run eval "$install_prog $extra_mode $instname $destdir/$name" \|\| exit $?
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Line 0 Link Here

(-)pkg-message (+12 lines)
	1
	2	***************** IMPORTANT UPGRADE NOTIFICATION *****************
	3
	4	If you're upgrading from earlier release to 1.4.x, please read UPGRADE
	5	document, which is installed in docs folder, or check it online:
	6
	7	http://www.inet.no/dante/doc/1.4.x/config/upgrade.html
	8
	9	The 1.4.x release has syntax changes and various new functionality
	10	additions.
	11
	12	***************** IMPORTANT UPGRADE NOTIFICATION *****************

Lines 1-19 Link Here

(-)pkg-plist (-3 / +16 lines)
1	@unexec %D/etc/rc.d/sockd.sh forcestop 2>/dev/null \|\| true	1	@unexec %D/etc/rc.d/sockd.sh forcestop 2>/dev/null \|\| true
2	bin/socksify	2	bin/socksify
3	etc/sockd.conf.example	3	@sample etc/sockd.conf.sample
4	etc/socks.conf.example	4	@sample etc/socks.conf.sample
5	include/socks.h	5	include/socks.h
6	lib/libdsocks.so	6	lib/libdsocks.so
7	lib/libsocks.a	7	lib/libsocks.a
8	lib/libsocks.so	8	lib/libsocks.so
9	lib/libsocks.so.1	9	lib/libsocks.so.0
		10	lib/libsocks.so.0.1.1
10	sbin/sockd	11	sbin/sockd
		12	man/man1/socksify.1.gz
		13	man/man5/sockd.conf.5.gz
		14	man/man5/socks.conf.5.gz
		15	man/man8/sockd.8.gz
		16	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-basic.conf
		17	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-chaining.conf
		18	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks-simple-withoutnameserver.conf
		19	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks-simple.conf
		20	%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
11	%%PORTDOCS%%%%DOCSDIR%%/README.socksify	21	%%PORTDOCS%%%%DOCSDIR%%/README.socksify
12	%%PORTDOCS%%%%DOCSDIR%%/README.survey	22	%%PORTDOCS%%%%DOCSDIR%%/README.survey
13	%%PORTDOCS%%%%DOCSDIR%%/README.usage	23	%%PORTDOCS%%%%DOCSDIR%%/README.usage
14	%%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol	24	%%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol
15	%%PORTDOCS%%%%DOCSDIR%%/SOCKS4A.protocol	25	%%PORTDOCS%%%%DOCSDIR%%/SOCKS4A.protocol
		26	%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
		27	%%PORTDOCS%%%%DOCSDIR%%/contrib/sockd-stat.awk
16	%%PORTDOCS%%%%DOCSDIR%%/rfc1928.txt	28	%%PORTDOCS%%%%DOCSDIR%%/rfc1928.txt
17	%%PORTDOCS%%%%DOCSDIR%%/rfc1929.txt	29	%%PORTDOCS%%%%DOCSDIR%%/rfc1929.txt
18	%%PORTDOCS%%%%DOCSDIR%%/rfc1961.txt	30	%%PORTDOCS%%%%DOCSDIR%%/rfc1961.txt
		31	%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
19	%%PORTDOCS%%@dirrm %%DOCSDIR%%	32	%%PORTDOCS%%@dirrm %%DOCSDIR%%