use archive source url

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index f055e32afa87ce160b66d860e946dc76cf8867a8..e2500e179b089396be95abb9d8561909b3c578ca 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -32,10 +32,10 @@ Summary(uk.UTF-8):  Найпопулярніший Web-Server
 Summary(zh_CN.UTF-8):  Internet 上应用最广泛的 Web 服务程序。
 Name:          apache1
 Version:       1.3.42
-Release:       7
+Release:       10
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
-Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
+Source0:       http://archive.apache.org/dist/httpd/apache_%{version}.tar.gz
 # Source0-md5: b76695ec68f9f8b512c9415fc69c1019
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
@@ -112,6 +112,7 @@ Patch40:    %{name}-security_htpasswd_user_buffer_overflow.patch
 Patch41:       %{name}-security_check_forensic_tempfiles.patch
 Patch42:       %{name}-lingerd.patch
 Patch43:       %{name}-getline.patch
+Patch44:       %{name}-format-security.patch
 URL:           http://httpd.apache.org/
 BuildRequires: bash
 BuildRequires: db-devel >= 4.1
@@ -120,7 +121,7 @@ BuildRequires:      mm-devel >= 1.3.0
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.4.0
 BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.647
 Requires:      %{name}-mod_access = %{version}-%{release}
 Requires:      %{name}-mod_alias = %{version}-%{release}
 Requires:      %{name}-mod_dir = %{version}-%{release}
@@ -1353,6 +1354,7 @@ cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h} src/main
 %patch42 -p1
 %endif
 %patch43 -p1
+%patch44 -p1
 
 # make manual link with full path
 %{__sed} -i -e 's,href="manual/,href="/manual/,i' htdocs/index.html.*
@@ -1407,14 +1409,14 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        $RPM_BUILD_ROOT%{httpdir}/html \
        $RPM_BUILD_ROOT%{_libexecdir} \
        $RPM_BUILD_ROOT/var/{log/{apache,archive/apache},run/apache} \
-       $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+       $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__make} -j1 install-quiet \
        root=$RPM_BUILD_ROOT
 
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1
 sed -e 's,/usr/lib,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apache
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apache
 bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 mv $RPM_BUILD_ROOT%{_mandir}/hu/man8/{httpd,apache}.8
 mv $RPM_BUILD_ROOT%{_mandir}/pl/man8/{httpd,apache}.8
@@ -1471,8 +1473,8 @@ echo "LoadModule digest_module    modules/mod_digest.so" > $CFG/74_mod_digest.conf
 echo "LoadModule log_forensic_module   modules/mod_log_forensic.so" > $CFG/75_mod_log_forensic.conf
 echo "LoadModule mmap_static_module    modules/mod_mmap_static.so" > $CFG/76_mod_mmap_static.conf
 cp -a %{SOURCE13} $CFG/77_mod_info.conf
-cp -a %{SOURCE24}      $CFG/80_errordocs.conf
-cp -a %{SOURCE17}      $CFG/80_mod_alias.conf
+cp -a %{SOURCE24} $CFG/80_errordocs.conf
+cp -a %{SOURCE17} $CFG/80_mod_alias.conf
 # cgi_test: create config file with ScriptAlias
 cat << 'EOF' > $CFG/09_cgi_test.conf
 ScriptAlias /cgi-bin/printenv %{cgibindir}/printenv
@@ -1491,7 +1493,7 @@ ln -s ../../var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
 
 ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
 
-install %{SOURCE26} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+cp -p %{SOURCE26} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 # Not packaged.
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.default
@@ -1941,7 +1943,7 @@ fi
 %endif
 %attr(755,root,root) %{_bindir}/checkgid
 %attr(755,root,root) %{_sbindir}/apache
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
 %dir %attr(1773,root,http) /var/run/apache
 %{_mandir}/man8/apache.8*
 %lang(hu) %{_mandir}/hu/man8/apache.8*