Attachment #157213 for bug #188374




# $FreeBSD: head/net/3proxy/Makefile 382278 2015-03-25 23:51:05Z marino $

PORTNAME=	3proxy
PORTVERSION=	0.7.1.2
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://github.com/z3APA3A/3proxy/archive/v${PORTVERSION}.tar.gz?dummy=/
		http://security.nnov.ru/soft/3proxy/${PORTVERSION}/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)

LICENSE=	APACHE20 BSD2CLAUSE GPLv2 GPLv3 LGPL21 LGPL3
LICENSE_COMB=	dual

CONFLICTS_INSTALL=	libproxy-[0-9]*

OPTIONS_DEFINE=	DOCS

MAKEFILE=	Makefile.unix
USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
USE_RC_SUBR=	3proxy
USES=		tar:tgz

PORTDOCS=	README

post-patch:
	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}

do-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts mycrypt ${STAGEDIR}${PREFIX}/bin/
	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ${STAGEDIR}${PREFIX}/man/man8/
	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)3proxy.0.7-no-bin/distinfo (-2 / +2 lines)
1	SHA256 (3proxy-0.6.1.tgz) = 10f8804258791e80353a334dc9b80473a02c6dda939de76451e655f643aadd7f	1	SHA256 (3proxy-0.7.1.2.tar.gz) = 85c5cadad1878855c382622787f787d5c2c30bdea0a240f7d35cfd8abe30b746
2	SIZE (3proxy-0.6.1.tgz) = 480160	2	SIZE (3proxy-0.7.1.2.tar.gz) = 468593




diff -urN man/3proxy.8 man-bin/3proxy.8
--- man/3proxy.8	2015-02-17 16:09:13.000000000 +0300
+++ man-bin/3proxy.8	2015-05-28 11:58:00.543952000 +0300
@@ -25,18 +25,7 @@
 It can establish multiple
 gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
 v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
-from configuration file like independant service 
-.BR proxy (8)
-.BR socks (8)
-.BR pop3p (8)
-.BR tcppm (8)
-.BR udppm (8)
-.BR ftppr (8)
-.BR dnspr
-but
-.BR 3proxy
-is not a kind of wrapper or superserver for this daemons. It just has same
-code compiled in, but provides much more functionality. SOCKSv5
+from configuration file like independant service. SOCKSv5
 implementatation allows to use 3proxy with any UDP or TCP based client
 applications designed without
 proxy support (with
@@ -84,7 +73,7 @@
 configuration from stdin. It makes it possible to use 3proxy.cfg file as
 executable script just by setting +x mode and adding
 .br
-#!/usr/local/3proxy/3proxy
+#!/usr/local/bin/3proxy
 .br
 as a first line in 3proxy.cfg
 .TP
@@ -133,14 +122,14 @@
 wget to automate this task.
 .SH FILES
 .TP
-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
+.I "/usr/local/etc/3proxy.cfg (3proxy.cfg)"
 .BR 3proxy
 configuration file
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
+3proxy.cfg(3),
 kill(1), syslogd(8),
 .br
 http://3proxy.ru/
@@ -148,6 +137,6 @@
 3APA3A is pronounced as \`\`zaraza\'\'.
 .SH AUTHORS
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/3proxy.cfg.3 man-bin/3proxy.cfg.3
--- man/3proxy.cfg.3	2015-02-17 16:09:13.000000000 +0300
+++ man-bin/3proxy.cfg.3	2015-05-28 11:55:28.565596000 +0300
@@ -113,15 +113,6 @@
 .B -a1
 (for proxy) - anonymous proxy (random client information reported)
 .br
- Also, all options mentioned for 
-.BR proxy (8)
-.BR socks (8)
-.BR pop3p (8)
-.BR tcppm (8)
-.BR udppm (8)
-.BR ftppr (8)
- are also supported.
-.br
  Portmapping services listen at SRCPORT and connect to DSTADDR:DSTPORT
 HTTP and SOCKS proxies are standard. 
 .br
@@ -884,13 +875,13 @@
 
 
 .SH SEE ALSO
-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+3proxy(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH TRIVIA
 3APA3A is pronounced as \`\`zaraza\'\'.
 .SH AUTHORS
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )

Lines 15-20 Link Here

(-)3proxy.0.7-no-bin/pkg-descr (-2 / +2 lines)
15	3proxy is FreeWare. It can be used under terms of GNU/GPL or under it own	15	3proxy is FreeWare. It can be used under terms of GNU/GPL or under it own
16	license (please read License Agreement).	16	license (please read License Agreement).
17		17
18	For licensing or commercial support please e-mail to 3proxy@security.nnov.ru	18	For licensing or commercial support please e-mail to 3proxy@3proxy.ru
19		19
20	WWW: http://www.security.nnov.ru/soft/3proxy/	20	WWW: http://3proxy.ru/




bin/3proxy
bin/countersutil
bin/dighosts
bin/ftppr
bin/icqpr
bin/msnpr
bin/mycrypt
bin/pop3p
bin/proxy
bin/smtpp
bin/socks
bin/tcppm
bin/udppm
@sample etc/3proxy.cfg.sample
lib/3proxy/PCREPlugin.so
lib/3proxy/StringsPlugin.so
lib/3proxy/TrafficPlugin.so
man/man3/3proxy.cfg.3.gz
man/man8/3proxy.8.gz
man/man8/ftppr.8.gz
man/man8/pop3p.8.gz
man/man8/proxy.8.gz
man/man8/socks.8.gz
man/man8/tcppm.8.gz
man/man8/udppm.8.gz

Return to bug 188374

Lines 2-12 Link Here

(-)3proxy.0.7-no-bin/Makefile (-10 / +5 lines)
2	# $FreeBSD: head/net/3proxy/Makefile 382278 2015-03-25 23:51:05Z marino $	2	# $FreeBSD: head/net/3proxy/Makefile 382278 2015-03-25 23:51:05Z marino $
3		3
4	PORTNAME= 3proxy	4	PORTNAME= 3proxy
5	PORTVERSION= 0.6.1	5	PORTVERSION= 0.7.1.2
6	PORTREVISION= 1
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://3proxy.ru/${PORTVERSION}/ \	7	MASTER_SITES= http://github.com/z3APA3A/3proxy/archive/v${PORTVERSION}.tar.gz?dummy=/
9	http://security.nnov.ru/soft/3proxy/${PORTVERSION}/
10		8
11	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)	10	COMMENT= Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
Lines 14-40 Link Here
14	LICENSE= APACHE20 BSD2CLAUSE GPLv2 GPLv3 LGPL21 LGPL3	12	LICENSE= APACHE20 BSD2CLAUSE GPLv2 GPLv3 LGPL21 LGPL3
15	LICENSE_COMB= dual	13	LICENSE_COMB= dual
16		14
17	CONFLICTS_INSTALL= libproxy-[0-9]*
18
19	OPTIONS_DEFINE= DOCS	15	OPTIONS_DEFINE= DOCS
20		16
21	MAKEFILE= Makefile.unix	17	MAKEFILE= Makefile.unix
22	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}	18	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
23	USE_RC_SUBR= 3proxy	19	USE_RC_SUBR= 3proxy
24	USES= tar:tgz
25		20
26	PORTDOCS= Readme	21	PORTDOCS= README
27		22
28	post-patch:	23	post-patch:
29	@${REINPLACE_CMD} -e 's\|%%CFLAGS%%\|${CFLAGS}\|' ${WRKSRC}/${MAKEFILE}	24	@${REINPLACE_CMD} -e 's\|%%CFLAGS%%\|${CFLAGS}\|' ${WRKSRC}/${MAKEFILE}
30		25
31	do-install:	26	do-install:
32	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/	27	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
33	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p proxy smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/	28	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts mycrypt ${STAGEDIR}${PREFIX}/bin/
34	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/	29	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
35	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/	30	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
36	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/	31	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
37	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 proxy.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/	32	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ${STAGEDIR}${PREFIX}/man/man8/
38	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/	33	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
39		34
40	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Line 0 Link Here

(-)3proxy.0.7-no-bin/files/patch-man (+95 lines)
		1	diff -urN man/3proxy.8 man-bin/3proxy.8
		2	--- man/3proxy.8 2015-02-17 16:09:13.000000000 +0300
		3	+++ man-bin/3proxy.8 2015-05-28 11:58:00.543952000 +0300
		4	@@ -25,18 +25,7 @@
		5	It can establish multiple
		6	gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
		7	v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
		8	-from configuration file like independant service
		9	-.BR proxy (8)
		10	-.BR socks (8)
		11	-.BR pop3p (8)
		12	-.BR tcppm (8)
		13	-.BR udppm (8)
		14	-.BR ftppr (8)
		15	-.BR dnspr
		16	-but
		17	-.BR 3proxy
		18	-is not a kind of wrapper or superserver for this daemons. It just has same
		19	-code compiled in, but provides much more functionality. SOCKSv5
		20	+from configuration file like independant service. SOCKSv5
		21	implementatation allows to use 3proxy with any UDP or TCP based client
		22	applications designed without
		23	proxy support (with
		24	@@ -84,7 +73,7 @@
		25	configuration from stdin. It makes it possible to use 3proxy.cfg file as
		26	executable script just by setting +x mode and adding
		27	.br
		28	-#!/usr/local/3proxy/3proxy
		29	+#!/usr/local/bin/3proxy
		30	.br
		31	as a first line in 3proxy.cfg
		32	.TP
		33	@@ -133,14 +122,14 @@
		34	wget to automate this task.
		35	.SH FILES
		36	.TP
		37	-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
		38	+.I "/usr/local/etc/3proxy.cfg (3proxy.cfg)"
		39	.BR 3proxy
		40	configuration file
		41	.SH BUGS
		42	Report all bugs to
		43	-.BR 3proxy@security.nnov.ru
		44	+.BR 3proxy@3proxy.ru
		45	.SH SEE ALSO
		46	-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
		47	+3proxy.cfg(3),
		48	kill(1), syslogd(8),
		49	.br
		50	http://3proxy.ru/
		51	@@ -148,6 +137,6 @@
		52	3APA3A is pronounced as \`\`zaraza\'\'.
		53	.SH AUTHORS
		54	3proxy is designed by 3APA3A
		55	-.RI ( 3APA3A@security.nnov.ru ),
		56	+.RI ( 3APA3A@3proxy.ru ),
		57	Vladimir Dubrovin
		58	-.RI ( vlad@sandy.ru )
		59	+.RI ( vlad@securityvulns.ru )
		60	diff -urN man/3proxy.cfg.3 man-bin/3proxy.cfg.3
		61	--- man/3proxy.cfg.3 2015-02-17 16:09:13.000000000 +0300
		62	+++ man-bin/3proxy.cfg.3 2015-05-28 11:55:28.565596000 +0300
		63	@@ -113,15 +113,6 @@
		64	.B -a1
65	(for proxy) - anonymous proxy (random client information reported)
66	.br
67	- Also, all options mentioned for
68	-.BR proxy (8)
69	-.BR socks (8)
70	-.BR pop3p (8)
71	-.BR tcppm (8)
72	-.BR udppm (8)
73	-.BR ftppr (8)
74	- are also supported.
75	-.br
76	Portmapping services listen at SRCPORT and connect to DSTADDR:DSTPORT
77	HTTP and SOCKS proxies are standard.
78	.br
79	@@ -884,13 +875,13 @@
80
81
82	.SH SEE ALSO
83	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
84	+3proxy(8), syslogd(8),
85	.br
86	http://3proxy.ru/
87	.SH TRIVIA
88	3APA3A is pronounced as \`\`zaraza\'\'.
89	.SH AUTHORS
90	3proxy is designed by 3APA3A
91	-.RI ( 3APA3A@security.nnov.ru ),
92	+.RI ( 3APA3A@3proxy.ru ),
93	Vladimir Dubrovin
94	-.RI ( vlad@sandy.ru )
95	+.RI ( vlad@securityvulns.ru )

Lines 1-25 Link Here

(-)3proxy.0.7-no-bin/pkg-plist (-15 lines)
1	bin/3proxy	1	bin/3proxy
2	bin/countersutil	2	bin/countersutil
3	bin/dighosts	3	bin/dighosts
4	bin/ftppr
5	bin/icqpr
6	bin/msnpr
7	bin/mycrypt	4	bin/mycrypt
8	bin/pop3p
9	bin/proxy
10	bin/smtpp
11	bin/socks
12	bin/tcppm
13	bin/udppm
14	@sample etc/3proxy.cfg.sample	5	@sample etc/3proxy.cfg.sample
15	lib/3proxy/PCREPlugin.so	6	lib/3proxy/PCREPlugin.so
16	lib/3proxy/StringsPlugin.so	7	lib/3proxy/StringsPlugin.so
17	lib/3proxy/TrafficPlugin.so	8	lib/3proxy/TrafficPlugin.so
18	man/man3/3proxy.cfg.3.gz	9	man/man3/3proxy.cfg.3.gz
19	man/man8/3proxy.8.gz	10	man/man8/3proxy.8.gz
20	man/man8/ftppr.8.gz
21	man/man8/pop3p.8.gz
22	man/man8/proxy.8.gz
23	man/man8/socks.8.gz
24	man/man8/tcppm.8.gz
25	man/man8/udppm.8.gz