diff --git a/.gitignore b/.gitignore index e613aad..2b2ee45 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ varnish-2.1.3.tar.gz /varnish-4.1.2.tar.gz /varnish-4.1.2_fix_python24.el5.patch /pkg-varnish-cache-eff850c.tar.gz +/varnish-4.1.3.tar.gz +/pkg-varnish-cache-4e27994.tar.gz diff --git a/sources b/sources index ead651c..4a3e06d 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -51d446c0193dd773f5a881f7c0beb304 varnish-4.1.2.tar.gz -fcc87f5801ee05c6d808e8962893ecc1 varnish-cache-redhat-f3dbcce.tar.gz -daca0b5f553ac0ad5dbbbc849e831292 varnish-4.1.2_fix_python24.el5.patch -705c99b8d4011c3bee5d61bb68412e6d pkg-varnish-cache-eff850c.tar.gz +f9c761a54324ad02c4fe44ce1d291d70 varnish-4.1.3.tar.gz +007fc6cb2adbdff44a4cb22f813b4ea1 pkg-varnish-cache-4e27994.tar.gz diff --git a/varnish-4.1.3_fix_Werror_el6.patch b/varnish-4.1.3_fix_Werror_el6.patch new file mode 100644 index 0000000..de6ea10 --- /dev/null +++ b/varnish-4.1.3_fix_Werror_el6.patch @@ -0,0 +1,11 @@ +--- configure.orig 2016-08-02 14:56:14.888475820 +0200 ++++ configure 2016-08-02 14:56:26.633158063 +0200 +@@ -17247,7 +17247,7 @@ + # The reason for -Wno-error=unused-result is a glibc/gcc interaction + # idiocy where write is marked as warn_unused_result, causing build + # failures. +-CFLAGS="${CFLAGS} -Wall -Werror" ++#CFLAGS="${CFLAGS} -Wall -Werror" + OCFLAGS="${OCFLAGS} -Wall -Werror" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unused-result" >&5 + $as_echo_n "checking whether C compiler accepts -Werror=unused-result... " >&6; } diff --git a/varnish.spec b/varnish.spec index c0b39fc..c96483f 100644 --- a/varnish.spec +++ b/varnish.spec @@ -6,20 +6,20 @@ # Package scripts are now external # https://github.com/varnishcache/pkg-varnish-cache -%define commit1 eff850c7d8863a74baf312dd985177e50b10a6b9 +%define commit1 4e2799451f49ad88fd90437ca9fc0df05d3f9e4c %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) Summary: High-performance HTTP accelerator Name: varnish -Version: 4.1.2 -Release: 2%{?v_rc}%{?dist} +Version: 4.1.3 +Release: 1%{?v_rc}%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ Source0: http://repo.varnish-cache.org/source/%{name}-%{version}%{?vd_rc}.tar.gz Source1: https://github.com/varnishcache/pkg-varnish-cache/archive/%{commit1}.tar.gz#/pkg-varnish-cache-%{shortcommit1}.tar.gz Patch1: varnish-4.1.1.fix_ld_library_path_in_sphinx_build.patch -Patch2: varnish-4.0.3_fix_Werror_el6.patch +Patch2: varnish-4.1.3_fix_Werror_el6.patch Patch3: varnish-4.1.2_fix_python24.el5.patch Patch4: varnish-4.0.3_fix_varnish4_selinux.el6.patch Patch6: varnish-4.1.0.fix_find-provides.patch @@ -117,13 +117,13 @@ Group: Documentation %description docs Documentation files for %name -#%package libs-static +#% package libs-static #Summary: Files for static linking of %{name} library functions #Group: Development/Libraries #BuildRequires: ncurses-devel #Requires: varnish-libs-devel = %{version}-%{release} # -#%description libs-static +#% description libs-static #Files for static linking of varnish library functions #Varnish Cache is a high-performance HTTP accelerator @@ -191,8 +191,15 @@ make %{?_smp_mflags} V=1 redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc %endif +# Explicit python, please +sed -i 's/env python/python2/g;' lib/libvcc/vmodtool.py + +# Clean up the sphinx documentation rm -rf doc/sphinx/build/html/_sources rm -rf doc/sphinx/build +rm -f doc/sphinx/Makefile.in.orig + +# Replace bogus RPM_BUILD_ROOT variable with the contents of the actual buildroot macro sed -i "s,\${RPM_BUILD_ROOT}/../../BUILD/varnish\*,%{buildroot}%{_includedir}/%{name}," redhat/find-provides %check @@ -203,7 +210,7 @@ make -j16 check LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{buildroot}%{_libdir}/% %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="install -p" +make install DESTDIR=%{buildroot} INSTALL="install -p" # None of these for fedora find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' @@ -239,6 +246,10 @@ install -D -m 0755 redhat/varnish_reload_vcl %{buildroot}%{_sbindir}/varnish_rel echo %{_libdir}/varnish > %{buildroot}%{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf +# No idea why these ends up with mode 600 in the debug package +chmod 644 lib/libvmod_*/*.c +chmod 644 lib/libvmod_*/*.h + # selinux module for el6 %if 0%{?rhel} == 6 cd selinux @@ -263,13 +274,13 @@ rm -rf %{buildroot} %else %doc LICENSE %endif -%doc README ChangeLog +%doc README.rst ChangeLog %doc etc/builtin.vcl etc/example.vcl %dir %{_sysconfdir}/varnish/ %config(noreplace) %{_sysconfdir}/varnish/default.vcl %config(noreplace) %{_sysconfdir}/logrotate.d/varnish -# systemd from fedora 17 +# systemd from fedora 17 and rhel 7 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %{_unitdir}/varnish.service %{_unitdir}/varnishncsa.service @@ -408,6 +419,15 @@ fi %endif %changelog +* Tue Aug 04 2016 Ingvar Hagelund 4.1.3-1 +- New upstream release +- New snapshot of pkg-varnish, commit 4e27994 +- README is now named README.rst +- Rebased Werror patch for el6 +- vmod vcc files readable for all users +- set explicit python version in vmodtool.py +- Remove superflous Makefile.in.orig generated by patch + * Thu Mar 31 2016 Ingvar Hagelund 4.1.2-2 - Added missing tarball for pkg-varnish