Update to 0.8.12

* utilize logdir
* use gzip as default archiver in config
* install pamauth.so plugin

PR:		227700
Submitted by:	maintainer

3 files changed, 37 insertions, 24 deletions

diff --git a/net/3proxy/files/patch-Makefile.unix b/net/3proxy/files/patch-Makefile.unix
index 52b7d64f792d..61792ec201fd 100644
--- a/net/3proxy/files/patch-Makefile.unix
+++ b/net/3proxy/files/patch-Makefile.unix
@@ -1,4 +1,4 @@
---- Makefile.unix.orig	2017-10-19 14:54:31 UTC
+--- Makefile.unix.orig	2018-04-18 19:48:45 UTC
 +++ Makefile.unix
 @@ -8,18 +8,18 @@
  # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
@@ -8,13 +8,13 @@
 +CC ?= gcc
  
  # 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 = -g -O2 -fno-strict-aliasing -c -pthread -D_THREAD_SAFE -D_REENTRANT -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
+-LDFLAGS = -O2 -fno-strict-aliasing -pthread
 +LN ?= ${CC}
-+LDFLAGS = -pthread
++LDFLAGS = -fno-strict-aliasing -pthread
  # -lpthreads may be reuqired on some platforms instead of -pthreads
  # -ldl or -lld may be required for some platforms
  DCFLAGS = -fpic
diff --git a/net/3proxy/files/patch-cfg_3proxy.cfg.sample b/net/3proxy/files/patch-cfg_3proxy.cfg.sample
index 9496239afbe5..448f2518a3cf 100644
--- a/net/3proxy/files/patch-cfg_3proxy.cfg.sample
+++ b/net/3proxy/files/patch-cfg_3proxy.cfg.sample
@@ -1,4 +1,4 @@
---- cfg/3proxy.cfg.sample.orig	2017-10-20 15:02:38 UTC
+--- cfg/3proxy.cfg.sample.orig	2018-04-18 19:48:45 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
@@ -15,8 +15,21 @@
  
 -#log /var/log/3proxy/log D
 -log c:\3proxy\logs\3proxy.log D
-+log /var/log/3proxy/log D
++log %%3PROXY_LOGDIR%%/log D
 +#log c:\3proxy\logs\3proxy.log D
  # log allows to specify log file location and rotation, D means logfile
  # is created daily
  
+@@ -72,10 +72,10 @@ log c:\3proxy\logs\3proxy.log D
+ logformat "- +_L%t.%.  %N.%p %E %U %C:%c %R:%r %O %I %h %T"
+ 
+ 
+-#archiver gz /bin/gzip %F
++archiver gz /usr/bin/gzip %F
+ #archiver zip zip -m -qq %A %F
+ #archiver zip pkzipc -add -silent -move %A %F
+-archiver rar rar a -df -inul %A %F
++#archiver rar rar a -df -inul %A %F
+ # if archiver specified log file will be compressed after closing.
+ # you should specify extension, path to archiver and command line, %A will be
+ # substituted with archive file name, %f - with original file name.
diff --git a/net/3proxy/files/patch-man b/net/3proxy/files/patch-man
index 638fe3f6fa58..36104f8ddce6 100644
--- a/net/3proxy/files/patch-man
+++ b/net/3proxy/files/patch-man
@@ -1,4 +1,4 @@
---- man/3proxy.8.orig	2016-01-19 22:20:05 UTC
+--- man/3proxy.8.orig	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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
+@@ -954,7 +954,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	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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	2018-04-18 19:48:45 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