From 28bd9edd4dd4cdf67a3726dab8259730ae50d77b Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 10 Jul 2018 00:05:25 -0500
Subject: [PATCH 01/32] Remove needless use of %defattr

---
 3proxy.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index c90e2ad..6d8f84f 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -130,7 +130,6 @@ EOF
 /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/%{name}.cfg
 %attr(0755,root,root) %config %{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name}

From 5b05fc0babbd6e977a094f17e06e5d2c766ff6b4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 18:52:56 +0000
Subject: [PATCH 02/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 6d8f84f..b07a3d2 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -5,7 +5,7 @@
 
 Name:		3proxy
 Version:		0.8.2
-Release:		6%{?dist}
+Release:		7%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -145,6 +145,9 @@ EOF
 %endif
 
 %changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From c38fc308ef53099c123240e5fd2642c5cc2691cf Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 24 Jul 2018 16:01:17 +0200
Subject: [PATCH 03/32] Add missing BuildRequires on gcc

make[1]: gcc: Command not found

References: https://bugzilla.redhat.com/show_bug.cgi?id=1603250
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 3proxy.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/3proxy.spec b/3proxy.spec
index b07a3d2..3fb7dee 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -19,6 +19,7 @@ Source1:		3proxy.init
 Source2:		3proxy.cfg
 Source3:		3proxy.service
 # EPEL still require it
+BuildRequires:  gcc
 BuildRequires:	openssl-devel
 Requires:		initscripts
 

From a6246fe653bb68cf66f3af4994f9e029210f20a7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 18 Nov 2018 21:36:57 +0000
Subject: [PATCH 04/32] Update to 0.8.12, retire long unused sysv init scripts

---
 .gitignore  |  1 +
 3proxy.init | 85 -----------------------------------------------------
 3proxy.spec | 83 +++++++++++++++------------------------------------
 sources     |  2 +-
 4 files changed, 25 insertions(+), 146 deletions(-)
 delete mode 100644 3proxy.init

diff --git a/.gitignore b/.gitignore
index 27b9136..19d4502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /3proxy-0.7.1.1.tgz
 /3proxy-0.7.1.2.tgz
 /3proxy-0.8.2.tar.gz
+/3proxy-0.8.12.tar.gz
diff --git a/3proxy.init b/3proxy.init
deleted file mode 100644
index 556ee54..0000000
--- a/3proxy.init
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-# Init file for Software Watchdog daemon.
-#
-# Written by Dag Wieers <dag@wieers.com>.
-# Rewrote for ALT Linux by Pavlov Konstantin <thresh@altlinux.ru>
-# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan@hubbitus.info>
-#
-# chkconfig: - 02 98
-# description: 3proxy Proxy Server
-#
-# processname: 3proxy
-# config: /etc/3proxy.cfg
-
-WITHOUT_RC_COMPAT=1
-
-. /etc/init.d/functions
-
-### Default variables
-prog=3proxy
-CONFIG=/etc/3proxy.cfg
-PROXY=/usr/bin/3proxy
-RETVAL=0
-LOCKFILE=/var/lock/subsys/3proxy
-#LOGFILE=/var/log/3proxy.log
-
-start() {
-	echo -n $"Starting $prog: "
-	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
-	daemon "$PROXY" "$CONFIG"
-	RETVAL=$?
-	echo
-		[ 0 -eq $RETVAL ] && touch ${LOCKFILE}
-	return $RETVAL
-}
-
-stop() {
-	echo -n $"Stopping $prog: "
-	killproc -d 3 "$prog"
-	RETVAL=$?
-	echo
-		[ 0 -eq $RETVAL ] && rm -f ${LOCKFILE}
-	return $RETVAL
-}
-
-restart() {
-	stop
-	start
-}
-
-reload(){
-	echo -n $"Reloading $prog: "
-	killproc $prog -USR1
-	RETVAL=$?
-	echo
-}
-
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-	reload
-	;;
-  condrestart)
-	[ -e $LOCKFILE ] && restart
-	RETVAL=$?
-	;;
-  status)
-	status "$PROXY"
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}"
-	RETVAL=1
-	;;
-esac
-
-exit $RETVAL
diff --git a/3proxy.spec b/3proxy.spec
index 3fb7dee..a181bdd 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -4,39 +4,33 @@
 %global _hardened_build 1
 
 Name:		3proxy
-Version:		0.8.2
-Release:		7%{?dist}
+Version:	0.8.12
+Release:	1%{?dist}
 
-Summary:		Tiny but very powerful proxy
+Summary:	Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
 
-License:		BSD or ASL 2.0 or GPLv2+ or LGPLv2+
-Group:		System Environment/Daemons
-Url:			http://3proxy.ru/?l=EN
+License:	BSD or ASL 2.0 or GPLv2+ or LGPLv2+
+Url:		http://3proxy.ru/?l=EN
 
-Source0:		https://github.com/z3APA3A/%{name}/archive/%{name}-%{version}.tar.gz
-Source1:		3proxy.init
-Source2:		3proxy.cfg
-Source3:		3proxy.service
-# EPEL still require it
+Source0:	https://github.com/z3APA3A/%{name}/archive/%{name}-%{version}.tar.gz
+Source2:	3proxy.cfg
+Source3:	3proxy.service
 BuildRequires:  gcc
 BuildRequires:	openssl-devel
-Requires:		initscripts
 
 # I correct config path in man only. It is fully Fedora related.
 Patch0:		3proxy-0.6.1-config-path.patch
 
-# Systemd compliant: https://fedoraproject.org/wiki/Systemd_Packaging_Draft
-# https://fedoraproject.org/wiki/Packaging:Systemd
-# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
-BuildRequires:			systemd
+BuildRequires:		systemd
 Requires(post):		systemd
-Requires(preun):		systemd
-Requires(postun):		systemd
+Requires(preun):	systemd
+Requires(postun):	systemd
 # This is actually needed for the %triggerun script but Requires(triggerun)
 # is not valid.  We can use %post because this particular %triggerun script
 # should fire just after this package is installed.
-Requires(post):		systemd-sysv, systemd-units
+Requires(post):		systemd
+Obsoletes: 3proxy-sysvinit < 0.8.12
 
 
 %description
@@ -54,30 +48,17 @@ SOCKS v5, FTP, POP3, UDP и TCP проброс портов (portmapping), сп
 на имени пользователя, слиентском IP адресе, IP цели, времени дня, дня недели
 и т.д.
 
-%if 0%{fedora} < 23
-%package sysvinit
-Summary:	Legacy SysV initscripts for %{name} server
-Group:	System Environment/Daemons
-
-%description sysvinit
-Legacy SysV initscripts for init mechanisms such as upstart
-which do not support the systemd unit file format.
-%endif
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
-
-%patch0 -p0 -b .man-cfg
+%autosetup -p0
 
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux
 
 %build
-%{__make} -f Makefile.Linux
+make -f Makefile.Linux
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/
 mkdir -p %{buildroot}%{_mandir}/man{3,8}
@@ -99,17 +80,10 @@ install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
 install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
 install -pD -m755 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
 
-	for man in man/*.{3,8} ; do
+for man in man/*.{3,8} ; do
 	install "$man" "%{buildroot}%{_mandir}/man${man:(-1)}/"
-	done
+done
 
-cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} <<EOF
-#!/bin/sh
-
-	if [ "\$2" = "up" ]; then
-	/sbin/service %{name} condrestart || : # reload doesn't work
-	fi
-EOF
 
 %post
 %systemd_post %{name}.service
@@ -120,32 +94,21 @@ EOF
 %postun
 %systemd_postun_with_restart %{name}.service
 
-%triggerun -- %{name} < 0.6.1-10
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply httpd
-# to migrate them to systemd targets
-%{_bindir}/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
-/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-
 %files
+%license copying
+%doc README authors Release.notes
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/%{name}.cfg
-%attr(0755,root,root) %config %{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name}
 %{_localstatedir}/log/%{name}
-%doc README authors copying Release.notes
 %{_mandir}/man8/*.8.gz
 %{_mandir}/man3/*.3.gz
 %{_unitdir}/%{name}.service
 
-%if 0%{?fedora} < 23
-%files sysvinit
-%{_initrddir}/%{name}
-%endif
-
 %changelog
+* Sat Nov 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.12-1
+- Update 0.8.12
+- Retire sysvinit
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 4c6e777..4e79563 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af34e4e8f47976bd34a1d0be043cf4bd  3proxy-0.8.2.tar.gz
+SHA512 (3proxy-0.8.12.tar.gz) = 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d

From 33fc18a9c734e5e8140c1d345f0e1076b208dc40 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 11:19:28 +0000
Subject: [PATCH 05/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index a181bdd..04a3064 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -5,7 +5,7 @@
 
 Name:		3proxy
 Version:	0.8.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -105,6 +105,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Nov 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.12-1
 - Update 0.8.12
 - Retire sysvinit

From 76bd08dce0d3498cafcb12b83d691d2d33ac970e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 15:36:47 +0000
Subject: [PATCH 06/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 04a3064..4e25a33 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -5,7 +5,7 @@
 
 Name:		3proxy
 Version:	0.8.12
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -105,6 +105,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 9fc53cff99629bbc0d8d4ed94f70a79eae6c82cd Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <pahan@hubbitus.info>
Date: Wed, 23 Oct 2019 00:13:54 +0300
Subject: [PATCH 07/32] 0.8.13-1: - Update to 0.8.13 version (bz#1742435). -
 Try build on epel8 (bz#1757824). - Completely remove SOURCE1 sysvinit legacy.
 - Reformat with spaces.

---
 .gitignore  |  1 +
 3proxy.spec | 49 ++++++++++++++++++++++++++-----------------------
 sources     |  2 +-
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 19d4502..27957a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /3proxy-0.7.1.2.tgz
 /3proxy-0.8.2.tar.gz
 /3proxy-0.8.12.tar.gz
+/3proxy-0.8.13.tar.gz
diff --git a/3proxy.spec b/3proxy.spec
index 4e25a33..afd63d0 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -3,34 +3,34 @@
 
 %global _hardened_build 1
 
-Name:		3proxy
-Version:	0.8.12
-Release:	3%{?dist}
+Name:             3proxy
+Version:          0.8.13
+Release:          1%{?dist}
 
-Summary:	Tiny but very powerful proxy
-Summary(ru):	Маленький, но крайне мощный прокси-сервер
+Summary:          Tiny but very powerful proxy
+Summary(ru):      Маленький, но крайне мощный прокси-сервер
 
-License:	BSD or ASL 2.0 or GPLv2+ or LGPLv2+
-Url:		http://3proxy.ru/?l=EN
+License:          BSD or ASL 2.0 or GPLv2+ or LGPLv2+
+Url:              http://3proxy.ru/?l=EN
 
-Source0:	https://github.com/z3APA3A/%{name}/archive/%{name}-%{version}.tar.gz
-Source2:	3proxy.cfg
-Source3:	3proxy.service
-BuildRequires:  gcc
-BuildRequires:	openssl-devel
+Source0:          https://github.com/z3APA3A/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source2:          3proxy.cfg
+Source3:          3proxy.service
+BuildRequires:    gcc
+BuildRequires:    openssl-devel
 
 # I correct config path in man only. It is fully Fedora related.
-Patch0:		3proxy-0.6.1-config-path.patch
+Patch0:           3proxy-0.6.1-config-path.patch
 
-BuildRequires:		systemd
-Requires(post):		systemd
-Requires(preun):	systemd
-Requires(postun):	systemd
+BuildRequires:    systemd
+Requires(post):   systemd
+Requires(preun):  systemd
+Requires(postun): systemd
 # This is actually needed for the %triggerun script but Requires(triggerun)
 # is not valid.  We can use %post because this particular %triggerun script
 # should fire just after this package is installed.
-Requires(post):		systemd
-Obsoletes: 3proxy-sysvinit < 0.8.12
+Requires(post):   systemd
+Obsoletes:        3proxy-sysvinit < 0.8.12
 
 
 %description
@@ -74,14 +74,11 @@ install -m755 -D src/socks %{buildroot}%{_bindir}/socks
 install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
 install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm
 
-%if 0%{?fedora} < 23
-install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
-%endif
 install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
 install -pD -m755 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
 
 for man in man/*.{3,8} ; do
-	install "$man" "%{buildroot}%{_mandir}/man${man:(-1)}/"
+  install "$man" "%{buildroot}%{_mandir}/man${man:(-1)}/"
 done
 
 
@@ -105,6 +102,12 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Tue Oct 22 2019 Pavel Alexeev <Pahan@Hubbitus.info> - 0.8.13-1
+- Update to 0.8.13 version (bz#1742435).
+- Try build on epel8 (bz#1757824).
+- Completely remove SOURCE1 sysvinit legacy.
+- Reformat with spaces.
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 4e79563..16ff90b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3proxy-0.8.12.tar.gz) = 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d
+SHA512 (3proxy-0.8.13.tar.gz) = 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79

From 0c98fe3595406b31c351babb1294ae4206b462a4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 09:07:54 +0000
Subject: [PATCH 08/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index afd63d0..21fa8fc 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -5,7 +5,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          1%{?dist}
+Release:          2%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -102,6 +102,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Oct 22 2019 Pavel Alexeev <Pahan@Hubbitus.info> - 0.8.13-1
 - Update to 0.8.13 version (bz#1742435).
 - Try build on epel8 (bz#1757824).

From b377fdcb2dad01bb0d39ac80f6d509eeeb6a6b2d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 10:10:13 +0000
Subject: [PATCH 09/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 21fa8fc..4e34131 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -5,7 +5,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          2%{?dist}
+Release:          3%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -102,6 +102,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 37f0665643566c2c1894de998c142f5daeb710ed Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 15 Dec 2020 01:28:55 +0000
Subject: [PATCH 10/32] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 3proxy.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/3proxy.spec b/3proxy.spec
index 4e34131..65254ed 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -23,6 +23,7 @@ BuildRequires:    openssl-devel
 Patch0:           3proxy-0.6.1-config-path.patch
 
 BuildRequires:    systemd
+BuildRequires: make
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd

From 0c1cee5000299a83121ac39f8d1908efe8926350 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 25 Jan 2021 22:13:14 +0000
Subject: [PATCH 11/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 65254ed..3167f9f 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -5,7 +5,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          3%{?dist}
+Release:          4%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -103,6 +103,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 609c0483ebcc154f6307fac17140c496317568f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 2 Mar 2021 15:07:36 +0100
Subject: [PATCH 12/32] Rebuild for updated fedora-rpm-macros

See https://pagure.io/fesco/issue/2583.
---
 3proxy.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/3proxy.spec b/3proxy.spec
index 3167f9f..66da485 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,11 +1,8 @@
-# To build on Fedora 14 due to https://bugzilla.redhat.com/show_bug.cgi?id=715580
-#% global _unitdir /lib/systemd/system
-
 %global _hardened_build 1
 
 Name:             3proxy
 Version:          0.8.13
-Release:          4%{?dist}
+Release:          5%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -103,6 +100,10 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.8.13-5
+- Rebuilt for updated fedora-rpm-macros.
+  See https://pagure.io/fesco/issue/2583.
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 34b41e37f397fbca607ab199fc2a8e8401f61248 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 10:41:34 +0000
Subject: [PATCH 13/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 27b243bcf20aebea5e353438de28bc2dc6eec452 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 15:36:00 +0000
Subject: [PATCH 14/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 66da485..5ceb9ac 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          5%{?dist}
+Release:          6%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.8.13-5
 - Rebuilt for updated fedora-rpm-macros.
   See https://pagure.io/fesco/issue/2583.

From 2dac2495429772bdd0a02fc180b86c2ae8bf0238 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 19:10:22 +0000
Subject: [PATCH 15/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 5ceb9ac..3402d38 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          6%{?dist}
+Release:          7%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 849152153a5364ade74c3bbff737e0ca59e070f1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 18:23:15 +0000
Subject: [PATCH 16/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 3402d38..3fb0154 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          7%{?dist}
+Release:          8%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From a37f4f44584916624e53df919e02064e8f3c3b65 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 19:34:43 +0000
Subject: [PATCH 17/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 3fb0154..eeb16c3 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          8%{?dist}
+Release:          9%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From eecf56326ac8e71257a3e55a548a1f2e8adbefaf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 10:54:13 +0000
Subject: [PATCH 18/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index eeb16c3..09c852c 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          9%{?dist}
+Release:          10%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 8b13ab26895f6fa6abde97bd240827a98cc0e475 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jan 2024 12:00:38 +0000
Subject: [PATCH 19/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 09c852c..1acd5a8 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          10%{?dist}
+Release:          11%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 78f3e9802e64bbc108c6c9467e4ea82a59b0291e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 09:06:06 +0000
Subject: [PATCH 20/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index 1acd5a8..faa2a05 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          11%{?dist}
+Release:          12%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 4269b85bab1971c35e498848de77f16b352307c3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 20:39:50 +0000
Subject: [PATCH 21/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index faa2a05..dd4e660 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          12%{?dist}
+Release:          13%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 50015e7fa617cca89403d8f626ce244ff5056a88 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 29 Jan 2024 10:42:57 +0000
Subject: [PATCH 22/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 3proxy.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/3proxy.spec b/3proxy.spec
index dd4e660..a3e816c 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.8.13
-Release:          13%{?dist}
+Release:          14%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -100,6 +100,9 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 5b012da2cc6739e6a3b7da82be1e0f08adb89941 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <me@fale.io>
Date: Sun, 11 Feb 2024 15:14:30 +0100
Subject: [PATCH 23/32] Update to 0.9.4, fixes rhbz#1888503 and rhbz#2261821

---
 .gitignore  |  1 +
 3proxy.spec | 49 +++++++++++++++++++++----------------------------
 sources     |  2 +-
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27957a6..41a8baf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /3proxy-0.8.2.tar.gz
 /3proxy-0.8.12.tar.gz
 /3proxy-0.8.13.tar.gz
+/3proxy-0.9.4.tar.gz
diff --git a/3proxy.spec b/3proxy.spec
index a3e816c..f0ef64e 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,36 +1,26 @@
 %global _hardened_build 1
 
 Name:             3proxy
-Version:          0.8.13
-Release:          14%{?dist}
+Version:          0.9.4
+Release:          1%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
 
 License:          BSD or ASL 2.0 or GPLv2+ or LGPLv2+
 Url:              http://3proxy.ru/?l=EN
-
-Source0:          https://github.com/z3APA3A/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:          https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source2:          3proxy.cfg
 Source3:          3proxy.service
+
 BuildRequires:    gcc
+BuildRequires:    make
 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
 
-BuildRequires:    systemd
-BuildRequires: make
-Requires(post):   systemd
-Requires(preun):  systemd
-Requires(postun): systemd
-# This is actually needed for the %triggerun script but Requires(triggerun)
-# is not valid.  We can use %post because this particular %triggerun script
-# should fire just after this package is installed.
-Requires(post):   systemd
-Obsoletes:        3proxy-sysvinit < 0.8.12
-
-
 %description
 %{name} -- light proxy server.
 Universal proxy server with HTTP, HTTPS, SOCKS v4, SOCKS v4a, SOCKS v5, FTP,
@@ -51,7 +41,7 @@ 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 +=/" Makefile.Linux
 
 %build
 make -f Makefile.Linux
@@ -61,16 +51,15 @@ mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/
 mkdir -p %{buildroot}%{_mandir}/man{3,8}
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
-install -m755 -D src/%{name} %{buildroot}%{_bindir}/%{name}
-install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
-install -m755 -D src/ftppr %{buildroot}%{_bindir}/ftppr
-install -m755 -D src/mycrypt %{buildroot}%{_bindir}/mycrypt
-install -m755 -D src/pop3p %{buildroot}%{_bindir}/pop3p
-install -m755 -D src/%{name} %{buildroot}%{_bindir}/%{name}
-install -m755 -D src/proxy %{buildroot}%{_bindir}/htproxy
-install -m755 -D src/socks %{buildroot}%{_bindir}/socks
-install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
-install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm
+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/pop3p %{buildroot}%{_bindir}/pop3p
+install -m755 -D bin/proxy %{buildroot}%{_bindir}/htproxy
+install -m755 -D bin/smtpp %{buildroot}%{_bindir}/smtpp
+install -m755 -D bin/socks %{buildroot}%{_bindir}/socks
+install -m755 -D bin/tcppm %{buildroot}%{_bindir}/tcppm
+install -m755 -D bin/udppm %{buildroot}%{_bindir}/udppm
 
 install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
 install -pD -m755 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
@@ -91,7 +80,7 @@ done
 
 %files
 %license copying
-%doc README authors Release.notes
+%doc README authors
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/%{name}.cfg
 %{_localstatedir}/log/%{name}
@@ -100,6 +89,10 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Sun Feb 11 2024 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.9.4-1
+- Update to 0.9.4, fixes rhbz#1888503
+- Fix FTBFS, fixes rhbz#2261821
+
 * Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 16ff90b..1c57dd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3proxy-0.8.13.tar.gz) = 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
+SHA512 (3proxy-0.9.4.tar.gz) = d3316f6ee1217e580ce593a7bfd9d76672487a89862f247373b0acf3ea207887c758168e33b25db9fc974063deab0826c20d455cab2536d03eee49d8bddda6b5

From 1fd8dd0b77dac903bedfbb856a2e5b50a64389a4 Mon Sep 17 00:00:00 2001
From: Tim Semeijn <tim@goat.re>
Date: Tue, 20 Feb 2024 13:09:00 +0100
Subject: [PATCH 24/32] Fix failing builds with *_poll build patch
 (3proxy-0.9.4-poll-build.patch)

Convert license to SPDX
---
 3proxy-0.9.4-poll-build.patch | 48 +++++++++++++++++++++++++++++++++++
 3proxy.spec                   | 10 ++++++--
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 3proxy-0.9.4-poll-build.patch

diff --git a/3proxy-0.9.4-poll-build.patch b/3proxy-0.9.4-poll-build.patch
new file mode 100644
index 0000000..2afcfe2
--- /dev/null
+++ b/3proxy-0.9.4-poll-build.patch
@@ -0,0 +1,48 @@
+--- src/common.c
++++ src/common.c
+@@ -156,7 +156,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
+@@ -66,6 +66,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)
+@@ -81,7 +82,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
+@@ -694,7 +695,7 @@
+ 	int (WINAPI *_getsockname)(SOCKET s, struct sockaddr * name, int * namelen);
+    	int (WINAPI *_getsockopt)(SOCKET s, int level, int optname, char * optval, int * optlen);
+ 	int (WINAPI *_setsockopt)(SOCKET s, int level, int optname, const char *optval, int optlen);
+-	int (WINAPI *_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
++	int (WINAPI *_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
+ 	int (WINAPI *_send)(SOCKET s, const char *msg, int len, int flags);
+ 	int  (WINAPI *_sendto)(SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen);
+ 	int  (WINAPI *_recv)(SOCKET s, char *buf, int len, int flags);
+@@ -711,7 +712,7 @@
+ 	int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen);
+    	int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen);
+ 	int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen);
+-	int (*_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
++	int (*_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
+ 	size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags);
+ 	size_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen);
+ 	size_t (*_recv)(SOCKET s, void *buf, size_t len, int flags);
diff --git a/3proxy.spec b/3proxy.spec
index f0ef64e..9525c39 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,12 +2,12 @@
 
 Name:             3proxy
 Version:          0.9.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
 
-License:          BSD or ASL 2.0 or GPLv2+ or LGPLv2+
+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
 Source0:          https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source2:          3proxy.cfg
@@ -20,6 +20,8 @@ BuildRequires:    systemd-rpm-macros
 
 # I correct config path in man only. It is fully Fedora related.
 Patch0:           3proxy-0.6.1-config-path.patch
+# Fixes *_poll build error
+Patch1:           3proxy-0.9.4-poll-build.patch
 
 %description
 %{name} -- light proxy server.
@@ -89,6 +91,10 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
+* Tue Feb 20 2024 Tim Semeijn <tim@goat.re> - 0.9.4-2
+- Fix failing builds with *_poll build patch (3proxy-0.9.4-poll-build.patch)
+- Convert license to SPDX
+
 * Sun Feb 11 2024 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.9.4-1
 - Update to 0.9.4, fixes rhbz#1888503
 - Fix FTBFS, fixes rhbz#2261821

From ccd21cf6bbbb53314325c9913b5aa662e6379694 Mon Sep 17 00:00:00 2001
From: Tim Semeijn <tim@goat.re>
Date: Wed, 28 Feb 2024 13:43:20 +0100
Subject: [PATCH 25/32] Use %autorelease and %autochangelog

---
 3proxy.spec | 216 +---------------------------------------------------
 changelog   | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+), 214 deletions(-)
 create mode 100644 changelog

diff --git a/3proxy.spec b/3proxy.spec
index 9525c39..cecd5e0 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -2,7 +2,7 @@
 
 Name:             3proxy
 Version:          0.9.4
-Release:          2%{?dist}
+Release:          %autorelease
 
 Summary:          Tiny but very powerful proxy
 Summary(ru):      Маленький, но крайне мощный прокси-сервер
@@ -91,216 +91,4 @@ done
 %{_unitdir}/%{name}.service
 
 %changelog
-* Tue Feb 20 2024 Tim Semeijn <tim@goat.re> - 0.9.4-2
-- Fix failing builds with *_poll build patch (3proxy-0.9.4-poll-build.patch)
-- Convert license to SPDX
-
-* Sun Feb 11 2024 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.9.4-1
-- Update to 0.9.4, fixes rhbz#1888503
-- Fix FTBFS, fixes rhbz#2261821
-
-* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.8.13-5
-- Rebuilt for updated fedora-rpm-macros.
-  See https://pagure.io/fesco/issue/2583.
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Oct 22 2019 Pavel Alexeev <Pahan@Hubbitus.info> - 0.8.13-1
-- Update to 0.8.13 version (bz#1742435).
-- Try build on epel8 (bz#1757824).
-- Completely remove SOURCE1 sysvinit legacy.
-- Reformat with spaces.
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Nov 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.12-1
-- Update 0.8.12
-- Retire sysvinit
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 23 2016 Pavel Alexeev <Pahan@Hubbitus.info> - 0.8.2-1
-- Major upstream update - 0.8.2. Bz#1300097.
-- Tarballs now on github.
-
-* Fri Jan 01 2016 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7.1.3-1
-- New upstream release 0.7.1.3 - bz#1263482.
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.1.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Mar 05 2015 Adam Jackson <ajax@redhat.com> 0.7.1.2-2
-- Drop sysvinit subpackage on F23+
-
-* Mon Feb 23 2015 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7.7.2-1
-- New upstream version 0.7.7.2
-
-* Mon Aug 18 2014 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7.7.1-1
-- Update to 0.7.7.1 - bz#1114274.
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Apr 8 2014 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7-1
-- Update to 0.7 version bz#1085256.
-- Add BR openssl-devel.
-
-* Tue Jan 7 2014 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-18
-- Step to systemd macroses (#850383)
-
-* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Apr 26 2013 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-16
-- Harden build - bz#955141
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Jun 23 2011 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-12
-- Make service systemd compliant (BZ#657412).
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Nov 4 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-10
-- Add man3/3proxy.cfg.3 man (BZ#648204).
-- Gone explicit man gzip - leave it for rpm.
-
-* Sun May 30 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-9
-- Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch
-
-* Mon Mar 15 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-8
-- Update to version 0.6.1
-- In NM event processing replace service restart to condrestart - BZ#572662
-
-* Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-7
-- Again new init-script for Fix BZ#533144 :).
-
-* Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-6
-- Forgot commit new init-script for Fix BZ#533144.
-
-* Sun Nov 8 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-5
-- Fix BZ#533144:
-- Add reload section to service file, fix stop.
-- Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey)
-- Include man-files.
-- Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/
-
-* Thu Aug 20 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-3
-- Fedora Review started - thank you Peter Lemenkov.
-- Change rights (0755->0644) of config.
-- Disable service by default.
-- Add BR dos2unix.
-
-* Mon Aug 17 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-2
-- /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy-bin.
-- Add Source2: 3proxy.cfg from Alt Linux (slightly modified) - http://sisyphus.ru/ru/srpm/Sisyphus/3proxy/sources/1 (thanks to Afanasov Dmitry).
-- Add log-dir %%{_localstatedir}/log/%%{name}
-
-* Mon Aug 17 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-1
-- Ressurect old spec. New version 0.6.
-- Rename spec to classic %%{name}.spec.
-- Remove Hu part from release and add %%{?dist}.
-- Change summary, description, URL. Add Russian localisation of sumamry and description.
-- Strip some old comments.
-- Add to %%doc Readme Changelog authors copying news.
-- Turn macros usage from %%name to %%{name} for consistence.
-- Change group from System/Servers to standard System Environment/Daemons.
-- Add %%defattr(-,root,root,-) in %%files section.
-- Add cleanup in %%install section.
-- Add %%clean section with cleanup buildroot.
-- License changed from just GPL to "BSD or ASL 2.0 or GPLv2+ or LGPLv2+" (according to Makefile.Linux)
-- Add %%config(noreplace) mark to all configs.
-- Add file %%{_initdir}/%%{name}
-- Old %%{_initdir} macros replaced by %%{_initrddir}
-- Hack makefile to use system CFLAGS.
-- Add %%post/%%postun sections.
-
-* Fri Jan 25 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.5.3k
-- Import from ftp://ftp.nluug.nl/pub/os/Linux/distr/altlinux/4.0/Server/4.0.1/files/SRPMS/3proxy-0.5.3h-alt1.src.rpm
-	Combine with ftp://ftp.pbone.net/mirror/ftp.sourceforge.net/pub/sourceforge/t/th/three-proxy/3proxy-0.5.3g-1.src.rpm
-- Steep to version 0.5.3k
-- Comment out packager
-- Reformat header of spec with tabs
-- Add desc from second src.rpm of import
-- Correct source0
-- Add -c key fo %%setup macro
-- Add BuildRoot definition (this is not ALT)
-- Change
-	Release:	alt1
-	to
-	Release:	0.Hu.0
-
-* Fri Apr 13 2007 Lunar Child <luch@altlinux.ru> 0.5.3h-alt1
-- new version
-
-* Wed Mar 21 2007 Lunar Child <luch@altlinux.ru> 0.5.3g-alt2
-- Added init script.
-- Added new trivial config file.
-
-* Tue Mar 20 2007 Lunar Child <luch@altlinux.ru> 0.5.3g-alt1
-- First build for ALT Linux Sisyphus
+%autochangelog
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..cbe6c3b
--- /dev/null
+++ b/changelog
@@ -0,0 +1,211 @@
+* Tue Feb 20 2024 Tim Semeijn <tim@goat.re> - 0.9.4-2
+- Fix failing builds with *_poll build patch (3proxy-0.9.4-poll-build.patch)
+- Convert license to SPDX
+ 
+* Sun Feb 11 2024 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.9.4-1
+- Update to 0.9.4, fixes rhbz#1888503
+- Fix FTBFS, fixes rhbz#2261821
+ 
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+ 
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+ 
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+ 
+* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+ 
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+ 
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+ 
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+ 
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+ 
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+ 
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.8.13-5
+- Rebuilt for updated fedora-rpm-macros.
+  See https://pagure.io/fesco/issue/2583.
+ 
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+ 
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+ 
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+ 
+* Tue Oct 22 2019 Pavel Alexeev <Pahan@Hubbitus.info> - 0.8.13-1
+- Update to 0.8.13 version (bz#1742435).
+- Try build on epel8 (bz#1757824).
+- Completely remove SOURCE1 sysvinit legacy.
+- Reformat with spaces.
+ 
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+ 
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+ 
+* Sat Nov 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.12-1
+- Update 0.8.12
+- Retire sysvinit
+ 
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+ 
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+ 
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+ 
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+ 
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+ 
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+ 
+* Sat Jan 23 2016 Pavel Alexeev <Pahan@Hubbitus.info> - 0.8.2-1
+- Major upstream update - 0.8.2. Bz#1300097.
+- Tarballs now on github.
+ 
+* Fri Jan 01 2016 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7.1.3-1
+- New upstream release 0.7.1.3 - bz#1263482.
+ 
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+ 
+* Thu Mar 05 2015 Adam Jackson <ajax@redhat.com> 0.7.1.2-2
+- Drop sysvinit subpackage on F23+
+ 
+* Mon Feb 23 2015 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7.7.2-1
+- New upstream version 0.7.7.2
+ 
+* Mon Aug 18 2014 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7.7.1-1
+- Update to 0.7.7.1 - bz#1114274.
+ 
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+* Tue Apr 8 2014 Pavel Alexeev <Pahan@Hubbitus.info> - 0.7-1
+- Update to 0.7 version bz#1085256.
+- Add BR openssl-devel.
+ 
+* Tue Jan 7 2014 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-18
+- Step to systemd macroses (#850383)
+ 
+* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+* Fri Apr 26 2013 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-16
+- Harden build - bz#955141
+ 
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+* Thu Jun 23 2011 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-12
+- Make service systemd compliant (BZ#657412).
+ 
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+* Thu Nov 4 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-10
+- Add man3/3proxy.cfg.3 man (BZ#648204).
+- Gone explicit man gzip - leave it for rpm.
+ 
+* Sun May 30 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-9
+- Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch
+ 
+* Mon Mar 15 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-8
+- Update to version 0.6.1
+- In NM event processing replace service restart to condrestart - BZ#572662
+ 
+* Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-7
+- Again new init-script for Fix BZ#533144 :).
+ 
+* Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-6
+- Forgot commit new init-script for Fix BZ#533144.
+ 
+* Sun Nov 8 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-5
+- Fix BZ#533144:
+- Add reload section to service file, fix stop.
+- Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey)
+- Include man-files.
+- Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/
+* Thu Aug 20 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-3
+- Fedora Review started - thank you Peter Lemenkov.
+- Change rights (0755->0644) of config.
+- Disable service by default.
+- Add BR dos2unix.
+ 
+* Mon Aug 17 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-2
+- /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy-bin.
+- Add Source2: 3proxy.cfg from Alt Linux (slightly modified) - http://sisyphus.ru/ru/srpm/Sisyphus/3proxy/sources/1 (thanks to Afanasov Dmitry).
+- Add log-dir %%{_localstatedir}/log/%%{name}
+* Mon Aug 17 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-1
+- Ressurect old spec. New version 0.6.
+- Rename spec to classic %%{name}.spec.
+- Remove Hu part from release and add %%{?dist}.
+- Change summary, description, URL. Add Russian localisation of sumamry and description.
+- Strip some old comments.
+- Add to %%doc Readme Changelog authors copying news.
+- Turn macros usage from %%name to %%{name} for consistence.
+- Change group from System/Servers to standard System Environment/Daemons.
+- Add %%defattr(-,root,root,-) in %%files section.
+- Add cleanup in %%install section.
+- Add %%clean section with cleanup buildroot.
+- License changed from just GPL to "BSD or ASL 2.0 or GPLv2+ or LGPLv2+" (according to Makefile.Linux)
+- Add %%config(noreplace) mark to all configs.
+- Add file %%{_initdir}/%%{name}
+- Old %%{_initdir} macros replaced by %%{_initrddir}
+- Hack makefile to use system CFLAGS.
+- Add %%post/%%postun sections.
+ 
+* Fri Jan 25 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.5.3k
+- Import from ftp://ftp.nluug.nl/pub/os/Linux/distr/altlinux/4.0/Server/4.0.1/files/SRPMS/3proxy-0.5.3h-alt1.src.rpm
+	Combine with ftp://ftp.pbone.net/mirror/ftp.sourceforge.net/pub/sourceforge/t/th/three-proxy/3proxy-0.5.3g-1.src.rpm
+- Steep to version 0.5.3k
+- Comment out packager
+- Reformat header of spec with tabs
+- Add desc from second src.rpm of import
+- Correct source0
+- Add -c key fo %%setup macro
+- Add BuildRoot definition (this is not ALT)
+- Change
+	Release:	alt1
+	to
+	Release:	0.Hu.0
+ 
+* Fri Apr 13 2007 Lunar Child <luch@altlinux.ru> 0.5.3h-alt1
+- new version
+ 
+* Wed Mar 21 2007 Lunar Child <luch@altlinux.ru> 0.5.3g-alt2
+- Added init script.
+- Added new trivial config file.
+ 
+* Tue Mar 20 2007 Lunar Child <luch@altlinux.ru> 0.5.3g-alt1
+- First build for ALT Linux Sisyphus

From bb47a76f7bcfaaf19b28fc888b31501d5afbf2c5 Mon Sep 17 00:00:00 2001
From: Tim Semeijn <tim@goat.re>
Date: Fri, 29 Mar 2024 08:51:35 +0000
Subject: [PATCH 26/32] Adapt manpages to reflect renamed proxy binary (fixes
 rhbz#2271587)

---
 3proxy-0.9.4-manpage.patch | 286 +++++++++++++++++++++++++++++++++++++
 3proxy.spec                |   2 +
 2 files changed, 288 insertions(+)
 create mode 100644 3proxy-0.9.4-manpage.patch

diff --git a/3proxy-0.9.4-manpage.patch b/3proxy-0.9.4-manpage.patch
new file mode 100644
index 0000000..b58fcf6
--- /dev/null
+++ b/3proxy-0.9.4-manpage.patch
@@ -0,0 +1,286 @@
+--- man/proxy.8
++++ /dev/null
+@@ -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
+-Daemonise. 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 interface proxy should initiate connections
+-from. 
+-By default system will deside which address to use in accordance
+-with 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.
+-.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 client with HTTP proxy support or configure router to redirect
+-HTTP traffic to proxy (transparent proxy). Configure client to connect to
+-.I internal_ip
+-and
+-.IR port .
+-HTTPS support allows 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.ru
+-.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.ru )
+--- /dev/null
++++ man/htproxy.8
+@@ -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
++Daemonise. 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 interface proxy should initiate connections
++from. 
++By default system will deside which address to use in accordance
++with 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.
++.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 client with HTTP proxy support or configure router to redirect
++HTTP traffic to proxy (transparent proxy). Configure client to connect to
++.I internal_ip
++and
++.IR port .
++HTTPS support allows 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.ru
++.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.ru )
+--- man/3proxy.8
++++ man/3proxy.8
+@@ -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 
+-.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.ru
+ .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), udppm(8),
+ kill(1), syslogd(8),
+ .br
+ https://3proxy.org/
+--- man/3proxy.cfg.3
++++ man/3proxy.cfg.3
+@@ -46,7 +46,7 @@
+  Next commands start gateway services:
+ 
+ .br
+-.B proxy
++.B htproxy
+ [options]
+ .br
+ .B socks
+@@ -74,7 +74,7 @@
+ .br
+  Descriptions:
+ .br
+-.B proxy
++.B htproxy
+ HTTP/HTTPS proxy (default port 3128)
+ .br
+ .B socks
+@@ -174,7 +174,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)
+@@ -1057,7 +1057,7 @@
+ 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), ftppr(8), htproxy(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+  https://3proxy.org/
+ .SH TRIVIA
+--- man/ftppr.8
++++ man/ftppr.8
+@@ -79,7 +79,7 @@
+ 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), htproxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/pop3p.8
++++ man/pop3p.8
+@@ -75,7 +75,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.ru
+ .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/smtpp.8
++++ man/smtpp.8
+@@ -76,7 +76,7 @@
+ Report all bugs to
+ .BR 3proxy@3proxy.ru
+ .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
++++ man/socks.8
+@@ -76,7 +76,7 @@
+ 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), ftppr(8), htproxy(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/tcppm.8
++++ man/tcppm.8
+@@ -65,7 +65,7 @@
+ 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), ftppr(8), htproxy(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
+--- man/udppm.8
++++ man/udppm.8
+@@ -71,7 +71,7 @@
+ 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), ftppr(8), htproxy(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+ .br
+ https://3proxy.org/
+ .SH AUTHORS
diff --git a/3proxy.spec b/3proxy.spec
index cecd5e0..c73fa0e 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -22,6 +22,8 @@ BuildRequires:    systemd-rpm-macros
 Patch0:           3proxy-0.6.1-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
 
 %description
 %{name} -- light proxy server.

From 808de6655b04f8b786e4066ceb03fe8efd062e55 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 14:40:11 +0000
Subject: [PATCH 27/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 5dc8ec0919b7532764289fa49ca4c0056b7f789b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 08:20:30 +0000
Subject: [PATCH 28/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From eb51614382d73368215144b9a43c777ce7c9f9ec Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 20 Jan 2025 07:16:49 +0000
Subject: [PATCH 29/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 2b0216c6bb326883aca81d866db352adc43d0d8b Mon Sep 17 00:00:00 2001
From: Tim Semeijn <tim@semeijn.net>
Date: Fri, 21 Mar 2025 15:30:16 +0000
Subject: [PATCH 30/32] Update to 0.9.5 (fixes rhbz#2351065)

---
 .gitignore                    |   1 +
 3proxy-0.9.4-manpage.patch    | 333 ++++++++++++++++++----------------
 3proxy-0.9.4-poll-build.patch |  31 ++--
 3proxy.spec                   |   3 +-
 sources                       |   2 +-
 5 files changed, 187 insertions(+), 183 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41a8baf..8c95915 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /3proxy-0.8.12.tar.gz
 /3proxy-0.8.13.tar.gz
 /3proxy-0.9.4.tar.gz
+/3proxy-0.9.5.tar.gz
diff --git a/3proxy-0.9.4-manpage.patch b/3proxy-0.9.4-manpage.patch
index b58fcf6..00fb7ad 100644
--- a/3proxy-0.9.4-manpage.patch
+++ b/3proxy-0.9.4-manpage.patch
@@ -1,84 +1,72 @@
---- man/proxy.8
-+++ /dev/null
-@@ -1,78 +0,0 @@
--.TH proxy "8" "January 2019" "3proxy 0.9" "Universal proxy server"
--.SH NAME
+--- man/3proxy.8
++++ man/3proxy.8
+@@ -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 
+-.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/
+--- man/3proxy.cfg.3
++++ man/3proxy.cfg.3
+@@ -46,7 +46,7 @@
+  Next commands start gateway services:
+ 
+ .br
 -.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 htproxy
+ [options]
+ .br
+ .B socks
+@@ -74,7 +74,7 @@
+ .br
+  Descriptions:
+ .br
 -.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
--Daemonise. 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 interface proxy should initiate connections
--from. 
--By default system will deside which address to use in accordance
--with 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.
--.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 client with HTTP proxy support or configure router to redirect
--HTTP traffic to proxy (transparent proxy). Configure client to connect to
--.I internal_ip
--and
--.IR port .
--HTTPS support allows 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.ru
--.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.ru )
++.B htproxy
+ HTTP/HTTPS proxy (default port 3128)
+ .br
+ .B socks
+@@ -185,7 +185,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)
+@@ -1078,7 +1078,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
+--- man/ftppr.8
++++ man/ftppr.8
+@@ -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
 --- /dev/null
 +++ man/htproxy.8
 @@ -0,0 +1,78 @@
@@ -152,102 +140,114 @@
 +instead.
 +.SH BUGS
 +Report all bugs to
-+.BR 3proxy@3proxy.ru
++.BR 3proxy@3proxy.org
 +.SH SEE ALSO
-+3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
++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.ru )
---- man/3proxy.8
-+++ man/3proxy.8
-@@ -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 
--.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.ru
- .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), udppm(8),
- kill(1), syslogd(8),
- .br
- https://3proxy.org/
---- man/3proxy.cfg.3
-+++ man/3proxy.cfg.3
-@@ -46,7 +46,7 @@
-  Next commands start gateway services:
- 
- .br
--.B proxy
-+.B htproxy
- [options]
- .br
- .B socks
-@@ -74,7 +74,7 @@
- .br
-  Descriptions:
- .br
--.B proxy
-+.B htproxy
- HTTP/HTTPS proxy (default port 3128)
- .br
- .B socks
-@@ -174,7 +174,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)
-@@ -1057,7 +1057,7 @@
- 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), ftppr(8), htproxy(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
- .br
-  https://3proxy.org/
- .SH TRIVIA
---- man/ftppr.8
-+++ man/ftppr.8
-@@ -79,7 +79,7 @@
- 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), htproxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
++.RI ( 3proxy@3proxy.org )
 --- man/pop3p.8
 +++ man/pop3p.8
 @@ -75,7 +75,7 @@
  Report all bugs to
- .BR 3proxy@3proxy.ru
+ .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),
++3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
  .br
  https://3proxy.org/
  .SH AUTHORS
+--- man/proxy.8
++++ /dev/null
+@@ -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
+-Daemonise. 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 interface proxy should initiate connections
+-from. 
+-By default system will deside which address to use in accordance
+-with 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.
+-.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 client with HTTP proxy support or configure router to redirect
+-HTTP traffic to proxy (transparent proxy). Configure client to connect to
+-.I internal_ip
+-and
+-.IR port .
+-HTTPS support allows 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 )
 --- man/smtpp.8
 +++ man/smtpp.8
 @@ -76,7 +76,7 @@
  Report all bugs to
- .BR 3proxy@3proxy.ru
+ .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),
++3proxy(8), ftppr(8), htproxy(8), socks(8), tcppm(8), tlspr(8), udppm(8), syslogd(8),
  .br
  https://3proxy.org/
  .SH AUTHORS
@@ -255,10 +255,10 @@
 +++ man/socks.8
 @@ -76,7 +76,7 @@
  Report all bugs to
- .BR 3proxy@3proxy.ru
+ .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), 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
@@ -266,10 +266,21 @@
 +++ man/tcppm.8
 @@ -65,7 +65,7 @@
  Report all bugs to
- .BR 3proxy@3proxy.ru
+ .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), 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
+--- man/tlspr.8
++++ man/tlspr.8
+@@ -78,7 +78,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
@@ -277,10 +288,10 @@
 +++ man/udppm.8
 @@ -71,7 +71,7 @@
  Report all bugs to
- .BR 3proxy@3proxy.ru
+ .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), 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.4-poll-build.patch b/3proxy-0.9.4-poll-build.patch
index 2afcfe2..99c97d7 100644
--- a/3proxy-0.9.4-poll-build.patch
+++ b/3proxy-0.9.4-poll-build.patch
@@ -1,6 +1,6 @@
 --- src/common.c
 +++ src/common.c
-@@ -156,7 +156,7 @@
+@@ -157,7 +157,7 @@
   WINAPI
  #endif
  
@@ -11,7 +11,7 @@
  	fd_set oobfd;
 --- src/structures.h
 +++ src/structures.h
-@@ -66,6 +66,7 @@
+@@ -69,6 +69,7 @@
  #ifdef WITH_POLL
  #include <poll.h>
  #else
@@ -19,7 +19,7 @@
  #ifdef WITH_WSAPOLL
  
  #define poll(A,B,C) WSAPoll(A,B,C)
-@@ -81,7 +82,7 @@
+@@ -84,7 +85,7 @@
  #ifdef _WIN32
    WINAPI
  #endif
@@ -28,21 +28,12 @@
  #ifndef POLLIN
  #define POLLIN 1
  #endif
-@@ -694,7 +695,7 @@
- 	int (WINAPI *_getsockname)(SOCKET s, struct sockaddr * name, int * namelen);
-    	int (WINAPI *_getsockopt)(SOCKET s, int level, int optname, char * optval, int * optlen);
- 	int (WINAPI *_setsockopt)(SOCKET s, int level, int optname, const char *optval, int optlen);
--	int (WINAPI *_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
+@@ -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)(SOCKET s, const char *msg, int len, int flags);
- 	int  (WINAPI *_sendto)(SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen);
- 	int  (WINAPI *_recv)(SOCKET s, char *buf, int len, int flags);
-@@ -711,7 +712,7 @@
- 	int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen);
-    	int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen);
- 	int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen);
--	int (*_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
-+	int (*_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
- 	size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags);
- 	size_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen);
- 	size_t (*_recv)(SOCKET s, void *buf, size_t len, int flags);
+ 	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.spec b/3proxy.spec
index c73fa0e..6472a95 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,7 +1,7 @@
 %global _hardened_build 1
 
 Name:             3proxy
-Version:          0.9.4
+Version:          0.9.5
 Release:          %autorelease
 
 Summary:          Tiny but very powerful proxy
@@ -63,6 +63,7 @@ install -m755 -D bin/proxy %{buildroot}%{_bindir}/htproxy
 install -m755 -D bin/smtpp %{buildroot}%{_bindir}/smtpp
 install -m755 -D bin/socks %{buildroot}%{_bindir}/socks
 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 -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
diff --git a/sources b/sources
index 1c57dd3..f1d0f7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3proxy-0.9.4.tar.gz) = d3316f6ee1217e580ce593a7bfd9d76672487a89862f247373b0acf3ea207887c758168e33b25db9fc974063deab0826c20d455cab2536d03eee49d8bddda6b5
+SHA512 (3proxy-0.9.5.tar.gz) = b668db6438da19ee2479228af744b9b3b9ff2c7e6d97aaf3b20737b165ab2baf656ac9ea92b6f1e169c428784c7d9e3e7eeb7c3effb1c0b77e5038319b6d2bcd

From 1cf40dec3b263842bae07a203f54877a2f7e46ad Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 15:39:28 +0000
Subject: [PATCH 31/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 7f14f5bedd10054b96aec34f7f49a5363bfe9ffa Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 02:25:48 +0000
Subject: [PATCH 32/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild