diff --git a/apache-ssl-stuff.tar.bz2 b/apache-ssl-stuff.tar.bz2 index 4b4b4aa..39f95fd 100644 --- a/apache-ssl-stuff.tar.bz2 +++ b/apache-ssl-stuff.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4c919f1ebd8ce788c10749b28a259302843c0061d56e199c2cb7a929c30d6ed -size 82910 +oid sha256:65caa151a4af2c46075d2dc2a1399f3398c9d5585bc7d6b89bcf582c86c46d20 +size 8433 diff --git a/apache2.changes b/apache2.changes index 250f534..8724897 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 25 16:59:27 CET 2009 - prusnak@suse.cz + +- moved Snakeoil certificates to separate subpackage example-certificates + [bnc#419601] +- removed outdated ca-bundle.crt + ------------------------------------------------------------------- Sat Dec 20 00:49:29 CET 2008 - poeml@suse.de diff --git a/apache2.spec b/apache2.spec index 5c58d67..48c1d35 100644 --- a/apache2.spec +++ b/apache2.spec @@ -31,7 +31,7 @@ BuildRequires: expat-devel %endif # %define pname apache2 -%define vers 2 +%define vers 2 %define httpd httpd2 %define apache_mmn %(test -s %{S:0} && { echo -n apache_mmn_; bzcat %{S:0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; }) %define default_mpm prefork @@ -63,7 +63,7 @@ License: The Apache Software License Group: Productivity/Networking/Web/Servers %define realver 2.2.11 Version: 2.2.11 -Release: 1 +Release: 2 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -243,7 +243,7 @@ Authors: The event MPM (multi-Processing Module) is experimental, so it may or may not work as expected. -It uses a seperate thread to handle Keep Alive requests and accepting +It uses a separate thread to handle Keep Alive requests and accepting connections. Keep Alive requests have traditionally required httpd to dedicate a worker to handle it. This dedicated worker could not be used again until the Keep Alive timeout was reached. @@ -274,7 +274,7 @@ for development using the Apache API. %package doc License: The Apache Software License -Summary: Additional Package Documentation. +Summary: Additional Package Documentation Group: Documentation/Other %if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9 Provides: apache-doc @@ -302,6 +302,20 @@ server. +Authors: +-------- + Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE + +%package example-certificates +License: The Apache Software License +Summary: Example certificates for the Apache 2 Web Server +Group: Productivity/Networking/Web/Servers + +%description example-certificates +Snakeoil example certificates for Apache. + + + Authors: -------- Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE @@ -817,9 +831,6 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %dir %{sysconfdir}/ssl.prm %{sysconfdir}/ssl.*/README* %config %{sysconfdir}/ssl.*/Makefile - %{sysconfdir}/ssl.*/snakeoil* - %{sysconfdir}/ssl.*/*.0 -%config %{sysconfdir}/ssl.crt/ca-bundle.crt %config(noreplace) %{sysconfdir}/ssl.crt/server.crt %config(noreplace) %{sysconfdir}/ssl.csr/server.csr %config(noreplace) %{sysconfdir}/ssl.key/server.key @@ -905,6 +916,11 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %config(noreplace) %{htdocsdir}/favicon.ico %config(noreplace) %{htdocsdir}/robots.txt +%files example-certificates +%defattr(-,root,root) +%{sysconfdir}/ssl.*/snakeoil* +%{sysconfdir}/ssl.*/*.0 + %files utils %defattr(-,root,root) %doc %{_mandir}/man8/ab%{vers}.8.* @@ -1029,6 +1045,10 @@ if ! test -f /.buildenv; then fi %changelog +* Wed Feb 25 2009 prusnak@suse.cz +- moved Snakeoil certificates to separate subpackage example-certificates + [bnc#419601] +- removed outdated ca-bundle.crt * Sat Dec 20 2008 poeml@suse.de - update to 2.2.11: core: diff --git a/robots.txt b/robots.txt index b05a9fb..2d702ad 100644 --- a/robots.txt +++ b/robots.txt @@ -1,7 +1,7 @@ # exclude help system from robots User-agent: * -Disallow: /manual/ -Disallow: /doc/ +Disallow: /manual/ +Disallow: /doc/ Disallow: /gif/ # but allow htdig to index our doc-tree User-agent: susedig