pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/3proxy
Module Name: pkgsrc
Committed By: triaxx
Date: Sun Nov 27 13:14:01 UTC 2022
Modified Files:
pkgsrc/net/3proxy: Makefile distinfo
pkgsrc/net/3proxy/patches: patch-Makefile.unix patch-ab patch-ac
patch-ad patch-ae patch-cfg_3proxy.cfg.sample patch-man_3proxy.8
patch-man_3proxy.cfg.3
Added Files:
pkgsrc/net/3proxy/patches: patch-src_plugins_PamAuth_pamauth.c
patch-src_plugins_TransparentPlugin_transparent__plugin.c
patch-src_version.h
Log Message:
3proxy: Update to 0.9.4
pkgsrc changes:
---------------
* Update the license to 3proxy-0.9-license.
* Remove outdated comments about the old licenses.
upstream changes:
-----------------
3proxy-0.9.4 Latest
! Fix: invalid handling of '-' character in ACL hostname
! Fix: minor bugfixes and improvements
+ parentretry command added (defaults to 2) to retry connections to parent
proxies
- icqpr related code (OSCAR proxy) removed, due to drop of OSCAR support by
messengers
3proxy-0.9.3
Bugfixes:
Fixed: systemd description file (proxy may fail to start after reboot or via
systemctl)
Fixed: group/account creation in installation scripts
Fixed: countall/nocounall do not work in some configurations
Fixed: counters do not work if counter file is not specified
Fixed: counters without rotation (type N) are incorrectly shown in web admin
interface
Fixed: %n may be incomplete or missed in long log records
Fixed: connect back functionality does not work
Improvements:
+ Docker builds
3proxy-0.9.2
Bugfixes:
Fixed: bandwidth limiters (once again)
Fixed: data filtering plugins (PCREPlugin, SSLPlugin). SSLPlugin use on Linux
requires to disable splice (-s0)
FIxed: standalone proxies do not react on HUP (Ctrl+C) in Linux/Unix
Fixed: few minor bugs
Improvements:
+ deb for arm platforms (experimental)
+ Openssl 1.1 support for SSLPlugin
3proxy-0.9.1
Bugfixes:
Fixed: socket may be closed before all data received/sent
Fixed: bandlimin non-working
Fixed: countall/nocountall
Fixed: few race conditions
Improvements:
deb/rpm build, systemd support (experimental)
3proxy-0.9.0
o Socket options, interface binding
o Connection limiting / connection rate limiting
o RADIUS support (beta)
o Zero copy (splice) support for Linux
o Possibility to limit user to single IP (via authentication cache)
bugfixes, improvements
3proxy-0.8.13
Bugfixes:
!! Fixed out-of-bound write and few minor bugs on configuration saving in admin
! fixed: $ is not correctly handled in the beginning of quoted line on configuration parsing
3proxy-0.8.12
Bugfixes:
! Fixed hostname support in SOCKSv5 UDP portmapping
! -fno-strict-aliasing added to gcc options (compiling without this option
can lead to unpredictable issues under Debian with gcc 6 and potentially
others)
! Fixed LDAP plugin compilation issues (LDAP plugin is still listed as
unsupported though) and some minor fixes and improvements.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/3proxy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/3proxy/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/3proxy/patches/patch-Makefile.unix \
pkgsrc/net/3proxy/patches/patch-man_3proxy.8 \
pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/3proxy/patches/patch-ab \
pkgsrc/net/3proxy/patches/patch-ac pkgsrc/net/3proxy/patches/patch-ad
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/3proxy/patches/patch-ae
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/net/3proxy/patches/patch-cfg_3proxy.cfg.sample
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/3proxy/patches/patch-src_plugins_PamAuth_pamauth.c \
pkgsrc/net/3proxy/patches/patch-src_plugins_TransparentPlugin_transparent__plugin.c \
pkgsrc/net/3proxy/patches/patch-src_version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/3proxy/Makefile
diff -u pkgsrc/net/3proxy/Makefile:1.13 pkgsrc/net/3proxy/Makefile:1.14
--- pkgsrc/net/3proxy/Makefile:1.13 Wed Feb 21 15:20:04 2018
+++ pkgsrc/net/3proxy/Makefile Sun Nov 27 13:14:00 2022
@@ -1,27 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2018/02/21 15:20:04 triaxx Exp $
-#
+# $NetBSD: Makefile,v 1.14 2022/11/27 13:14:00 triaxx Exp $
-DISTNAME= 3proxy-0.8.11
+DISTNAME= 3proxy-0.9.4
CATEGORIES= net
-MASTER_SITES= https://3proxy.ru/${DISTNAME:S/3proxy-//}/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=3proxy/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://3proxy.ru/
COMMENT= Multi-protocol proxy
-# 3proxy-0.5.* is dual-licenced under GPL or custom terms. It's not
-# clear exactly which version of the GPL is intended; ${WRKSRC}/License
-# says "current version of GNU GPL" without specifying a numeric version
-# number. 3proxy-0.6.* will have a different license.
-# 3proxy-0.7-license is now inspired by BSD license.
-LICENSE= 3proxy-0.7-license
+LICENSE= 3proxy-0.9-license
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
REQD_FILES= ${EGDIR}/3proxy.cfg.sample \
${PKG_SYSCONFDIR}/${PKGBASE}/3proxy.cfg
OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE} ${VARBASE}/log/${PKGBASE}
RCD_SCRIPTS= threeproxy
-WRKSRC= ${WRKDIR}/${PKGBASE}
MAKE_FILE= Makefile.unix
MAKE_FLAGS+= LIBS=${BUILDLINK_LDADD.dl:Q}
@@ -42,7 +34,7 @@ SUBST_VARS.cfg+= VARBASE
# install the HTML pages, because they provide no more information than
# the man pages.
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/3proxy ${DESTDIR}${PREFIX}/sbin/.
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/3proxy ${DESTDIR}${PREFIX}/sbin/.
${INSTALL_MAN} ${WRKSRC}/man/3proxy.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/.
${INSTALL_MAN} ${WRKSRC}/man/3proxy.cfg.3 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/3proxy.cfg.5
Index: pkgsrc/net/3proxy/distinfo
diff -u pkgsrc/net/3proxy/distinfo:1.10 pkgsrc/net/3proxy/distinfo:1.11
--- pkgsrc/net/3proxy/distinfo:1.10 Tue Oct 26 11:05:20 2021
+++ pkgsrc/net/3proxy/distinfo Sun Nov 27 13:14:00 2022
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:05:20 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/11/27 13:14:00 triaxx Exp $
-BLAKE2s (3proxy-0.8.11.tgz) = 21fc38274deb19257b08a6b67bc3d2711567b2d728416c5d6f3ea73009b4e72e
-SHA512 (3proxy-0.8.11.tgz) = 4160684892292a0c4666f8b8f3bdba0c0846842816ef4f6d0ce7286b520a3cda2ceee76580d2e61942afb9404a8ad93aa0260043acd4ffbfc1c38b3e31857c67
-Size (3proxy-0.8.11.tgz) = 511157 bytes
-SHA1 (patch-ab) = 3ad025c8577f1494d6949efcd5bf104672027a0d
-SHA1 (patch-ac) = e4e4a005e815c7cd353103bbcbbfdb849d637517
-SHA1 (patch-ad) = 8081f363dbf0232e5d1db1bc5e09f93ac7cfe95b
-SHA1 (patch-ae) = 467ad84a16ee806da1bbc3d297434bd31a25bb27
-SHA1 (patch-cfg_3proxy.cfg.sample) = 841eb478bd5ca09bd19364d61dcd963b7a15c790
-SHA1 (patch-Makefile.unix) = bcaf278e55d954ecc758a0f01c7e35f8d7a7fca2
-SHA1 (patch-man_3proxy.8) = ea00a3c99c201fc87efb1270bfaab13a4e2f9c75
-SHA1 (patch-man_3proxy.cfg.3) = 52fb754e7241c10612e13bca66127072732b56f1
+BLAKE2s (3proxy-0.9.4.tar.gz) = e207319dbc7b88cac0779ab51f177bfa098392c261ab6594417e03fced40c657
+SHA512 (3proxy-0.9.4.tar.gz) = d3316f6ee1217e580ce593a7bfd9d76672487a89862f247373b0acf3ea207887c758168e33b25db9fc974063deab0826c20d455cab2536d03eee49d8bddda6b5
+Size (3proxy-0.9.4.tar.gz) = 610340 bytes
+SHA1 (patch-Makefile.unix) = aabfa5ad7985ddf8b1240e65bc00c86837d844b0
+SHA1 (patch-ab) = 097103e06e576d6e4ad1830122ab6f4d9ed32a3b
+SHA1 (patch-ac) = a68b7949b22a250b7ed223c7790d420fa7ab624c
+SHA1 (patch-ad) = 625c35af17d4d23203e550f8f7e293175b11813f
+SHA1 (patch-ae) = 9ef8ce232d10603527fcc77cc266a2557e8ec2a3
+SHA1 (patch-cfg_3proxy.cfg.sample) = 7b113b9494ca80d613fb53bde02df0b9e3a40584
+SHA1 (patch-man_3proxy.8) = 69a64574e4b1f543ccd4e90bead39740a638b0f4
+SHA1 (patch-man_3proxy.cfg.3) = 3b650436821b1c0cab72a94c1ca245295c5bfba6
+SHA1 (patch-src_plugins_PamAuth_pamauth.c) = 97674438898ddc9ea7cce9a7da303e378d50bcdf
+SHA1 (patch-src_plugins_TransparentPlugin_transparent__plugin.c) = 1176f14c05443c5bcaaa8a36f68701d8446c6997
+SHA1 (patch-src_version.h) = 774543930f3d64240907a1b1dd798372a09e6362
Index: pkgsrc/net/3proxy/patches/patch-Makefile.unix
diff -u pkgsrc/net/3proxy/patches/patch-Makefile.unix:1.1 pkgsrc/net/3proxy/patches/patch-Makefile.unix:1.2
--- pkgsrc/net/3proxy/patches/patch-Makefile.unix:1.1 Mon Feb 19 21:25:46 2018
+++ pkgsrc/net/3proxy/patches/patch-Makefile.unix Sun Nov 27 13:14:00 2022
@@ -1,32 +1,31 @@
-$NetBSD: patch-Makefile.unix,v 1.1 2018/02/19 21:25:46 triaxx Exp $
+$NetBSD: patch-Makefile.unix,v 1.2 2022/11/27 13:14:00 triaxx Exp $
Fix Makefile inconsistency
From FreeBSD ports
---- Makefile.unix.orig 2017-10-19 14:25:42.000000000 +0000
+--- Makefile.unix.orig 2021-07-01 16:59:57.000000000 +0000
+++ Makefile.unix
@@ -8,18 +8,18 @@
- # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
-
- BUILDDIR =
--CC = gcc
-+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 = -c -O2 -pipe -fstack-protector -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o
--LN = gcc
--LDFLAGS = -O2 -pthread
-+LN = ${CC}
-+LDFLAGS = -pthread
- # -lpthreads may be reuqired on some platforms instead of -pthreads
- # -ldl or -lld may be required for some platforms
- DCFLAGS = -fpic
- DLFLAGS = -shared
--DLSUFFICS = .ld.so
-+DLSUFFICS = .so
- LIBS =
- LIBSPREFIX = -l
- LIBSSUFFIX =
+ # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
+
+ BUILDDIR = ../bin/
+-CC = gcc
++CC ?= gcc
+
+ # you may need -L/usr/pkg/lib for older NetBSD versions
+-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 -fstack-protector -fno-strict-aliasing -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+ COUT = -o
+ LN = $(CC)
+-LDFLAGS = -O2 -fno-strict-aliasing -pthread
++LDFLAGS = -fstack-protector -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
+ DLFLAGS = -shared
+-DLSUFFICS = .ld.so
++DLSUFFICS = .so
+ LIBS =
+ LIBSPREFIX = -l
+ LIBSSUFFIX =
Index: pkgsrc/net/3proxy/patches/patch-man_3proxy.8
diff -u pkgsrc/net/3proxy/patches/patch-man_3proxy.8:1.1 pkgsrc/net/3proxy/patches/patch-man_3proxy.8:1.2
--- pkgsrc/net/3proxy/patches/patch-man_3proxy.8:1.1 Tue Feb 20 13:01:30 2018
+++ pkgsrc/net/3proxy/patches/patch-man_3proxy.8 Sun Nov 27 13:14:00 2022
@@ -1,24 +1,24 @@
-$NetBSD: patch-man_3proxy.8,v 1.1 2018/02/20 13:01:30 triaxx Exp $
+$NetBSD: patch-man_3proxy.8,v 1.2 2022/11/27 13:14:00 triaxx Exp $
Fix hardcoded PATH.
---- man/3proxy.8.orig 2016-01-23 16:09:23.000000000 +0000
+--- man/3proxy.8.orig 2021-07-01 16:59:57.000000000 +0000
+++ man/3proxy.8
@@ -84,7 +84,7 @@ directory). Under Unix, if no config fil
- 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
-+#!@PREFIX@/bin/3proxy
- .br
- as a first line in 3proxy.cfg
- .TP
+ 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
++#!@PREFIX@/bin/3proxy
+ .br
+ as a first line in 3proxy.cfg
+ .TP
@@ -133,7 +133,7 @@ Web admin service can also be used to re
- wget to automate this task.
- .SH FILES
- .TP
--.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
-+.I "@PKG_SYSCONFDIR@/3proxy/3proxy.cfg (3proxy.cfg)"
- .BR 3proxy
- configuration file
- .SH BUGS
+ wget to automate this task.
+ .SH FILES
+ .TP
+-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
++.I "@PKG_SYSCONFDIR@/3proxy/3proxy.cfg (3proxy.cfg)"
+ .BR 3proxy
+ configuration file
+ .SH BUGS
Index: pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3
diff -u pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3:1.1 pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3:1.2
--- pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3:1.1 Tue Feb 20 13:01:30 2018
+++ pkgsrc/net/3proxy/patches/patch-man_3proxy.cfg.3 Sun Nov 27 13:14:00 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-man_3proxy.cfg.3,v 1.1 2018/02/20 13:01:30 triaxx Exp $
+$NetBSD: patch-man_3proxy.cfg.3,v 1.2 2022/11/27 13:14:00 triaxx Exp $
Fix hardcoded PATH.
---- man/3proxy.cfg.3.orig 2017-10-19 14:25:42.000000000 +0000
+--- man/3proxy.cfg.3.orig 2021-07-01 16:59:57.000000000 +0000
+++ man/3proxy.cfg.3
@@ -32,7 +32,7 @@ Good practice is to quote any argument y
- File inclusion:
- .br
- You can include file by using $FILENAME macro (replace FILENAME with a path
--to file, for example $/usr/local/etc/3proxy/conf.incl or
-+to file, for example $@PKG_SYSCONFDIR@/3proxy/conf.incl or
- $"c:\\Program Files\\3proxy\\include.cfg" Quotation is
- required in last example because path contains space character.
- For included file <CR> (end of line characters) is treated as space character
+ File inclusion:
+ .br
+ You can include file by using $FILENAME macro (replace FILENAME with a path
+-to file, for example $/usr/local/etc/3proxy/conf.incl or
++to file, for example $@PKG_SYSCONFDIR@/3proxy/conf.incl or
+ $"c:\\\\Program Files\\3proxy\\include.cfg" Quotation is
+ required in last example because path contains space character.
+ For included file <CR> (end of line characters) is treated as space character
Index: pkgsrc/net/3proxy/patches/patch-ab
diff -u pkgsrc/net/3proxy/patches/patch-ab:1.3 pkgsrc/net/3proxy/patches/patch-ab:1.4
--- pkgsrc/net/3proxy/patches/patch-ab:1.3 Mon Feb 19 21:25:46 2018
+++ pkgsrc/net/3proxy/patches/patch-ab Sun Nov 27 13:14:00 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2018/02/19 21:25:46 triaxx Exp $
+$NetBSD: patch-ab,v 1.4 2022/11/27 13:14:00 triaxx Exp $
Compliance with toupper() documentation.
---- src/ntlm.c.orig 2015-02-17 13:07:21.000000000 +0000
+--- src/ntlm.c.orig 2021-07-01 16:59:57.000000000 +0000
+++ src/ntlm.c
-@@ -43,7 +43,7 @@ int text2unicode(const char * text, char
- buflen = ((buflen>>1)<<1);
- if(!text || !buflen) return 0;
- do {
-- buf[count++] = toupper(*text++);
-+ buf[count++] = toupper((unsigned char)*text++);
- buf[count++] = '\0';
- } while (*text && count < buflen);
- return count;
+@@ -42,7 +42,7 @@ int text2unicode(const char * text, char
+ buflen = ((buflen>>1)<<1);
+ if(!text || !buflen) return 0;
+ do {
+- buf[count++] = toupper(*text++);
++ buf[count++] = toupper((unsigned char)*text++);
+ buf[count++] = '\0';
+ } while (*text && count < buflen);
+ return count;
Index: pkgsrc/net/3proxy/patches/patch-ac
diff -u pkgsrc/net/3proxy/patches/patch-ac:1.3 pkgsrc/net/3proxy/patches/patch-ac:1.4
--- pkgsrc/net/3proxy/patches/patch-ac:1.3 Mon Feb 19 21:25:46 2018
+++ pkgsrc/net/3proxy/patches/patch-ac Sun Nov 27 13:14:00 2022
@@ -1,36 +1,37 @@
-$NetBSD: patch-ac,v 1.3 2018/02/19 21:25:46 triaxx Exp $
+$NetBSD: patch-ac,v 1.4 2022/11/27 13:14:00 triaxx Exp $
Compliance with isspace() documentation.
---- src/webadmin.c.orig 2015-02-17 13:07:21.000000000 +0000
+--- src/webadmin.c.orig 2021-07-01 16:59:57.000000000 +0000
+++ src/webadmin.c
-@@ -375,12 +375,12 @@ void * adminchild(struct clientparam* pa
- sb = strchr(buf, ':');
- if(!sb)continue;
- ++sb;
-- while(isspace(*sb))sb++;
-+ while(isspace((unsigned char)*sb))sb++;
- if(!*sb || strncasecmp(sb, "basic", 5)){
- continue;
- }
- sb+=5;
-- while(isspace(*sb))sb++;
-+ while(isspace((unsigned char)*sb))sb++;
- i = de64((unsigned char *)sb, (unsigned char *)username, 255);
- if(i<=0)continue;
- username[i] = 0;
-@@ -396,12 +396,12 @@ void * adminchild(struct clientparam* pa
- }
- else if(i > 15 && (!strncasecmp(buf, "content-length:", 15))){
- sb = buf + 15;
-- while(isspace(*sb))sb++;
-+ while(isspace((unsigned char)*sb))sb++;
- contentlen = atoi(sb);
- }
- else if(i > 13 && (!strncasecmp(buf, "content-type:", 13))){
- sb = buf + 13;
-- while(isspace(*sb))sb++;
-+ while(isspace((unsigned char)*sb))sb++;
- if(!strncasecmp(sb, "x-www-form-urlencoded", 21)) isform = 1;
- }
- }
+@@ -403,12 +403,12 @@ void * adminchild(struct clientparam* pa
+ sb = strchr(buf, ':');
+ if(!sb)continue;
+ ++sb;
+- while(isspace(*sb))sb++;
++ while(isspace((unsigned char)*sb))sb++;
+ if(!*sb || strncasecmp(sb, "basic", 5)){
+ continue;
+ }
+ sb+=5;
+- while(isspace(*sb))sb++;
++ while(isspace((unsigned char)*sb))sb++;
+ i = de64((unsigned char *)sb, (unsigned char *)username, 255);
+ if(i<=0)continue;
+ username[i] = 0;
+@@ -424,13 +424,13 @@ void * adminchild(struct clientparam* pa
+ }
+ else if(i > 15 && (!strncasecmp(buf, "content-length:", 15))){
+ sb = buf + 15;
+- while(isspace(*sb))sb++;
++ while(isspace((unsigned char)*sb))sb++;
+ sscanf(sb, "%u", &contentlen);
+ if(contentlen > LINESIZE*1024) contentlen = 0;
+ }
+ else if(i > 13 && (!strncasecmp(buf, "content-type:", 13))){
+ sb = buf + 13;
+- while(isspace(*sb))sb++;
++ while(isspace((unsigned char)*sb))sb++;
+ if(!strncasecmp(sb, "x-www-form-urlencoded", 21)) isform = 1;
+ }
+ }
Index: pkgsrc/net/3proxy/patches/patch-ad
diff -u pkgsrc/net/3proxy/patches/patch-ad:1.3 pkgsrc/net/3proxy/patches/patch-ad:1.4
--- pkgsrc/net/3proxy/patches/patch-ad:1.3 Mon Feb 19 21:25:46 2018
+++ pkgsrc/net/3proxy/patches/patch-ad Sun Nov 27 13:14:00 2022
@@ -1,29 +1,29 @@
-$NetBSD: patch-ad,v 1.3 2018/02/19 21:25:46 triaxx Exp $
+$NetBSD: patch-ad,v 1.4 2022/11/27 13:14:00 triaxx Exp $
Calling usleep for 1000000 microseconds or more is not allowed, so add a
myusleep() wrapper to DTRT.
---- src/common.c.orig 2017-10-19 14:31:30.000000000 +0000
+--- src/common.c.orig 2021-07-01 16:59:57.000000000 +0000
+++ src/common.c
-@@ -881,3 +881,21 @@ unsigned long getip46(int family, unsign
- return 0;
- #endif
- }
-+
-+/*
-+ * POSIX says:
-+ * The usleep() function may fail if:
-+ * [EINVAL] The time interval specified one million or more microseconds.
-+ *
-+ * Other code in 3proxy calls usleep with much larger arguments, but
-+ * that gets redirected here via "#define usleep(usecs) myusleep(usecs)"
-+ * in proxy.h. We call sleep() for any whole number of seconds, and
-+ * the real usleep() for any left over microseconds.
-+ */
-+int myusleep(useconds_t useconds)
-+{
-+ unsigned int secs = useconds / 1000000;
-+ useconds = useconds % 1000000;
-+ if (secs > 0) sleep(secs);
-+ return (usleep)(useconds);
-+}
+@@ -632,3 +632,21 @@ unsigned long getip46(int family, unsign
+ return 0;
+ #endif
+ }
++
++/*
++ * POSIX says:
++ * The usleep() function may fail if:
++ * [EINVAL] The time interval specified one million or more microseconds.
++ *
++ * Other code in 3proxy calls usleep with much larger arguments, but
++ * that gets redirected here via "#define usleep(usecs) myusleep(usecs)"
++ * in proxy.h. We call sleep() for any whole number of seconds, and
++ * the real usleep() for any left over microseconds.
++ */
++int myusleep(useconds_t useconds)
++{
++ unsigned int secs = useconds / 1000000;
++ useconds = useconds % 1000000;
++ if (secs > 0) sleep(secs);
++ return (usleep)(useconds);
++}
Index: pkgsrc/net/3proxy/patches/patch-ae
diff -u pkgsrc/net/3proxy/patches/patch-ae:1.4 pkgsrc/net/3proxy/patches/patch-ae:1.5
--- pkgsrc/net/3proxy/patches/patch-ae:1.4 Mon Feb 19 21:25:46 2018
+++ pkgsrc/net/3proxy/patches/patch-ae Sun Nov 27 13:14:00 2022
@@ -1,27 +1,27 @@
-$NetBSD: patch-ae,v 1.4 2018/02/19 21:25:46 triaxx Exp $
+$NetBSD: patch-ae,v 1.5 2022/11/27 13:14:00 triaxx Exp $
Fix build on OpenBSD and Bitrig.
Calling usleep for 1000000 microseconds or more is not allowed, so add a
myusleep() wrapper to DTRT.
---- src/proxy.h.orig 2017-10-19 14:25:44.000000000 +0000
+--- src/proxy.h.orig 2021-07-01 16:59:57.000000000 +0000
+++ src/proxy.h
-@@ -21,7 +21,9 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#if !(defined(__OpenBSD__) || !defined(__Bitrig__))
- #include <sys/timeb.h>
-+#endif
- #include <fcntl.h>
- #include <time.h>
-
-@@ -107,6 +109,8 @@
- #endif
- void daemonize(void);
- #define SLEEPTIME 1000
-+#define usleep(usecs) myusleep(usecs)
-+int myusleep(useconds_t);
- #ifndef O_BINARY
- #define O_BINARY 0
- #endif
+@@ -21,6 +21,9 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#if !(defined(__OpenBSD__) || !defined(__Bitrig__))
++#include <sys/timeb.h>
++#endif
+ #include <fcntl.h>
+ #include <time.h>
+
+@@ -100,6 +103,8 @@
+ #endif
+ void daemonize(void);
+ #define SLEEPTIME 1000
++#define usleep(usecs) myusleep(usecs)
++int myusleep(useconds_t);
+ #ifndef O_BINARY
+ #define O_BINARY 0
+ #endif
Index: pkgsrc/net/3proxy/patches/patch-cfg_3proxy.cfg.sample
diff -u pkgsrc/net/3proxy/patches/patch-cfg_3proxy.cfg.sample:1.2 pkgsrc/net/3proxy/patches/patch-cfg_3proxy.cfg.sample:1.3
--- pkgsrc/net/3proxy/patches/patch-cfg_3proxy.cfg.sample:1.2 Wed Feb 21 15:20:04 2018
+++ pkgsrc/net/3proxy/patches/patch-cfg_3proxy.cfg.sample Sun Nov 27 13:14:00 2022
@@ -1,50 +1,50 @@
-$NetBSD: patch-cfg_3proxy.cfg.sample,v 1.2 2018/02/21 15:20:04 triaxx Exp $
+$NetBSD: patch-cfg_3proxy.cfg.sample,v 1.3 2022/11/27 13:14:00 triaxx Exp $
Adjust PATH according to pkgsrc defined directories.
---- cfg/3proxy.cfg.sample.orig 2017-10-19 14:53:32.000000000 +0000
+--- cfg/3proxy.cfg.sample.orig 2021-07-01 16:59:57.000000000 +0000
+++ cfg/3proxy.cfg.sample
@@ -1,7 +1,7 @@
--#!/usr/local/bin/3proxy
-+#!@PREFIX@/bin/3proxy
- # Yes, 3proxy.cfg can be executable, in this case you should place
- # something like
--#config /usr/local/3proxy/3proxy.cfg
-+#config @PKG_SYSCONFDIR@/3proxy/3proxy.cfg
- # to show which configuration 3proxy should re-read on realod.
-
- #system "echo Hello world!"
+-#!/usr/local/bin/3proxy
++#!@PREFIX@/bin/3proxy
+ # Yes, 3proxy.cfg can be executable, in this case you should place
+ # something like
+-#config /usr/local/3proxy/3proxy.cfg
++#config @PKG_SYSCONFDIR@/3proxy/3proxy.cfg
+ # to show which configuration 3proxy should re-read on realod.
+
+ #system "echo Hello world!"
@@ -26,19 +26,19 @@ timeouts 1 5 30 60 180 1800 15 60
- users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9HyhcMHEe1"
- # note that "" required, overvise $... is treated as include file name.
- # $1$qwer$CHFTUFGqkjue9HyhcMHEe1 is 'test' in MD5 crypt format.
--#users $/usr/local/etc/3proxy/passwd
-+#users $@PKG_SYSCONFDIR@/etc/3proxy/passwd
- # 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 @VARBASE@/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
-
+ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9HyhcMHEe1"
+ # note that "" required, overvise $... is treated as include file name.
+ # $1$qwer$CHFTUFGqkjue9HyhcMHEe1 is 'test' in MD5 crypt format.
+-#users $/usr/local/etc/3proxy/passwd
++#users $@PKG_SYSCONFDIR@/etc/3proxy/passwd
+ # 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 @VARBASE@/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
+
@@ -193,7 +193,7 @@ admin
- #tcppm 443 websrv 443
-
-
--#chroot /usr/local/jail
-+#chroot @VARBASE@/chroot/3proxy
- #setgid 65535
- #setuid 65535
- # now we needn't any root rights. We can chroot and setgid/setuid.
+ #tcppm 443 websrv 443
+
+
+-#chroot /usr/local/jail
++#chroot @VARBASE@/chroot/3proxy
+ #setgid 65535
+ #setuid 65535
+ # now we needn't any root rights. We can chroot and setgid/setuid.
Added files:
Index: pkgsrc/net/3proxy/patches/patch-src_plugins_PamAuth_pamauth.c
diff -u /dev/null pkgsrc/net/3proxy/patches/patch-src_plugins_PamAuth_pamauth.c:1.1
--- /dev/null Sun Nov 27 13:14:01 2022
+++ pkgsrc/net/3proxy/patches/patch-src_plugins_PamAuth_pamauth.c Sun Nov 27 13:14:00 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_PamAuth_pamauth.c,v 1.1 2022/11/27 13:14:00 triaxx Exp $
+
+Suppress warning for incompatibility with strdup() return type.
+
+--- src/plugins/PamAuth/pamauth.c.orig 2021-07-01 16:59:57.000000000 +0000
++++ src/plugins/PamAuth/pamauth.c
+@@ -132,7 +132,7 @@ PLUGINAPI int PLUGINCALL start(struct pl
+ if(argc < 2) return 1;
+ pl = pluginlink;
+ if(service) free(service);
+- service=strdup((char *)argv[1]);
++ service = (unsigned char *)strdup((char *)argv[1]);
+
+ if (already_loaded) { return (0); }
+
Index: pkgsrc/net/3proxy/patches/patch-src_plugins_TransparentPlugin_transparent__plugin.c
diff -u /dev/null pkgsrc/net/3proxy/patches/patch-src_plugins_TransparentPlugin_transparent__plugin.c:1.1
--- /dev/null Sun Nov 27 13:14:01 2022
+++ pkgsrc/net/3proxy/patches/patch-src_plugins_TransparentPlugin_transparent__plugin.c Sun Nov 27 13:14:01 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_TransparentPlugin_transparent__plugin.c,v 1.1 2022/11/27 13:14:01 triaxx Exp $
+
+Suppress warning for incompatibility with strdup() return type.
+
+--- src/plugins/TransparentPlugin/transparent_plugin.c.orig 2021-07-01 16:59:57.000000000 +0000
++++ src/plugins/TransparentPlugin/transparent_plugin.c
+@@ -63,7 +63,7 @@ static FILTER_ACTION transparent_filter_
+ #endif
+ pl->myinet_ntop(*SAFAMILY(¶m->req), SAADDR(¶m->req), (char *)addrbuf, sizeof(addrbuf));
+ if(param->hostname) pl->freefunc(param->hostname);
+- param->hostname = pl->strdupfunc(addrbuf);
++ param->hostname = (unsigned char *)pl->strdupfunc(addrbuf);
+ param->sinsr = param->req;
+ return PASS;
+ }
Index: pkgsrc/net/3proxy/patches/patch-src_version.h
diff -u /dev/null pkgsrc/net/3proxy/patches/patch-src_version.h:1.1
--- /dev/null Sun Nov 27 13:14:01 2022
+++ pkgsrc/net/3proxy/patches/patch-src_version.h Sun Nov 27 13:14:01 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_version.h,v 1.1 2022/11/27 13:14:01 triaxx Exp $
+
+Fix version increment which has been forgotten at releasing date.
+
+--- src/version.h.orig 2021-07-01 16:59:57.000000000 +0000
++++ src/version.h
+@@ -1,12 +1,12 @@
+ #ifndef VERSION
+-#define VERSION "3proxy-0.9.3"
++#define VERSION "3proxy-0.9.4"
+ #endif
+ #ifndef BUILDDATE
+ #define BUILDDATE ""
+ #endif
+ #define MAJOR3PROXY 0
+ #define SUBMAJOR3PROXY 9
+-#define MINOR3PROXY 3
++#define MINOR3PROXY 4
+ #define SUBMINOR3PROXY 0
+-#define RELEASE3PROXY "3proxy-0.9.3(" BUILDDATE ")\0"
++#define RELEASE3PROXY "3proxy-0.9.4(" BUILDDATE ")\0"
+ #define YEAR3PROXY "2021"
Home |
Main Index |
Thread Index |
Old Index