From beefd32b692c91362c82256d0343d012bbb8aa77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:35:42 +0000 Subject: [PATCH 01/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index 9f257aa..ff31d90 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 27%{?dist} +Release: 28%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -48,6 +48,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 94981736239544726250a81977860ca5df767bea Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 03:54:27 +0000 Subject: [PATCH 02/16] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- corkscrew.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/corkscrew.spec b/corkscrew.spec index ff31d90..225f452 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -11,6 +11,7 @@ Patch0: %{name}-%{version}-from-debian.patch Patch1: %{name}-%{version}-typo.patch BuildRequires: gcc +BuildRequires: make %description From 5d50a3e8d8abf941080c8543155a4cdcbbfdaebd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:34:18 +0000 Subject: [PATCH 03/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index 225f452..d6c1e3a 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -49,6 +49,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.0-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 739c4643df3643dac55ebd69bfdb3de1066426ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:05:21 +0000 Subject: [PATCH 04/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 68c3cfb11ce0122d3f4b0ca0eebd0ae6deee1d3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:51:16 +0000 Subject: [PATCH 05/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index d6c1e3a..7840ef4 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 29%{?dist} +Release: 30%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -49,6 +49,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2f19292112574ffb0752303ee4692ac8b7a78af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:35:54 +0000 Subject: [PATCH 06/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index 7840ef4..369859a 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 30%{?dist} +Release: 31%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -49,6 +49,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.0-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.0-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 660637846d97d062154acf72c746ad1822473fc1 Mon Sep 17 00:00:00 2001 From: Peter Fordham Date: Mon, 19 Dec 2022 05:10:44 +0000 Subject: [PATCH 07/16] Port configure script to C99. https://fedoraproject.org/wiki/Toolchain/PortingToModernC Rebuilding configure with new autotools would also solve the problem. --- corkscrew-2.0-configure-c99.patch | 33 +++++++++++++++++++++++++++++++ corkscrew.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 corkscrew-2.0-configure-c99.patch diff --git a/corkscrew-2.0-configure-c99.patch b/corkscrew-2.0-configure-c99.patch new file mode 100644 index 0000000..ea46eba --- /dev/null +++ b/corkscrew-2.0-configure-c99.patch @@ -0,0 +1,33 @@ +diff --git a/configure b/configure +index 6903f54..af12a92 100755 +--- a/configure ++++ b/configure +@@ -906,7 +906,7 @@ cat > conftest.$ac_ext << EOF + #line 907 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1450,7 +1450,7 @@ cat > conftest.$ac_ext << EOF + #line 1451 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1999,8 +1999,8 @@ else + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int main () { int i; for (i = 0; i < 256; i++) +-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +-exit (0); } ++if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) return 2; ++return 0; } + + EOF + if { (eval echo configure:2007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null diff --git a/corkscrew.spec b/corkscrew.spec index 369859a..f8dee0e 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 31%{?dist} +Release: 32%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -9,6 +9,7 @@ Source1: %{name}.1 Patch0: %{name}-%{version}-from-debian.patch Patch1: %{name}-%{version}-typo.patch +Patch2: %{name}-%{version}-configure-c99.patch BuildRequires: gcc BuildRequires: make @@ -27,6 +28,7 @@ It has been tested with the following HTTP proxies : %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure @@ -49,6 +51,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Mon Dec 19 2022 Peter Fordham - 2.0-32 +- Port configure script to C99 + * Wed Jul 20 2022 Fedora Release Engineering - 2.0-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8e567602b9ac066ef5f202a478cfa02cd38be3e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:31:20 +0000 Subject: [PATCH 08/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index f8dee0e..b5d87c7 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -51,6 +51,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Dec 19 2022 Peter Fordham - 2.0-32 - Port configure script to C99 From aa55efee718c550a8a8d504871a66c4e983dd8ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:24:23 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index b5d87c7..2653cdb 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -51,6 +51,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.0-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.0-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8c011a664b366cef3ac1cd867da48b46713fae42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:12:05 +0000 Subject: [PATCH 10/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index 2653cdb..39b7e75 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 34%{?dist} +Release: 35%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -51,6 +51,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.0-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From fda560df6f34d1ea2f09d73afc4eee7317764546 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:07:06 +0000 Subject: [PATCH 11/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index 39b7e75..108f00c 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 35%{?dist} +Release: 36%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -51,6 +51,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.0-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 357eec4b126b08b32a4af258b4e68838e0b46b44 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 12/16] Eliminate use of obsolete %patchN syntax (#2283636) --- corkscrew.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/corkscrew.spec b/corkscrew.spec index 108f00c..a51661c 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -26,9 +26,9 @@ It has been tested with the following HTTP proxies : %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 %build %configure From fbae14ee6440964badf26577e3395e9164bb14de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:00:54 +0000 Subject: [PATCH 13/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index a51661c..ca9e799 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 36%{?dist} +Release: 37%{?dist} License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz @@ -51,6 +51,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.0-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5cb8fcef04b19786e97138ade6aab6e31d8a5c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 10:22:28 +0200 Subject: [PATCH 14/16] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- corkscrew.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/corkscrew.spec b/corkscrew.spec index ca9e799..4d5b355 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,8 +1,9 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 37%{?dist} -License: GPLv2 +Release: 38%{?dist} +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz Source1: %{name}.1 @@ -51,6 +52,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Mon Jul 29 2024 Miroslav Suchý - 2.0-38 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.0-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8c4bde0fca8dff4f82fb343780f2f665ab58670b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:32:54 +0000 Subject: [PATCH 15/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index 4d5b355..af8b196 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 38%{?dist} +Release: 39%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://freshmeat.sourceforge.net/projects/corkscrew @@ -52,6 +52,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.0-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 2.0-38 - convert license to SPDX From 1f421cdc220c66c26dddae6515ec3f391e590fb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:40:45 +0000 Subject: [PATCH 16/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- corkscrew.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corkscrew.spec b/corkscrew.spec index af8b196..5bb8ee1 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,7 +1,7 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 39%{?dist} +Release: 40%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://freshmeat.sourceforge.net/projects/corkscrew @@ -52,6 +52,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.0-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.0-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild