Attachment 187349 Details for Bug 223148 – port patch

[patch] port patch

3proxy-0.8.11.patch (text/plain), 7.73 KB, created by Pavel Timofeev on 2017-10-21 13:39:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2017-10-21 13:39:26 UTC

Size: 7.73 KB

patch

obsolete

>diff -ruN /root/3proxy.orig/Makefile 3proxy/Makefile
>--- /root/3proxy.orig/Makefile	2017-10-20 17:55:58.554932000 +0300
>+++ 3proxy/Makefile	2017-10-20 17:56:22.373044000 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/net/3proxy/Makefile 444659 2017-06-29 18:20:26Z ultima $
> 
> PORTNAME=	3proxy
>-PORTVERSION=	0.8.10
>+PORTVERSION=	0.8.11
> CATEGORIES=	net
> 
> MAINTAINER=	timp87@gmail.com
>diff -ruN /root/3proxy.orig/distinfo 3proxy/distinfo
>--- /root/3proxy.orig/distinfo	2017-10-20 17:55:58.555531000 +0300
>+++ 3proxy/distinfo	2017-10-20 17:57:44.716904000 +0300
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1498592146
>-SHA256 (z3APA3A-3proxy-0.8.10_GH0.tar.gz) = 31af5c37bc37c90626ff689e0dcd412bbce19cdd124e3d3a09421898b4f760c2
>-SIZE (z3APA3A-3proxy-0.8.10_GH0.tar.gz) = 497026
>+SHA256 (z3APA3A-3proxy-0.8.11_GH0.tar.gz) = fc4295e1a462baa61977fcc21747db7861c4e3d0dcca86cbaa3e06017e5c66c9
>+SIZE (z3APA3A-3proxy-0.8.11_GH0.tar.gz) = 497117
>diff -ruN /root/3proxy.orig/files/patch-Makefile.unix 3proxy/files/patch-Makefile.unix
>--- /root/3proxy.orig/files/patch-Makefile.unix	2017-10-20 17:55:58.557125000 +0300
>+++ 3proxy/files/patch-Makefile.unix	2017-10-20 18:04:29.200285000 +0300
>@@ -1,4 +1,4 @@
>---- Makefile.unix.orig	2016-01-19 22:20:05 UTC
>+--- Makefile.unix.orig	2017-10-19 14:54:31 UTC
> +++ Makefile.unix
> @@ -8,18 +8,18 @@
>  # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
>@@ -9,7 +9,7 @@
>  
>  # you may need -L/usr/pkg/lib for older NetBSD versions
> -CFLAGS = -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
>-+CFLAGS = -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
>++CFLAGS = -c -O2 -pipe  -fstack-protector -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
>  COUT = -o 
> -LN = gcc
> -LDFLAGS = -O2 -pthread
>@@ -22,5 +22,5 @@
> -DLSUFFICS = .ld.so
> +DLSUFFICS = .so
>  LIBS =
>- LNOUT = -o 
>- EXESUFFICS =
>+ LIBSPREFIX = -l
>+ LIBSSUFFIX = 
>diff -ruN /root/3proxy.orig/files/patch-cfg-3proxy.cfg.sample 3proxy/files/patch-cfg-3proxy.cfg.sample
>--- /root/3proxy.orig/files/patch-cfg-3proxy.cfg.sample	2017-10-20 17:55:58.556161000 +0300
>+++ 3proxy/files/patch-cfg-3proxy.cfg.sample	1970-01-01 03:00:00.000000000 +0300
>@@ -1,22 +0,0 @@
>---- cfg/3proxy.cfg.sample.orig	2016-01-19 22:20:05 UTC
>-+++ cfg/3proxy.cfg.sample
>-@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$
>- # this example shows you how to include passwd file. For included files
>- # <CR> and <LF> are treated as field separators.
>- 
>--#daemon
>-+daemon
>- # now we will not depend on any console (daemonize). daemon must be given
>- # before any significant command on *nix.
>- 
>--service
>-+#service
>- # service is required under NT if you want 3proxy to start as service
>- 
>--#log /usr/local/etc/3proxy/logs/3proxy.log D
>--log c:\3proxy\logs\3proxy.log D
>-+log /var/log/3proxy.log D
>-+#log c:\3proxy\logs\3proxy.log D
>- # log allows to specify log file location and rotation, D means logfile
>- # is created daily
>- 
>diff -ruN /root/3proxy.orig/files/patch-cfg_3proxy.cfg.sample 3proxy/files/patch-cfg_3proxy.cfg.sample
>--- /root/3proxy.orig/files/patch-cfg_3proxy.cfg.sample	1970-01-01 03:00:00.000000000 +0300
>+++ 3proxy/files/patch-cfg_3proxy.cfg.sample	2017-10-20 18:04:29.202957000 +0300
>@@ -0,0 +1,22 @@
>+--- cfg/3proxy.cfg.sample.orig	2017-10-20 15:02:38 UTC
>++++ cfg/3proxy.cfg.sample
>+@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$
>+ # this example shows you how to include passwd file. For included files
>+ # <CR> and <LF> are treated as field separators.
>+ 
>+-#daemon
>++daemon
>+ # now we will not depend on any console (daemonize). daemon must be given
>+ # before any significant command on *nix.
>+ 
>+-service
>++#service
>+ # service is required under NT if you want 3proxy to start as service
>+ 
>+-#log /var/log/3proxy/log D
>+-log c:\3proxy\logs\3proxy.log D
>++log /var/log/3proxy/log D
>++#log c:\3proxy\logs\3proxy.log D
>+ # log allows to specify log file location and rotation, D means logfile
>+ # is created daily
>+ 
>diff -ruN /root/3proxy.orig/files/patch-man 3proxy/files/patch-man
>--- /root/3proxy.orig/files/patch-man	2017-10-20 17:55:58.556833000 +0300
>+++ 3proxy/files/patch-man	2017-10-20 18:04:29.241722000 +0300
>@@ -1,4 +1,4 @@
>---- man/3proxy.8.orig	2016-01-19 22:20:05 UTC
>+--- man/3proxy.8.orig	2017-10-19 14:54:31 UTC
> +++ man/3proxy.8
> @@ -26,7 +26,7 @@ It can establish multiple
>  gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
>@@ -35,7 +35,7 @@
>  kill(1), syslogd(8),
>  .br
>  http://3proxy.ru/
>---- man/3proxy.cfg.3.orig	2016-01-19 22:20:05 UTC
>+--- man/3proxy.cfg.3.orig	2017-10-19 14:54:31 UTC
> +++ man/3proxy.cfg.3
> @@ -153,7 +153,7 @@ listen on given local HOST:port for inco
>  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.
>@@ -46,7 +46,7 @@
>  .BR socks (8)
>  .BR pop3p (8)
>  .BR tcppm (8)
>-@@ -927,7 +927,7 @@ corruption and/or Content-Length chaging
>+@@ -943,7 +943,7 @@ corruption and/or Content-Length chaging
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO
>@@ -55,9 +55,9 @@
>  .br
>  http://3proxy.ru/
>  .SH TRIVIA
>---- man/ftppr.8.orig	2016-01-19 22:20:05 UTC
>+--- man/ftppr.8.orig	2017-10-19 14:54:31 UTC
> +++ man/ftppr.8
>-@@ -75,7 +75,7 @@ Only cleartext authentication is current
>+@@ -79,7 +79,7 @@ Only cleartext authentication is current
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO
>@@ -66,9 +66,9 @@
>  .br
>  http://3proxy.ru/
>  .SH AUTHORS
>---- man/icqpr.8.orig	2016-01-19 22:20:05 UTC
>+--- man/icqpr.8.orig	2017-10-19 14:54:31 UTC
> +++ man/icqpr.8
>-@@ -68,7 +68,7 @@ as a destination in client application. 
>+@@ -72,7 +72,7 @@ as a destination in client application. 
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO
>@@ -77,9 +77,9 @@
>  .br
>  http://3proxy.ru/
>  .SH AUTHORS
>---- man/pop3p.8.orig	2016-01-19 22:20:05 UTC
>+--- man/pop3p.8.orig	2017-10-19 14:54:31 UTC
> +++ man/pop3p.8
>-@@ -71,7 +71,7 @@ we know which server to connect.
>+@@ -75,7 +75,7 @@ we know which server to connect.
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO
>@@ -88,7 +88,7 @@
>  .br
>  http://3proxy.ru/
>  .SH AUTHORS
>---- man/proxy.8.orig	2016-01-19 22:20:05 UTC
>+--- man/proxy.8.orig	2017-10-19 14:54:31 UTC
> +++ man/proxy.8
> @@ -1,15 +1,15 @@
> -.TH proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server"
>@@ -110,9 +110,9 @@
>  is HTTP gateway service with HTTPS and FTP over HTTPS support.
>  .SH OPTIONS
>  .TP
>---- man/smtpp.8.orig	2016-01-19 22:20:05 UTC
>+--- man/smtpp.8.orig	2017-10-19 14:54:31 UTC
> +++ man/smtpp.8
>-@@ -72,7 +72,7 @@ we know which server to connect.
>+@@ -76,7 +76,7 @@ we know which server to connect.
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO
>@@ -121,9 +121,9 @@
>  .br
>  http://3proxy.ru/
>  .SH AUTHORS
>---- man/socks.8.orig	2016-01-19 22:20:05 UTC
>+--- man/socks.8.orig	2017-10-19 14:54:31 UTC
> +++ man/socks.8
>-@@ -67,7 +67,7 @@ instead.
>+@@ -71,7 +71,7 @@ instead.
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO
>@@ -132,9 +132,9 @@
>  .br
>  http://3proxy.ru/
>  .SH AUTHORS
>---- man/tcppm.8.orig	2016-01-19 22:20:05 UTC
>+--- man/tcppm.8.orig	2017-10-19 14:54:31 UTC
> +++ man/tcppm.8
>-@@ -61,7 +61,7 @@ as a destination in client application. 
>+@@ -65,7 +65,7 @@ as a destination in client application. 
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO
>@@ -143,9 +143,9 @@
>  .br
>  http://3proxy.ru/
>  .SH AUTHORS
>---- man/udppm.8.orig	2016-01-19 22:20:05 UTC
>+--- man/udppm.8.orig	2017-10-19 14:54:31 UTC
> +++ man/udppm.8
>-@@ -67,7 +67,7 @@ as a destination in client application. 
>+@@ -71,7 +71,7 @@ as a destination in client application. 
>  Report all bugs to
>  .BR 3proxy@3proxy.ru
>  .SH SEE ALSO

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 223148: 187349