From c0d6422d388054967359c4762f752505dbe87c23 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 27 Jan 2021 12:07:06 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mod_fcgid.git#91513bf4c954cf618d02c6cddd8195bb85b8d514 --- fcgid.conf | 14 -------- mod_fcgid.rpmlintrc | 24 +++++++++++++ mod_fcgid.spec | 83 ++++++++++----------------------------------- 3 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 fcgid.conf create mode 100644 mod_fcgid.rpmlintrc diff --git a/fcgid.conf b/fcgid.conf deleted file mode 100644 index 90f208e..0000000 --- a/fcgid.conf +++ /dev/null @@ -1,14 +0,0 @@ -# This is the Apache server configuration file for providing FastCGI support -# through mod_fcgid -# -# Documentation is available at -# http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html - -LoadModule fcgid_module modules/mod_fcgid.so - -# Use FastCGI to process .fcg .fcgi & .fpl scripts -AddHandler fcgid-script fcg fcgi fpl - -# Sane place to put sockets and shared memory file -FcgidIPCDir /var/run/mod_fcgid -FcgidProcessTableFile /var/run/mod_fcgid/fcgid_shm diff --git a/mod_fcgid.rpmlintrc b/mod_fcgid.rpmlintrc new file mode 100644 index 0000000..d82b88e --- /dev/null +++ b/mod_fcgid.rpmlintrc @@ -0,0 +1,24 @@ +from Config import * + +# Technical terms +addFilter("spelling-error %description -l en_US (fastcgi|fcgid) -> ") +addFilter("spelling-error Summary\(en_US\) fcgid -> ") + +# This may show up if httpd-devel is not installed +addFilter("specfile-error warning: line [0-9]*: Possible unexpanded macro in: Requires: httpd-mmn = %{_httpd_mmn}") + +# False positive: this is where systemd wants it +addFilter("hardcoded-library-path in %{_prefix}/lib/tmpfiles.d") + +# configure.apxs is not an autotools configure script +addFilter("configure-without-libdir-spec") + +# Using non-ghost allows the package to run straight after installation without a reboot +addFilter("non-ghost-in-run /run/mod_fcgid") + +# Permission 0775 is required for correct operation +addFilter("non-standard-dir-perm /run/mod_fcgid 775") + +# File explicitly encoded as ISO-8859-1 +addFilter("file-not-utf8 /usr/share/doc/mod_fcgid.*/mod_fcgid.html.en") + diff --git a/mod_fcgid.spec b/mod_fcgid.spec index dc62620..21e02ff 100644 --- a/mod_fcgid.spec +++ b/mod_fcgid.spec @@ -1,46 +1,10 @@ -# Compatible macros for those introduced in Fedora 18, RHEL 7 -%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?fedora} && 0%{?fedora} <= 17) -# apxs script location -%global _httpd_apxs %{_sbindir}/apxs -# Module Magic Number -%global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0) -# Configuration directory -%global _httpd_confdir %{_sysconfdir}/httpd/conf.d -# systemd tmpfiles directory -%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d -%endif - -# For httpd ≥ 2.4 we have a different filesystem layout -%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?fedora} && 0%{?fedora} <= 17) -%global httpd24 0 -%global rundir %{_localstatedir}/run -%else -%global httpd24 1 -%global rundir /run -%endif - -# rundir on tmpfs from Fedora 15, RHEL 7 -%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?fedora} && 0%{?fedora} <= 14) -%global rundir_tmpfs 0 -%else -%global rundir_tmpfs 1 -%endif - -# systemd-units merged into systemd at Fedora 17 -%if (0%{?fedora} && 0%{?fedora} <= 16) -%global systemd_units systemd-units -%else -%global systemd_units systemd -%endif - Name: mod_fcgid Version: 2.3.9 -Release: 22%{?dist} +Release: 24%{?dist} Summary: FastCGI interface module for Apache 2 License: ASL 2.0 URL: http://httpd.apache.org/mod_fcgid/ Source0: http://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-%{version}.tar.bz2 -Source1: fcgid.conf Source2: mod_fcgid-2.1-README.RPM Source3: mod_fcgid-2.1-README.SELinux Source4: mod_fcgid-tmpfs.conf @@ -50,15 +14,13 @@ Patch1: mod_fcgid-2.3.9-segfault-upload.patch Patch2: mod_fcgid-2.3.9-r1848298.patch BuildRequires: coreutils BuildRequires: gcc -BuildRequires: httpd-devel >= 2.0 +BuildRequires: httpd-devel >= 2.4 BuildRequires: make BuildRequires: pkgconfig BuildRequires: sed Requires: httpd-mmn = %{_httpd_mmn} -# %%systemd_units needed for ownership of %%{_tmpfilesdir} -%if %{rundir_tmpfs} -Requires: %{systemd_units} -%endif +# systemd needed for ownership of %%{_tmpfilesdir} +Requires: systemd %description mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi. @@ -68,7 +30,6 @@ as possible. %prep %setup -q -cp -p %{SOURCE1} fcgid.conf cp -p %{SOURCE2} README.RPM cp -p %{SOURCE3} README.SELinux cp -p %{SOURCE5} fcgid24.conf @@ -87,51 +48,43 @@ make %install %make_install MKINSTALLDIRS="mkdir -p" -%if %{httpd24} mkdir -p %{buildroot}{%{_httpd_confdir},%{_httpd_modconfdir}} echo "LoadModule fcgid_module modules/mod_fcgid.so" > %{buildroot}%{_httpd_modconfdir}/10-fcgid.conf install -D -m 644 fcgid24.conf %{buildroot}%{_httpd_confdir}/fcgid.conf -%else -install -D -m 644 fcgid.conf %{buildroot}%{_httpd_confdir}/fcgid.conf -%endif -install -d -m 755 %{buildroot}%{rundir}/mod_fcgid +install -d -m 755 %{buildroot}/run/mod_fcgid # Include the manual as %%doc, don't need it elsewhere -%if %{httpd24} rm -rf %{buildroot}%{_httpd_contentdir}/manual -%else -rm -rf %{buildroot}%{_var}/www/manual -%endif -# Make sure %%{rundir}/mod_fcgid exists at boot time for systems -# with %%{rundir} on tmpfs (#656625) -%if %{rundir_tmpfs} +# Make sure /run/mod_fcgid exists at boot time (#656625) install -d -m 755 %{buildroot}%{_tmpfilesdir} install -p -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/mod_fcgid.conf -%endif %files -%if 0%{?_licensedir:1} %license LICENSE-FCGID -%else -%doc LICENSE-FCGID -%endif %doc README.RPM README.SELinux # mod_fcgid.html.en is explicitly encoded as ISO-8859-1 %doc CHANGES-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID %doc docs/manual/mod/mod_fcgid.html.en modules/fcgid/ChangeLog %doc build/fixconf.sed %{_libdir}/httpd/modules/mod_fcgid.so -%if %{httpd24} %config(noreplace) %{_httpd_modconfdir}/10-fcgid.conf -%endif %config(noreplace) %{_httpd_confdir}/fcgid.conf -%if %{rundir_tmpfs} %{_tmpfilesdir}/mod_fcgid.conf -%endif -%dir %attr(0775,root,apache) %{rundir}/mod_fcgid/ +%dir %attr(0775,root,apache) /run/mod_fcgid/ %changelog +* Wed Jan 27 2021 Paul Howarth - 2.3.9-24 +- Drop EL-6 support + - Use %%license unconditionally + - _httpd_* macros always available + - Run directory is always /run on tmpfs + - Assume httpd ≥ 2.4 filesystem layout + - systemd-units always provided by systemd + +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.9-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Aug 27 2020 Joe Orton - 2.3.9-22 - merge fixes from RHEL (r1848298, etc)