commit 78e63f49b43691cd0b39561ef4c311837d7d73d157a35777361639b079c3df3b Author: Adrian Schröter Date: Fri May 3 11:05:03 2024 +0200 Sync from SUSE:SLFO:Main apache-rpm-macros revision 35e077643c8f3a1cd0efa56086bc44a6 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes new file mode 100644 index 0000000..4f82fd9 --- /dev/null +++ b/apache-rpm-macros.changes @@ -0,0 +1,161 @@ +------------------------------------------------------------------- +Thu Nov 26 13:36:53 UTC 2020 - pgajdos@suse.com + +- version update to 20201124 + * change location of apache2_MMN + +------------------------------------------------------------------- +Tue Feb 11 09:12:20 UTC 2020 - pgajdos@suse.com + +- version update to 20200211 + * remove %apache_test_* macros, %apache_rex_* is the replacement + (package apache-rex) +- deleted sources + - macros.apache-module-test (not needed) + +------------------------------------------------------------------- +Sun Nov 24 17:42:16 UTC 2019 - Neal Gompa + +- Replace incorrect usage of %_libexecdir/rpm with %_rpmconfigdir + +------------------------------------------------------------------- +Wed Jan 20 18:33:51 UTC 2016 - pgajdos@suse.com + +- version 20161120 +- %apache_test_module_start_apache: detect if module is built in + statically before attempt to search for it in filesystem + +------------------------------------------------------------------- +Mon Jan 11 15:21:58 UTC 2016 - pgajdos@suse.com + +- version 20160111 + * added %{apache_version} + +------------------------------------------------------------------- +Thu Nov 26 08:51:19 UTC 2015 - pgajdos@suse.com + +- version 20151211 +- %apache_test_module_start_apache: + * declare -p switch in function header + * fix wording of messages when apache start failed + * report unsuccessful start also to stderr to see it in build + log, when stdout is redirected to a file (see apache-test: + when apache test failed, macro is exiting 1, so the log is + not cat'ed to output) + * %{apache_branch} converted to a number: 204 for 2.4, + 202 for 2.2 + +------------------------------------------------------------------- +Tue Nov 10 15:34:04 UTC 2015 - pgajdos@suse.com + +- require apache-rpm-macros-control [bsc#893659] + +------------------------------------------------------------------- +Thu Nov 5 11:54:12 UTC 2015 - pgajdos@suse.com + +- do not append macros.apache-module-test to macros.apache, provide + separate macros file instead + +------------------------------------------------------------------- +Wed Sep 30 17:14:29 UTC 2015 - pgajdos@suse.com + +- version 20150930 +- %apache_test_module_start_apache, %apache_test_module_load: + introduce -t option +- %apache_test_module_curl: introduce -r option + +------------------------------------------------------------------- +Tue Sep 22 07:16:24 UTC 2015 - pgajdos@suse.com + +- version 20150921 +- make package usable also for other rpm based distros +- %apache_test_module_start_apache: introduce -p, -u and -g options +- %apache_test_module_curl: introduce -p and -u option + +------------------------------------------------------------------- +Fri Sep 18 08:18:45 UTC 2015 - pgajdos@suse.com + +- version 20150918 +- -m is no longer required (see apache2-mod_apreq2 for usecase) + +------------------------------------------------------------------- +Tue Sep 15 09:13:18 UTC 2015 - pgajdos@suse.com + +- version 20150915 +- new macro: %apache_access_syntax_version + +------------------------------------------------------------------- +Sat Sep 5 07:22:53 UTC 2015 - pgajdos@suse.com + +- version 20150904 +- new macros: %apache_test_module_curl, %apache_test_module_dir + +------------------------------------------------------------------- +Thu Sep 3 08:36:35 UTC 2015 - pgajdos@suse.com + +- version 20150903 +- %apache_test_module_start_apache: + * better check that httpd is really running + * add -p to mkdir test to not fail if test exist and do not + remove test dir + +------------------------------------------------------------------- +Mon Aug 31 08:30:28 UTC 2015 - pgajdos@suse.com + +- bump version to 20150902 + +------------------------------------------------------------------- +Fri Aug 28 08:27:11 UTC 2015 - pgajdos@suse.com + +- added macros to test loading modules + %apache_test_module_start_apache + %apache_test_module_stop_apache + %apache_test_module_load + + macros.apache-module-test + +------------------------------------------------------------------- +Tue Jul 28 12:01:08 UTC 2015 - pgajdos@suse.com + +- this is arch package + +------------------------------------------------------------------- +Mon Jul 27 16:03:19 UTC 2015 - pgajdos@suse.com + +- bump version to 20150717 + +------------------------------------------------------------------- +Fri Jul 17 06:36:39 UTC 2015 - pgajdos@suse.com + +- %{apache_suse_maintenance_mmn} expands to just 'apache2' when + apache2 does not provide suse_maintenance_mmn_# symbol + +------------------------------------------------------------------- +Mon Jul 13 11:50:52 UTC 2015 - pgajdos@suse.com + +- new macro: %{apache_suse_maintenance_mmn} [bnc#915666] (internal) + +------------------------------------------------------------------- +Tue Nov 11 09:58:44 UTC 2014 - pgajdos@suse.com + +- new macros: %{apache_user}, %{apache_group} [bnc#904409] + +------------------------------------------------------------------- +Tue Nov 4 14:43:18 UTC 2014 - pgajdos@suse.com + +- add %{apache_datadir} macro + +------------------------------------------------------------------- +Mon Nov 3 07:23:01 UTC 2014 - pgajdos@suse.com + +- fix %{apache_apxs} macro + +------------------------------------------------------------------- +Fri Oct 31 08:56:11 UTC 2014 - pgajdos@suse.com + +- fix %{apache_branch} macro + +------------------------------------------------------------------- +Fri Oct 17 12:11:26 UTC 2014 - pgajdos@suse.com + +- initial version of package 20141017 [bnc#673937] + diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec new file mode 100644 index 0000000..8daaeb3 --- /dev/null +++ b/apache-rpm-macros.spec @@ -0,0 +1,108 @@ +# +# spec file for package apache-rpm-macros +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define ap_major 2 +%if 0%{?suse_version} +%define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) +%define ap_version %(rpm -q --qf "%%{version}" apache%{ap_major} | tr '.' ' ' | { read maj min patch; printf "%d%02d%02d" $maj $min $patch; }) +%else +%define ap_branch %(rpm -q --qf "%%{version}" httpd | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) +%define ap_version %(rpm -q --qf "%%{version}" httpd | tr '.' ' ' | { read maj min patch; printf "%d%02d%02d" $maj $min $patch; }) +%endif +%define ap_pname apache%{ap_major} +%define ap_apxs %(ls -1 /usr/{,s}bin/apxs{,2} 2>/dev/null | head -n 1) +%define ap_cflags %(%{ap_apxs} -q CFLAGS) +%define ap_includedir %(%{ap_apxs} -q INCLUDEDIR) +%define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR) +%define ap_localstatedir %(%{ap_apxs} -q LOCALSTATEDIR) +%if 0%{?suse_version} +%define ap_mmn %(%{_libexecdir}/apache2_MMN 2>/dev/null || %{_libdir}/apache2_MMN 2>/dev/null) +%define ap_maint_mmn %(MMN=$(rpm -q --provides apache2 | grep suse_maintenance_mmn); test -z "$MMN" && MMN=apache2; echo $MMN) +%endif +%define ap_serverroot %(%{ap_apxs} -q PREFIX) +%define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR) +%define ap_datadir %(%{ap_apxs} -q DATADIR) +%if 0%{?suse_version} +%define ap_user wwwrun +%define ap_group www +%else +%define ap_user apache +%define ap_group apache +%endif +%if 0%{?suse_version} +%define ap_access_syntax_version %(if [ $(grep -c '^[[:space:]]*Require all denied' /etc/apache2/httpd.conf) -gt 0 ]; then echo 24; else echo 22; fi) +%endif +# +%if 0%{?suse_version} > 1230 +%define macros_dir %{_rpmconfigdir}/macros.d +%else +%define macros_dir %{_sysconfdir}/rpm +%endif +%define macros_file macros.apache +Name: apache-rpm-macros +Version: 20201124 +Release: 0 +Summary: Apache RPM Macros +License: Apache-2.0 +Group: Productivity/Networking/Web/Servers +URL: http://httpd.apache.org/ +%if 0%{?suse_version} +BuildRequires: apache%{ap_major}-devel +%else +BuildRequires: httpd-devel +%endif +Requires: apache-rpm-macros-control +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +RPM Macros intended for Apache modules spec files. + +%prep + +%build +cat << eom > %{macros_file} +%%apache_major %{ap_major} +%%apache_branch %{ap_branch} +%%apache_version %{ap_version} +%%apache_pname %{ap_pname} +%%apache_apxs %{ap_apxs} +%%apache_cflags %{ap_cflags} +%%apache_includedir %{ap_includedir} +%%apache_libexecdir %{ap_libexecdir} +%%apache_localstatedir %{ap_localstatedir} +%%apache_mmn %{ap_mmn} +%%apache_suse_maintenance_mmn %{ap_maint_mmn} +%%apache_serverroot %{ap_serverroot} +%%apache_sysconfdir %{ap_sysconfdir} +%%apache_datadir %{ap_datadir} +%%apache_user %{ap_user} +%%apache_group %{ap_group} +%%apache_access_syntax_version %{ap_access_syntax_version} +eom +echo >> %{macros_file} + +%install +mkdir -p %{buildroot}%{macros_dir} +install -m 644 %{macros_file} %{buildroot}%{macros_dir} + +%files +%defattr(-,root,root) +%dir %{macros_dir} +%{macros_dir}/macros.apache* + +%changelog