Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29503
Modified Files:
apache2.info apache2.patch
Log Message:
Add new module, systemusers to reenable the functions removed by dmacks changes
that cause me endless pain since I forgot about it being removed. It's not
enabled by default so it won't hurt anything, a2enmod systemusers to enable.
And Added a better check for the interactive warning, so we don't get borthered
by it on every single upgrade
Index: apache2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/apache2.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- apache2.info 9 Sep 2008 04:27:07 -0000 1.23
+++ apache2.info 6 Oct 2008 15:57:17 -0000 1.24
@@ -1,6 +1,6 @@
Package: apache2
Version: 2.2.9
-Revision: 3
+Revision: 4
###
Replaces: apache2, apache2-ssl
Provides: httpd
@@ -11,7 +11,7 @@
Source-MD5: 80d3754fc278338033296f0d41ef2c04
###
PatchFile: %n.patch
-PatchFile-MD5: ac58f80930410493f89f80e7900132a4
+PatchFile-MD5: 1b3754c5f2cdf7e83f94db0e5a7e6f03
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -396,19 +396,22 @@
# set -e # implicit in fink's .deb scripts
if [ -f %p/etc/apache2/httpd.conf ]; then
- echo ""
- echo "WARNING: the modules and base directory have changed. This will"
- echo " affect the logs, htdocs, cgi-bin, etc directories. You"
- echo " *MUST* update your config files, by choosing 'Y' at the"
- echo " conf file update prompt, or by updating your current
conf"
- echo " conf files to reflect the changes."
- echo ""
- /bin/echo "Do you want to continue [Y/n] ? \c";
- read CONTINUECHOICE
- case $CONTINUECHOICE in
- y|Y|'' ) ;;
- * ) exit 1 ;;
- esac
+ # Check to see it's not just a place holder
+ if [ `stat -c %%s %p/etc/apache2/httpd.conf` -gt 368 ]; then
+ echo ""
+ echo "WARNING: the modules and base directory have changed.
This will"
+ echo " affect the logs, htdocs, cgi-bin, etc
directories. You"
+ echo " *MUST* update your config files, by choosing
'Y' at the"
+ echo " conf file update prompt, or by updating your
current conf"
+ echo " conf files to reflect the changes."
+ echo ""
+ /bin/echo "Do you want to continue [Y/n] ? \c";
+ read CONTINUECHOICE
+ case $CONTINUECHOICE in
+ y|Y|'' ) ;;
+ * ) exit 1 ;;
+ esac
+ fi
fi
exit 0
<<
Index: apache2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/apache2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- apache2.patch 9 Sep 2008 04:27:07 -0000 1.5
+++ apache2.patch 6 Oct 2008 15:57:17 -0000 1.6
@@ -2938,6 +2938,16 @@
+++ httpd-2.2.6/fink/config-dir/mods-available/userdir.load 2007-12-05
21:31:57.000000000 -0700
@@ -0,0 +1 @@
+LoadModule userdir_module @FINKPREFIX@/lib/apache2/modules/mod_userdir.so
+diff -ruN httpd-2.2.6.orig/fink/config-dir/mods-available/systemusers.conf
httpd-2.2.6/fink/config-dir/mods-available/systemusers.conf
+--- httpd-2.2.6.orig/fink/config-dir/mods-available/systemusers.conf
1969-12-31 17:00:00.000000000 -0700
++++ httpd-2.2.6/fink/config-dir/mods-available/systemusers.conf
2007-12-05 21:31:57.000000000 -0700
+@@ -0,0 +1 @@
++Include /etc/apache2/users/
+diff -ruN httpd-2.2.6.orig/fink/config-dir/mods-available/systemusers.load
httpd-2.2.6/fink/config-dir/mods-available/systemusers.load
+--- httpd-2.2.6.orig/fink/config-dir/mods-available/systemusers.load
1969-12-31 17:00:00.000000000 -0700
++++ httpd-2.2.6/fink/config-dir/mods-available/systemusers.load
2007-12-05 21:31:57.000000000 -0700
+@@ -0,0 +1 @@
++
diff -ruN httpd-2.2.6.orig/fink/config-dir/mods-available/usertrack.load
httpd-2.2.6/fink/config-dir/mods-available/usertrack.load
--- httpd-2.2.6.orig/fink/config-dir/mods-available/usertrack.load
1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.2.6/fink/config-dir/mods-available/usertrack.load 2007-12-05
21:32:04.000000000 -0700
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
