public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/3proxy] epel8: Merge branch 'rawhide' into epel8
@ 2026-08-23 22:53 Tim Semeijn
0 siblings, 0 replies; 2+ messages in thread
From: Tim Semeijn @ 2026-08-23 22:53 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/3proxy
Branch : epel8
Commit : a5da6c52c427afb46bd968cc7d2a0a6768a427ec
Author : Tim Semeijn <fedora@semops.nl>
Date : 2026-08-23T22:53:04+00:00
Stats : +244/-417 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/3proxy/c/a5da6c52c427afb46bd968cc7d2a0a6768a427ec?branch=epel8
Log:
Merge branch 'rawhide' into epel8
---
diff --git a/.gitignore b/.gitignore
index 2cf52dc..e805d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/3proxy-0.9.5.tar.gz
/3proxy-0.9.6.tar.gz
/3proxy-0.9.7.tar.gz
+/3proxy-1.0.0.tar.gz
diff --git a/3proxy-0.9.4-poll-build.patch b/3proxy-0.9.4-poll-build.patch
deleted file mode 100644
index 99c97d7..0000000
--- a/3proxy-0.9.4-poll-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/common.c
-+++ src/common.c
-@@ -157,7 +157,7 @@
- WINAPI
- #endif
-
-- mypoll(struct mypollfd *fds, unsigned int nfds, int timeout){
-+ mypoll(struct mypollfd *fds, nfds_t nfds, int timeout){
- fd_set readfd;
- fd_set writefd;
- fd_set oobfd;
---- src/structures.h
-+++ src/structures.h
-@@ -69,6 +69,7 @@
- #ifdef WITH_POLL
- #include <poll.h>
- #else
-+typedef unsigned int nfds_t;
- #ifdef WITH_WSAPOLL
-
- #define poll(A,B,C) WSAPoll(A,B,C)
-@@ -84,7 +85,7 @@
- #ifdef _WIN32
- WINAPI
- #endif
-- mypoll(struct mypollfd *fds, unsigned int nfds, int timeout);
-+ mypoll(struct mypollfd *fds, nfds_t nfds, int timeout);
- #ifndef POLLIN
- #define POLLIN 1
- #endif
-@@ -434,7 +435,7 @@
- int (WINAPI *_getsockname)(void* state, SOCKET s, struct sockaddr * name, int * namelen);
- int (WINAPI *_getsockopt)(void* state, SOCKET s, int level, int optname, char * optval, int * optlen);
- int (WINAPI *_setsockopt)(void* state, SOCKET s, int level, int optname, const char *optval, int optlen);
-- int (WINAPI *_poll)(void* state, struct pollfd *fds, unsigned int nfds, int timeout);
-+ int (WINAPI *_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
- int (WINAPI *_send)(void* state, SOCKET s, const char *msg, int len, int flags);
- int (WINAPI *_sendto)(void* state, SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen);
- int (WINAPI *_recv)(void* state, SOCKET s, char *buf, int len, int flags);
diff --git a/3proxy-0.9.6-config-path.patch b/3proxy-0.9.6-config-path.patch
deleted file mode 100644
index 01c552c..0000000
--- a/3proxy-0.9.6-config-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- man/3proxy.8.orig 2026-07-09 08:46:27
-+++ man/3proxy.8 2026-07-09 08:46:27
-@@ -74,7 +74,7 @@
- .TP
- .B config_file
- Name of config file. See
--.BR 3proxy.cfg (3)
-+.BR 3proxy.cfg (5)
- for configuration file format. Under Windows, if config_file is not specified,
- .BR 3proxy
- looks for a file named
-@@ -84,7 +84,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
-@@ -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
diff --git a/3proxy-0.9.7-manpage.patch b/3proxy-0.9.7-manpage.patch
deleted file mode 100644
index 9c2e75f..0000000
--- a/3proxy-0.9.7-manpage.patch
+++ /dev/null
@@ -1,341 +0,0 @@
---- man/3proxy.8 2026-07-09 00:56:57
-+++ man/3proxy.8 2026-07-09 00:56:11
-@@ -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 the configuration file like an independent service
--.BR proxy (8)
-+.BR htproxy (8)
- .BR socks (8)
- .BR pop3p (8)
- .BR tcppm (8)
-@@ -140,7 +140,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy.cfg(5), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
-+3proxy.cfg(5), ftppr(8), htproxy(8), socks(8), pop3p(8), tcppm(8), tlspr(8), udppm(8),
- kill(1), syslogd(8),
- .br
- https://3proxy.org/
---- man/3proxy.cfg.5 2026-07-09 00:56:57
-+++ man/3proxy.cfg.5 2026-07-09 00:56:23
-@@ -46,7 +46,7 @@
- Next commands start gateway services:
-
- .br
--.B proxy
-+.B htproxy
- [options]
- .br
- .B socks
-@@ -77,7 +77,7 @@
- .br
- Descriptions:
- .br
--.B proxy
-+.B htproxy
- HTTP/HTTPS proxy (default port 3128)
- .br
- .B socks
-@@ -206,7 +206,7 @@
- (for proxy) generate Via: and X-Forwarded-For: instead of Forwarded:
- .br
- Also, all options mentioned for
--.BR proxy (8)
-+.BR htproxy (8)
- .BR socks (8)
- .BR pop3p (8)
- .BR tcppm (8)
-@@ -1384,7 +1384,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), 3proxy_crypt(8), proxy(8), ftppr(8), socks(8), pop3p(8), smtpp(8), tlspr(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), 3proxy_crypt(8), ftppr(8), htproxy(8), socks(8), pop3p(8), smtpp(8), tlspr(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/ftppr.8 2026-07-09 00:56:57
-+++ man/ftppr.8 2026-07-09 00:56:28
-@@ -102,7 +102,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), htproxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/htproxy.8 1970-01-01 01:00:00
-+++ man/htproxy.8 2026-07-09 00:58:31
-@@ -0,0 +1,100 @@
-+.TH proxy "8" "May 2026" "3proxy 0.9" "Universal proxy server"
-+.SH NAME
-+.B htproxy
-+\- HTTP proxy gateway service
-+.SH SYNOPSIS
-+.BR "htproxy " [ -d ][ -a ]
-+.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
-+.IB \fR[ -p port\fR]
-+.IB \fR[ -i internal_ip\fR]
-+.IB \fR[ -e external_ip\fR]
-+.SH DESCRIPTION
-+.B htproxy
-+is HTTP gateway service with HTTPS and FTP over HTTPS support.
-+.SH OPTIONS
-+.TP
-+.B -I
-+Inetd mode. Standalone service only.
-+.TP
-+.B -d
-+Daemonize. Detach service from console and run in the background.
-+.TP
-+.B -t
-+Be silenT. Do not log start/stop/accept error records.
-+.TP
-+.B -u
-+Never ask for username authentication
-+.TP
-+.B -e
-+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 \-ni\fIPATH\fR
-+(Linux only) Switch to the network namespace identified by
-+.I PATH
-+before opening the listening socket. The current namespace is saved and restored
-+immediately after binding, so outgoing connections run in the original namespace
-+unless
-+.B \-ne
-+is also given.
-+.TP
-+.B \-ne\fIPATH\fR
-+(Linux only) Switch to the network namespace identified by
-+.I PATH
-+after the listening socket has been bound (and after restoring from
-+.B \-ni
-+if applicable). Both options accept any namespace file path
-+(e.g.\& \fI/var/run/netns/myns\fR or \fI/proc/PID/ns/net\fR)
-+and require \fBCAP_SYS_ADMIN\fR.
-+.TP
-+.B -i
-+Internal address. IP address the proxy accepts connections to.
-+By default, connections to any interface are accepted. It\'s usually unsafe.
-+Unix domain sockets can be specified with
-+.I -iunix:/path/to/socket
-+syntax (e.g., -iunix:/var/run/proxy.sock). On Linux, abstract sockets use
-+.I -iunix:@socketname
-+syntax.
-+.TP
-+.B -a
-+Anonymous. Hide information about client.
-+.TP
-+.B -a1
-+Anonymous. Show fake information about client.
-+.TP
-+.B -p
-+Port. Port proxy listens for incoming connections. Default is 3128.
-+.TP
-+.B -l
-+Log. By default logging is to stdout. If
-+.I logfile
-+is specified logging is to file. Under Unix, if
-+.RI \' @ \'
-+preceeds
-+.IR logfile ,
-+syslog is used for logging.
-+.TP
-+.B -S
-+Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
-+crashes.
-+.SH CLIENTS
-+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 you to use almost any TCP-based protocol. If you need to
-+limit clients, use
-+.BR 3proxy (8)
-+instead.
-+.SH BUGS
-+Report all bugs to
-+.BR 3proxy@3proxy.org
-+.SH SEE ALSO
-+3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
-+.br
-+https://3proxy.org/
-+.SH AUTHORS
-+3proxy is designed by Vladimir Dubrovin <vlad@3proxy.org>
---- man/pop3p.8 2026-07-09 00:56:57
-+++ man/pop3p.8 2026-07-09 00:56:30
-@@ -98,7 +98,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/proxy.8 2026-07-09 00:56:57
-+++ man/proxy.8 1970-01-01 01:00:00
-@@ -1,100 +0,0 @@
--.TH proxy "8" "May 2026" "3proxy 0.9" "Universal proxy server"
--.SH NAME
--.B proxy
--\- HTTP proxy gateway service
--.SH SYNOPSIS
--.BR "proxy " [ -d ][ -a ]
--.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
--.IB \fR[ -p port\fR]
--.IB \fR[ -i internal_ip\fR]
--.IB \fR[ -e external_ip\fR]
--.SH DESCRIPTION
--.B proxy
--is HTTP gateway service with HTTPS and FTP over HTTPS support.
--.SH OPTIONS
--.TP
--.B -I
--Inetd mode. Standalone service only.
--.TP
--.B -d
--Daemonize. Detach service from console and run in the background.
--.TP
--.B -t
--Be silenT. Do not log start/stop/accept error records.
--.TP
--.B -u
--Never ask for username authentication
--.TP
--.B -e
--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 \-ni\fIPATH\fR
--(Linux only) Switch to the network namespace identified by
--.I PATH
--before opening the listening socket. The current namespace is saved and restored
--immediately after binding, so outgoing connections run in the original namespace
--unless
--.B \-ne
--is also given.
--.TP
--.B \-ne\fIPATH\fR
--(Linux only) Switch to the network namespace identified by
--.I PATH
--after the listening socket has been bound (and after restoring from
--.B \-ni
--if applicable). Both options accept any namespace file path
--(e.g.\& \fI/var/run/netns/myns\fR or \fI/proc/PID/ns/net\fR)
--and require \fBCAP_SYS_ADMIN\fR.
--.TP
--.B -i
--Internal address. IP address the proxy accepts connections to.
--By default, connections to any interface are accepted. It\'s usually unsafe.
--Unix domain sockets can be specified with
--.I -iunix:/path/to/socket
--syntax (e.g., -iunix:/var/run/proxy.sock). On Linux, abstract sockets use
--.I -iunix:@socketname
--syntax.
--.TP
--.B -a
--Anonymous. Hide information about client.
--.TP
--.B -a1
--Anonymous. Show fake information about client.
--.TP
--.B -p
--Port. Port proxy listens for incoming connections. Default is 3128.
--.TP
--.B -l
--Log. By default logging is to stdout. If
--.I logfile
--is specified logging is to file. Under Unix, if
--.RI \' @ \'
--preceeds
--.IR logfile ,
--syslog is used for logging.
--.TP
--.B -S
--Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
--crashes.
--.SH CLIENTS
--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 you to use almost any TCP-based protocol. If you need to
--limit clients, use
--.BR 3proxy (8)
--instead.
--.SH BUGS
--Report all bugs to
--.BR 3proxy@3proxy.org
--.SH SEE ALSO
--3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
--.br
--https://3proxy.org/
--.SH AUTHORS
--3proxy is designed by Vladimir Dubrovin <vlad@3proxy.org>
---- man/smtpp.8 2026-07-09 00:56:57
-+++ man/smtpp.8 2026-07-09 00:56:33
-@@ -99,7 +99,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/socks.8 2026-07-09 00:56:57
-+++ man/socks.8 2026-07-09 00:56:35
-@@ -107,7 +107,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), htproxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/tcppm.8 2026-07-09 00:56:57
-+++ man/tcppm.8 2026-07-09 00:56:38
-@@ -96,7 +96,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
-+3proxy(8), htproxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/tlspr.8 2026-07-09 00:56:57
-+++ man/tlspr.8 2026-07-09 00:56:40
-@@ -103,7 +103,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), ftppr(8), proxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/udppm.8 2026-07-09 00:56:57
-+++ man/udppm.8 2026-07-09 00:56:43
-@@ -89,7 +89,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
-+3proxy(8), htproxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
diff --git a/3proxy-1.0.0-config-path.patch b/3proxy-1.0.0-config-path.patch
new file mode 100644
index 0000000..8ba363c
--- /dev/null
+++ b/3proxy-1.0.0-config-path.patch
@@ -0,0 +1,31 @@
+diff --git a/man/3proxy.8 b/man/3proxy.8
+index 2379308..b48f95c 100644
+--- a/man/3proxy.8
++++ b/man/3proxy.8
+@@ -75,7 +75,7 @@ compatibility with existing log file parsers. It makes it possible to use
+ .TP
+ .B config_file
+ Name of config file. See
+-.BR 3proxy.cfg (3)
++.BR 3proxy.cfg (5)
+ for configuration file format. Under Windows, if config_file is not specified,
+ .BR 3proxy
+ looks for a file named
+@@ -85,7 +85,7 @@ looks for a file named
+ 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
++#!/usr/bin/3proxy
+ .br
+ as a first line in 3proxy.cfg
+ .TP
+@@ -134,7 +134,7 @@ Web admin service can also be used to reload configuration. Use
+ 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
diff --git a/3proxy-1.0.0-manpage.patch b/3proxy-1.0.0-manpage.patch
new file mode 100644
index 0000000..401e1d8
--- /dev/null
+++ b/3proxy-1.0.0-manpage.patch
@@ -0,0 +1,192 @@
+diff --git a/man/3proxy.8 b/man/3proxy.8
+index 7b89b36..aaef4af 100644
+--- a/man/3proxy.8
++++ b/man/3proxy.8
+@@ -26,7 +26,7 @@ It can establish multiple
+ 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 the configuration file like an independent service
+-.BR proxy (8)
++.BR htproxy (8)
+ .BR socks (8)
+ .BR pop3p (8)
+ .BR imapp (8)
+@@ -141,7 +141,7 @@ configuration file
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy.cfg(5), proxy(8), ftppr(8), socks(8), pop3p(8), imapp(8), tcppm(8), udppm(8),
++3proxy.cfg(5), ftppr(8), htproxy(8), socks(8), pop3p(8), imapp(8), tcppm(8), tlspr(8), udppm(8),
+ kill(1), syslogd(8),
+ .br
+ https://3proxy.org/
+diff --git a/man/3proxy.cfg.5 b/man/3proxy.cfg.5
+index 416bb17..e100b1c 100644
+--- a/man/3proxy.cfg.5
++++ b/man/3proxy.cfg.5
+@@ -46,7 +46,7 @@ Recursion is not allowed.
+ Next commands start gateway services:
+
+ .br
+-.B proxy
++.B htproxy
+ [options]
+ .br
+ .B socks
+@@ -80,7 +80,7 @@ Recursion is not allowed.
+ .br
+ Descriptions:
+ .br
+-.B proxy
++.B htproxy
+ HTTP/HTTPS proxy (default port 3128)
+ .br
+ .B socks
+@@ -240,7 +240,7 @@ Never ask for username/password
+ (for proxy) generate Via: and X-Forwarded-For: instead of Forwarded:
+ .br
+ Also, all options mentioned for
+-.BR proxy (8)
++.BR htproxy (8)
+ .BR socks (8)
+ .BR pop3p (8)
+ .BR imapp (8)
+@@ -1498,7 +1498,7 @@ authentication and/or allow/deny ACLs.
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), 3proxy_crypt(8), proxy(8), ftppr(8), socks(8), pop3p(8), imapp(8), smtpp(8), tlspr(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), 3proxy_crypt(8), ftppr(8), htproxy(8), socks(8), pop3p(8), imapp(8), smtpp(8), tlspr(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/ftppr.8 b/man/ftppr.8
+index 93665d4..d623dad 100644
+--- a/man/ftppr.8
++++ b/man/ftppr.8
+@@ -102,7 +102,7 @@ Only cleartext authentication is currently supported.
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/proxy.8 b/man/htproxy.8
+similarity index 98%
+rename from man/proxy.8
+rename to man/htproxy.8
+index d3c4385..6136bc8 100644
+--- a/man/proxy.8
++++ b/man/htproxy.8
+@@ -1,15 +1,15 @@
+ .TH proxy "8" "May 2026" "3proxy 0.9" "Universal proxy server"
+ .SH NAME
+-.B proxy
++.B htproxy
+ \- HTTP proxy gateway service
+ .SH SYNOPSIS
+-.BR "proxy " [ -d ][ -a ]
++.BR "htproxy " [ -d ][ -a ]
+ .IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
+ .IB \fR[ -p port\fR]
+ .IB \fR[ -i internal_ip\fR]
+ .IB \fR[ -e external_ip\fR]
+ .SH DESCRIPTION
+-.B proxy
++.B htproxy
+ is HTTP gateway service with HTTPS and FTP over HTTPS support.
+ .SH OPTIONS
+ .TP
+diff --git a/man/imapp.8 b/man/imapp.8
+index 13e1dee..a5a043f 100644
+--- a/man/imapp.8
++++ b/man/imapp.8
+@@ -117,7 +117,7 @@ with the client fails.
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), ftppr(8), pop3p(8), proxy(8), smtpp(8), socks(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
++3proxy(8), ftppr(8), pop3p(8), htproxy(8), smtpp(8), socks(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/pop3p.8 b/man/pop3p.8
+index 19c7382..458e88c 100644
+--- a/man/pop3p.8
++++ b/man/pop3p.8
+@@ -113,7 +113,7 @@ with the client fails.
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/smtpp.8 b/man/smtpp.8
+index 8f25403..7d2c7a5 100644
+--- a/man/smtpp.8
++++ b/man/smtpp.8
+@@ -114,7 +114,7 @@ with the client fails.
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/socks.8 b/man/socks.8
+index ec49d53..dc533f0 100644
+--- a/man/socks.8
++++ b/man/socks.8
+@@ -107,7 +107,7 @@ instead.
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/tcppm.8 b/man/tcppm.8
+index 0145977..102263b 100644
+--- a/man/tcppm.8
++++ b/man/tcppm.8
+@@ -96,7 +96,7 @@ as the destination in the client application. The connection is forwarded to
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/tlspr.8 b/man/tlspr.8
+index 6bd903d..f75d853 100644
+--- a/man/tlspr.8
++++ b/man/tlspr.8
+@@ -113,7 +113,7 @@ instead.
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), ftppr(8), proxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), ftppr(8), htproxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+diff --git a/man/udppm.8 b/man/udppm.8
+index 03cbed3..a96442f 100644
+--- a/man/udppm.8
++++ b/man/udppm.8
+@@ -89,7 +89,7 @@ as the destination in the client application. All datagrams are forwarded to
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
diff --git a/3proxy.spec b/3proxy.spec
index d7b35fe..875e681 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,12 +1,12 @@
Name: 3proxy
-Version: 0.9.7
+Version: 1.0.0
Release: %autorelease
Summary: Tiny but very powerful proxy
Summary(ru): Маленький, но крайне мощный прокси-сервер
License: BSD-3-Clause OR Apache-2.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later
-Url: http://3proxy.ru/?l=EN
+Url: https://3proxy.org/
Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source2: 3proxy.cfg
Source3: 3proxy.service
@@ -14,14 +14,14 @@ Source3: 3proxy.service
BuildRequires: gcc
BuildRequires: make
BuildRequires: openssl-devel
+BuildRequires: pam-devel
+BuildRequires: pcre2-devel
BuildRequires: systemd-rpm-macros
# I correct config path in man only. It is fully Fedora related.
-Patch0: 3proxy-0.9.6-config-path.patch
-# Fixes *_poll build error
-Patch1: 3proxy-0.9.4-poll-build.patch
+Patch0: 3proxy-1.0.0-config-path.patch
# Adapt manpages to reflect renamed proxy binary
-Patch2: 3proxy-0.9.7-manpage.patch
+Patch1: 3proxy-1.0.0-manpage.patch
%description
%{name} -- light proxy server.
@@ -40,7 +40,7 @@ SOCKS v5, FTP, POP3, UDP и TCP проброс портов (portmapping), сп�
%prep
-%autosetup -p0
+%autosetup -p1
# To use "fedora" CFLAGS (exported)
sed -i -e "s/^CFLAGS [?]=\+/CFLAGS +=/" -e "s/^CFLAGS =/CFLAGS +=/" Makefile.Linux
@@ -53,9 +53,11 @@ sed -i -e "s/^CFLAGS [?]=\+/CFLAGS +=/" -e "s/^CFLAGS =/CFLAGS +=/" Makefile.Lin
install -d %{buildroot}%{_sysconfdir}
install -d %{buildroot}%{_mandir}/man{5,8}
install -d %{buildroot}%{_localstatedir}/log/%{name}
+install -d %{buildroot}%{_libdir}/%{name}
install -m755 -D bin/%{name} %{buildroot}%{_bindir}/%{name}
install -m755 -D bin/ftppr %{buildroot}%{_bindir}/ftppr
+install -m755 -D bin/imapp %{buildroot}%{_bindir}/imapp
install -m755 -D bin/crypt %{buildroot}%{_bindir}/mycrypt
install -m755 -D bin/pop3p %{buildroot}%{_bindir}/pop3p
install -m755 -D bin/proxy %{buildroot}%{_bindir}/htproxy
@@ -65,6 +67,8 @@ install -m755 -D bin/tcppm %{buildroot}%{_bindir}/tcppm
install -m755 -D bin/tlspr %{buildroot}%{_bindir}/tlspr
install -m755 -D bin/udppm %{buildroot}%{_bindir}/udppm
+install -m755 -D bin/*.ld.so %{buildroot}%{_libdir}/%{name}/
+
install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}.cfg
install -p -m644 -D %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
@@ -74,7 +78,12 @@ done
for man in man/*.8 ; do
install -p -m644 "$man" "%{buildroot}%{_mandir}/man8/"
done
+echo ".so 3proxy_crypt.8" > %{buildroot}%{_mandir}/man8/mycrypt.8
+%check
+# Upstream does not provide an automated test suite.
+# Smoke test the built binaries.
+%{buildroot}%{_bindir}/mycrypt test password
%post
%systemd_post %{name}.service
@@ -91,6 +100,7 @@ done
%{_bindir}/%{name}
%{_bindir}/ftppr
%{_bindir}/htproxy
+%{_bindir}/imapp
%{_bindir}/mycrypt
%{_bindir}/pop3p
%{_bindir}/smtpp
@@ -98,6 +108,8 @@ done
%{_bindir}/tcppm
%{_bindir}/tlspr
%{_bindir}/udppm
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.ld.so
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%dir %{_localstatedir}/log/%{name}
%{_mandir}/man5/*.5*
diff --git a/sources b/sources
index c9d00df..7a6b6cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3proxy-0.9.7.tar.gz) = 031121b939cd83b2135e3fd6d9d08fd9ded5eac59b6c4f1c043575b4bb39c67cef7e8ea629bd40b6567b2810c12b589165fde0bdeb02906afb5c2fc639ef1f48
+SHA512 (3proxy-1.0.0.tar.gz) = 3516935698b199a17a3f92c567353836723906b8c44cdfec9511bf1840fbf086b04d9e1b4f6a1d4b622f588151badce019cbc397b6a77a6aaf5930743e242669
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [rpms/3proxy] epel8: Merge branch 'rawhide' into epel8
@ 2026-07-09 11:28 Tim Semeijn
0 siblings, 0 replies; 2+ messages in thread
From: Tim Semeijn @ 2026-07-09 11:28 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/3proxy
Branch : epel8
Commit : dce25c9a9a782524d646e905eef24ace1dd63367
Author : Tim Semeijn <fedora@semops.nl>
Date : 2026-07-09T11:27:58+00:00
Stats : +366/-323 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/3proxy/c/dce25c9a9a782524d646e905eef24ace1dd63367?branch=epel8
Log:
Merge branch 'rawhide' into epel8
---
diff --git a/.gitignore b/.gitignore
index d4d9e12..2cf52dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/3proxy-0.9.4.tar.gz
/3proxy-0.9.5.tar.gz
/3proxy-0.9.6.tar.gz
+/3proxy-0.9.7.tar.gz
diff --git a/3proxy-0.9.6-config-path.patch b/3proxy-0.9.6-config-path.patch
index 0f62aa4..01c552c 100644
--- a/3proxy-0.9.6-config-path.patch
+++ b/3proxy-0.9.6-config-path.patch
@@ -1,6 +1,15 @@
---- man/3proxy.8.orig
-+++ man/3proxy.8
-@@ -87,7 +87,7 @@
+--- man/3proxy.8.orig 2026-07-09 08:46:27
++++ man/3proxy.8 2026-07-09 08:46:27
+@@ -74,7 +74,7 @@
+ .TP
+ .B config_file
+ Name of config file. See
+-.BR 3proxy.cfg (3)
++.BR 3proxy.cfg (5)
+ for configuration file format. Under Windows, if config_file is not specified,
+ .BR 3proxy
+ looks for a file named
+@@ -84,7 +84,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
@@ -9,7 +18,7 @@
.br
as a first line in 3proxy.cfg
.TP
-@@ -136,7 +136,7 @@
+@@ -133,7 +133,7 @@
wget to automate this task.
.SH FILES
.TP
diff --git a/3proxy-0.9.6-manpage.patch b/3proxy-0.9.6-manpage.patch
deleted file mode 100644
index a13adc8..0000000
--- a/3proxy-0.9.6-manpage.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-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 the configuration file like an independent service
--.BR proxy (8)
-+.BR htproxy (8)
- .BR socks (8)
- .BR pop3p (8)
- .BR tcppm (8)
-@@ -140,7 +140,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
-+3proxy.cfg(3), ftppr(8), htproxy(8), socks(8), pop3p(8), tcppm(8), tlspr(8), udppm(8),
- kill(1), syslogd(8),
- .br
- https://3proxy.org/
-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:
-
- .br
--.B proxy
-+.B htproxy
- [options]
- .br
- .B socks
-@@ -77,7 +77,7 @@
- .br
- Descriptions:
- .br
--.B proxy
-+.B htproxy
- HTTP/HTTPS proxy (default port 3128)
- .br
- .B socks
-@@ -188,7 +188,7 @@
- of IP-IP NAT (will not work for PAT)
- .br
- Also, all options mentioned for
--.BR proxy (8)
-+.BR htproxy (8)
- .BR socks (8)
- .BR pop3p (8)
- .BR tcppm (8)
-@@ -1122,7 +1122,7 @@
- Report all bugs to
- .BR 3proxy@3proxy.org
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), pop3p(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH TRIVIA
-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
- .SH SEE ALSO
--3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), htproxy(8), pop3p(8), socks(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
-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
-+.B htproxy
-+\- HTTP proxy gateway service
-+.SH SYNOPSIS
-+.BR "htproxy " [ -d ][ -a ]
-+.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
-+.IB \fR[ -p port\fR]
-+.IB \fR[ -i internal_ip\fR]
-+.IB \fR[ -e external_ip\fR]
-+.SH DESCRIPTION
-+.B htproxy
-+is HTTP gateway service with HTTPS and FTP over HTTPS support.
-+.SH OPTIONS
-+.TP
-+.B -I
-+Inetd mode. Standalone service only.
-+.TP
-+.B -d
-+Daemonize. Detach service from console and run in the background.
-+.TP
-+.B -t
-+Be silenT. Do not log start/stop/accept error records.
-+.TP
-+.B -u
-+Never ask for username authentication
-+.TP
-+.B -e
-+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 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.
-+.TP
-+.B -a1
-+Anonymous. Show fake information about client.
-+.TP
-+.B -p
-+Port. Port proxy listens for incoming connections. Default is 3128.
-+.TP
-+.B -l
-+Log. By default logging is to stdout. If
-+.I logfile
-+is specified logging is to file. Under Unix, if
-+.RI \' @ \'
-+preceeds
-+.IR logfile ,
-+syslog is used for logging.
-+.TP
-+.B -S
-+Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
-+crashes.
-+.SH CLIENTS
-+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 you to use almost any TCP-based protocol. If you need to
-+limit clients, use
-+.BR 3proxy (8)
-+instead.
-+.SH BUGS
-+Report all bugs to
-+.BR 3proxy@3proxy.org
-+.SH SEE ALSO
-+3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
-+.br
-+https://3proxy.org/
-+.SH AUTHORS
-+3proxy is designed by Vladimir 3APA3A Dubrovin
-+.RI ( 3proxy@3proxy.org )
-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
- .SH SEE ALSO
--3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
-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
--.B proxy
--\- HTTP proxy gateway service
--.SH SYNOPSIS
--.BR "proxy " [ -d ][ -a ]
--.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
--.IB \fR[ -p port\fR]
--.IB \fR[ -i internal_ip\fR]
--.IB \fR[ -e external_ip\fR]
--.SH DESCRIPTION
--.B proxy
--is HTTP gateway service with HTTPS and FTP over HTTPS support.
--.SH OPTIONS
--.TP
--.B -I
--Inetd mode. Standalone service only.
--.TP
--.B -d
--Daemonize. Detach service from console and run in the background.
--.TP
--.B -t
--Be silenT. Do not log start/stop/accept error records.
--.TP
--.B -u
--Never ask for username authentication
--.TP
--.B -e
--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 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.
--.TP
--.B -a1
--Anonymous. Show fake information about client.
--.TP
--.B -p
--Port. Port proxy listens for incoming connections. Default is 3128.
--.TP
--.B -l
--Log. By default logging is to stdout. If
--.I logfile
--is specified logging is to file. Under Unix, if
--.RI \' @ \'
--preceeds
--.IR logfile ,
--syslog is used for logging.
--.TP
--.B -S
--Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
--crashes.
--.SH CLIENTS
--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 you to use almost any TCP-based protocol. If you need to
--limit clients, use
--.BR 3proxy (8)
--instead.
--.SH BUGS
--Report all bugs to
--.BR 3proxy@3proxy.org
--.SH SEE ALSO
--3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
--.br
--https://3proxy.org/
--.SH AUTHORS
--3proxy is designed by Vladimir 3APA3A Dubrovin
--.RI ( 3proxy@3proxy.org )
-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
- .SH SEE ALSO
--3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
-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
--3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), pop3p(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
-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
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), pop3p(8), tlspr(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
-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
--3proxy(8), ftppr(8), proxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
-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
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), htproxy(8), socks(8), pop3p(8), tlspr(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
diff --git a/3proxy-0.9.7-manpage.patch b/3proxy-0.9.7-manpage.patch
new file mode 100644
index 0000000..9c2e75f
--- /dev/null
+++ b/3proxy-0.9.7-manpage.patch
@@ -0,0 +1,341 @@
+--- man/3proxy.8 2026-07-09 00:56:57
++++ man/3proxy.8 2026-07-09 00:56:11
+@@ -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 the configuration file like an independent service
+-.BR proxy (8)
++.BR htproxy (8)
+ .BR socks (8)
+ .BR pop3p (8)
+ .BR tcppm (8)
+@@ -140,7 +140,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy.cfg(5), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
++3proxy.cfg(5), ftppr(8), htproxy(8), socks(8), pop3p(8), tcppm(8), tlspr(8), udppm(8),
+ kill(1), syslogd(8),
+ .br
+ https://3proxy.org/
+--- man/3proxy.cfg.5 2026-07-09 00:56:57
++++ man/3proxy.cfg.5 2026-07-09 00:56:23
+@@ -46,7 +46,7 @@
+ Next commands start gateway services:
+
+ .br
+-.B proxy
++.B htproxy
+ [options]
+ .br
+ .B socks
+@@ -77,7 +77,7 @@
+ .br
+ Descriptions:
+ .br
+-.B proxy
++.B htproxy
+ HTTP/HTTPS proxy (default port 3128)
+ .br
+ .B socks
+@@ -206,7 +206,7 @@
+ (for proxy) generate Via: and X-Forwarded-For: instead of Forwarded:
+ .br
+ Also, all options mentioned for
+-.BR proxy (8)
++.BR htproxy (8)
+ .BR socks (8)
+ .BR pop3p (8)
+ .BR tcppm (8)
+@@ -1384,7 +1384,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), 3proxy_crypt(8), proxy(8), ftppr(8), socks(8), pop3p(8), smtpp(8), tlspr(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), 3proxy_crypt(8), ftppr(8), htproxy(8), socks(8), pop3p(8), smtpp(8), tlspr(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/ftppr.8 2026-07-09 00:56:57
++++ man/ftppr.8 2026-07-09 00:56:28
+@@ -102,7 +102,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/htproxy.8 1970-01-01 01:00:00
++++ man/htproxy.8 2026-07-09 00:58:31
+@@ -0,0 +1,100 @@
++.TH proxy "8" "May 2026" "3proxy 0.9" "Universal proxy server"
++.SH NAME
++.B htproxy
++\- HTTP proxy gateway service
++.SH SYNOPSIS
++.BR "htproxy " [ -d ][ -a ]
++.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
++.IB \fR[ -p port\fR]
++.IB \fR[ -i internal_ip\fR]
++.IB \fR[ -e external_ip\fR]
++.SH DESCRIPTION
++.B htproxy
++is HTTP gateway service with HTTPS and FTP over HTTPS support.
++.SH OPTIONS
++.TP
++.B -I
++Inetd mode. Standalone service only.
++.TP
++.B -d
++Daemonize. Detach service from console and run in the background.
++.TP
++.B -t
++Be silenT. Do not log start/stop/accept error records.
++.TP
++.B -u
++Never ask for username authentication
++.TP
++.B -e
++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 \-ni\fIPATH\fR
++(Linux only) Switch to the network namespace identified by
++.I PATH
++before opening the listening socket. The current namespace is saved and restored
++immediately after binding, so outgoing connections run in the original namespace
++unless
++.B \-ne
++is also given.
++.TP
++.B \-ne\fIPATH\fR
++(Linux only) Switch to the network namespace identified by
++.I PATH
++after the listening socket has been bound (and after restoring from
++.B \-ni
++if applicable). Both options accept any namespace file path
++(e.g.\& \fI/var/run/netns/myns\fR or \fI/proc/PID/ns/net\fR)
++and require \fBCAP_SYS_ADMIN\fR.
++.TP
++.B -i
++Internal address. IP address the proxy accepts connections to.
++By default, connections to any interface are accepted. It\'s usually unsafe.
++Unix domain sockets can be specified with
++.I -iunix:/path/to/socket
++syntax (e.g., -iunix:/var/run/proxy.sock). On Linux, abstract sockets use
++.I -iunix:@socketname
++syntax.
++.TP
++.B -a
++Anonymous. Hide information about client.
++.TP
++.B -a1
++Anonymous. Show fake information about client.
++.TP
++.B -p
++Port. Port proxy listens for incoming connections. Default is 3128.
++.TP
++.B -l
++Log. By default logging is to stdout. If
++.I logfile
++is specified logging is to file. Under Unix, if
++.RI \' @ \'
++preceeds
++.IR logfile ,
++syslog is used for logging.
++.TP
++.B -S
++Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
++crashes.
++.SH CLIENTS
++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 you to use almost any TCP-based protocol. If you need to
++limit clients, use
++.BR 3proxy (8)
++instead.
++.SH BUGS
++Report all bugs to
++.BR 3proxy@3proxy.org
++.SH SEE ALSO
++3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
++.br
++https://3proxy.org/
++.SH AUTHORS
++3proxy is designed by Vladimir Dubrovin <vlad@3proxy.org>
+--- man/pop3p.8 2026-07-09 00:56:57
++++ man/pop3p.8 2026-07-09 00:56:30
+@@ -98,7 +98,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/proxy.8 2026-07-09 00:56:57
++++ man/proxy.8 1970-01-01 01:00:00
+@@ -1,100 +0,0 @@
+-.TH proxy "8" "May 2026" "3proxy 0.9" "Universal proxy server"
+-.SH NAME
+-.B proxy
+-\- HTTP proxy gateway service
+-.SH SYNOPSIS
+-.BR "proxy " [ -d ][ -a ]
+-.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
+-.IB \fR[ -p port\fR]
+-.IB \fR[ -i internal_ip\fR]
+-.IB \fR[ -e external_ip\fR]
+-.SH DESCRIPTION
+-.B proxy
+-is HTTP gateway service with HTTPS and FTP over HTTPS support.
+-.SH OPTIONS
+-.TP
+-.B -I
+-Inetd mode. Standalone service only.
+-.TP
+-.B -d
+-Daemonize. Detach service from console and run in the background.
+-.TP
+-.B -t
+-Be silenT. Do not log start/stop/accept error records.
+-.TP
+-.B -u
+-Never ask for username authentication
+-.TP
+-.B -e
+-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 \-ni\fIPATH\fR
+-(Linux only) Switch to the network namespace identified by
+-.I PATH
+-before opening the listening socket. The current namespace is saved and restored
+-immediately after binding, so outgoing connections run in the original namespace
+-unless
+-.B \-ne
+-is also given.
+-.TP
+-.B \-ne\fIPATH\fR
+-(Linux only) Switch to the network namespace identified by
+-.I PATH
+-after the listening socket has been bound (and after restoring from
+-.B \-ni
+-if applicable). Both options accept any namespace file path
+-(e.g.\& \fI/var/run/netns/myns\fR or \fI/proc/PID/ns/net\fR)
+-and require \fBCAP_SYS_ADMIN\fR.
+-.TP
+-.B -i
+-Internal address. IP address the proxy accepts connections to.
+-By default, connections to any interface are accepted. It\'s usually unsafe.
+-Unix domain sockets can be specified with
+-.I -iunix:/path/to/socket
+-syntax (e.g., -iunix:/var/run/proxy.sock). On Linux, abstract sockets use
+-.I -iunix:@socketname
+-syntax.
+-.TP
+-.B -a
+-Anonymous. Hide information about client.
+-.TP
+-.B -a1
+-Anonymous. Show fake information about client.
+-.TP
+-.B -p
+-Port. Port proxy listens for incoming connections. Default is 3128.
+-.TP
+-.B -l
+-Log. By default logging is to stdout. If
+-.I logfile
+-is specified logging is to file. Under Unix, if
+-.RI \' @ \'
+-preceeds
+-.IR logfile ,
+-syslog is used for logging.
+-.TP
+-.B -S
+-Increase or decrease stack size. You may want to try something like -S8192 if you experience 3proxy
+-crashes.
+-.SH CLIENTS
+-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 you to use almost any TCP-based protocol. If you need to
+-limit clients, use
+-.BR 3proxy (8)
+-instead.
+-.SH BUGS
+-Report all bugs to
+-.BR 3proxy@3proxy.org
+-.SH SEE ALSO
+-3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+-.br
+-https://3proxy.org/
+-.SH AUTHORS
+-3proxy is designed by Vladimir Dubrovin <vlad@3proxy.org>
+--- man/smtpp.8 2026-07-09 00:56:57
++++ man/smtpp.8 2026-07-09 00:56:33
+@@ -99,7 +99,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/socks.8 2026-07-09 00:56:57
++++ man/socks.8 2026-07-09 00:56:35
+@@ -107,7 +107,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/tcppm.8 2026-07-09 00:56:57
++++ man/tcppm.8 2026-07-09 00:56:38
+@@ -96,7 +96,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/tlspr.8 2026-07-09 00:56:57
++++ man/tlspr.8 2026-07-09 00:56:40
+@@ -103,7 +103,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), ftppr(8), proxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
++3proxy(8), ftppr(8), htproxy(8), socks(8), pop3p(8), smtpp(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/udppm.8 2026-07-09 00:56:57
++++ man/udppm.8 2026-07-09 00:56:43
+@@ -89,7 +89,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.org
+ .SH SEE ALSO
+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
++3proxy(8), htproxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
diff --git a/3proxy.spec b/3proxy.spec
index 3eff03b..d7b35fe 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,5 +1,5 @@
Name: 3proxy
-Version: 0.9.6
+Version: 0.9.7
Release: %autorelease
Summary: Tiny but very powerful proxy
@@ -21,7 +21,7 @@ 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.6-manpage.patch
+Patch2: 3proxy-0.9.7-manpage.patch
%description
%{name} -- light proxy server.
@@ -43,20 +43,20 @@ SOCKS v5, FTP, POP3, UDP и TCP проброс портов (portmapping), сп�
%autosetup -p0
# To use "fedora" CFLAGS (exported)
-sed -i -e "s/^CFLAGS =/CFLAGS +=/" Makefile.Linux
+sed -i -e "s/^CFLAGS [?]=\+/CFLAGS +=/" -e "s/^CFLAGS =/CFLAGS +=/" Makefile.Linux
%build
%set_build_flags
-%make_build -f Makefile.Linux
+%make_build -f Makefile.Linux PREFIX=
%install
install -d %{buildroot}%{_sysconfdir}
-install -d %{buildroot}%{_mandir}/man{3,8}
+install -d %{buildroot}%{_mandir}/man{5,8}
install -d %{buildroot}%{_localstatedir}/log/%{name}
install -m755 -D bin/%{name} %{buildroot}%{_bindir}/%{name}
install -m755 -D bin/ftppr %{buildroot}%{_bindir}/ftppr
-install -m755 -D bin/mycrypt %{buildroot}%{_bindir}/mycrypt
+install -m755 -D bin/crypt %{buildroot}%{_bindir}/mycrypt
install -m755 -D bin/pop3p %{buildroot}%{_bindir}/pop3p
install -m755 -D bin/proxy %{buildroot}%{_bindir}/htproxy
install -m755 -D bin/smtpp %{buildroot}%{_bindir}/smtpp
@@ -68,8 +68,8 @@ install -m755 -D bin/udppm %{buildroot}%{_bindir}/udppm
install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}.cfg
install -p -m644 -D %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
-for man in man/*.3 ; do
- install -p -m644 "$man" "%{buildroot}%{_mandir}/man3/"
+for man in man/*.5 ; do
+ install -p -m644 "$man" "%{buildroot}%{_mandir}/man5/"
done
for man in man/*.8 ; do
install -p -m644 "$man" "%{buildroot}%{_mandir}/man8/"
@@ -87,7 +87,7 @@ done
%files
%license copying
-%doc README authors
+%doc README.md authors
%{_bindir}/%{name}
%{_bindir}/ftppr
%{_bindir}/htproxy
@@ -100,7 +100,7 @@ done
%{_bindir}/udppm
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%dir %{_localstatedir}/log/%{name}
-%{_mandir}/man3/*.3*
+%{_mandir}/man5/*.5*
%{_mandir}/man8/*.8*
%{_unitdir}/%{name}.service
diff --git a/sources b/sources
index b5b9a9a..c9d00df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3proxy-0.9.6.tar.gz) = fcdefbbf78dc54041fd32273e13634308e3d820c4657e28bcc44575186705f1195ed336bb244c0b36e5abbda1286c313894c4740595e76f940f79c241ebe1197
+SHA512 (3proxy-0.9.7.tar.gz) = 031121b939cd83b2135e3fd6d9d08fd9ded5eac59b6c4f1c043575b4bb39c67cef7e8ea629bd40b6567b2810c12b589165fde0bdeb02906afb5c2fc639ef1f48
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-08-23 22:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-23 22:53 [rpms/3proxy] epel8: Merge branch 'rawhide' into epel8 Tim Semeijn
-- strict thread matches above, loose matches on Subject: below --
2026-07-09 11:28 Tim Semeijn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox