diff --git a/.gitignore b/.gitignore index e17d0f4..17c8af7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /hitch-b1ee595d7803dbdd403b554eb4ec0416d00efeb3.tar.gz /hitch-adca8d96fa16de1f2e66717ec2b7c95b772a1204.tar.gz /hitch-1.0.1.tar.gz +/hitch-1.1.0.tar.gz diff --git a/hitch-1.1.0_stronger_ciphers.e7be033.patch b/hitch-1.1.0_stronger_ciphers.e7be033.patch new file mode 100644 index 0000000..6cbd963 --- /dev/null +++ b/hitch-1.1.0_stronger_ciphers.e7be033.patch @@ -0,0 +1,22 @@ +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 9c5b55e..1fcdaff 100644 --- a/hitch.spec +++ b/hitch.spec @@ -9,11 +9,13 @@ %global hitch_homedir %{_localstatedir}/lib/hitch %global hitch_confdir %{_sysconfdir}/hitch %global hitch_datadir %{_datadir}/hitch +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + %global _hardened_build 1 Name: hitch -Version: 1.0.1 +Version: 1.1.0 Release: 1%{?dist} Summary: Network proxy that terminates TLS/SSL connections @@ -32,6 +34,7 @@ Patch0: hitch.systemd.service.patch Patch1: hitch.initrc.redhat.patch Patch3: hitch-1.0.1_tests_nobody_group.patch Patch4: hitch.test07_missing_curl_resolve_on_el6.patch +Patch5: hitch-1.1.0_stronger_ciphers.e7be033.patch %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 Requires(post): systemd @@ -55,6 +58,7 @@ of connections efficiently on multicore machines. %if 0%{?rhel} == 6 %patch4 %endif +%patch5 -p1 %build #./bootstrap @@ -68,15 +72,16 @@ export LDFLAGS export CPPFLAGS %endif -%configure +%configure \ + --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} + make %{?_smp_mflags} -#sed -i 's/nogroup/nobody/g' src/tests/configs/test08*.cfg %install echo %_docdir -%make_install DOCDIR=%{buildroot}%{_docdir} +%make_install sed ' s/user = ""/user = "%{hitch_user}"/g; s/group = ""/group = "%{hitch_group}"/g; @@ -136,6 +141,7 @@ useradd -r -g %{hitch_group} -s /sbin/nologin -d %{hitch_homedir} %{hitch_user} %files %doc README.md +%doc CHANGES.rst %doc hitch.conf.ex %if 0%{?rhel} == 6 %doc LICENSE @@ -159,6 +165,11 @@ useradd -r -g %{hitch_group} -s /sbin/nologin -d %{hitch_homedir} %{hitch_user} %changelog +* Mon Nov 23 2015 Ingvar Hagelund 1.1.0-1 +- New upstream release +- Use the _pkgdocdir macro to avoid docdir hacks for el6 +- Added a patch from upstream that sets stronger ciphers as default + * Thu Oct 15 2015 Ingvar Hagelund 1.0.1-1 - New upstream release - New Home and Source0 URLs diff --git a/sources b/sources index 61e15d2..02def67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12389cbe3a1185ca24d8c9183cd99c08 hitch-1.0.1.tar.gz +f8b916e8739f55432ec8af5146e522ed hitch-1.1.0.tar.gz