rpms/mod_fcgid/F-7 .cvsignore, 1.4, 1.5 mod_fcgid.spec, 1.5, 1.6 sources, 1.4, 1.5
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Sat Sep 15 16:05:58 UTC 2007
- Previous message (by thread): rpms/mod_fcgid/devel .cvsignore, 1.4, 1.5 mod_fcgid.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/pv/devel .cvsignore,1.3,1.4 pv.spec,1.2,1.3 sources,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pghmcfc
Update of /cvs/pkgs/rpms/mod_fcgid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9314
Modified Files:
.cvsignore mod_fcgid.spec sources
Log Message:
resync with devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Feb 2007 14:20:03 -0000 1.4
+++ .cvsignore 15 Sep 2007 16:05:24 -0000 1.5
@@ -1 +1 @@
-mod_fcgid.2.1.tar.gz
+mod_fcgid.2.2.tar.gz
Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/mod_fcgid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_fcgid.spec 15 Jun 2007 17:14:10 -0000 1.5
+++ mod_fcgid.spec 15 Sep 2007 16:05:24 -0000 1.6
@@ -9,26 +9,26 @@
%define selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink
%endif
-Name: mod_fcgid
-Version: 2.1
-Release: 3%{?dist}
-Summary: Apache2 module for high-performance server-side scripting
-Group: System Environment/Daemons
-License: GPL
-URL: http://fastcgi.coremail.cn/
-Source0: http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
-Source1: fcgid.conf
-Source2: fastcgi.te
-Source3: fastcgi.fc
-Source4: mod_fcgid-2.1-README.RPM
-Source5: http://fastcgi.coremail.cn/doc.htm
-Source6: http://fastcgi.coremail.cn/configuration.htm
-Source7: mod_fcgid-2.1-README.SELinux
-Source8: fastcgi-2.5.te
-Patch0: mod_fcgid.2.1-docurls.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: httpd-devel >= 2.0
-Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
+Name: mod_fcgid
+Version: 2.2
+Release: 1%{?dist}
+Summary: Apache2 module for high-performance server-side scripting
+Group: System Environment/Daemons
+License: GPL+
+URL: http://fastcgi.coremail.cn/
+Source0: http://downloads.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
+Source1: fcgid.conf
+Source2: fastcgi.te
+Source3: fastcgi.fc
+Source4: mod_fcgid-2.1-README.RPM
+Source5: http://fastcgi.coremail.cn/doc.htm
+Source6: http://fastcgi.coremail.cn/configuration.htm
+Source7: mod_fcgid-2.1-README.SELinux
+Source8: fastcgi-2.5.te
+Patch0: mod_fcgid.2.1-docurls.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gawk, httpd-devel >= 2.0, pkgconfig
+Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
%description
mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi.
@@ -40,9 +40,9 @@
%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
%define selinux_policynum %(echo %{selinux_policyver} | %{__awk} -F. '{ printf "%d%02d%02d", $1, $2, $3 }')
%package selinux
-Summary: SELinux policy module supporting FastCGI applications with mod_fcgid
-Group: System Environment/Base
-BuildRequires: %{selinux_buildreqs}
+Summary: SELinux policy module supporting FastCGI applications with mod_fcgid
+Group: System Environment/Base
+BuildRequires: %{selinux_buildreqs}
# selinux-policy is required for directory ownership of %{_datadir}/selinux/*
# Modules built against one version of a policy may not work with older policy
# versions, as noted on fedora-selinux-list:
@@ -50,10 +50,10 @@
# Hence the versioned dependency. The versioning will hopefully be replaced by
# an ABI version requirement or something similar in the future
%if "%{selinux_policyver}" != ""
-Requires: selinux-policy >= %{selinux_policyver}
+Requires: selinux-policy >= %{selinux_policyver}
%endif
-Requires: %{name} = %{version}-%{release}
-Requires(post): /usr/sbin/semodule, /sbin/restorecon
+Requires: %{name} = %{version}-%{release}
+Requires(post): /usr/sbin/semodule, /sbin/restorecon
Requires(postun): /usr/sbin/semodule, /sbin/restorecon
%description selinux
@@ -75,6 +75,8 @@
%{__cp} -p %{SOURCE7} README.SELinux
%patch0 -p1
%{__sed} -i -e 's/\r$//' directives.htm configuration.htm
+/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8
+%{__mv} -f configuration.htm.utf8 configuration.htm
%build
topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
@@ -82,9 +84,9 @@
%if %{selinux_module}
for selinuxvariant in %{selinux_variants}
do
- %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
- %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
+ %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
+ %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
+ %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done
%endif
@@ -92,10 +94,10 @@
%{__rm} -rf %{buildroot}
topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
%{__make} \
- top_dir=${topdir} \
- DESTDIR=%{buildroot} \
- MKINSTALLDIRS="%{__mkdir_p}" \
- install
+ top_dir=${topdir} \
+ DESTDIR=%{buildroot} \
+ MKINSTALLDIRS="%{__mkdir_p}" \
+ install
%{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
@@ -103,9 +105,9 @@
%if %{selinux_module}
for selinuxvariant in %{selinux_variants}
do
- %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
+ %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+ %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
+ %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
done
# Hardlink identical policy module packages together
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
@@ -119,8 +121,8 @@
# Install SELinux policy modules
for selinuxvariant in %{selinux_variants}
do
- /usr/sbin/semodule -s ${selinuxvariant} -i \
- %{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
+ /usr/sbin/semodule -s ${selinuxvariant} -i \
+ %{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
done
# Fix up non-standard directory context
/sbin/restorecon %{_localstatedir}/run/mod_fcgid || :
@@ -128,15 +130,15 @@
%postun selinux
# Clean up after package removal
if [ $1 -eq 0 ]; then
- # Remove SELinux policy modules
- for selinuxvariant in %{selinux_variants}
- do
- /usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || :
- done
- # Clean up any remaining file contexts (shouldn't be any really)
- [ -d %{_localstatedir}/run/mod_fcgid ] && \
- /sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
+ # Remove SELinux policy modules
+ for selinuxvariant in %{selinux_variants}; do
+ /usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || :
+ done
+ # Clean up any remaining file contexts (shouldn't be any really)
+ [ -d %{_localstatedir}/run/mod_fcgid ] && \
+ /sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
fi
+exit 0
%endif
%files
@@ -155,6 +157,26 @@
%endif
%changelog
+* Fri Sep 14 2007 Paul Howarth <paul at city-fan.org> 2.2-1
+- Update to version 2.2
+- Make sure docs are encoded as UTF-8
+
+* Mon Sep 3 2007 Joe Orton <jorton at redhat.com> 2.1-6
+- rebuild for fixed 32-bit APR (#254241)
+
+* Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 2.1-5
+- Update source URL to point to downloads.sf.net rather than dl.sf.net
+- Upstream released new tarball without changing version number, though the
+ only change was in arch/win32/fcgid_pm_win.c, which is not used to build the
+ RPM package
+- Clarify license as GPL (unspecified/any version)
+- Unexpand tabs in spec
+- Add buildreq of gawk
+
+* Fri Aug 3 2007 Paul Howarth <paul at city-fan.org> 2.1-4
+- Add buildreq of pkgconfig, a missing dependency of both apr-devel and
+ apr-util-devel on FC5
+
* Fri Jun 15 2007 Paul Howarth <paul at city-fan.org> 2.1-3
- Major update of SELinux policy, supporting accessing data on NFS/CIFS shares
and a new boolean, httpd_fastcgi_can_sendmail, to allow connections to SMTP
@@ -208,9 +230,9 @@
* Tue Jul 4 2006 Paul Howarth <paul at city-fan.org> 1.09-10
- SELinux policy update:
* allow httpd to read httpd_fastcgi_content_t without having the
- httpd_builtin_scripting boolean set
+ | httpd_builtin_scripting boolean set
* allow httpd_fastcgi_script_t to read /etc/resolv.conf without
- having the httpd_can_network_connect boolean set
+ | having the httpd_can_network_connect boolean set
* Sun Jun 18 2006 Paul Howarth <paul at city-fan.org> 1.09-9
- Discard output of semodule in %%postun
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Feb 2007 14:20:03 -0000 1.4
+++ sources 15 Sep 2007 16:05:24 -0000 1.5
@@ -1 +1 @@
-68a6479e398a20577334f16a8b06c418 mod_fcgid.2.1.tar.gz
+ce7d7b16e69643dbd549d43d85025983 mod_fcgid.2.2.tar.gz
- Previous message (by thread): rpms/mod_fcgid/devel .cvsignore, 1.4, 1.5 mod_fcgid.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/pv/devel .cvsignore,1.3,1.4 pv.spec,1.2,1.3 sources,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list