Hello community, here is the log from the commit of package apache2 checked in at Sun Apr 20 21:03:35 CEST 2008. -------- --- apache2/apache2.changes 2008-04-01 16:05:49.000000000 +0200 +++ apache2/apache2.changes 2008-04-18 14:20:24.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Apr 18 14:17:31 CEST 2008 - poeml@suse.de + +- sync up with changes from Build Service: + - new implementation of sysconf_addword, using sed instead of ed. + Moving it from the -utils subpackage into the parent package, + where it's actually needed. If sysconf_addword is already present + in the system, it is preferred (by PATH). That's because the tool + has been integrated into aaa_base.rpm with openSUSE 11.0. + Removing the requires on the ed package. [bnc#377131] + - better documentation how to enable SSL in /etc/sysconfig/apache2 + - quickstart readme: the link to the openSUSE wiki is about to move + - add "127.0.0.1" to the local access list in mod_status.conf, + because on some systems "localhost" seems to resolve only to IPv6 + localhost + - /etc/init.d/apache2: implement restart-graceful, stop-graceful + - fix graceful-restart. Wait until the pidfile is gone, but don't + wait for the parent to disappear. It stays there, after closing + the listen ports. + - don't configure in maintainer-mode. It not only enables compile + time warnings, but also adds AP_DEBUG into the mix which causes + enablement of debug code which is not wanted in production + builds. + - drop obsolete patches mod_dbd.c-issue18989-autoconnect.dif and + mod_dbd.c-r571441, as the 2.2.8 mod_dbd is just fine. + +------------------------------------------------------------------- Old: ---- mod_dbd.c-issue18989-autoconnect.dif mod_dbd.c-r512038 New: ---- sysconf_addword ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.b21757/_old 2008-04-20 21:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.b21757/_new 2008-04-20 21:02:39.000000000 +0200 @@ -56,7 +56,7 @@ Group: Productivity/Networking/Web/Servers %define realver 2.2.8 Version: 2.2.8 -Release: 8 +Release: 13 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -77,6 +77,9 @@ Source42: get_module_list Source43: get_includes Source44: find_httpd2_includes +# sysconf_addword is part of aaa_base.rpm starting with openSUSE 11.0 +# we bring our own copy for the cases where it is not available +Source45: sysconf_addword Source46: a2enflag Source47: a2enmod Source48: apache2.xml @@ -100,14 +103,12 @@ Source131: apache2-vhost-ssl.template Source140: apache2-check_forensic Source141: apache-20-22-upgrade -Source150: mod_dbd.c-r512038 Patch2: httpd-2.1.3alpha-layout.dif Patch10: httpd-2.1.3alpha-autoconf-2.59.dif Patch23: httpd-2.1.9-apachectl.dif Patch65: httpd-2.0.49-log_server_status.dif Patch66: httpd-2.0.54-envvars.dif Patch67: httpd-2.2.0-apxs-a2enmod.dif -Patch150: mod_dbd.c-issue18989-autoconnect.dif Url: http://httpd.apache.org/ Icon: Apache.xpm Summary: The Apache Web Server Version 2.0 @@ -329,8 +330,6 @@ %patch65 -p1 %patch66 -p1 %patch67 -p1 -cp -p %{S:150} modules/database/mod_dbd.c -#%patch150 -p0 # cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # @@ -358,7 +357,6 @@ %endif CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE -DMAX_SERVER_LIMIT=200000 -DLDAP_DEPRECATED -DMAXLINE=4096" \ ./configure \ - --enable-maintainer-mode \ --enable-layout=SuSE81%(test "%_lib" = lib64 && echo -n _64) \ --with-program-name=httpd%{vers}$mpm_suffix \ --with-apr=%{_bindir}/apr-1-config \ @@ -575,6 +573,7 @@ sed 's+/usr/lib+/usr/%_lib+' $RPM_SOURCE_DIR/get_module_list \ > $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/get_module_list chmod 755 $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/get_module_list +install -m 755 $RPM_SOURCE_DIR/sysconf_addword $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/ install -m 755 $RPM_SOURCE_DIR/a2enflag $RPM_BUILD_ROOT/%{_sbindir} ln -s a2enflag $RPM_BUILD_ROOT/%{_sbindir}/a2disflag install -m 755 $RPM_SOURCE_DIR/a2enmod $RPM_BUILD_ROOT/%{_sbindir} @@ -846,6 +845,7 @@ %{_prefix}/share/%{pname}/find_httpd2_includes %{_prefix}/share/%{pname}/find_mpm %{_prefix}/share/%{pname}/load_configuration +%{_prefix}/share/%{pname}/sysconf_addword %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl %if %prefork @@ -1031,6 +1031,29 @@ fi %changelog +* Fri Apr 18 2008 poeml@suse.de +- sync up with changes from Build Service: + - new implementation of sysconf_addword, using sed instead of ed. + Moving it from the -utils subpackage into the parent package, + where it's actually needed. If sysconf_addword is already present + in the system, it is preferred (by PATH). That's because the tool + has been integrated into aaa_base.rpm with openSUSE 11.0. + Removing the requires on the ed package. [bnc#377131] + - better documentation how to enable SSL in /etc/sysconfig/apache2 + - quickstart readme: the link to the openSUSE wiki is about to move + - add "127.0.0.1" to the local access list in mod_status.conf, + because on some systems "localhost" seems to resolve only to IPv6 + localhost + - /etc/init.d/apache2: implement restart-graceful, stop-graceful + - fix graceful-restart. Wait until the pidfile is gone, but don't + wait for the parent to disappear. It stays there, after closing + the listen ports. + - don't configure in maintainer-mode. It not only enables compile + time warnings, but also adds AP_DEBUG into the mix which causes + enablement of debug code which is not wanted in production + builds. + - drop obsolete patches mod_dbd.c-issue18989-autoconnect.dif and + mod_dbd.c-r571441, as the 2.2.8 mod_dbd is just fine. * Tue Apr 01 2008 mkoenig@suse.de - remove dir /usr/share/omc/svcinfo.d as it is provided now by filesystem ++++++ a2enflag ++++++ --- apache2/a2enflag 2007-01-22 14:08:55.000000000 +0100 +++ apache2/a2enflag 2008-04-18 14:23:11.000000000 +0200 @@ -10,7 +10,7 @@ sysconf=/etc/sysconfig/apache2 var=APACHE_SERVER_FLAGS -PATH="$PATH:/usr/bin:/usr/sbin" +PATH="$PATH:/usr/bin:/usr/sbin:/usr/share/apache2" debug=true ++++++ a2enmod ++++++ --- apache2/a2enmod 2007-01-22 14:09:13.000000000 +0100 +++ apache2/a2enmod 2008-04-18 14:23:26.000000000 +0200 @@ -10,7 +10,7 @@ sysconf=/etc/sysconfig/apache2 var=APACHE_MODULES -PATH="$PATH:/usr/bin:/usr/sbin" +PATH="$PATH:/usr/bin:/usr/sbin:/usr/share/apache2" debug=true ++++++ apache2-mod_status.conf ++++++ --- apache2/apache2-mod_status.conf 2006-04-28 17:00:38.000000000 +0200 +++ apache2/apache2-mod_status.conf 2008-04-18 14:24:07.000000000 +0200 @@ -9,7 +9,7 @@ SetHandler server-status Order deny,allow Deny from all - Allow from localhost + Allow from localhost 127.0.0.1 </Location> </IfModule> ++++++ apache2-README.QUICKSTART ++++++ --- apache2/apache2-README.QUICKSTART 2007-01-26 12:43:10.000000000 +0100 +++ apache2/apache2-README.QUICKSTART 2008-04-18 14:24:27.000000000 +0200 @@ -1,6 +1,6 @@ This README is now online: -http://www.opensuse.org/Apache_Howto_Quickstart +http://en.opensuse.org/Apache_Quickstart_HOWTO General starting point: http://www.opensuse.org/Apache ++++++ rc.apache2 ++++++ --- apache2/rc.apache2 2007-01-22 14:14:16.000000000 +0100 +++ apache2/rc.apache2 2008-04-18 14:26:53.000000000 +0200 @@ -14,7 +14,7 @@ ### BEGIN INIT INFO # Provides: apache2 httpd2 # Required-Start: $local_fs $remote_fs $network -# X-UnitedLinux-Should-Start: $named $time postgresql sendmail mysql ypclient dhcp radiusd +# Should-Start: $named $time postgresql sendmail mysql ypclient dhcp radiusd # Required-Stop: $local_fs $remote_fs $network # X-UnitedLinux-Should-Stop: # Default-Start: 3 5 @@ -174,6 +174,31 @@ rc_status -v ;; + stop-graceful) + echo "Shutting down httpd2 gracefully (SIGWINCH)" + if ! [ -f $pidfile ]; then + echo -n "(not running)" + else + pid=$(<$pidfile) + kill -WINCH $pid 2>/dev/null + case $? in + 1) echo -n "(not running)";; + 0) # wait until the pidfile is gone. The parent stays there, but closes the listen ports. + echo -n "(waiting for parent to close listen ports and remove pidfile) " + for ((wait=0; wait<120; wait++)); do + if test -f $pidfile; then + usleep 500000 + continue + else + break + fi + done + ;; + esac + fi + + rc_status -v + ;; try-restart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). @@ -209,6 +234,18 @@ # Remember status and be quiet rc_status -v ;; + restart-graceful) + $0 configtest "$@" || { rc_failed $?; rc_exit; } + + if $0 status &>/dev/null; then + $0 stop-graceful "$@" + $0 start "$@" + else + $0 start "$@" + fi + # Remember status and be quiet + rc_status + ;; reload|force-reload|graceful) echo -n "Reload httpd2 (graceful restart)" cmdline=$(echo $apache_bin -f $httpd_conf $server_flags "$@") @@ -294,13 +331,18 @@ where <command> is one of: start - start httpd startssl - start httpd with -DSSL - stop - stop httpd (sendign SIGTERM to parent) + stop - stop httpd (sending SIGTERM to parent) try-restart - stop httpd and if this succeeds (i.e. if it was running before), start it again. + status - check whether httpd is running + restart - stop httpd if running; start httpd - reload|graceful - do a graceful restart by sending a SIGUSR1 or + restart-graceful - stop httpd gracefully if running; start httpd + reload|graceful - do a graceful restart by sending a SIGUSR1, or start if not running + stop-graceful - stop httpd (sending SIGWINCH to parent) + configtest - do a configuration syntax test extreme-configtest - try to run httpd as nobody (detects more errors by actually loading the configuration, but cannot @@ -308,10 +350,12 @@ probe - probe for the necessity of a reload, give out the argument which is required for a reload. (by comparing conf files with pidfile timestamp) + full-server-status - dump a full status screen; requires lynx or w3m and mod_status enabled server-status - dump a short status screen; requires lynx or w3m and mod_status enabled + help - this screen optional server flags are passed through to httpd. ++++++ sysconfig.apache2 ++++++ --- apache2/sysconfig.apache2 2006-04-28 17:00:48.000000000 +0200 +++ apache2/sysconfig.apache2 2008-04-18 14:27:58.000000000 +0200 @@ -51,14 +51,15 @@ # * In the APACHE_MODULES variable, you can use mod_xyz or just xyz syntax. # You may also name an absolute path if you like. # -# * NOTE ON MOD_SSL: before you can enable this module, you need a server certificate. +# * NOTE ON SSL: before you can use mod_ssl, you need a server certificate. # A test certificate can be created by entering # 'cd /usr/share/doc/packages/apache2; ./certificate.sh' as root. # Also, you need to set the ServerName inside the <VirtualHost _default_:443> # block to the fully qualified domain name (see /etc/HOSTNAME). -# # * if your server certificate is protected by a passphrase you should increase the # APACHE_START_TIMEOUT (see above) +# * to finally enable ssl support, you need to add 'SSL' to APACHE_SERVER_FLAGS +# below. # # * modules listed here will be ignored if they are not installed # @@ -89,7 +90,7 @@ # special cases, like during server maintenance, or for testing # something temporarily. # -# Notably, to enable SSL support, 'SSL' needs to be added here. +# Notably, to enable ssl support, 'SSL' needs to be added here. # To enable the server-status, 'STATUS' needs to be added here. # # It does not matter if you write flag1, -D flag1 or -Dflag1. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org