diff --git a/corkscrew-2.0-configure-c99.patch b/corkscrew-2.0-configure-c99.patch deleted file mode 100644 index ea46eba..0000000 --- a/corkscrew-2.0-configure-c99.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 5bb8ee1..369859a 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,16 +1,14 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 40%{?dist} -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +Release: 31%{?dist} +License: GPLv2 URL: http://freshmeat.sourceforge.net/projects/corkscrew Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz 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,9 +25,8 @@ It has been tested with the following HTTP proxies : %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 +%patch0 -p1 +%patch1 -p1 %build %configure @@ -52,33 +49,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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