Update to 0.9.6 (fixes rhbz#2457569)

This commit is contained in:
Tim Semeijn 2026-04-17 12:35:58 +00:00
commit 0d8e4f960d
6 changed files with 84 additions and 72 deletions

1
.gitignore vendored
View file

@ -7,3 +7,4 @@
/3proxy-0.8.13.tar.gz
/3proxy-0.9.4.tar.gz
/3proxy-0.9.5.tar.gz
/3proxy-0.9.6.tar.gz

View file

@ -1,20 +0,0 @@
--- man/3proxy.8.orig 2009-07-13 17:52:25.000000000 +0400
+++ man/3proxy.8 2010-05-30 21:39:19.000000000 +0400
@@ -84,7 +84,7 @@
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
+#!/etc/3proxy
.br
as a first line in 3proxy.cfg
.TP
@@ -133,7 +133,7 @@
wget to automate this task.
.SH FILES
.TP
-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
+.I "/etc/3proxy.cfg (3proxy.cfg)"
.BR 3proxy
configuration file
.SH BUGS

View file

@ -0,0 +1,20 @@
--- man/3proxy.8.orig
+++ man/3proxy.8
@@ -87,7 +87,7 @@
configuration from stdin. It makes it possible to use the 3proxy.cfg file as
an executable script just by setting +x mode and adding
.br
-#!/usr/local/3proxy/3proxy
+#!/etc/3proxy
.br
as a first line in 3proxy.cfg
.TP
@@ -136,7 +136,7 @@
wget to automate this task.
.SH FILES
.TP
-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
+.I "/etc/3proxy.cfg (3proxy.cfg)"
.BR 3proxy
configuration file
.SH BUGS

View file

@ -1,9 +1,10 @@
--- man/3proxy.8
+++ man/3proxy.8
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/3proxy.8 3proxy-0.9.6-new/3proxy-0.9.6/man/3proxy.8
--- man/3proxy.8 2026-04-11 10:06:43.000000000 +0000
+++ man/3proxy.8 2026-04-17 11:58:23.918784163 +0000
@@ -26,7 +26,7 @@
gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
from configuration file like independant service
from the configuration file like an independent service
-.BR proxy (8)
+.BR htproxy (8)
.BR socks (8)
@ -18,8 +19,9 @@
kill(1), syslogd(8),
.br
https://3proxy.org/
--- man/3proxy.cfg.3
+++ man/3proxy.cfg.3
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/3proxy.cfg.3 3proxy-0.9.6-new/3proxy-0.9.6/man/3proxy.cfg.3
--- man/3proxy.cfg.3 2026-04-11 10:06:43.000000000 +0000
+++ man/3proxy.cfg.3 2026-04-17 11:58:55.722904351 +0000
@@ -46,7 +46,7 @@
Next commands start gateway services:
@ -29,7 +31,7 @@
[options]
.br
.B socks
@@ -74,7 +74,7 @@
@@ -77,7 +77,7 @@
.br
Descriptions:
.br
@ -38,7 +40,7 @@
HTTP/HTTPS proxy (default port 3128)
.br
.B socks
@@ -185,7 +185,7 @@
@@ -188,7 +188,7 @@
of IP-IP NAT (will not work for PAT)
.br
Also, all options mentioned for
@ -47,7 +49,7 @@
.BR socks (8)
.BR pop3p (8)
.BR tcppm (8)
@@ -1078,7 +1078,7 @@
@@ -1122,7 +1122,7 @@
Report all bugs to
.BR 3proxy@3proxy.org
.SH SEE ALSO
@ -56,8 +58,9 @@
.br
https://3proxy.org/
.SH TRIVIA
--- man/ftppr.8
+++ man/ftppr.8
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/ftppr.8 3proxy-0.9.6-new/3proxy-0.9.6/man/ftppr.8
--- man/ftppr.8 2026-04-11 10:06:43.000000000 +0000
+++ man/ftppr.8 2026-04-17 11:58:23.935784227 +0000
@@ -79,7 +79,7 @@
Report all bugs to
.BR 3proxy@3proxy.org
@ -67,8 +70,9 @@
.br
https://3proxy.org/
.SH AUTHORS
--- /dev/null
+++ man/htproxy.8
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/htproxy.8 3proxy-0.9.6-new/3proxy-0.9.6/man/htproxy.8
--- man/htproxy.8 1970-01-01 00:00:00.000000000 +0000
+++ man/htproxy.8 2026-04-17 11:58:23.976784382 +0000
@@ -0,0 +1,78 @@
+.TH proxy "8" "January 2019" "3proxy 0.9" "Universal proxy server"
+.SH NAME
@ -89,7 +93,7 @@
+Inetd mode. Standalone service only.
+.TP
+.B -d
+Daemonise. Detach service from console and run in the background.
+Daemonize. Detach service from console and run in the background.
+.TP
+.B -t
+Be silenT. Do not log start/stop/accept error records.
@ -98,14 +102,14 @@
+Never ask for username authentication
+.TP
+.B -e
+External address. IP address of interface proxy should initiate connections
+from.
+By default system will deside which address to use in accordance
+with routing table.
+External address. IP address of the interface the proxy should initiate connections
+from.
+By default, the system will decide which address to use in accordance
+with the routing table.
+.TP
+.B -i
+Internal address. IP address proxy accepts connections to.
+By default connection to any interface is accepted. It\'s usually unsafe.
+Internal address. IP address the proxy accepts connections to.
+By default, connections to any interface are accepted. It\'s usually unsafe.
+.TP
+.B -a
+Anonymous. Hide information about client.
@ -129,12 +133,12 @@
+Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
+crashes.
+.SH CLIENTS
+You should use client with HTTP proxy support or configure router to redirect
+HTTP traffic to proxy (transparent proxy). Configure client to connect to
+You should use a client with HTTP proxy support or configure a router to redirect
+HTTP traffic to the proxy (transparent proxy). Configure the client to connect to
+.I internal_ip
+and
+.IR port .
+HTTPS support allows to use almost any TCP based protocol. If you need to
+HTTPS support allows you to use almost any TCP-based protocol. If you need to
+limit clients, use
+.BR 3proxy (8)
+instead.
@ -148,8 +152,9 @@
+.SH AUTHORS
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.org )
--- man/pop3p.8
+++ man/pop3p.8
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/pop3p.8 3proxy-0.9.6-new/3proxy-0.9.6/man/pop3p.8
--- man/pop3p.8 2026-04-11 10:06:43.000000000 +0000
+++ man/pop3p.8 2026-04-17 11:58:23.938784239 +0000
@@ -75,7 +75,7 @@
Report all bugs to
.BR 3proxy@3proxy.org
@ -159,8 +164,9 @@
.br
https://3proxy.org/
.SH AUTHORS
--- man/proxy.8
+++ /dev/null
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/proxy.8 3proxy-0.9.6-new/3proxy-0.9.6/man/proxy.8
--- man/proxy.8 2026-04-11 10:06:43.000000000 +0000
+++ man/proxy.8 1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-.TH proxy "8" "January 2019" "3proxy 0.9" "Universal proxy server"
-.SH NAME
@ -181,7 +187,7 @@
-Inetd mode. Standalone service only.
-.TP
-.B -d
-Daemonise. Detach service from console and run in the background.
-Daemonize. Detach service from console and run in the background.
-.TP
-.B -t
-Be silenT. Do not log start/stop/accept error records.
@ -190,14 +196,14 @@
-Never ask for username authentication
-.TP
-.B -e
-External address. IP address of interface proxy should initiate connections
-from.
-By default system will deside which address to use in accordance
-with routing table.
-External address. IP address of the interface the proxy should initiate connections
-from.
-By default, the system will decide which address to use in accordance
-with the routing table.
-.TP
-.B -i
-Internal address. IP address proxy accepts connections to.
-By default connection to any interface is accepted. It\'s usually unsafe.
-Internal address. IP address the proxy accepts connections to.
-By default, connections to any interface are accepted. It\'s usually unsafe.
-.TP
-.B -a
-Anonymous. Hide information about client.
@ -221,12 +227,12 @@
-Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
-crashes.
-.SH CLIENTS
-You should use client with HTTP proxy support or configure router to redirect
-HTTP traffic to proxy (transparent proxy). Configure client to connect to
-You should use a client with HTTP proxy support or configure a router to redirect
-HTTP traffic to the proxy (transparent proxy). Configure the client to connect to
-.I internal_ip
-and
-.IR port .
-HTTPS support allows to use almost any TCP based protocol. If you need to
-HTTPS support allows you to use almost any TCP-based protocol. If you need to
-limit clients, use
-.BR 3proxy (8)
-instead.
@ -240,8 +246,9 @@
-.SH AUTHORS
-3proxy is designed by Vladimir 3APA3A Dubrovin
-.RI ( 3proxy@3proxy.org )
--- man/smtpp.8
+++ man/smtpp.8
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/smtpp.8 3proxy-0.9.6-new/3proxy-0.9.6/man/smtpp.8
--- man/smtpp.8 2026-04-11 10:06:43.000000000 +0000
+++ man/smtpp.8 2026-04-17 11:58:23.942784254 +0000
@@ -76,7 +76,7 @@
Report all bugs to
.BR 3proxy@3proxy.org
@ -251,9 +258,10 @@
.br
https://3proxy.org/
.SH AUTHORS
--- man/socks.8
+++ man/socks.8
@@ -76,7 +76,7 @@
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/socks.8 3proxy-0.9.6-new/3proxy-0.9.6/man/socks.8
--- man/socks.8 2026-04-11 10:06:43.000000000 +0000
+++ man/socks.8 2026-04-17 11:58:23.945784265 +0000
@@ -84,7 +84,7 @@
Report all bugs to
.BR 3proxy@3proxy.org
.SH SEE ALSO
@ -262,8 +270,9 @@
.br
https://3proxy.org/
.SH AUTHORS
--- man/tcppm.8
+++ man/tcppm.8
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/tcppm.8 3proxy-0.9.6-new/3proxy-0.9.6/man/tcppm.8
--- man/tcppm.8 2026-04-11 10:06:43.000000000 +0000
+++ man/tcppm.8 2026-04-17 11:58:23.949784280 +0000
@@ -65,7 +65,7 @@
Report all bugs to
.BR 3proxy@3proxy.org
@ -273,9 +282,10 @@
.br
https://3proxy.org/
.SH AUTHORS
--- man/tlspr.8
+++ man/tlspr.8
@@ -78,7 +78,7 @@
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/tlspr.8 3proxy-0.9.6-new/3proxy-0.9.6/man/tlspr.8
--- man/tlspr.8 2026-04-11 10:06:43.000000000 +0000
+++ man/tlspr.8 2026-04-17 11:58:23.952784292 +0000
@@ -77,7 +77,7 @@
Report all bugs to
.BR 3proxy@3proxy.org
.SH SEE ALSO
@ -284,8 +294,9 @@
.br
https://3proxy.org/
.SH AUTHORS
--- man/udppm.8
+++ man/udppm.8
diff -urN 3proxy-0.9.6-orig/3proxy-0.9.6/man/udppm.8 3proxy-0.9.6-new/3proxy-0.9.6/man/udppm.8
--- man/udppm.8 2026-04-11 10:06:43.000000000 +0000
+++ man/udppm.8 2026-04-17 11:58:23.955784303 +0000
@@ -71,7 +71,7 @@
Report all bugs to
.BR 3proxy@3proxy.org

View file

@ -1,5 +1,5 @@
Name: 3proxy
Version: 0.9.5
Version: 0.9.6
Release: %autorelease
Summary: Tiny but very powerful proxy
@ -17,11 +17,11 @@ BuildRequires: openssl-devel
BuildRequires: systemd-rpm-macros
# I correct config path in man only. It is fully Fedora related.
Patch0: 3proxy-0.6.1-config-path.patch
Patch0: 3proxy-0.9.6-config-path.patch
# Fixes *_poll build error
Patch1: 3proxy-0.9.4-poll-build.patch
# Adapt manpages to reflect renamed proxy binary
Patch2: 3proxy-0.9.4-manpage.patch
Patch2: 3proxy-0.9.6-manpage.patch
%description
%{name} -- light proxy server.

View file

@ -1 +1 @@
SHA512 (3proxy-0.9.5.tar.gz) = b668db6438da19ee2479228af744b9b3b9ff2c7e6d97aaf3b20737b165ab2baf656ac9ea92b6f1e169c428784c7d9e3e7eeb7c3effb1c0b77e5038319b6d2bcd
SHA512 (3proxy-0.9.6.tar.gz) = fcdefbbf78dc54041fd32273e13634308e3d820c4657e28bcc44575186705f1195ed336bb244c0b36e5abbda1286c313894c4740595e76f940f79c241ebe1197