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..4b03a1a 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,20 +1,17 @@ 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 -URL: http://freshmeat.sourceforge.net/projects/corkscrew +Release: 9%{?dist} +License: GPLv2 +Group: Applications/Internet +URL: http://www.agroman.net/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 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description Corkscrew is a tool for tunneling SSH through HTTP proxies. @@ -27,22 +24,27 @@ 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 -%make_build +make %{?_smp_mflags} %install +rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -%make_install + +make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT # man page install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 +%clean +rm -rf $RPM_BUILD_ROOT + %files +%defattr(-,root,root,-) %doc AUTHORS %doc ChangeLog %doc COPYING @@ -52,99 +54,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 - -* 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 - -* 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 - -* Wed Jul 24 2019 Fedora Release Engineering - 2.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.0-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.0-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 2.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 2.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 2.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 2.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 2.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 2.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 2.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - * Tue Feb 24 2009 Fedora Release Engineering - 2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild