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

(-)3proxy/Makefile (-3 / +8 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/net/3proxy/Makefile 452682 2017-10-22 19:36:03Z ultima $
2
# $FreeBSD: head/net/3proxy/Makefile 452682 2017-10-22 19:36:03Z ultima $
3
3
4
PORTNAME=	3proxy
4
PORTNAME=	3proxy
5
PORTVERSION=	0.8.11
5
PORTVERSION=	0.8.12
6
CATEGORIES=	net
6
CATEGORIES=	net
7
7
8
MAINTAINER=	timp87@gmail.com
8
MAINTAINER=	timp87@gmail.com
Lines 13-38 Link Here
13
13
14
OPTIONS_DEFINE=	DOCS
14
OPTIONS_DEFINE=	DOCS
15
15
16
3PROXY_LOGDIR=	/var/log/${PORTNAME}
17
16
MAKEFILE=	Makefile.unix
18
MAKEFILE=	Makefile.unix
17
USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
18
USE_RC_SUBR=	3proxy
19
USE_RC_SUBR=	3proxy
19
USE_GITHUB=	yes
20
USE_GITHUB=	yes
20
GH_ACCOUNT=	z3APA3A
21
GH_ACCOUNT=	z3APA3A
22
PLIST_SUB=	PORTNAME=${PORTNAME} \
23
		3PROXY_LOGDIR=${3PROXY_LOGDIR}
21
24
22
PORTDOCS=	README
25
PORTDOCS=	README
23
26
24
post-patch:
27
post-patch:
25
	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
28
	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
29
	@${REINPLACE_CMD} -e 's|%%3PROXY_LOGDIR%%|${3PROXY_LOGDIR}|' ${WRKSRC}/cfg/3proxy.cfg.sample
26
30
27
post-build:
31
post-build:
28
	${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr
32
	${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr
29
	${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8
33
	${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8
30
34
31
do-install:
35
do-install:
36
	@${MKDIR} ${STAGEDIR}/${3PROXY_LOGDIR}
32
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
37
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
33
	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy dighosts ftppr icqpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/
38
	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy dighosts ftppr icqpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/
34
	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
39
	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}/
40
	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so pamauth.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
36
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
41
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
37
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 httppr.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
42
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 httppr.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
38
43
(-)3proxy/distinfo (-2 / +2 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1498592146
1
TIMESTAMP = 1498592146
2
SHA256 (z3APA3A-3proxy-0.8.11_GH0.tar.gz) = fc4295e1a462baa61977fcc21747db7861c4e3d0dcca86cbaa3e06017e5c66c9
2
SHA256 (z3APA3A-3proxy-0.8.12_GH0.tar.gz) = c2ad3798b4f0df06cfcc7b49f658304e451d60e4834e2705ef83ddb85a03f849
3
SIZE (z3APA3A-3proxy-0.8.11_GH0.tar.gz) = 497117
3
SIZE (z3APA3A-3proxy-0.8.12_GH0.tar.gz) = 528990
(-)3proxy/files/patch-Makefile.unix (-4 / +4 lines)
Lines 1-4 Link Here
1
--- Makefile.unix.orig	2017-10-19 14:54:31 UTC
1
--- Makefile.unix.orig	2018-04-18 19:48:45 UTC
2
+++ Makefile.unix
2
+++ Makefile.unix
3
@@ -8,18 +8,18 @@
3
@@ -8,18 +8,18 @@
4
 # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
4
 # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
Lines 8-20 Link Here
8
+CC ?= gcc
8
+CC ?= gcc
9
 
9
 
10
 # you may need -L/usr/pkg/lib for older NetBSD versions
10
 # you may need -L/usr/pkg/lib for older NetBSD versions
11
-CFLAGS = -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
11
-CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
12
+CFLAGS = -c -O2 -pipe  -fstack-protector -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
12
+CFLAGS = -c -O2 -pipe  -fstack-protector -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
13
 COUT = -o 
13
 COUT = -o 
14
-LN = gcc
14
-LN = gcc
15
-LDFLAGS = -O2 -pthread
15
-LDFLAGS = -O2 -fno-strict-aliasing -pthread
16
+LN ?= ${CC}
16
+LN ?= ${CC}
17
+LDFLAGS = -pthread
17
+LDFLAGS = -fno-strict-aliasing -pthread
18
 # -lpthreads may be reuqired on some platforms instead of -pthreads
18
 # -lpthreads may be reuqired on some platforms instead of -pthreads
19
 # -ldl or -lld may be required for some platforms
19
 # -ldl or -lld may be required for some platforms
20
 DCFLAGS = -fpic
20
 DCFLAGS = -fpic
(-)3proxy/files/patch-cfg_3proxy.cfg.sample (-2 / +15 lines)
Lines 1-4 Link Here
1
--- cfg/3proxy.cfg.sample.orig	2017-10-20 15:02:38 UTC
1
--- cfg/3proxy.cfg.sample.orig	2018-04-18 19:48:45 UTC
2
+++ cfg/3proxy.cfg.sample
2
+++ cfg/3proxy.cfg.sample
3
@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$
3
@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$
4
 # this example shows you how to include passwd file. For included files
4
 # this example shows you how to include passwd file. For included files
Lines 15-22 Link Here
15
 
15
 
16
-#log /var/log/3proxy/log D
16
-#log /var/log/3proxy/log D
17
-log c:\3proxy\logs\3proxy.log D
17
-log c:\3proxy\logs\3proxy.log D
18
+log /var/log/3proxy/log D
18
+log %%3PROXY_LOGDIR%%/log D
19
+#log c:\3proxy\logs\3proxy.log D
19
+#log c:\3proxy\logs\3proxy.log D
20
 # log allows to specify log file location and rotation, D means logfile
20
 # log allows to specify log file location and rotation, D means logfile
21
 # is created daily
21
 # is created daily
22
 
22
 
23
@@ -72,10 +72,10 @@ log c:\3proxy\logs\3proxy.log D
24
 logformat "- +_L%t.%.  %N.%p %E %U %C:%c %R:%r %O %I %h %T"
25
 
26
 
27
-#archiver gz /bin/gzip %F
28
+archiver gz /usr/bin/gzip %F
29
 #archiver zip zip -m -qq %A %F
30
 #archiver zip pkzipc -add -silent -move %A %F
31
-archiver rar rar a -df -inul %A %F
32
+#archiver rar rar a -df -inul %A %F
33
 # if archiver specified log file will be compressed after closing.
34
 # you should specify extension, path to archiver and command line, %A will be
35
 # substituted with archive file name, %f - with original file name.
(-)3proxy/files/patch-man (-18 / +18 lines)
Lines 1-4 Link Here
1
--- man/3proxy.8.orig	2016-01-19 22:20:05 UTC
1
--- man/3proxy.8.orig	2018-04-18 19:48:45 UTC
2
+++ man/3proxy.8
2
+++ man/3proxy.8
3
@@ -26,7 +26,7 @@ It can establish multiple
3
@@ -26,7 +26,7 @@ It can establish multiple
4
 gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
4
 gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
Lines 35-41 Link Here
35
 kill(1), syslogd(8),
35
 kill(1), syslogd(8),
36
 .br
36
 .br
37
 http://3proxy.ru/
37
 http://3proxy.ru/
38
--- man/3proxy.cfg.3.orig	2016-01-19 22:20:05 UTC
38
--- man/3proxy.cfg.3.orig	2018-04-18 19:48:45 UTC
39
+++ man/3proxy.cfg.3
39
+++ man/3proxy.cfg.3
40
@@ -153,7 +153,7 @@ listen on given local HOST:port for inco
40
@@ -153,7 +153,7 @@ listen on given local HOST:port for inco
41
 connect to given remote HOST:port instead of listening local connection on -p or default port. Can be used with another 3proxy service running -R option for connect back functionality. Most commonly used with proxy or socks. HOST can be given as IP or hostname, useful in case of dynamic DNS.
41
 connect to given remote HOST:port instead of listening local connection on -p or default port. Can be used with another 3proxy service running -R option for connect back functionality. Most commonly used with proxy or socks. HOST can be given as IP or hostname, useful in case of dynamic DNS.
Lines 46-52 Link Here
46
 .BR socks (8)
46
 .BR socks (8)
47
 .BR pop3p (8)
47
 .BR pop3p (8)
48
 .BR tcppm (8)
48
 .BR tcppm (8)
49
@@ -927,7 +927,7 @@ corruption and/or Content-Length chaging
49
@@ -954,7 +954,7 @@ corruption and/or Content-Length chaging
50
 Report all bugs to
50
 Report all bugs to
51
 .BR 3proxy@3proxy.ru
51
 .BR 3proxy@3proxy.ru
52
 .SH SEE ALSO
52
 .SH SEE ALSO
Lines 55-63 Link Here
55
 .br
55
 .br
56
 http://3proxy.ru/
56
 http://3proxy.ru/
57
 .SH TRIVIA
57
 .SH TRIVIA
58
--- man/ftppr.8.orig	2016-01-19 22:20:05 UTC
58
--- man/ftppr.8.orig	2018-04-18 19:48:45 UTC
59
+++ man/ftppr.8
59
+++ man/ftppr.8
60
@@ -75,7 +75,7 @@ Only cleartext authentication is current
60
@@ -79,7 +79,7 @@ Only cleartext authentication is current
61
 Report all bugs to
61
 Report all bugs to
62
 .BR 3proxy@3proxy.ru
62
 .BR 3proxy@3proxy.ru
63
 .SH SEE ALSO
63
 .SH SEE ALSO
Lines 66-74 Link Here
66
 .br
66
 .br
67
 http://3proxy.ru/
67
 http://3proxy.ru/
68
 .SH AUTHORS
68
 .SH AUTHORS
69
--- man/icqpr.8.orig	2016-01-19 22:20:05 UTC
69
--- man/icqpr.8.orig	2018-04-18 19:48:45 UTC
70
+++ man/icqpr.8
70
+++ man/icqpr.8
71
@@ -68,7 +68,7 @@ as a destination in client application. 
71
@@ -72,7 +72,7 @@ as a destination in client application. 
72
 Report all bugs to
72
 Report all bugs to
73
 .BR 3proxy@3proxy.ru
73
 .BR 3proxy@3proxy.ru
74
 .SH SEE ALSO
74
 .SH SEE ALSO
Lines 77-85 Link Here
77
 .br
77
 .br
78
 http://3proxy.ru/
78
 http://3proxy.ru/
79
 .SH AUTHORS
79
 .SH AUTHORS
80
--- man/pop3p.8.orig	2016-01-19 22:20:05 UTC
80
--- man/pop3p.8.orig	2018-04-18 19:48:45 UTC
81
+++ man/pop3p.8
81
+++ man/pop3p.8
82
@@ -71,7 +71,7 @@ we know which server to connect.
82
@@ -75,7 +75,7 @@ we know which server to connect.
83
 Report all bugs to
83
 Report all bugs to
84
 .BR 3proxy@3proxy.ru
84
 .BR 3proxy@3proxy.ru
85
 .SH SEE ALSO
85
 .SH SEE ALSO
Lines 88-94 Link Here
88
 .br
88
 .br
89
 http://3proxy.ru/
89
 http://3proxy.ru/
90
 .SH AUTHORS
90
 .SH AUTHORS
91
--- man/proxy.8.orig	2016-01-19 22:20:05 UTC
91
--- man/proxy.8.orig	2018-04-18 19:48:45 UTC
92
+++ man/proxy.8
92
+++ man/proxy.8
93
@@ -1,15 +1,15 @@
93
@@ -1,15 +1,15 @@
94
-.TH proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server"
94
-.TH proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server"
Lines 110-118 Link Here
110
 is HTTP gateway service with HTTPS and FTP over HTTPS support.
110
 is HTTP gateway service with HTTPS and FTP over HTTPS support.
111
 .SH OPTIONS
111
 .SH OPTIONS
112
 .TP
112
 .TP
113
--- man/smtpp.8.orig	2016-01-19 22:20:05 UTC
113
--- man/smtpp.8.orig	2018-04-18 19:48:45 UTC
114
+++ man/smtpp.8
114
+++ man/smtpp.8
115
@@ -72,7 +72,7 @@ we know which server to connect.
115
@@ -76,7 +76,7 @@ we know which server to connect.
116
 Report all bugs to
116
 Report all bugs to
117
 .BR 3proxy@3proxy.ru
117
 .BR 3proxy@3proxy.ru
118
 .SH SEE ALSO
118
 .SH SEE ALSO
Lines 121-129 Link Here
121
 .br
121
 .br
122
 http://3proxy.ru/
122
 http://3proxy.ru/
123
 .SH AUTHORS
123
 .SH AUTHORS
124
--- man/socks.8.orig	2016-01-19 22:20:05 UTC
124
--- man/socks.8.orig	2018-04-18 19:48:45 UTC
125
+++ man/socks.8
125
+++ man/socks.8
126
@@ -67,7 +67,7 @@ instead.
126
@@ -71,7 +71,7 @@ instead.
127
 Report all bugs to
127
 Report all bugs to
128
 .BR 3proxy@3proxy.ru
128
 .BR 3proxy@3proxy.ru
129
 .SH SEE ALSO
129
 .SH SEE ALSO
Lines 132-140 Link Here
132
 .br
132
 .br
133
 http://3proxy.ru/
133
 http://3proxy.ru/
134
 .SH AUTHORS
134
 .SH AUTHORS
135
--- man/tcppm.8.orig	2016-01-19 22:20:05 UTC
135
--- man/tcppm.8.orig	2018-04-18 19:48:45 UTC
136
+++ man/tcppm.8
136
+++ man/tcppm.8
137
@@ -61,7 +61,7 @@ as a destination in client application. 
137
@@ -65,7 +65,7 @@ as a destination in client application. 
138
 Report all bugs to
138
 Report all bugs to
139
 .BR 3proxy@3proxy.ru
139
 .BR 3proxy@3proxy.ru
140
 .SH SEE ALSO
140
 .SH SEE ALSO
Lines 143-151 Link Here
143
 .br
143
 .br
144
 http://3proxy.ru/
144
 http://3proxy.ru/
145
 .SH AUTHORS
145
 .SH AUTHORS
146
--- man/udppm.8.orig	2016-01-19 22:20:05 UTC
146
--- man/udppm.8.orig	2018-04-18 19:48:45 UTC
147
+++ man/udppm.8
147
+++ man/udppm.8
148
@@ -67,7 +67,7 @@ as a destination in client application. 
148
@@ -71,7 +71,7 @@ as a destination in client application. 
149
 Report all bugs to
149
 Report all bugs to
150
 .BR 3proxy@3proxy.ru
150
 .BR 3proxy@3proxy.ru
151
 .SH SEE ALSO
151
 .SH SEE ALSO
(-)3proxy/pkg-plist (-6 / +8 lines)
Lines 1-23 Link Here
1
bin/3proxy
1
bin/3proxy
2
bin/dighosts
2
bin/dighosts
3
bin/ftppr
3
bin/ftppr
4
bin/httppr
4
bin/icqpr
5
bin/icqpr
5
bin/mycrypt
6
bin/mycrypt
6
bin/pop3p
7
bin/pop3p
7
bin/httppr
8
bin/smtpp
8
bin/smtpp
9
bin/socks
9
bin/socks
10
bin/tcppm
10
bin/tcppm
11
bin/udppm
11
bin/udppm
12
@sample etc/3proxy.cfg.sample
12
lib/%%PORTNAME%%/PCREPlugin.so
13
lib/3proxy/PCREPlugin.so
13
lib/%%PORTNAME%%/StringsPlugin.so
14
lib/3proxy/StringsPlugin.so
14
lib/%%PORTNAME%%/TrafficPlugin.so
15
lib/3proxy/TrafficPlugin.so
15
lib/%%PORTNAME%%/pamauth.so
16
man/man3/3proxy.cfg.3.gz
16
man/man3/3proxy.cfg.3.gz
17
man/man8/3proxy.8.gz
17
man/man8/3proxy.8.gz
18
man/man8/ftppr.8.gz
18
man/man8/ftppr.8.gz
19
man/man8/pop3p.8.gz
20
man/man8/httppr.8.gz
19
man/man8/httppr.8.gz
20
man/man8/pop3p.8.gz
21
man/man8/socks.8.gz
21
man/man8/socks.8.gz
22
man/man8/tcppm.8.gz
22
man/man8/tcppm.8.gz
23
man/man8/udppm.8.gz
23
man/man8/udppm.8.gz
24
@dir(,,755) %%3PROXY_LOGDIR%%
25
@sample etc/3proxy.cfg.sample

Return to bug 227700