From f57f279cd9a44c68481a5b7dd82f536dab07a73d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 5 Oct 2016 20:45:01 +0300 Subject: [PATCH] up to 1.4.1 (2016-09-23) - drop outdated patches --- hitch-1.0.1_tests_nobody_group.patch | 48 ------------------- hitch-1.1.0_stronger_ciphers.e7be033.patch | 22 --------- hitch.spec | 14 ++---- ...h.test07_missing_curl_resolve_on_el6.patch | 10 ---- 4 files changed, 4 insertions(+), 90 deletions(-) delete mode 100644 hitch-1.0.1_tests_nobody_group.patch delete mode 100644 hitch-1.1.0_stronger_ciphers.e7be033.patch delete mode 100644 hitch.test07_missing_curl_resolve_on_el6.patch diff --git a/hitch-1.0.1_tests_nobody_group.patch b/hitch-1.0.1_tests_nobody_group.patch deleted file mode 100644 index 59b782a..0000000 --- a/hitch-1.0.1_tests_nobody_group.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ru src/tests/configs.orig/test08a.cfg src/tests/configs/test08a.cfg ---- src/tests/configs.orig/test08a.cfg 2015-07-23 15:22:17.000000000 +0200 -+++ src/tests/configs/test08a.cfg 2015-10-15 21:29:42.565891140 +0200 -@@ -8,7 +8,7 @@ - keepalive = 3600 - chroot = "" - user = "nobody" --group = "nogroup" -+group = "nobody" - quiet = on - syslog = on - quiet = on -diff -ru src/tests/configs.orig/test08b.cfg src/tests/configs/test08b.cfg ---- src/tests/configs.orig/test08b.cfg 2015-07-23 15:22:17.000000000 +0200 -+++ src/tests/configs/test08b.cfg 2015-10-15 21:29:42.566891197 +0200 -@@ -8,7 +8,7 @@ - keepalive = 3600 - chroot = "" - user = "nobody" --group = "nogroup" -+group = "nobody" - quiet = on - syslog = on - syslog-facility = "info" -diff -ru src/tests/configs.orig/test08c.cfg src/tests/configs/test08c.cfg ---- src/tests/configs.orig/test08c.cfg 2015-07-23 15:22:17.000000000 +0200 -+++ src/tests/configs/test08c.cfg 2015-10-15 21:29:42.566891197 +0200 -@@ -8,7 +8,7 @@ - keepalive = 3600 - chroot = "" - user = "nobody" --group = "nogroup" -+group = "nobody" - quiet = on - syslog = on - syslog-facility = "daemon" -diff -ru src/tests/configs.orig/test08d.cfg src/tests/configs/test08d.cfg ---- src/tests/configs.orig/test08d.cfg 2015-07-23 15:22:17.000000000 +0200 -+++ src/tests/configs/test08d.cfg 2015-10-15 21:29:42.566891197 +0200 -@@ -9,7 +9,7 @@ - keepalive = 3600 - chroot = "" - user = "nobody" --group = "nogroup" -+group = "nobody" - quiet = on - syslog = on - syslog-facility = "daemon" diff --git a/hitch-1.1.0_stronger_ciphers.e7be033.patch b/hitch-1.1.0_stronger_ciphers.e7be033.patch deleted file mode 100644 index 6cbd963..0000000 --- a/hitch-1.1.0_stronger_ciphers.e7be033.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e7be0333a6f50188bd3f8649a1ea77be7ddeda95 Mon Sep 17 00:00:00 2001 -From: Lasse Karstensen -Date: Mon, 23 Nov 2015 14:29:32 +0100 -Subject: [PATCH] Use recommended cipher list in example config. - ---- - hitch.conf.ex | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hitch.conf.ex b/hitch.conf.ex -index d76a1c2..d47523a 100644 ---- a/hitch.conf.ex -+++ b/hitch.conf.ex -@@ -32,7 +32,7 @@ pem-file = "" - # - # Run openssl ciphers for list of available ciphers. - # type: string --ciphers = "" -+ciphers = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH" - - # Enforce server cipher list order - # diff --git a/hitch.spec b/hitch.spec index 157c6e1..48253c6 100644 --- a/hitch.spec +++ b/hitch.spec @@ -4,17 +4,14 @@ Summary: Network proxy that terminates TLS/SSL connections Name: hitch -Version: 1.1.0 +Version: 1.4.1 Release: 1 License: BSD Group: Daemons Source0: https://hitch-tls.org/source/%{name}-%{version}.tar.gz -# Source0-md5: f8b916e8739f55432ec8af5146e522ed +# Source0-md5: 111913964c35bb6ef41474273e0b6755 Patch0: %{name}.systemd.service.patch Patch1: %{name}.initrc.redhat.patch -Patch3: %{name}-1.0.1_tests_nobody_group.patch -Patch4: %{name}.test07_missing_curl_resolve_on_el6.patch -Patch5: %{name}-1.1.0_stronger_ciphers.e7be033.patch URL: https://hitch-tls.org/ BuildRequires: libev-devel >= 4 BuildRequires: libtool @@ -43,9 +40,6 @@ machines. %setup -q %patch0 %patch1 -%patch3 -%patch4 -%patch5 -p1 %build CFLAGS="%{rpmcflags} -fPIE" @@ -71,7 +65,7 @@ sed ' s/group = ""/group = "%{hitch_group}"/g; s/backend = "\[127.0.0.1\]:8000"/backend = "[127.0.0.1]:6081"/g; s/syslog = off/syslog = on/g; - ' hitch.conf.ex > hitch.conf + ' hitch.conf.example > hitch.conf sed -i 's/daemon = off/daemon = on/g;' hitch.conf install -p -D hitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hitch.conf @@ -109,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README.md LICENSE CHANGES.rst hitch.conf.ex +%doc README.md LICENSE CHANGES.rst hitch.conf.example %dir %{_sysconfdir}/%{name} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/hitch.conf %attr(754,root,root) /etc/rc.d/init.d/hitch diff --git a/hitch.test07_missing_curl_resolve_on_el6.patch b/hitch.test07_missing_curl_resolve_on_el6.patch deleted file mode 100644 index 554e199..0000000 --- a/hitch.test07_missing_curl_resolve_on_el6.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -x cc2a776f -Naur ../hitch-adca8d96fa16de1f2e66717ec2b7c95b772a1204.orig/src/tests/test07-nomatch-abort ./src/tests/test07-nomatch-abort ---- ../hitch-adca8d96fa16de1f2e66717ec2b7c95b772a1204.orig/src/tests/test07-nomatch-abort 2015-08-17 11:46:16.000000000 +0200 -+++ ./src/tests/test07-nomatch-abort 2015-08-17 13:44:50.630148835 +0200 -@@ -30,5 +30,4 @@ - grep -q -c "unrecognized name" $DUMPFILE - test "$?" = "0" || die "Expected 'unrecognized name' error." - --CURL_EXTRA="--resolve site1.example.com:$LISTENPORT:127.0.0.1" --runcurl site1.example.com $LISTENPORT -+(echo -e 'GET / HTTP/1.0\nHost: site1.example.com\n'; sleep 1) | openssl s_client -connect $LISTENADDR:$LISTENPORT > $DUMPFILE 2>&1 -- 2.44.0