ports/127781: [UPDATE] www/zerowait-httpd and take maintainership
Dennis Herrmann
adox at mcx2.org
Wed Oct 1 18:30:03 UTC 2008
>Number: 127781
>Category: ports
>Synopsis: [UPDATE] www/zerowait-httpd and take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 01 18:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Dennis Herrmann
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD dhn.homeunix.com 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #2: Sun Sep 14 08:19:18 CEST 2008 root at contempt:/usr/obj/usr/src/sys/CONTEMPT i386
>Description:
I update it to 0.8d and take maintainership
>How-To-Repeat:
>Fix:
--- zerowait-httpd.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/zerowait-httpd/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 19 Aug 2008 09:18:37 -0000 1.8
+++ Makefile 26 Sep 2008 17:39:14 -0000
@@ -5,21 +5,22 @@
# $FreeBSD: ports/www/zerowait-httpd/Makefile,v 1.8 2008/08/19 09:18:37 linimon Exp $
#
-PORTNAME= zerowait-httpd
-PORTVERSION= 0.7p
+PORTNAME= zerowait
+PORTVERSION= 0.8d
CATEGORIES= www
-MASTER_SITES= http://www.0w.ru/httpd/
-DISTNAME= 0W-httpd-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES= http://www.0w.ru/httpd/ \
+ http://mirror.mcx2.org/
+PKGNAMESUFFIX= -httpd
+DISTNAME= 0W-httpd-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= adox at mcx2.org
COMMENT= Lightweight and fast http server
USE_GMAKE= yes
USE_OPENSSL= yes
USE_RC_SUBR= 0W-httpd
-ALL_TARGET= # none
+ALL_TARGET= #none
-MAKE_ARGS= CFLAGS="${CFLAGS}" CPPFLAGS=-I..
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --owner=${WWWOWN} --group=${WWWGRP}
PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/zerowait-httpd/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Dec 2006 20:14:29 -0000 1.5
+++ distinfo 26 Sep 2008 13:49:03 -0000
@@ -1,3 +1,3 @@
-MD5 (0W-httpd-0.7p.tar.gz) = 4d4a3fe0581b5b1e4fad50c34a1c0d7f
-SHA256 (0W-httpd-0.7p.tar.gz) = db4e9c3eca019b61a86abbb0866827d8b344bd316ef8f8ef0738ee54001be4f8
-SIZE (0W-httpd-0.7p.tar.gz) = 99506
+MD5 (0W-httpd-0.8d.tar.gz) = 2fd1db27c4d2950a63da271e2c839197
+SHA256 (0W-httpd-0.8d.tar.gz) = 17e80d7eb9bed49736f696c720d4f6fdb25e974f615e1dd456c455d885233e13
+SIZE (0W-httpd-0.8d.tar.gz) = 111979
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/zerowait-httpd/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist 25 Apr 2006 19:52:00 -0000 1.3
+++ pkg-plist 29 Sep 2008 17:48:03 -0000
@@ -1,17 +1,19 @@
@unexec %D/etc/rc.d/0W-httpd stop
-bin/update-countries.sh
-bin/convert-ranges
bin/convert-geoip
-sbin/0W-httpd
+bin/convert-ranges
+bin/update-countries.sh
etc/0W-httpd/countries
etc/0W-httpd/countries.ips
etc/0W-httpd/countries.rus
+ at unexec if cmp -s %D/etc/0W-httpd/httpd.conf.sample %D/etc/0W-httpd/httpd.conf; then rm -f %D/etc/0W-httpd/httpd.conf; fi
etc/0W-httpd/httpd.conf.sample
+ at exec if [ ! -f %D/etc/0W-httpd/httpd.conf ] ; then cp -p %D/%F %B/httpd.conf; fi
@exec install -d -o %%WWWOWN%% -g %%WWWGRP%% %D/0W-httpd/pids
@exec install -d -o %%WWWOWN%% -g %%WWWGRP%% %D/0W-httpd/data
@exec install -d -o %%WWWOWN%% -g %%WWWGRP%% %D/0W-httpd/logs
- at dirrm etc/0W-httpd/
+sbin/0W-httpd
+ at unexec rm -fr %D/0W-httpd/logs > /dev/null 2>&1 || true
+ at dirrmtry etc/0W-httpd
@dirrm 0W-httpd/pids
@dirrm 0W-httpd/data
- at unexec rm -fr %D/0W-httpd/logs > /dev/null 2>&1 || true
@dirrm 0W-httpd
Index: files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/www/zerowait-httpd/files/patch-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile
--- files/patch-Makefile 5 Dec 2006 20:14:29 -0000 1.3
+++ files/patch-Makefile 29 Sep 2008 17:06:36 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig Tue Dec 5 15:06:00 2006
-+++ Makefile Tue Dec 5 15:07:24 2006
+--- Makefile.orig 2008-03-16 00:44:45.000000000 +0100
++++ Makefile 2008-09-26 19:44:38.000000000 +0200
@@ -13,13 +13,14 @@
rm -f *~ src/*~
@@ -8,12 +8,12 @@
- 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* conf/regions* $(ROOT)/conf
-- install -b -m 644 docs/crontab docs/httpd.ru.txt $(ROOT)/docs
+- install -b -m 644 docs/*.txt $(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)
+ 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 755 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/ && \
@@ -21,4 +21,3 @@
+ 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]"
-
Index: files/patch-src_common_settings.h
===================================================================
RCS file: /home/pcvs/ports/www/zerowait-httpd/files/patch-src_common_settings.h,v
retrieving revision 1.1
diff -u -r1.1 patch-src_common_settings.h
--- files/patch-src_common_settings.h 22 Jun 2005 14:51:27 -0000 1.1
+++ files/patch-src_common_settings.h 26 Sep 2008 17:01:22 -0000
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/common/settings.h.orig 2008-02-04 12:42:36.000000000 +0100
++++ src/common/settings.h 2008-09-26 18:59:48.000000000 +0200
+@@ -40,15 +40,15 @@
#ifndef ROOT
#define ROOT "/var/0W"
#endif
@@ -9,21 +9,17 @@
-#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 CMD ROOT "/0W-httpd/cmd"
+#define LOGS ROOT "/0W-httpd/logs"
-+#define TMP ROOT "/0W-httpd/tmp"
++#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 WWW ROOT "/0W-httpd"
++#define HTML WWW "/0W-httpd/data"
#define RN "\r\n"
--
- #if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
- #define HAVE_BACKTRACE
--- zerowait-httpd.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list