Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (36f6804738b861bb87afe1e1e427085a7696a7ca)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (36f6804738b861bb87afe1e1e427085a7696a7ca)
  • Date: Tue, 27 May 2008 16:07:27 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT grace.yuugen.jp>:

ChangeLog | 3 ++
http/apache-mod_ssl/CONFLICTS | 11 ++++++--
http/apache-mod_ssl/HISTORY | 3 ++
http/apache/CONFLICTS | 11 ++++++--
http/apache/HISTORY | 3 ++
http/apache2/CONFLICTS | 11 ++++++--
http/apache2/HISTORY | 3 ++
http/apache22/CONFLICTS | 11 ++++++--
http/apache22/HISTORY | 4 +++
http/apache22/PREPARE | 3 --
http/xshttpd/BUILD | 21 ++++++++++++++++
http/xshttpd/CONFIGURE | 49
+++++++++++++++++++++++++++++++++++++++
http/xshttpd/CONFLICTS | 6 ++++
http/xshttpd/DEPENDS | 31 ++++++++++++++++++++++++
http/xshttpd/DETAILS | 45 +++++++++++++++++++++++++++++++++++
http/xshttpd/EXPORTS | 1
http/xshttpd/FINAL | 13 ++++++++++
http/xshttpd/HISTORY | 9 +++++++
http/xshttpd/PREPARE | 1
http/xshttpd/PROVIDES | 1
http/xshttpd/init.d/xshttpd | 33 ++++++++++++++++++++++++++
http/xshttpd/init.d/xshttpd.conf | 6 ++++
http/xshttpd/johans.gpg |binary
23 files changed, 265 insertions(+), 14 deletions(-)

New commits:
commit dab09243bb40801c0bd253d1b815f095479fd3c3
Author: Remko van der Vossen <wich AT grace.yuugen.jp>
Commit: Remko van der Vossen <wich AT grace.yuugen.jp>

http/apache22: conflicts with new spell xshttpd

commit cf3154f5085d1842d696c60725f81a47cb04dbb7
Author: Remko van der Vossen <wich AT grace.yuugen.jp>
Commit: Remko van der Vossen <wich AT grace.yuugen.jp>

http/apache2: conflicts with new spell xshttpd

commit 87628682df07acc73249fbb540c327e7c929479f
Author: Remko van der Vossen <wich AT grace.yuugen.jp>
Commit: Remko van der Vossen <wich AT grace.yuugen.jp>

http/apache-mod_ssl: conflicts with new spell xshttpd

commit 6d47f14b0a7af4899e718c118395c554e03c9536
Author: Remko van der Vossen <wich AT grace.yuugen.jp>
Commit: Remko van der Vossen <wich AT grace.yuugen.jp>

http/apache: conflicts with new spell xshttpd

commit 4cfd58b4e00ddd06758d29367f229a857f34b086
Author: Remko van der Vossen <wich AT grace.yuugen.jp>
Commit: Remko van der Vossen <wich AT grace.yuugen.jp>

http/xshttpd: new spell, fast, secure webserver

diff --git a/ChangeLog b/ChangeLog
index 02ed4c7..ddab886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * http/xshttpd: new spell, fast, secure webserver
+
2008-05-27 Ladislav Hagara <hgr AT vabo.cz>
* doc/xmltoman: new spell, an XML to man page converter

diff --git a/http/apache-mod_ssl/CONFLICTS b/http/apache-mod_ssl/CONFLICTS
index f9db029..64bdc8d 100755
--- a/http/apache-mod_ssl/CONFLICTS
+++ b/http/apache-mod_ssl/CONFLICTS
@@ -1,3 +1,8 @@
-conflicts apache
-conflicts apache2
-conflicts apache22
+conflicts apache &&
+conflicts apache2 &&
+conflicts apache22 &&
+persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache-mod_ssl and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
+ conflicts xshttpd
+fi
diff --git a/http/apache-mod_ssl/HISTORY b/http/apache-mod_ssl/HISTORY
index 9eb76ef..a5b9a66 100644
--- a/http/apache-mod_ssl/HISTORY
+++ b/http/apache-mod_ssl/HISTORY
@@ -1,3 +1,6 @@
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: conflict with xshttpd if that is compiled without prefix
+
2008-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.31-1.3.41, SECURITY_PATCH=2

diff --git a/http/apache/CONFLICTS b/http/apache/CONFLICTS
index 1e7aacc..9507f3f 100755
--- a/http/apache/CONFLICTS
+++ b/http/apache/CONFLICTS
@@ -1,3 +1,8 @@
-conflicts apache-mod_ssl
-conflicts apache2
-conflicts apache22
+conflicts apache-mod_ssl &&
+conflicts apache2 &&
+conflicts apache22 &&
+persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
+ conflicts xshttpd
+fi
diff --git a/http/apache/HISTORY b/http/apache/HISTORY
index 3f70275..8ea4e23 100644
--- a/http/apache/HISTORY
+++ b/http/apache/HISTORY
@@ -1,3 +1,6 @@
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: conflict with xshttpd if that is compiled without prefix
+
2008-01-25 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depend on gdbm (Bug #14241) for mod_rewrite

diff --git a/http/apache2/CONFLICTS b/http/apache2/CONFLICTS
index ad57002..f000b70 100755
--- a/http/apache2/CONFLICTS
+++ b/http/apache2/CONFLICTS
@@ -1,3 +1,8 @@
-conflicts apache-mod_ssl
-conflicts apache
-conflicts apache22
+conflicts apache &&
+conflicts apache-mod_ssl &&
+conflicts apache22 &&
+persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache2 and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
+ conflicts xshttpd
+fi
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 8cb3967..805c8eb 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,6 @@
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: conflict with xshttpd if that is compiled without prefix
+
2008-01-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.63, SECURITY_PATCH=3
http://httpd.apache.org/security/vulnerabilities_20.html
diff --git a/http/apache22/CONFLICTS b/http/apache22/CONFLICTS
index dd43cf8..8b14455 100755
--- a/http/apache22/CONFLICTS
+++ b/http/apache22/CONFLICTS
@@ -1,3 +1,8 @@
-conflicts apache-mod_ssl
-conflicts apache2
-conflicts apache
+conflicts apache &&
+conflicts apache-mod_ssl &&
+conflicts apache2 &&
+persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache22 and xshttpd both provide the httpd binary, recast
xshttpd with the binary prefix if you wish to keep both spells installed."
1>&2
+ conflicts xshttpd
+fi
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 23b0767..cb9dc7a 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,7 @@
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: conflict with xshttpd if that is compiled without prefix
+ * PREPARE: 'type' "2.2.3" -> "2.2.*"
+
2008-01-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.8, SECURITY_PATCH=3
http://httpd.apache.org/security/vulnerabilities_22.html
diff --git a/http/apache22/PREPARE b/http/apache22/PREPARE
index 64e77dd..d2dd650 100755
--- a/http/apache22/PREPARE
+++ b/http/apache22/PREPARE
@@ -1,7 +1,6 @@
config_query APACHE22_SHARED "Build modules as shared?" n &&

if (spell_ok apache)||(spell_ok apache2); then
- message "Apache 2.2.3 is incompatible with 1.* and 2.0.*"
+ message "Apache 2.2.* is incompatible with 1.* and 2.0.*"
query "Are you sure you want to continue?" n
fi
-
diff --git a/http/xshttpd/BUILD b/http/xshttpd/BUILD
new file mode 100755
index 0000000..8fd490b
--- /dev/null
+++ b/http/xshttpd/BUILD
@@ -0,0 +1,21 @@
+cd $SOURCE_DIRECTORY &&
+sed -i -e "s,/usr/local/lib/httpd,$XSHTTPD_ROOTDIR,"
config/httpd.conf.sample &&
+sed -i -e 's,/usr/local,/usr,' config/script.methods.sample &&
+
+if [[ $XSHTTPD_USE_PREFIX == "y" ]]; then
+ sed -i -e 's/httpd.conf/xs&/' -e 's/httpd.pid/xs&/'
config/httpd.conf.sample &&
+ case $XSHTTPD_BRANCH in
+ devel)
+ sed -i -e 's/httpd.conf/xs&/' -e 's/httpd.pid/xs&/' src/constants.h
+ ;;
+ *)
+ sed -i -e 's/httpd.conf/xs&/' -e 's/httpd.pid/xs&/' src/confuser.h
+ ;;
+ esac
+ sed -i -e 's/^httpd/xs&/' -e 's/\([[:blank:]]\)\(httpd\)/\1xs\2/' -e
's/HTTPD/XS&/' man/*.{1,5,7}* &&
+ sed -i -e 's/httpd.conf/xs&/' config/Makefile.* &&
+ mv config/httpd.conf.sample config/xshttpd.conf.sample
+fi &&
+
+OPTS="$XSHTTPD_OPTS $OPTS" &&
+default_build
diff --git a/http/xshttpd/CONFIGURE b/http/xshttpd/CONFIGURE
new file mode 100755
index 0000000..f48823e
--- /dev/null
+++ b/http/xshttpd/CONFIGURE
@@ -0,0 +1,49 @@
+unset XSHTTPD_OPTS
+
+config_query_list XSHTTPD_PP \
+ "Which configuration preprocessor would you like to use?" \
+ "none" \
+ "m4" \
+ "cpp" &&
+
+case $XSHTTPD_PP in
+ none)
+ list_add XSHTTPD_OPTS "--without-preprocessor"
+
+ ;;
+ *)
+ list_add XSHTTPD_OPTS "--with-preprocessor=$XSHTTPD_PP"
+ ;;
+esac &&
+
+XSHTTPD_OLD_USE_PREFIX=$XSHTTPD_USE_PREFIX
+
+config_query XSHTTPD_USE_PREFIX \
+ "Do you want to use a binary prefix? (To install xshttpd alongside another
httpd)" \
+ "n" &&
+
+if [[ $XSHTTPD_USE_PREFIX == "y" ]]; then
+ list_add XSHTTPD_OPTS "--program-transform-name=s/^httpd/xs&/"
+fi &&
+
+unset XSHTTPD_CAST_TYPE
+
+if spell_ok xshttpd; then
+ if [[ $XSHTTPD_OLD_USE_PREFIX == $XSHTTPD_USE_PREFIX ]]; then
+ XSHTTPD_CAST_TYPE=unchanged
+ else
+ XSHTTPD_CAST_TYPE=changed
+ fi
+else
+ XSHTTPD_CAST_TYPE=new
+fi &&
+
+persistent_add XSHTTPD_CAST_TYPE
+
+config_query_string XSHTTPD_ROOTDIR \
+ "What do you want xshttpd to use as root directory?" \
+ "/srv/www" &&
+
+list_add XSHTTPD_OPTS "--with-rootdir=$XSHTTPD_ROOTDIR" &&
+
+persistent_add XSHTTPD_OPTS
diff --git a/http/xshttpd/CONFLICTS b/http/xshttpd/CONFLICTS
new file mode 100755
index 0000000..3135b31
--- /dev/null
+++ b/http/xshttpd/CONFLICTS
@@ -0,0 +1,6 @@
+if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ conflicts apache &&
+ conflicts apache-mod_ssl &&
+ conflicts apache2 &&
+ conflicts apache22
+fi
diff --git a/http/xshttpd/DEPENDS b/http/xshttpd/DEPENDS
new file mode 100755
index 0000000..32e2094
--- /dev/null
+++ b/http/xshttpd/DEPENDS
@@ -0,0 +1,31 @@
+optional_depends openssl \
+ '--with-ssl' \
+ '--without-ssl' \
+ 'for SSL connection support' &&
+
+optional_depends pcre \
+ '--with-pcre' \
+ '--without-pcre' \
+ 'for rewrite support' &&
+
+optional_depends openldap \
+ '--with-ldap' \
+ '--without-ldap' \
+ 'for LDAP support' &&
+
+optional_depends curl \
+ '--with-curl' \
+ '--without-curl' \
+ 'for reverse proxy support' &&
+
+if [[ "$XSHTTPD_BRANCH" == 'devel' ]]; then
+ optional_depends perl \
+ '--with-perl' \
+ '--without-perl' \
+ 'for embedded Perl support (experimental)'
+fi &&
+
+optional_depends python \
+ '--with-python' \
+ '--without-python' \
+ 'for embedded Python support (experimental)'
diff --git a/http/xshttpd/DETAILS b/http/xshttpd/DETAILS
new file mode 100755
index 0000000..5815838
--- /dev/null
+++ b/http/xshttpd/DETAILS
@@ -0,0 +1,45 @@
+ SPELL=xshttpd
+ case $XSHTTPD_BRANCH in
+ devel)
+ VERSION=36b11
+ ;;
+ *)
+ VERSION=35g03
+ ;;
+ esac
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+ SOURCE_URL[0]=ftp://ftp.stack.nl/pub/xs-httpd/release/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="johans.gpg:$SOURCE2:UPSTREAM_KEY"
+ WEB_SITE="http://www.stack.nl/xs-httpd/";
+ FRESHMEAT_URL="http://freshmeat.net/projects/xs-httpd/";
+ LICENSE[0]=BSD
+ ENTERED=20071102
+ KEYWORDS="http httpd"
+ SHORT="xs-httpd is a small, fast, pre-forked HTTP server"
+cat << EOF
+xs-httpd is a WWW server that has the following features:
+
+* It is pronounced as "access HTTP daemon"
+* It is small (very small in fact: a factor two to three smaller than normal
+ servers on disk and in memory)
+* It is fast (because it is so small and does not do unnecessary things)
+* Uses very little CPU time
+* Configurable (extensive configuration options for admins and users)
+* Runs user CGI binaries under their own user ID!
+* Gets users' pages under their own user ID, allowing them to really have
+ protected pages (when combined with the built-in authentication mechanism)
+* Does not fork for every connection (has a fixed number of servers)
+* Comes with some other useful programs
+* Offers Server-Side Includes for many common tasks, including built-in page
+ counters (text or graphical)
+* Supports PHP and other interpreted file formats
+* Supports automatic decompression to save diskspace and bandwidth
+* Serves SSL (https) and http connections through the same daemon
+* Supports SSL client certificates (as means of authentication)
+* Full support for IPv6
+* Available under BSD license (since version 3.5)
+EOF
diff --git a/http/xshttpd/EXPORTS b/http/xshttpd/EXPORTS
new file mode 100644
index 0000000..27fe1a4
--- /dev/null
+++ b/http/xshttpd/EXPORTS
@@ -0,0 +1 @@
+XSHTTPD_USE_PREFIX
diff --git a/http/xshttpd/FINAL b/http/xshttpd/FINAL
new file mode 100755
index 0000000..08ee37f
--- /dev/null
+++ b/http/xshttpd/FINAL
@@ -0,0 +1,13 @@
+case $XSHTTPD_CAST_TYPE in
+ new)
+ message "${PROBLEM_COLOR}"
+ message "Please modify the /etc/sysconfig/xshttpd config file
appropriately."
+ message "${MESSAGE_COLOR}"
+ ;;
+ changed)
+ message "${PROBLEM_COLOR}"
+ message "You changed the xshttpd binary prefix setting, do not forget to"
+ message "modify the /etc/sysconfig/xshttpd config file accordingly."
+ message "${MESSAGE_COLOR}"
+ ;;
+esac
diff --git a/http/xshttpd/HISTORY b/http/xshttpd/HISTORY
new file mode 100644
index 0000000..a73cb62
--- /dev/null
+++ b/http/xshttpd/HISTORY
@@ -0,0 +1,9 @@
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Version 35g03 and 36b11
+ * PREPARE, DETAILS: Allow branch selection
+ * CONFIGURE, BUILD, EXPORTS: Allow prefixed binaries
+ * init.d/xshttpd{,.conf} Allow prefixed binaries
+ * CONFLICTS: conditional conflict on apache{,-mod_ssl,2,22}
+
+2007-11-02 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS, DEPENDS, PROVIDES, init.d/xshttpd, johans.gpg: spell
created.
diff --git a/http/xshttpd/PREPARE b/http/xshttpd/PREPARE
new file mode 100755
index 0000000..6218bc5
--- /dev/null
+++ b/http/xshttpd/PREPARE
@@ -0,0 +1 @@
+config_query_list XSHTTPD_BRANCH "Build which version?" stable devel
diff --git a/http/xshttpd/PROVIDES b/http/xshttpd/PROVIDES
new file mode 100755
index 0000000..dd11fda
--- /dev/null
+++ b/http/xshttpd/PROVIDES
@@ -0,0 +1 @@
+WEBSERVER
diff --git a/http/xshttpd/init.d/xshttpd b/http/xshttpd/init.d/xshttpd
new file mode 100644
index 0000000..fb5f570
--- /dev/null
+++ b/http/xshttpd/init.d/xshttpd
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+. /etc/sysconfig/xshttpd
+
+PIDFILE=${PIDFILE:-/var/run/httpd.pid}
+PROGRAM=${PROGRAM:-/usr/bin/httpd}
+CONTROLPROGRAM=${CONTROLPROGRAM:-/usr/bin/httpdc}
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+
+restart() {
+ if [[ -f $PIDFILE ]]; then
+ $CONTROLPROGRAM restart
+ evaluate_retval
+ else
+ run_func start
+ fi
+}
+
+stop() {
+ $CONTROLPROGRAM stop
+ evaluate_retval
+}
+
+status() {
+ $CONTROLPROGRAM status
+}
+
+reload() {
+ run_func restart
+}
diff --git a/http/xshttpd/init.d/xshttpd.conf
b/http/xshttpd/init.d/xshttpd.conf
new file mode 100644
index 0000000..3bd2485
--- /dev/null
+++ b/http/xshttpd/init.d/xshttpd.conf
@@ -0,0 +1,6 @@
+#Depending on whether you chose to install xshttpd with a binary prefix or
not
+#you need to replace the {foobar} below with xshttpd or httpd respectively.
+PIDFILE=/var/run/{foobar}.pid
+PROGRAM=/usr/bin/{foobar}
+CONTROLPROGRAM=/usr/bin/{foobar}c
+ARGS=
diff --git a/http/xshttpd/johans.gpg b/http/xshttpd/johans.gpg
new file mode 100644
index 0000000..e99b275
Binary files /dev/null and b/http/xshttpd/johans.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (36f6804738b861bb87afe1e1e427085a7696a7ca), Remko van der Vossen, 05/27/2008

Archive powered by MHonArc 2.6.24.

Top of Page