summaryrefslogtreecommitdiff
path: root/www/zerowait-httpd/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/zerowait-httpd/files')
-rw-r--r--www/zerowait-httpd/files/0W-httpd.sh11
-rw-r--r--www/zerowait-httpd/files/patch-Makefile57
-rw-r--r--www/zerowait-httpd/files/patch-settings.h28
-rw-r--r--www/zerowait-httpd/files/patch-src_common_settings.h29
-rw-r--r--www/zerowait-httpd/files/patch-src_httpd_Makefile15
5 files changed, 79 insertions, 61 deletions
diff --git a/www/zerowait-httpd/files/0W-httpd.sh b/www/zerowait-httpd/files/0W-httpd.sh
index c4317a1c954e..f10e657d344b 100644
--- a/www/zerowait-httpd/files/0W-httpd.sh
+++ b/www/zerowait-httpd/files/0W-httpd.sh
@@ -1,27 +1,28 @@
#!/bin/sh
# $FreeBSD$
-# PROVIDE: 0W-httpd
+# PROVIDE: zerowait
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: shutdown
-# Define these 0Whttpd_* variables in one of these files:
+# Define these zerowait_enable variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
-0Whttpd_enable=${0Whttpd_enable-"NO"}
-
. %%RC_SUBR%%
-name="0Whttpd"
+name="zerowait"
rcvar=`set_rcvar`
command="%%PREFIX%%/sbin/0W-httpd"
args="-c %%PREFIX%%/etc/0W-httpd/httpd.conf"
+required_files="%%PREFIX%%/etc/0W-httpd/httpd.conf"
+pidfile="%%PREFIX%%/0W-httpd/pids/httpd"
load_rc_config $name
+: ${zerowait_enable="NO"}
start_cmd="echo \"Starting ${name}.\"; /usr/bin/limits -U www ${command}"
diff --git a/www/zerowait-httpd/files/patch-Makefile b/www/zerowait-httpd/files/patch-Makefile
index b0b5686b3ae8..2c8229702454 100644
--- a/www/zerowait-httpd/files/patch-Makefile
+++ b/www/zerowait-httpd/files/patch-Makefile
@@ -1,30 +1,31 @@
---- Makefile.orig Wed Oct 6 21:21:53 2004
-+++ Makefile Sun Mar 20 17:31:49 2005
-@@ -2,6 +2,6 @@
+--- Makefile.orig Sun Apr 17 05:07:11 2005
++++ Makefile Wed Jun 22 14:16:31 2005
+@@ -10,13 +10,15 @@
+ rm -f *~ src/*~
--ROOT=/var/0W
--PRIV=nobody:nobody
-+ROOT=/var/0W
-+PRIV=www:www
-
- SUBDIRS=common httpd
-
-@@ -14,7 +14,14 @@
-
- install:
- set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
-- test -d $(ROOT) || (mkdir $(ROOT) && cp -R ../bin ../conf ../data ../logs $(ROOT))
-- test ../bin/0W-httpd -ef $(ROOT)/bin/0W-httpd || cp ../bin/0W-httpd $(ROOT)/bin/0W-httpd
-- chown -R $(PRIV) $(ROOT)/bin/0W-httpd $(ROOT)/logs $(ROOT)/data
-- chmod +s $(ROOT)/bin/0W-httpd
+ install: compile
+- install -d $(ROOT)/bin $(ROOT)/conf $(ROOT)/docs
+- install -d -o $(OWNER) -g $(GROUP) $(ROOT)/logs $(ROOT)/data/pids $(ROOT)/data/httpd
+- test -f $(ROOT)/conf/httpd.conf || install -m 644 conf/httpd.conf $(ROOT)/conf
+- install -b -m 644 conf/countries* $(ROOT)/conf
+- install -b -m 644 docs/* $(ROOT)/docs
+- install -b bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin
+- install -b -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(ROOT)/bin
+ test -d $(ROOT)/0W-httpd || (mkdir $(ROOT)/0W-httpd)
-+ cp -R ../data ../logs $(ROOT)/0W-httpd
-+ test ../bin/0W-httpd -ef $(ROOT)/sbin/0W-httpd || cp ../bin/0W-httpd $(ROOT)/sbin/0W-httpd
-+ test -d $(ROOT)/etc/0W-httpd || (mkdir $(ROOT)/etc/0W-httpd && cd ../conf/ && \
-+ cp countries $(ROOT)/etc/0W-httpd/countries.sample && \
-+ cp crontab $(ROOT)/etc/0W-httpd/crontab.sample && \
-+ cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample && \
-+ cp httpd.txt $(ROOT)/etc/0W-httpd/httpd.txt.sample && \
-+ cp ip2country $(ROOT)/etc/0W-httpd/ip2country.sample )
-+ chown -R $(PRIV) $(ROOT)/sbin/0W-httpd $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/data
-+ chmod +s $(ROOT)/sbin/0W-httpd
++ install -d $(ROOT)/0W-httpd/data $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/pids
++ install -m 0755 bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin
++ install -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(ROOT)/sbin
++ test -d $(ROOT)/etc/0W-httpd || (mkdir $(ROOT)/etc/0W-httpd && cd conf/ && \
++ cp countries* $(ROOT)/etc/0W-httpd/ && \
++ cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample )
++ chown -R $(OWNER):$(GROUP) $(ROOT)/sbin/0W-httpd $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/data $(ROOT)/0W-httpd/pids
++
+ @echo
+ @echo "Installed, run as root: $(ROOT)/bin/0W-httpd [-h]"
+
+@@ -33,3 +35,5 @@
+ @read answer
+ killall 0W-httpd || true
+ rm -rf $(ROOT)
++
++all: compile
diff --git a/www/zerowait-httpd/files/patch-settings.h b/www/zerowait-httpd/files/patch-settings.h
deleted file mode 100644
index 5e6eba787303..000000000000
--- a/www/zerowait-httpd/files/patch-settings.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- common/settings.h.orig Thu Mar 17 20:22:31 2005
-+++ common/settings.h Thu Mar 17 20:25:53 2005
-@@ -39,16 +39,16 @@
- #define BLOCK_SIZE 4096
- #define BUFFER_SIZE 4088
-
--#define ROOT "/var/0W"
--#define CONF ROOT "/conf"
--#define DATA ROOT "/data"
--#define CMD ROOT "/cmd"
--#define LOGS ROOT "/logs"
-+#define ROOT "/var/0W/0W-httpd/"
-+#define CONF ROOT "/var/0W/etc/0W-httpd/"
-+#define DATA ROOT "/var/0W/0W-httpd/data"
-+#define CMD ROOT "/var/0W/0W-httpd/cmd"
-+#define LOGS ROOT "/var/0W/0W-httpd/logs/"
- #define TMP ROOT "/tmp"
--#define PIDS DATA "/pids"
--#define TMPL DATA "/templates"
--#define WWW ROOT "/www"
--#define HTML WWW "/data"
-+#define PIDS DATA "/var/0W/0W-httpd/pids"
-+#define TMPL DATA "/var/0W/0W-httpd/templates"
-+#define WWW ROOT "/var/0W/0W-httpd/www"
-+#define HTML WWW "/var/0W/0W-httpd/data"
-
- #define ADMIN_EMAIL "counter@rax.ru"
- #define SITE_URL "http://www.rax.ru"
diff --git a/www/zerowait-httpd/files/patch-src_common_settings.h b/www/zerowait-httpd/files/patch-src_common_settings.h
new file mode 100644
index 000000000000..3ad7e92c7e0e
--- /dev/null
+++ b/www/zerowait-httpd/files/patch-src_common_settings.h
@@ -0,0 +1,29 @@
+--- src/common/settings.h.orig Sat Apr 16 06:48:58 2005
++++ src/common/settings.h Wed Jun 22 13:35:16 2005
+@@ -37,18 +37,18 @@
+ #ifndef ROOT
+ #define ROOT "/var/0W"
+ #endif
+-#define CONF ROOT "/conf"
+-#define DATA ROOT "/data"
+-#define CMD ROOT "/cmd"
+-#define LOGS ROOT "/logs"
+-#define TMP ROOT "/tmp"
++
++#define CONF ROOT "/etc/0W-httpd/"
++#define DATA ROOT "/0W-httpd"
++#define CMD ROOT "/0W-httpd/cmd"
++#define LOGS ROOT "/0W-httpd/logs"
++#define TMP ROOT "/0W-httpd/tmp"
+ #define PIDS DATA "/pids"
+ #define TMPL DATA "/templates"
+-#define WWW ROOT "/www"
+-#define HTML WWW "/data"
++#define WWW ROOT "/0W-httpd"
++#define HTML ROOT "/0W-httpd/data"
+
+ #define RN "\r\n"
+-
+
+ #if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
+ #define HAVE_BACKTRACE
diff --git a/www/zerowait-httpd/files/patch-src_httpd_Makefile b/www/zerowait-httpd/files/patch-src_httpd_Makefile
new file mode 100644
index 000000000000..16641c9e3f14
--- /dev/null
+++ b/www/zerowait-httpd/files/patch-src_httpd_Makefile
@@ -0,0 +1,15 @@
+--- src/httpd/Makefile.orig Wed Jun 22 13:16:28 2005
++++ src/httpd/Makefile Wed Jun 22 13:16:44 2005
+@@ -14,10 +14,10 @@
+ $(CC) $(LDFLAGS) $(OBJS) $(COMMON) built.o -o $@
+
+ convert-ranges: $(COMMON) Makefile ../Rules.make convert-ranges.c
+- $(CC) $(CFLAGS) $(LDFLAGS) $@.c $(COMMON) -o $@
++ $(CC) $(CFLAGS) -I.. $(LDFLAGS) $@.c $(COMMON) -o $@
+
+ convert-geoip: $(COMMON) Makefile ../Rules.make convert-geoip.c
+- $(CC) $(CFLAGS) $(LDFLAGS) $@.c $(COMMON) -o $@
++ $(CC) $(CFLAGS) -I.. $(LDFLAGS) $@.c $(COMMON) -o $@
+
+ $(COMMON):
+ cd ../common &&$(MAKE)
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 19:56:12 +0000