diff --git a/.gitignore b/.gitignore index 7ae2e9c..4e4520b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /hitch-00b264b5537986fecfa1013cc27ad3b7b771a646.tar.gz +/hitch-b1ee595d7803dbdd403b554eb4ec0416d00efeb3.tar.gz diff --git a/hitch.spec b/hitch.spec index a93ec2d..3acfb34 100644 --- a/hitch.spec +++ b/hitch.spec @@ -1,4 +1,4 @@ -%global commit 00b264b5537986fecfa1013cc27ad3b7b771a646 +%global commit b1ee595d7803dbdd403b554eb4ec0416d00efeb3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # Checks may only be ran from a host with internet connection @@ -14,7 +14,7 @@ Name: hitch Version: 1.0.0 -Release: 0.3.4.beta3%{?dist} +Release: 0.4.1.beta4%{?dist} Summary: Network proxy that terminates TLS/SSL connections Group: System Environment/Daemons @@ -30,8 +30,6 @@ Requires: openssl Patch0: hitch.systemd.service.patch Patch1: hitch.initrc.redhat.patch -# POS36-C correct revocation order while relinquishing privileges -Patch2: hitch-1.0.0-beta3.setgroups.patch # Fixes a bug in the test suite that leaves running processes behind Patch3: hitch.clean_test_processes.patch Patch4: hitch.test07_missing_curl_resolve_on_el6.patch @@ -54,7 +52,6 @@ of connections efficiently on multicore machines. %setup -qn %{name}-%{commit} %patch0 %patch1 -%patch2 -p1 %patch3 %if 0%{?rhel} == 6 %patch4 @@ -75,6 +72,7 @@ export CPPFLAGS %configure make %{?_smp_mflags} +sed -i 's/nogroup/nobody/g' tests/configs/test08*.cfg %install @@ -158,6 +156,11 @@ useradd -r -g %{hitch_group} -s /sbin/nologin -d %{hitch_homedir} %{hitch_user} %changelog +* Mon Aug 03 2015 Ingvar Hagelund 1.0.0-0.4.1.beta4 +- New upstream beta +- Dropped setgroups patch as it has been accepted upstream +- Simple sed replace nobody for nogroup in test08 + * Sun Jul 19 2015 Ingvar Hagelund 1.0.0-0.3.4.beta3 - Some more fixes for the fedora package review, ref Cicku diff --git a/sources b/sources index 29a4be7..5404c27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b786ab1da1a7314882c02423904c316 hitch-00b264b5537986fecfa1013cc27ad3b7b771a646.tar.gz +05184c997ddf1d167ae15adfbc9195e5 hitch-b1ee595d7803dbdd403b554eb4ec0416d00efeb3.tar.gz