Accepting request 1237712 from Apache

- Fix builds of test package with RPM 4.20:
  + noarch packages cannot rely on libdir, which is an
    arch-dependent variable. Rely on apxs -q libdir to extract the
    correct information instead. (forwarded request 1237660 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1237712
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=214

apache2-start_apache2

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH
 # Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH

apache2.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Jan 14 08:34:19 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix builds of test package with RPM 4.20:
+  + noarch packages cannot rely on libdir, which is an
+    arch-dependent variable. Rely on apxs -q libdir to extract the
+    correct information instead.
+
+-------------------------------------------------------------------
+Tue Nov  5 18:16:04 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
+
+- Update httpd-framework to svn1921782.
+- Fixes Apache's impact on bsc#1218342.
+
+-------------------------------------------------------------------
+Mon Nov  4 21:23:51 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Explicitly mark start_apache2 as bash-dependent.
+
+-------------------------------------------------------------------
+Mon Sep 30 14:40:42 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- Add /srv/www directories to filelist [bsc#1231027] 
+  (apache2 will not start since default config uses this directory)
+
 -------------------------------------------------------------------
 Sat Aug  3 17:27:07 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
 

apache2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %global upstream_name   httpd
 %global testsuite_name  %{upstream_name}-framework
-%global tversion        svn1901574
+%global tversion        svn1921782
 %global flavor          @BUILD_FLAVOR@%{nil}
 %define mpm             %{nil}
 %if "%{flavor}" == "prefork" || "%{flavor}" == "test_prefork"
@@ -549,6 +549,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/apache2/sysconfig.d
 mkdir -p %{buildroot}/%{_fillupdir}
 install -m 644 %{SOURCE30} %{buildroot}%{_fillupdir}/sysconfig.apache2
 
+# htdocsdir is used by default-server.conf
+mkdir -p %{buildroot}%{htdocsdir}
 mkdir -p %{buildroot}%{sysconfdir}
 mkdir -p %{buildroot}%{sysconfdir}/conf.d
 for c in default-server.conf \
@@ -733,6 +735,8 @@ apxs -q CFLAGS | grep "\\%{optflags}"
 cp %{SOURCE21} mod_example.c
 apxs -c mod_example.c
 test_dir="$PWD/my-test-devel"
+# hack: %{_libdir} cannot be used in noarch packages, define shell variable _libdir, using apxs to find the real value
+_libexecdir=$(apxs -q libdir)/apache2
 echo "Try to load example module"
 mkdir $test_dir
 cat > $test_dir/httpd.conf << EOF
@@ -743,7 +747,7 @@ User $(id -un)
 Group $(id -gn)
 Listen 60080
 DocumentRoot $test_dir
-LoadModule authz_core_module %{libexecdir}-%{default_mpm}/mod_authz_core.so
+LoadModule authz_core_module ${_libexecdir}-%{default_mpm}/mod_authz_core.so
 LoadModule example_module $PWD/.libs/mod_example.so
 <Location /hello>
   SetHandler example-handler
@@ -778,15 +782,17 @@ function dep()
 }
 # create a conf loading all MPM's modules
 echo >  $PWD/load-all-modules.conf
+# hack: %{_libdir} cannot be used in noarch packages, define shell variable _libdir, using apxs to find the real value
+_libdir=$(apxs -q libdir)
 # hack: sort -u to load mod_proxy before mod_proxy_http, mod_cache before mod_cache_disk, etc.
-modules=$(find %{_libdir}/apache2-%{mpm}/ %{_libdir}/apache2/ -name *.so | sed 's:.*/mod_\(.*\).so:\1:' | sort -u)
+modules=$(find ${_libdir}/apache2-%{mpm}/ ${_libdir}/apache2/ -name *.so | sed 's:.*/mod_\(.*\).so:\1:' | sort -u)
 # fix up dependencies
 dep "lbmethod_bybusyness" "proxy"
 dep "lbmethod_byrequests" "proxy"
 dep "lbmethod_bytraffic"  "proxy"
 dep "lbmethod_heartbeat"  "proxy"
 for m in $modules; do
-  path=$(find %{_libdir}/apache2-%{mpm}/ %{_libdir}/apache2/ -name mod_$m.so | head -n 1)
+  path=$(find ${_libdir}/apache2-%{mpm}/ ${_libdir}/apache2/ -name mod_$m.so | head -n 1)
   if ! grep -q "mod_$m.c" $PWD/load-all-modules.conf; then
     echo "<IfModule !mod_$m.c>"           >> $PWD/load-all-modules.conf
     echo "  LoadModule ${m}_module $path" >> $PWD/load-all-modules.conf
@@ -834,6 +840,8 @@ exit 0
 %attr(750,root,root) %dir %{logfiledir}
 %attr(750,%{httpduser},root) %dir %{proxycachedir}
 %attr(750,%{httpduser},root) %dir %{localstatedir}
+%dir %{datadir}
+%dir %{htdocsdir}
 %dir %{libexecdir}
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/apache2_MMN