[Lunar-commits] <moonbase> apache2: rename it httpd module. It's more appropiate.
Florin Braescu
florin at lunar-linux.org
Mon Feb 20 21:32:41 CET 2012
commit 7b46b65e8ff61155424a7b710075a3ed818d0244
Author: Florin Braescu <florin at lunar-linux.org>
Date: Mon Feb 20 21:32:41 2012 +0100
apache2: rename it httpd module. It's more appropiate.
---
aliases | 2 +-
mail/mailman/DEPENDS | 2 +-
mail/squirrelmail/DEPENDS | 2 +-
python/mod_python/DEPENDS | 2 +-
web/apache2/BUILD | 41 -----------------------------------------
web/apache2/CONFIGURE | 10 ----------
web/apache2/CONFLICTS | 2 --
web/apache2/DEPENDS | 14 --------------
web/apache2/DETAILS | 17 -----------------
web/apache2/POST_INSTALL | 1 -
web/apache2/init.d/httpd | 44 --------------------------------------------
web/apache2/services | 6 ------
web/httpd/BUILD | 41 +++++++++++++++++++++++++++++++++++++++++
web/httpd/CONFIGURE | 10 ++++++++++
web/httpd/CONFLICTS | 2 ++
web/httpd/DEPENDS | 14 ++++++++++++++
web/httpd/DETAILS | 15 +++++++++++++++
web/httpd/POST_INSTALL | 1 +
web/httpd/init.d/httpd | 44 ++++++++++++++++++++++++++++++++++++++++++++
web/httpd/services | 6 ++++++
web/mod_mono/DEPENDS | 2 +-
web/mod_perl/DEPENDS | 2 +-
web/mod_ruby/DEPENDS | 2 +-
web/mod_tidy/DEPENDS | 3 ++-
24 files changed, 142 insertions(+), 143 deletions(-)
diff --git a/aliases b/aliases
index 9544821..f21fb50 100644
--- a/aliases
+++ b/aliases
@@ -1,4 +1,4 @@
-%APACHE:apache2 apache apache-mod_ssl
+%APACHE:httpd apache apache-mod_ssl
%GECKO_RENDERER:xulrunner thunderbird seamonkey xulrunner5
%JAVA_SDK:sun-jdk sun-jre
%LISP:clisp gcl
diff --git a/mail/mailman/DEPENDS b/mail/mailman/DEPENDS
index d82bc10..bdcb11f 100644
--- a/mail/mailman/DEPENDS
+++ b/mail/mailman/DEPENDS
@@ -1,6 +1,6 @@
depends Python
-optional_depends apache2 "" "" "(a web server is required)"
+optional_depends httpd "" "" "(a web server is required)"
optional_depends apache "" "" "(a web server is required)"
optional_depends apache-mod_ssl "" "" "(a web server is required)"
optional_depends postfix "" "" "(an MTA is required)"
diff --git a/mail/squirrelmail/DEPENDS b/mail/squirrelmail/DEPENDS
index 8599269..785430a 100644
--- a/mail/squirrelmail/DEPENDS
+++ b/mail/squirrelmail/DEPENDS
@@ -1,2 +1,2 @@
-depends apache2
+depends httpd
depends %PHP
diff --git a/python/mod_python/DEPENDS b/python/mod_python/DEPENDS
index f0c3d3a..0f6a771 100644
--- a/python/mod_python/DEPENDS
+++ b/python/mod_python/DEPENDS
@@ -1,2 +1,2 @@
-depends apache2
+depends httpd
depends Python
diff --git a/web/apache2/BUILD b/web/apache2/BUILD
deleted file mode 100644
index cbcf5e9..0000000
--- a/web/apache2/BUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-
- OPTS="--prefix=/etc/httpd \
- --sysconfdir=/etc/httpd/conf \
- --exec-prefix=/usr \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/libexec/httpd/modules \
- --datadir=/var/www \
- --sharedstatedir=/var/run/httpd \
- --localstatedir=/var \
- --libdir=/usr/lib \
- --includedir=/usr/include/httpd \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --enable-so \
- --enable-rewrite \
- --enable-mime-magic \
- --enable-exception-hook \
- --enable-layout=GNU \
- --enable-usertrack \
- --with-apr=/usr \
- --with-apr-util=/usr \
- $OPTS"
-
-
- if [ "$USE_WORKER" == "n" ]; then
- OPTS+=" --with-mpm=prefork"
- else
- OPTS+=" --with-mpm=worker"
- fi
-
- echo "CFLAGS=$CFLAGS" &&
- echo "OPTS=$OPTS" &&
- ./configure $OPTS &&
- default_make &&
-
- if [ ! -e /usr/sbin/httpsd ] ; then
- ln -s httpd /usr/sbin/httpsd
- fi
-
-) > $C_FIFO 2>&1
diff --git a/web/apache2/CONFIGURE b/web/apache2/CONFIGURE
deleted file mode 100644
index c9db5d2..0000000
--- a/web/apache2/CONFIGURE
+++ /dev/null
@@ -1,10 +0,0 @@
-mquery ENABLE_SSL "Enable TLS/SSL ?" y --enable-ssl
-mquery ENABLE_PROXY "Enable Proxy support ?" y "--enable-proxy --enable-proxy-connect --enable-proxy-http --enable-proxy-ftp"
-mquery ENABLE_SUEXEC "Enable suexec ?" y "--enable-suexec --with-suexec --with-suexec-caller=nobody --with-suexec-docroot=/var/www --with-suexec-logfile=/var/log/httpd/suexec --with-suexec-bin=/usr/sbin/suexec --with-suexec-uidmin=500 --with-suexec-gidmin=500"
-mquery ENABLE_DAV "Enable WebDav ?" n "--enable-dav --enable-dav-fs --enable-dav-lock"
-mquery ENABLE_DEFLATE "Enable deflate transfer encoding support ?" n --enable-deflate
-mquery ENABLE_CGID "Enable cgid ?" y --enable-cgid --enable-cgi
-mquery ENABLE_INFO "Enable Info ?" n --enable-info
-mquery ENABLE_VHOST "Enable mass virtual hosting module ?" n --enable-vhost-alias
-mquery ENABLE_SPELL "Enable spelling ?" n --enable-spelling
-mquery USE_WORKER "Use worker threading model (for 2.6+nptl threading) ?" n
diff --git a/web/apache2/CONFLICTS b/web/apache2/CONFLICTS
deleted file mode 100644
index dfb9084..0000000
--- a/web/apache2/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts apache-mod_ssl
-conflicts apache
diff --git a/web/apache2/DEPENDS b/web/apache2/DEPENDS
deleted file mode 100644
index e085fe8..0000000
--- a/web/apache2/DEPENDS
+++ /dev/null
@@ -1,14 +0,0 @@
-depends expat
-depends apr-util
-
-optional_depends "db" \
- "--with-berkeley-db" \
- "--without-berkeley-db" \
- "for berkely db support"
-
-optional_depends "gdbm" \
- "--with-gdbm" \
- "--without-gdbm" \
- "for gdbm support"
-
-
diff --git a/web/apache2/DETAILS b/web/apache2/DETAILS
deleted file mode 100644
index 2291978..0000000
--- a/web/apache2/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
- MODULE=apache2
- VERSION=2.4.1
- BASENAME=httpd
- SOURCE=$BASENAME-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$BASENAME-$VERSION
- SOURCE_URL=http://www.apache.org/dist/$BASENAME
- SOURCE_VFY=sha1:23beffce77529971e09d0fb1e760cadf80afa4e6
- WEB_SITE=http://www.apache.org
- ENTERED=20020710
- UPDATED=20120220
- SHORT="A popular HTTP server"
-
-cat << EOF
-Apache is the world's most popular HTTP server, being quite possibly
-the best around in terms of functionality, efficiency, security and
-speed. This is Apache's v2 of the http server.
-EOF
diff --git a/web/apache2/POST_INSTALL b/web/apache2/POST_INSTALL
deleted file mode 100644
index 323c4fb..0000000
--- a/web/apache2/POST_INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-if module_installed php ; then lin -c php ; fi
diff --git a/web/apache2/init.d/httpd b/web/apache2/init.d/httpd
deleted file mode 100755
index 5e295b0..0000000
--- a/web/apache2/init.d/httpd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Startup script for the Apache Web Server
-#
-# chkconfig: 345 85 15
-# description: Apache is a World Wide Web server. It is used to serve \
-# HTML files and CGI.
-# processname: httpd
-# pidfile: /var/run/httpd.pid
-# config: /etc/httpd/conf/access.conf
-# config: /etc/httpd/conf/httpd.conf
-# config: /etc/httpd/conf/srm.conf
-# config: /etc/httpd/conf/ssl.conf
-
-# this passes the default startup stuff nicely:
-
-function graceful () {
- $PROCESS -k graceful
-}
-function startssl () {
- $PROCESS -f /etc/httpd/conf/ssl.conf -k start -DSSL &&
- echo -en "Starting apache+SSL:$RESULT_OK" ||
- echo -en "Starting apache+SSL:$RESULT_FAIL"
-}
-
-function configtest () {
- $PROCESS -t
-}
-
-function reload () {
- # apache does NOT accept HUP or INT!
- $0 restart
-}
-
-function fullstatus () {
- [ -x `which lynx` ] && lynx http://127.0.0.1:80/server-status || echo "No fullstatus available (need lynx)"
-}
-
-function usage () {
- echo "Usage: $0 {start|startssl|stop|graceful|restart|reload|probe|status|fullstatus}"
-}
-
-. /lib/lsb/init-functions $1
-
diff --git a/web/apache2/services b/web/apache2/services
deleted file mode 100644
index fbb18f2..0000000
--- a/web/apache2/services
+++ /dev/null
@@ -1,6 +0,0 @@
-www 80/tcp
-www 80/udp
-http 80/tcp
-http 80/udp
-https 443/tcp
-https 443/udp
diff --git a/web/httpd/BUILD b/web/httpd/BUILD
new file mode 100644
index 0000000..cbcf5e9
--- /dev/null
+++ b/web/httpd/BUILD
@@ -0,0 +1,41 @@
+(
+
+ OPTS="--prefix=/etc/httpd \
+ --sysconfdir=/etc/httpd/conf \
+ --exec-prefix=/usr \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/libexec/httpd/modules \
+ --datadir=/var/www \
+ --sharedstatedir=/var/run/httpd \
+ --localstatedir=/var \
+ --libdir=/usr/lib \
+ --includedir=/usr/include/httpd \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --enable-so \
+ --enable-rewrite \
+ --enable-mime-magic \
+ --enable-exception-hook \
+ --enable-layout=GNU \
+ --enable-usertrack \
+ --with-apr=/usr \
+ --with-apr-util=/usr \
+ $OPTS"
+
+
+ if [ "$USE_WORKER" == "n" ]; then
+ OPTS+=" --with-mpm=prefork"
+ else
+ OPTS+=" --with-mpm=worker"
+ fi
+
+ echo "CFLAGS=$CFLAGS" &&
+ echo "OPTS=$OPTS" &&
+ ./configure $OPTS &&
+ default_make &&
+
+ if [ ! -e /usr/sbin/httpsd ] ; then
+ ln -s httpd /usr/sbin/httpsd
+ fi
+
+) > $C_FIFO 2>&1
diff --git a/web/httpd/CONFIGURE b/web/httpd/CONFIGURE
new file mode 100644
index 0000000..c9db5d2
--- /dev/null
+++ b/web/httpd/CONFIGURE
@@ -0,0 +1,10 @@
+mquery ENABLE_SSL "Enable TLS/SSL ?" y --enable-ssl
+mquery ENABLE_PROXY "Enable Proxy support ?" y "--enable-proxy --enable-proxy-connect --enable-proxy-http --enable-proxy-ftp"
+mquery ENABLE_SUEXEC "Enable suexec ?" y "--enable-suexec --with-suexec --with-suexec-caller=nobody --with-suexec-docroot=/var/www --with-suexec-logfile=/var/log/httpd/suexec --with-suexec-bin=/usr/sbin/suexec --with-suexec-uidmin=500 --with-suexec-gidmin=500"
+mquery ENABLE_DAV "Enable WebDav ?" n "--enable-dav --enable-dav-fs --enable-dav-lock"
+mquery ENABLE_DEFLATE "Enable deflate transfer encoding support ?" n --enable-deflate
+mquery ENABLE_CGID "Enable cgid ?" y --enable-cgid --enable-cgi
+mquery ENABLE_INFO "Enable Info ?" n --enable-info
+mquery ENABLE_VHOST "Enable mass virtual hosting module ?" n --enable-vhost-alias
+mquery ENABLE_SPELL "Enable spelling ?" n --enable-spelling
+mquery USE_WORKER "Use worker threading model (for 2.6+nptl threading) ?" n
diff --git a/web/httpd/CONFLICTS b/web/httpd/CONFLICTS
new file mode 100644
index 0000000..dfb9084
--- /dev/null
+++ b/web/httpd/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts apache-mod_ssl
+conflicts apache
diff --git a/web/httpd/DEPENDS b/web/httpd/DEPENDS
new file mode 100644
index 0000000..e085fe8
--- /dev/null
+++ b/web/httpd/DEPENDS
@@ -0,0 +1,14 @@
+depends expat
+depends apr-util
+
+optional_depends "db" \
+ "--with-berkeley-db" \
+ "--without-berkeley-db" \
+ "for berkely db support"
+
+optional_depends "gdbm" \
+ "--with-gdbm" \
+ "--without-gdbm" \
+ "for gdbm support"
+
+
diff --git a/web/httpd/DETAILS b/web/httpd/DETAILS
new file mode 100644
index 0000000..aaca5e1
--- /dev/null
+++ b/web/httpd/DETAILS
@@ -0,0 +1,15 @@
+ MODULE=httpd
+ VERSION=2.4.1
+ SOURCE=$MODULE-$VERSION.tar.bz2
+ SOURCE_URL=http://www.apache.org/dist/$BASENAME
+ SOURCE_VFY=sha1:23beffce77529971e09d0fb1e760cadf80afa4e6
+ WEB_SITE=http://www.apache.org
+ ENTERED=20020710
+ UPDATED=20120220
+ SHORT="A popular HTTP server"
+
+cat << EOF
+Apache is the world's most popular HTTP server, being quite possibly
+the best around in terms of functionality, efficiency, security and
+speed. This is Apache's v2 of the http server.
+EOF
diff --git a/web/httpd/POST_INSTALL b/web/httpd/POST_INSTALL
new file mode 100644
index 0000000..323c4fb
--- /dev/null
+++ b/web/httpd/POST_INSTALL
@@ -0,0 +1 @@
+if module_installed php ; then lin -c php ; fi
diff --git a/web/httpd/init.d/httpd b/web/httpd/init.d/httpd
new file mode 100755
index 0000000..5e295b0
--- /dev/null
+++ b/web/httpd/init.d/httpd
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Startup script for the Apache Web Server
+#
+# chkconfig: 345 85 15
+# description: Apache is a World Wide Web server. It is used to serve \
+# HTML files and CGI.
+# processname: httpd
+# pidfile: /var/run/httpd.pid
+# config: /etc/httpd/conf/access.conf
+# config: /etc/httpd/conf/httpd.conf
+# config: /etc/httpd/conf/srm.conf
+# config: /etc/httpd/conf/ssl.conf
+
+# this passes the default startup stuff nicely:
+
+function graceful () {
+ $PROCESS -k graceful
+}
+function startssl () {
+ $PROCESS -f /etc/httpd/conf/ssl.conf -k start -DSSL &&
+ echo -en "Starting apache+SSL:$RESULT_OK" ||
+ echo -en "Starting apache+SSL:$RESULT_FAIL"
+}
+
+function configtest () {
+ $PROCESS -t
+}
+
+function reload () {
+ # apache does NOT accept HUP or INT!
+ $0 restart
+}
+
+function fullstatus () {
+ [ -x `which lynx` ] && lynx http://127.0.0.1:80/server-status || echo "No fullstatus available (need lynx)"
+}
+
+function usage () {
+ echo "Usage: $0 {start|startssl|stop|graceful|restart|reload|probe|status|fullstatus}"
+}
+
+. /lib/lsb/init-functions $1
+
diff --git a/web/httpd/services b/web/httpd/services
new file mode 100644
index 0000000..fbb18f2
--- /dev/null
+++ b/web/httpd/services
@@ -0,0 +1,6 @@
+www 80/tcp
+www 80/udp
+http 80/tcp
+http 80/udp
+https 443/tcp
+https 443/udp
diff --git a/web/mod_mono/DEPENDS b/web/mod_mono/DEPENDS
index 14aa456..091f597 100644
--- a/web/mod_mono/DEPENDS
+++ b/web/mod_mono/DEPENDS
@@ -1,2 +1,2 @@
-depends apache2
+depends httpd
depends xsp
diff --git a/web/mod_perl/DEPENDS b/web/mod_perl/DEPENDS
index f2e571e..3917ed7 100644
--- a/web/mod_perl/DEPENDS
+++ b/web/mod_perl/DEPENDS
@@ -1,2 +1,2 @@
depends perl
-depends apache2
+depends httpd
diff --git a/web/mod_ruby/DEPENDS b/web/mod_ruby/DEPENDS
index ce13574..90cbd26 100644
--- a/web/mod_ruby/DEPENDS
+++ b/web/mod_ruby/DEPENDS
@@ -1,2 +1,2 @@
depends eruby
-depends apache2
+depends httpd
diff --git a/web/mod_tidy/DEPENDS b/web/mod_tidy/DEPENDS
index fbd4693..a740305 100644
--- a/web/mod_tidy/DEPENDS
+++ b/web/mod_tidy/DEPENDS
@@ -1 +1,2 @@
-depends apache2
+depends httpd
+
More information about the Lunar-commits
mailing list