packages: cgiwrap/cgiwrap.spec - turn on custom-html-error pages - rel 7 - ...

[shadzik]

Author: shadzik                      Date: Thu Apr  8 01:38:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- turn on custom-html-error pages
- rel 7
- add default .html sites with errors, users are adviced to change them

---- Files affected:
packages/cgiwrap:
   cgiwrap.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/cgiwrap/cgiwrap.spec
diff -u packages/cgiwrap/cgiwrap.spec:1.15 packages/cgiwrap/cgiwrap.spec:1.16
--- packages/cgiwrap/cgiwrap.spec:1.15	Wed Mar 10 17:27:44 2010
+++ packages/cgiwrap/cgiwrap.spec	Thu Apr  8 03:38:17 2010
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Bramka do bezpieczniejszego dostępu użytkowników do skryptów CGI
 Name:		cgiwrap
 Version:	4.1
-Release:	6
+Release:	7
 License:	GPL
 Group:		Utilities
 Source0:	http://dl.sourceforge.net/cgiwrap/%{name}-%{version}.tar.gz
 # Source0-md5:	14c02c57e4a0c6224951018e2f6b9211
 Patch0:		%{name}-bs.patch
 Patch1:		%{name}-phprc.patch
+Patch2:		%{name}-customhtmlerrors.patch
 URL:		http://cgiwrap.sourceforge.net/
 BuildRequires:	automake
 BuildRequires:	libmagic-devel
@@ -34,9 +35,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 %build
 install %{_datadir}/automake/config.* .
+%{__autoconf}
 %configure \
 	--with-perl=%{_bindir}/perl \
 	--with-php=%{_bindir}/php.cgi \
@@ -51,14 +54,16 @@
 	--with-cgi-dir=public_html \
 	--without-check-symlink \
 	--without-check-group \
-	--with-use-script-url
+	--with-use-script-url \
+	--with-quiet-errors \
+	--with-custom-html-errors=/etc/cgiwrap
 
 %{__make} \
 	LDFLAGS='%{rpmldflags} -lmagic'
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_cgibindir}
+install -d $RPM_BUILD_ROOT{%{_cgibindir},%{_sysconfdir}/cgiwrap}
 
 install cgiwrap $RPM_BUILD_ROOT%{_cgibindir}
 install cgiwrap $RPM_BUILD_ROOT%{_cgibindir}/cgiwrapd
@@ -67,6 +72,16 @@
 install cgiwrap $RPM_BUILD_ROOT%{_cgibindir}/php-cgiwrap
 install cgiwrap $RPM_BUILD_ROOT%{_cgibindir}/php-cgiwrapd
 
+echo "The cgiwrap executable(s) were not made setuid-root. This is required" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/CGIWrapNotSetUID.html
+echo "The userid that the web server ran cgiwrap as does not match the userid that was configured into the cgiwrap executable" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/ServerUserMismatch.html
+echo "CGIWrap was configured with a server userid that does not exist" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/ServerUserNotFound.html
+echo "Execution is not permitted" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/ExecutionNotPermitted.html
+echo "CGIWrap access control mechanism denied execution of this script" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/AccessControl.html
+echo "CGIWrap encountered a system error" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/SystemError.html
+echo "CGIWrap encountered an error while attempting to execute this script" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/ExecFailed.html
+echo "CGIWrap was unable to find the user" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/NoSuchUser.html
+echo "The specified user does not have a script directory set up" > $RPM_BUILD_ROOT%{_sysconfdir}/cgiwrap/NoScriptDir.html
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,6 +89,8 @@
 %defattr(644,root,root,755)
 %doc htdocs/*
 %attr(4755,root,root) %{_cgibindir}/*
+%dir %{_sysconfdir}/cgiwrap
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cgiwrap/*.html
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -81,6 +98,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/04/08 01:38:17  shadzik
+- turn on custom-html-error pages
+- rel 7
+- add default .html sites with errors, users are adviced to change them
+
 Revision 1.15  2010/03/10 16:27:44  shadzik
 - make SCRIPT_NAME out of SCRIPT_URI
 - rel 6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cgiwrap/cgiwrap.spec?r1=1.15&r2=1.16&f=u