diff --git a/mod_proxy_cluster.conf.sample b/mod_proxy_cluster.conf.sample index 263edf9..5fa37c2 100644 --- a/mod_proxy_cluster.conf.sample +++ b/mod_proxy_cluster.conf.sample @@ -4,7 +4,7 @@ LoadModule cluster_slotmem_module /usr/lib64/httpd/modules/mod_cluster_slotmem.s LoadModule manager_module /usr/lib64/httpd/modules/mod_manager.so LoadModule advertise_module /usr/lib64/httpd/modules/mod_advertise.so -MemManagerFile /var/cache/mod_cluster +MemManagerFile /var/cache/httpd/mod_proxy_cluster Listen 6666 diff --git a/mod_proxy_cluster.spec b/mod_proxy_cluster.spec index 991f3fa..0ef01d4 100644 --- a/mod_proxy_cluster.spec +++ b/mod_proxy_cluster.spec @@ -1,47 +1,35 @@ -%global meadalpha %{nil} -%global meadrel %{nil} -%global version_major 1 -%global version_minor 3 -%global version_micro 14 -%global version_release None -%global commitid 547fccb264f57ecdd5f7818ea2d8f9cfac28c4ed -%global serial 19 - -%global pkg_name %{name} - #no jars in this native build, so skip signing %define _jarsign_opts --nocopy -%define reltag .Final -%define namedversion %{version}%{reltag} -%define jarname mod-cluster +# Update commitid and serial when new sources and release info is available +%global commitid 547fccb264f57ecdd5f7818ea2d8f9cfac28c4ed +%global serial 19 -%bcond_with zip - -Name: mod_proxy_cluster -Summary: JBoss mod_cluster for Apache httpd +Name: mod_proxy_cluster +Summary: JBoss mod_proxy_cluster for Apache httpd Version: 1.3.14 -Release: %{serial}%{reltag}_redhat_2%{?dist}.1 +Release: %{serial}%{?dist} Epoch: 0 License: LGPLv3 Group: Applications/System URL: http://www.jboss.org/ Source0: mod_cluster-%{commitid}.tar.gz -Source1: %{pkg_name}.conf.sample -Source2: %{pkg_name}.te -Source3: %{pkg_name}.fc +Source1: %{name}.conf.sample +Source2: %{name}.te +Source3: %{name}.fc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: httpd-devel -BuildRequires: apr-devel -BuildRequires: apr-util-devel -#64 bit natives only on RHEL 9 -ExcludeArch: i686 i386 -BuildRequires: autoconf -BuildRequires: gcc -BuildRequires: zip -BuildRequires: selinux-policy-devel -Requires(post): python3-policycoreutils + +# 64 bit natives only on RHEL 9 +ExcludeArch: i686 i386 + +BuildRequires: httpd-devel +BuildRequires: apr-devel +BuildRequires: apr-util-devel +BuildRequires: autoconf +BuildRequires: gcc +BuildRequires: selinux-policy-devel +Requires(post): python3-policycoreutils Requires(postun): python3-policycoreutils Requires: httpd >= 0:2.4.6 @@ -49,23 +37,12 @@ Requires: apr Requires: apr-util %description -JBoss mod_cluster for Apache httpd 2.4.37. - -%if %with zip -%package src-zip -Summary: Container for the source distribution of %{pkg_name} -Group: Development - -%description src-zip -Container for the source distribution of %{pkg_name}. -%endif +JBoss mod_proxy_cluster for Apache httpd. %prep %setup -q -n mod_cluster-%{commitid} %build -zip -q -r ../%{name}-%{namedversion}-src.zip native/* - %{!?apxs: %{expand: %%define apxs %{_sbindir}/apxs}} %define aplibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -83,20 +60,14 @@ popd %install %define aplibdir /usr/lib64/httpd/modules/ -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version} +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} install -d -m 755 $RPM_BUILD_ROOT/%{aplibdir}/ cp -p native/*/*.so ${RPM_BUILD_ROOT}/%{aplibdir}/ -install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/cache/mod_cluster +install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/cache/httpd/mod_proxy_cluster install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ install -p -m 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mod_cluster.conf.sample - -%if %with zip -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/jbossas-fordev -install -p -m 644 ../%{name}-%{namedversion}-src.zip \ - $RPM_BUILD_ROOT%{_javadir}/jbossas-fordev/ -%endif + $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mod_proxy_cluster.conf.sample # for SELinux install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name} @@ -106,7 +77,7 @@ pushd selinux cp -p %{SOURCE3} . make -f %{_datadir}/selinux/devel/Makefile - install -p -m 644 -D %{pkg_name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/mod_cluster.pp + install -p -m 644 -D %{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/mod_proxy_cluster.pp popd %clean @@ -114,18 +85,18 @@ rm -Rf $RPM_BUILD_ROOT %post if [ $1 -eq 1 ] ; then - %{_sbindir}/semodule -i %{_datadir}/selinux/packages/%{name}/mod_cluster.pp 2>/dev/null || : + %{_sbindir}/semodule -i %{_datadir}/selinux/packages/%{name}/mod_proxy_cluster.pp 2>/dev/null || : %{_sbindir}/semanage port -a -t http_port_t -p udp 23364 >/dev/null 2>&1 || : %{_sbindir}/semanage port -a -t http_port_t -p tcp 6666 >/dev/null 2>&1 || : - /sbin/restorecon -R /var/cache/mod_cluster >/dev/null 2>&1 || : + /sbin/restorecon -R /var/cache/httpd/mod_proxy_cluster >/dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ] ; then %{_sbindir}/semanage port -d -t http_port_t -p udp 23364 2>&1 || : %{_sbindir}/semanage port -d -t http_port_t -p tcp 6666 2>&1 || : - %{_sbindir}/semodule -r mod_cluster >/dev/null 2>&1 || : - /sbin/restorecon -R /var/cache/mod_cluster >/dev/null 2>&1 || : + %{_sbindir}/semodule -r mod_proxy_cluster >/dev/null 2>&1 || : + /sbin/restorecon -R /var/cache/httpd/mod_proxy_cluster >/dev/null 2>&1 || : fi %files @@ -133,20 +104,18 @@ fi %define aplibdir /usr/lib64/httpd/modules/ %defattr(0644,root,root,0755) %doc lgpl.txt -%dir %{_localstatedir}/cache/mod_cluster +%dir %{_localstatedir}/cache/httpd/mod_proxy_cluster %attr(0755,root,root) %{aplibdir}/* -%{_sysconfdir}/httpd/conf.d/mod_cluster.conf.sample +%{_sysconfdir}/httpd/conf.d/mod_proxy_cluster.conf.sample # for SELinux %dir %{_datadir}/selinux/packages/%{name} -%{_datadir}/selinux/packages/%{name}/mod_cluster.pp +%{_datadir}/selinux/packages/%{name}/mod_proxy_cluster.pp -%if %with zip -%files src-zip -%defattr(-,root,root,-) -%{_javadir}/jbossas-fordev/* -%endif %changelog +* Mon Aug 16 2021 Coty Sutherland - 1.3.14-20 +- Cleanup spec file + * Mon Aug 09 2021 Mohan Boddu - 0:1.3.14-19.Final_redhat_2.1 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 @@ -159,92 +128,3 @@ fi * Fri Jul 30 2021 George Zaronikas - 1.3.14-17.Final - Resolves: #1964892 - -* Mon May 11 2020 Mladen Turk - 1.3.14-1.Final -- Upgrade to mod_cluster 1.3.14 - -* Thu Aug 08 2019 Yaakov Selkowitz - 1.3.11-2 -- Rebuilt for multiple architectures - -* Thu Jun 27 2019 Petros Marios Prokopiou - 1.3.11-2 -- Applied fix for [JBCS-405] - -* Wed Jun 19 2019 Hui Wang - 1.3.11-2 -- Build with new httpd 2.4.37 - -* Wed Jun 19 2019 Hui Wang - 1.3.11-1 -- Build with new httpd 2.4.37 - -* Wed Jun 05 2019 Petros Marios Prokopiou - 1.3.11-1 -- Updating to mod_cluster 1.3.11 [JBCS-446] - -* Thu Nov 01 2018 Sokratis Zappis - 1.3.8-3 -- Build for JBCS httpd 2.4.29 SP1 DR1 - -* Tue Mar 06 2018 Hui Wang - 1.3.8-1 -- Build with the latest commitId - -* Tue Mar 06 2018 Jean-Frederic Clere - 1.3.8-1 -- retrying... - -* Mon Mar 05 2018 Georgios Zaronikas Karagiannis - 1.3.8-1 -- Build with httpd 2.4.29 - -* Mon Mar 05 2018 Jean-Frederic Clere - 1.3.8-1 -- Adjust to the new git repo. - -* Tue Nov 07 2017 Georgios Zaronikas Karagiannis - 1.3.8-14 -- Updating to 1.3.8 - -* Tue Nov 07 2017 George Zaronikas - 1.3.8-1 -- Updating to mod_cluster 1.3.8 - -* Tue Feb 07 2017 Jan Fnukal - 1.3.5-14 -- jbcs-httpd24 SP1 - -* Wed Oct 26 2016 Hui Wang - 1.3.5-13 -- Rebuild - -* Wed Oct 26 2016 Jean-Frederic Clere - 1.3.5-12 -- - -* Wed Oct 26 2016 Jean-Frederic Clere - 1.3.5-0 -- 1.3.5.Final-redhat - -* Fri Oct 21 2016 Permaine Cheung - 1.3.4-12 -- 1.3.4.Final-redhat-1 - -* Wed Jul 20 2016 Permaine Cheung - 1.3.3-11 -- 1.3.3.Final-redhat-1 - -* Wed Jul 20 2016 Permaine Cheung - 1.3.3-1.Final-redhat-1 -- 1.3.3 - -* Tue Feb 16 2016 Fernando Nasser - 1.3.1-10 -- Build from source-repos - -* Fri Feb 12 2016 Fernando Nasser - 1.3.1-9 -- JCSP-24 postun scriptlet fails when unistalling mod_cluster-native - -* Tue Dec 22 2015 Fernando Nasser - 0:1.3.1-7 -- Build in the jbcs-httpd24 collection - -* Tue Oct 20 2015 Permaine Cheung - 0:1.3.1-6.Final-redhat-2 -- Rebuild - -* Fri Apr 10 2015 Permaine Cheung - 0:1.3.1-5.Final-redhat-2 -- 1.3.1.Final-redhat-2 -- Remove patch for CVE-2015-0298 as it has been incorporated in the new tag - -* Wed Mar 18 2015 Dustin Kut Moy Cheung - 0:1.3.1-4.Beta2-redhat-1 -- add patch for CVE-2015-0298 - -* Mon Jan 26 2015 Permaine Cheung - 0:1.3.1-3.Beta1-redhat-1 -- 1.3.1.Beta2-redhat-1 - -* Thu Dec 18 2014 Weinan Li - 0:1.3.1-2.Beta1 -- Fix conf file - -* Tue Nov 18 2014 Permaine Cheung - 0:1.3.1-1.Beta1 -- 1.3.1.Beta1 -- JWS 3.0 build