From owner-svn-ports-all@freebsd.org Tue Nov 17 16:01:36 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1E3744680FB; Tue, 17 Nov 2020 16:01:36 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cb9fm0Q2Rz4pvK; Tue, 17 Nov 2020 16:01:36 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 011C822741; Tue, 17 Nov 2020 16:01:36 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AHG1ZFE072578; Tue, 17 Nov 2020 16:01:35 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AHG1Yfm072573; Tue, 17 Nov 2020 16:01:34 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202011171601.0AHG1Yfm072573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Tue, 17 Nov 2020 16:01:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555564 - in head/net/3proxy: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/net/3proxy: . files X-SVN-Commit-Revision: 555564 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2020 16:01:36 -0000 Author: fernape Date: Tue Nov 17 16:01:34 2020 New Revision: 555564 URL: https://svnweb.freebsd.org/changeset/ports/555564 Log: net/3proxy: update to 0.9.1 ChangeLog: https://github.com/z3APA3A/3proxy/releases/tag/0.9.1 PR: 250967 Submitted by: timp87@gmail.com (maintainer) Added: head/net/3proxy/files/patch-Makefile.FreeBSD (contents, props changed) Deleted: head/net/3proxy/files/patch-Makefile.unix Modified: head/net/3proxy/Makefile head/net/3proxy/distinfo head/net/3proxy/files/patch-cfg_3proxy.cfg.sample head/net/3proxy/files/patch-man head/net/3proxy/pkg-plist Modified: head/net/3proxy/Makefile ============================================================================== --- head/net/3proxy/Makefile Tue Nov 17 15:56:54 2020 (r555563) +++ head/net/3proxy/Makefile Tue Nov 17 16:01:34 2020 (r555564) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= 3proxy -PORTVERSION= 0.8.13 +PORTVERSION= 0.9.1 CATEGORIES= net MAINTAINER= timp87@gmail.com @@ -15,7 +15,7 @@ USE_RC_SUBR= 3proxy USE_GITHUB= yes GH_ACCOUNT= z3APA3A -MAKEFILE= Makefile.unix +MAKEFILE= Makefile.FreeBSD PLIST_SUB= PORTNAME=${PORTNAME} \ 3PROXY_LOGDIR=${3PROXY_LOGDIR} @@ -31,15 +31,15 @@ post-patch: @${REINPLACE_CMD} -e 's|%%3PROXY_LOGDIR%%|${3PROXY_LOGDIR}|' ${WRKSRC}/cfg/3proxy.cfg.sample post-build: - ${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr + ${MV} ${WRKSRC}/bin/proxy ${WRKSRC}/bin/httppr ${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8 do-install: @${MKDIR} ${STAGEDIR}/${3PROXY_LOGDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ - cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy dighosts ftppr icqpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC}/bin/ && ${INSTALL_PROGRAM} 3proxy ftppr mycrypt pop3p httppr smtpp socks tcppm udppm ${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 pamauth.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ + cd ${WRKSRC}/bin/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so pamauth.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/ cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 httppr.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/ Modified: head/net/3proxy/distinfo ============================================================================== --- head/net/3proxy/distinfo Tue Nov 17 15:56:54 2020 (r555563) +++ head/net/3proxy/distinfo Tue Nov 17 16:01:34 2020 (r555564) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565155136 -SHA256 (z3APA3A-3proxy-0.8.13_GH0.tar.gz) = a6d3cf9dd264315fa6ec848f6fe6c9057db005ce4ca8ed1deb00f6e1c3900f88 -SIZE (z3APA3A-3proxy-0.8.13_GH0.tar.gz) = 529072 +TIMESTAMP = 1605324101 +SHA256 (z3APA3A-3proxy-0.9.1_GH0.tar.gz) = 5d118848768836bf91d42858300bf22e0bede3b0f99cf9b3c9a30f9a4e4303ee +SIZE (z3APA3A-3proxy-0.9.1_GH0.tar.gz) = 605122 Added: head/net/3proxy/files/patch-Makefile.FreeBSD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/3proxy/files/patch-Makefile.FreeBSD Tue Nov 17 16:01:34 2020 (r555564) @@ -0,0 +1,15 @@ +--- Makefile.FreeBSD.orig 2020-10-28 21:12:45 UTC ++++ Makefile.FreeBSD +@@ -10,10 +10,10 @@ + BUILDDIR = ../bin/ + CC ?= gcc + +-CFLAGS = -c -O -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL ++CFLAGS = -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL + COUT = -o + LN ?= ${CC} +-LDFLAGS = -pthread -O -fno-strict-aliasing ++LDFLAGS = -pthread + # -lpthreads may be reuqired on some platforms instead of -pthreads + # -ldl or -lld may be required for some platforms + DCFLAGS = -fPIC Modified: head/net/3proxy/files/patch-cfg_3proxy.cfg.sample ============================================================================== --- head/net/3proxy/files/patch-cfg_3proxy.cfg.sample Tue Nov 17 15:56:54 2020 (r555563) +++ head/net/3proxy/files/patch-cfg_3proxy.cfg.sample Tue Nov 17 16:01:34 2020 (r555564) @@ -1,6 +1,6 @@ ---- cfg/3proxy.cfg.sample.orig 2018-04-18 19:48:45 UTC +--- cfg/3proxy.cfg.sample.orig 2020-10-22 08:38:44 UTC +++ cfg/3proxy.cfg.sample -@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$ +@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9H # this example shows you how to include passwd file. For included files # and are treated as field separators. Modified: head/net/3proxy/files/patch-man ============================================================================== --- head/net/3proxy/files/patch-man Tue Nov 17 15:56:54 2020 (r555563) +++ head/net/3proxy/files/patch-man Tue Nov 17 16:01:34 2020 (r555564) @@ -1,4 +1,4 @@ ---- man/3proxy.8.orig 2018-04-18 19:48:45 UTC +--- man/3proxy.8.orig 2020-10-22 08:38:44 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, @@ -9,7 +9,7 @@ .BR socks (8) .BR pop3p (8) .BR tcppm (8) -@@ -84,7 +84,7 @@ directory). Under Unix, if no config fil +@@ -84,7 +84,7 @@ directory). Under Unix, if no config file is specified configuration from stdin. It makes it possible to use 3proxy.cfg file as executable script just by setting +x mode and adding .br @@ -18,7 +18,7 @@ .br as a first line in 3proxy.cfg .TP -@@ -133,14 +133,14 @@ Web admin service can also be used to re +@@ -133,14 +133,14 @@ Web admin service can also be used to reload configura wget to automate this task. .SH FILES .TP @@ -34,11 +34,11 @@ +3proxy.cfg(3), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), kill(1), syslogd(8), .br - http://3proxy.ru/ ---- man/3proxy.cfg.3.orig 2018-04-18 19:48:45 UTC + https://3proxy.org/ +--- man/3proxy.cfg.3.orig 2020-10-22 08:38:44 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. +@@ -174,7 +174,7 @@ By default external address is reported. It's only use + of IP-IP NAT (will not work for PAT) .br Also, all options mentioned for -.BR proxy (8) @@ -46,38 +46,38 @@ .BR socks (8) .BR pop3p (8) .BR tcppm (8) -@@ -954,7 +954,7 @@ corruption and/or Content-Length chaging +@@ -1055,7 +1055,7 @@ corruption and/or Content-Length chaging. Default is 1 Report all bugs to .BR 3proxy@3proxy.ru .SH SEE ALSO -3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), +3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH TRIVIA ---- man/ftppr.8.orig 2018-04-18 19:48:45 UTC +--- man/ftppr.8.orig 2020-10-22 08:38:44 UTC +++ man/ftppr.8 -@@ -79,7 +79,7 @@ Only cleartext authentication is current +@@ -79,7 +79,7 @@ Only cleartext authentication is currently supported. Report all bugs to .BR 3proxy@3proxy.ru .SH SEE ALSO -3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8), +3proxy(8), httppr(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH AUTHORS ---- man/icqpr.8.orig 2018-04-18 19:48:45 UTC +--- man/icqpr.8.orig 2020-10-22 08:38:44 UTC +++ man/icqpr.8 -@@ -72,7 +72,7 @@ as a destination in client application. +@@ -72,7 +72,7 @@ as a destination in client application. Connection is Report all bugs to .BR 3proxy@3proxy.ru .SH SEE ALSO -3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), +3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH AUTHORS ---- man/pop3p.8.orig 2018-04-18 19:48:45 UTC +--- man/pop3p.8.orig 2020-10-22 08:38:44 UTC +++ man/pop3p.8 @@ -75,7 +75,7 @@ we know which server to connect. Report all bugs to @@ -86,12 +86,12 @@ -3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8), +3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH AUTHORS ---- man/proxy.8.orig 2018-04-18 19:48:45 UTC +--- man/proxy.8.orig 2020-10-22 08:38:44 UTC +++ man/proxy.8 @@ -1,15 +1,15 @@ --.TH proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server" +-.TH proxy "8" "January 2019" "3proxy 0.9" "Universal proxy server" +.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server" .SH NAME -.B proxy @@ -110,7 +110,7 @@ is HTTP gateway service with HTTPS and FTP over HTTPS support. .SH OPTIONS .TP ---- man/smtpp.8.orig 2018-04-18 19:48:45 UTC +--- man/smtpp.8.orig 2020-10-22 08:38:44 UTC +++ man/smtpp.8 @@ -76,7 +76,7 @@ we know which server to connect. Report all bugs to @@ -119,38 +119,38 @@ -3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8), +3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH AUTHORS ---- man/socks.8.orig 2018-04-18 19:48:45 UTC +--- man/socks.8.orig 2020-10-22 08:38:44 UTC +++ man/socks.8 -@@ -71,7 +71,7 @@ instead. +@@ -76,7 +76,7 @@ instead. Report all bugs to .BR 3proxy@3proxy.ru .SH SEE ALSO -3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), +3proxy(8), httppr(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH AUTHORS ---- man/tcppm.8.orig 2018-04-18 19:48:45 UTC +--- man/tcppm.8.orig 2020-10-22 08:38:44 UTC +++ man/tcppm.8 -@@ -65,7 +65,7 @@ as a destination in client application. +@@ -65,7 +65,7 @@ as a destination in client application. Connection is Report all bugs to .BR 3proxy@3proxy.ru .SH SEE ALSO -3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), +3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH AUTHORS ---- man/udppm.8.orig 2018-04-18 19:48:45 UTC +--- man/udppm.8.orig 2020-10-22 08:38:44 UTC +++ man/udppm.8 -@@ -71,7 +71,7 @@ as a destination in client application. +@@ -71,7 +71,7 @@ as a destination in client application. All datagrams Report all bugs to .BR 3proxy@3proxy.ru .SH SEE ALSO -3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), +3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), .br - http://3proxy.ru/ + https://3proxy.org/ .SH AUTHORS Modified: head/net/3proxy/pkg-plist ============================================================================== --- head/net/3proxy/pkg-plist Tue Nov 17 15:56:54 2020 (r555563) +++ head/net/3proxy/pkg-plist Tue Nov 17 16:01:34 2020 (r555564) @@ -1,8 +1,6 @@ bin/3proxy -bin/dighosts bin/ftppr bin/httppr -bin/icqpr bin/mycrypt bin/pop3p bin/smtpp