From 0c98fe3595406b31c351babb1294ae4206b462a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:07:54 +0000 Subject: [PATCH 01/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 22 2019 Pavel Alexeev - 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 Date: Mon, 27 Jul 2020 10:10:13 +0000 Subject: [PATCH 02/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 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 Date: Tue, 15 Dec 2020 01:28:55 +0000 Subject: [PATCH 03/17] 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 Date: Mon, 25 Jan 2021 22:13:14 +0000 Subject: [PATCH 04/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 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?= Date: Tue, 2 Mar 2021 15:07:36 +0100 Subject: [PATCH 05/17] 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 - 0.8.13-5 +- Rebuilt for updated fedora-rpm-macros. + See https://pagure.io/fesco/issue/2583. + * Mon Jan 25 2021 Fedora Release Engineering - 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 Date: Wed, 21 Jul 2021 10:41:34 +0000 Subject: [PATCH 06/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 27b243bcf20aebea5e353438de28bc2dc6eec452 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:36:00 +0000 Subject: [PATCH 07/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 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 Date: Wed, 19 Jan 2022 19:10:22 +0000 Subject: [PATCH 08/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 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 Date: Wed, 20 Jul 2022 18:23:15 +0000 Subject: [PATCH 09/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 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 Date: Wed, 18 Jan 2023 19:34:43 +0000 Subject: [PATCH 10/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 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 Date: Wed, 19 Jul 2023 10:54:13 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 0.8.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 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 Date: Thu, 18 Jan 2024 12:00:38 +0000 Subject: [PATCH 12/17] 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 - 0.8.13-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 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 Date: Fri, 19 Jan 2024 09:06:06 +0000 Subject: [PATCH 13/17] 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 - 0.8.13-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Fedora Release Engineering - 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 Date: Mon, 22 Jan 2024 20:39:50 +0000 Subject: [PATCH 14/17] 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 - 0.8.13-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 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 Date: Mon, 29 Jan 2024 10:42:57 +0000 Subject: [PATCH 15/17] 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 - 0.8.13-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 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 Date: Sun, 11 Feb 2024 15:14:30 +0100 Subject: [PATCH 16/17] 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 - 0.9.4-1 +- Update to 0.9.4, fixes rhbz#1888503 +- Fix FTBFS, fixes rhbz#2261821 + * Mon Jan 29 2024 Fedora Release Engineering - 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 Date: Tue, 20 Feb 2024 13:09:00 +0100 Subject: [PATCH 17/17] 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 + #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 - 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 - 0.9.4-1 - Update to 0.9.4, fixes rhbz#1888503 - Fix FTBFS, fixes rhbz#2261821