Update of /cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23867/main/finkinfo/web
Modified Files:
apache2.info apache2.patch
Log Message:
Backported latest versions from 10.3 that link to db42.
The recode php4 module had to be removed since it didn't build.
Maintainer set to none since TheSin is no longer maintaining 10.2-gcc3.3.
Index: apache2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/web/apache2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache2.info 18 Nov 2003 10:00:28 -0000 1.3
+++ apache2.info 24 Mar 2004 18:22:06 -0000 1.4
@@ -1,11 +1,11 @@
Package: apache2
Version: 2.0.48
-Revision: 2
+Revision: 5
###
Conflicts: apache, apache2 (<= 2.0.47-1), apache2-ssl
Replaces: apache, apache2 (<= 2.0.47-1), apache2-ssl
Provides: httpd
-BuildDepends: gawk, apr (>= 0.9.5-1), cyrus-sasl2-dev, db41 (>= 4.1.25-15), expat (>=
1.95.6-2), gdbm3, dlcompat-dev
+BuildDepends: gawk, apr (>= 0.9.5-2), db42 (>= 4.2.52-2), expat (>= 1.95.6-2), gdbm3,
dlcompat-dev
Depends: %N-mpm-worker (= %v-%r) | %N-mpm-perchild (= %v-%r) | %N-mpm-prefork (=
%v-%r) | %N-mpm-leader (= %v-%r) | %N-mpm-threadpool (= %v-%r), %N-common (= %v-%r)
###
CustomMirror: <<
@@ -84,6 +84,7 @@
install -m 664 httpd.conf.fink %i/etc/apache2/httpd.conf
rm -rf %i/etc/apche2/httpd-std.conf
install -m 664 httpd-std.conf.fink %i/etc/apache2/httpd-std.conf
+ install -m 664 httpd-server.conf.fink %i/etc/apache2/httpd-server.conf
rm -rf %i/include/apache2/ssl*.h
rm -rf %i/include/apache2/mod_ssl.h
rm -rf %i/var/apache2/manual/ssl
@@ -93,7 +94,7 @@
SplitOff: <<
Package: %N-common
Description: Apache2 Common Files (conf, icon, etc)
- Depends: daemonic, cyrus-sasl2-shlibs (>= 2.1.15-11), db41-shlibs (>= 4.1.25-15),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, apr-shlibs (>= 0.9.5-1), dlcompat-shlibs
+ Depends: daemonic, db42-shlibs (>= 4.2.52-2), expat-shlibs (>= 1.95.6-2),
gdbm3-shlibs, apr-shlibs (>= 0.9.5-2), dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, apache2-ssl-common, apache2-dev (<=
2.0.47-4)
Conflicts: apache2 (<= 2.0.47-1), apache, apache2-ssl-common
Files: <<
@@ -159,6 +160,7 @@
%p/etc/apache2/highperformance-std.conf
%p/etc/apache2/highperformance.conf
%p/etc/apache2/httpd-std.conf
+ %p/etc/apache2/httpd-server.conf
%p/etc/apache2/httpd.conf
%p/etc/apache2/magic
%p/etc/apache2/mime.types
@@ -179,7 +181,6 @@
<<
PreInstScript: <<
if [ -f %p/etc/apache2/httpd.conf ]; then
- a=foo
echo ""
echo "WARNING: the modules and base directory have changed. This will"
echo " affect the logs, htdocs, cgi-bin, etc directories. You"
@@ -187,25 +188,19 @@
echo " conf file update prompt, or by updating your current conf"
echo " conf files to reflect the changes."
echo ""
- while [ "$a" = "foo" ]; do
- echo -n "Do you want to continue [Y/n] ? "
- read a
- case $a in
- Y*) a=y;;
- y*) a=y;;
- N*) a=n;;
- n*) a=n;;
- *) a=foo
- echo "===> Try again!";;
- esac
- done
- if [ "$a" = "n" ]; then
- exit 1
- fi
+ echo -n "Do you want to continue [Y/n] ? ";
+ read CONTINUECHOICE
+ case $CONTINUECHOICE in
+ y|Y|'' ) ;;
+ * ) exit 1 ;;
+ esac
fi
-
exit 0
<<
+ DescPort: <<
+ If you are running OSX Server copy %p/etc/apache2/httpd-server.conf to
+ %p/etc/apache2/httpd.conf.
+ <<
<<
###
SplitOff2: <<
@@ -260,7 +255,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -298,7 +293,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -336,7 +331,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -374,7 +369,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -412,7 +407,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -450,7 +445,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -488,7 +483,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -526,7 +521,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -564,7 +559,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -602,7 +597,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -640,7 +635,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -678,7 +673,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -716,7 +711,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -754,7 +749,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -792,7 +787,7 @@
$APXS -e -a -n $MODULENAME $MODULE
%p/sbin/apachectl graceful
<<
- PreRmScript: <<
+ PreRmScript: <<
if [ "$1" != "remove" -a "$1" != "purge" ]; then
exit 0
fi
@@ -1039,6 +1034,7 @@
###
SplitOff25: <<
Package: %N-mpm-prefork
+ Provides: %N-nothread
Description: Apache2 Server Binary - [MPM PREFORK]
DescDetail: <<
Implements a non-threaded, pre-forking web server
@@ -1050,7 +1046,7 @@
non-thread-safe libraries. It is also the best MPM for isolating each
request, so that a problem with a single request will not affect any other.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-shlibs (>= 4.1.25-15), apr-shlibs
(>= 0.9.5-1), %N-common (= %v-%r), expat-shlibs (>= 1.95.6-2), gdbm3-shlibs,
dlcompat-shlibs
+ Depends: db42-shlibs (>= 4.2.52-2), apr-shlibs (>= 0.9.5-2), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Files: <<
@@ -1061,7 +1057,7 @@
PostInstScript: <<
update-alternatives --install %p/sbin/httpd httpd %p/sbin/httpd-prefork 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp
%p/lib/apache2/modules/httpd.exp-prefork 60
- <<
+ <<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
update-alternatives --remove httpd %p/sbin/httpd-prefork
@@ -1098,7 +1094,7 @@
This mpm is still highly experimental, and should be used with care.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-shlibs (>= 4.1.25-15), apr-shlibs
(>= 0.9.5-1), %N-common (= %v-%r), expat-shlibs (>= 1.95.6-2), gdbm3-shlibs,
dlcompat-shlibs
+ Depends: db42-shlibs (>= 4.2.52-2), apr-shlibs (>= 0.9.5-2), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-prefork,
%N-mpm-leader, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perfork,
%N-mpm-leader, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Files: <<
@@ -1109,7 +1105,7 @@
PostInstScript: <<
update-alternatives --install %p/sbin/httpd httpd %p/sbin/httpd-perchild 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp
%p/lib/apache2/modules/httpd.exp-perchild 60
- <<
+ <<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
update-alternatives --remove httpd %p/sbin/httpd-perchild
@@ -1133,7 +1129,7 @@
process-based server by keeping multiple processes available, each with
many threads.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-shlibs (>= 4.1.25-15), apr-shlibs
(>= 0.9.5-1), %N-common (= %v-%r), expat-shlibs (>= 1.95.6-2), gdbm3-shlibs,
dlcompat-shlibs
+ Depends: db42-shlibs (>= 4.2.52-2), apr-shlibs (>= 0.9.5-2), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-prefork, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-prefork, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Files: <<
@@ -1144,7 +1140,7 @@
PostInstScript: <<
update-alternatives --install %p/sbin/httpd httpd %p/sbin/httpd-worker 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp
%p/lib/apache2/modules/httpd.exp-worker 60
- <<
+ <<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
update-alternatives --remove httpd %p/sbin/httpd-worker
@@ -1165,7 +1161,7 @@
received as much testing. An experimental variant of the standard worker
MPM.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-shlibs (>= 4.1.25-15), apr-shlibs
(>= 0.9.5-1), %N-common (= %v-%r), expat-shlibs (>= 1.95.6-2), gdbm3-shlibs,
dlcompat-shlibs
+ Depends: db42-shlibs (>= 4.2.52-2), apr-shlibs (>= 0.9.5-2), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-prefork, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-prefork, %N-mpm-threadpool, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Files: <<
@@ -1176,7 +1172,7 @@
PostInstScript: <<
update-alternatives --install %p/sbin/httpd httpd %p/sbin/httpd-leader 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp
%p/lib/apache2/modules/httpd.exp-leader 60
- <<
+ <<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
update-alternatives --remove httpd %p/sbin/httpd-leader
@@ -1208,7 +1204,7 @@
threadpool code is useful primarily as a research platform. For
general-purpose use and for any production environments, use worker instead.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-shlibs (>= 4.1.25-15), apr-shlibs
(>= 0.9.5-1), %N-common (= %v-%r), expat-shlibs (>= 1.95.6-2), gdbm3-shlibs,
dlcompat-shlibs
+ Depends: db42-shlibs (>= 4.2.52-2), apr-shlibs (>= 0.9.5-2), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-prefork, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-prefork, apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild,
apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-ssl-mpm-prefork
Files: <<
@@ -1219,7 +1215,7 @@
PostInstScript: <<
update-alternatives --install %p/sbin/httpd httpd %p/sbin/httpd-threadpool 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp
%p/lib/apache2/modules/httpd.exp-threadpool 60
- <<
+ <<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
update-alternatives --remove httpd %p/sbin/httpd-threadpool
@@ -1261,4 +1257,4 @@
<<
License: BSD
Homepage: http://www.apache.org
-Maintainer: Sonic McTails <[EMAIL PROTECTED]>, Dustin Sias <[EMAIL PROTECTED]>
+Maintainer: None <[EMAIL PROTECTED]>
Index: apache2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/web/apache2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache2.patch 18 Nov 2003 10:00:30 -0000 1.3
+++ apache2.patch 24 Mar 2004 18:22:06 -0000 1.4
@@ -2449,3 +2449,1115 @@
fi
if test -n "$old_archive_from_expsyms_cmds"; then
+diff -ruN httpd-2.0.48.orig/httpd-server.conf.fink httpd-2.0.48/httpd-server.conf.fink
+--- httpd-2.0.48.orig/httpd-server.conf.fink Wed Dec 31 17:00:00 1969
++++ httpd-2.0.48/httpd-server.conf.fink Fri Oct 31 10:33:25 2003
+@@ -0,0 +1,1108 @@
++#
++# Based upon the NCSA server configuration files originally by Rob McCool.
++#
++# This is the main Apache server configuration file. It contains the
[...1084 lines suppressed...]
++# configuration.
++
++#
++# Use name-based virtual hosting.
++#
++#NameVirtualHost *
++
++#
++# VirtualHost example:
++# Almost any Apache directive may go into a VirtualHost container.
++# The first VirtualHost section is used for requests without a known
++# server name.
++#
++#<VirtualHost *>
++# ServerAdmin [EMAIL PROTECTED]
++# DocumentRoot /www/docs/dummy-host.example.com
++# ServerName dummy-host.example.com
++# ErrorLog logs/dummy-host.example.com-error_log
++# CustomLog logs/dummy-host.example.com-access_log common
++#</VirtualHost>
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
