From 6314c1d8078f2f6ab0c73a36d20bc8c9c378b4f8 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 5 May 2005 16:39:59 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into 
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/05 18:01:03+02:00 uni-frankfurt.de!mickeyl
upgrade openzaurus 3.5.4.conf and revert 1.3211 + add a note about that

2005/05/05 16:29:35+02:00 uni-frankfurt.de!mickeyl
add wlan-ng-modules 0.2.1-pre26. DEFAULT_PREFERENCE=-1 for now since it has build problems on certain kernels.

BKrev: 427a4c5fCgevI4GjFZMNn-fZa-K6_w
---
 packages/apache/files/init | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 packages/apache/files/init

(limited to 'packages/apache/files/init')

diff --git a/packages/apache/files/init b/packages/apache/files/init
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From 1533ba3c1e523417d644b960bf9a7a42de66f753 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Fri, 6 May 2005 16:40:05 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into 
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/06 17:41:26+02:00 uni-frankfurt.de!mickeyl
add quake courtesy Simon Pickering

BKrev: 427b9de5X-ZR3YB9eIJ9G5OnICdYwQ
---
 packages/apache/files/init | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 packages/apache/files/init

(limited to 'packages/apache/files/init')

diff --git a/packages/apache/files/init b/packages/apache/files/init
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3


From e613923b68e2708c5af0a536b425b8f3600b0145 Mon Sep 17 00:00:00 2001
From: David Karlstrom <daka@thg.se>
Date: Wed, 17 Aug 2005 13:40:41 +0000
Subject: Add apache 2.0.54. This package only compiles nativly, and is only
 tested on openslug-native. Since this is not for cross I'm leaving the apache
 files in nonworking for the time beeing.

---
 packages/apache/files/init | 73 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 packages/apache/files/init

(limited to 'packages/apache/files/init')

diff --git a/packages/apache/files/init b/packages/apache/files/init
new file mode 100644
index 0000000000..46dae0395f
--- /dev/null
+++ b/packages/apache/files/init
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# apache	Start the apache HTTP server.
+#
+
+NAME=apache
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/usr/sbin/httpd
+SUEXEC=/usr/lib/apache/suexec
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/apache/httpd.conf
+APACHECTL=/usr/sbin/apachectl 
+
+trap "" 1
+export LANG=C
+export PATH
+
+test -f $DAEMON || exit 0
+test -f $APACHECTL || exit 0
+
+# ensure we don't leak environment vars into apachectl
+APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL"
+
+if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF
+then
+    exit 0
+fi
+
+case "$1" in
+  start)
+    echo -n "Starting web server: $NAME"
+    start-stop-daemon --start --quiet --background --exec $DAEMON
+    ;;
+
+  stop)
+    echo -n "Stopping web server: $NAME"
+    start-stop-daemon --stop --signal 3 --quiet --exec $DAEMON
+    ;;
+
+  reload)
+    echo -n "Reloading $NAME configuration"
+    start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
+    ;;
+
+  reload-modules)
+    echo -n "Reloading $NAME modules"
+    $0 stop
+    $0 start
+    ;;
+
+  restart)
+    $0 reload-modules
+    exit $?
+    ;;
+
+  force-reload)
+    $0 reload-modules
+    exit $?
+    ;;
+
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}"
+    exit 1
+    ;;
+esac
+
+if [ $? == 0 ]; then
+	echo .
+	exit 0
+else
+	echo failed
+	exit 1
+fi
-- 
cgit v1.2.3


From 781ae9369c6a7a5555be6ed86e351958c7d252c6 Mon Sep 17 00:00:00 2001
From: David Karlstrom <daka@thg.se>
Date: Sun, 21 Aug 2005 21:27:15 +0000
Subject: Fix apache to use openssl from staging. Fix depends on pcre and
 expat. NOTE: still just for native building.

---
 packages/apache/files/init | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 packages/apache/files/init

(limited to 'packages/apache/files/init')

diff --git a/packages/apache/files/init b/packages/apache/files/init
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 84cdf4fa2923a81afa14144fad3fbcb63f52bb26 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 20 Aug 2005 05:10:28 +0000
Subject: Fixed the equality test in the apache init script.

---
 packages/apache/files/init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/apache/files/init')

diff --git a/packages/apache/files/init b/packages/apache/files/init
index 46dae0395f..6c8ff0a6ec 100755
--- a/packages/apache/files/init
+++ b/packages/apache/files/init
@@ -64,7 +64,7 @@ case "$1" in
     ;;
 esac
 
-if [ $? == 0 ]; then
+if [ $? = 0 ]; then
 	echo .
 	exit 0
 else
-- 
cgit v1.2.3