summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/wwwoffle/Makefile17
-rw-r--r--www/wwwoffle/PLIST6
-rw-r--r--www/wwwoffle/distinfo7
-rw-r--r--www/wwwoffle/patches/patch-ac112
4 files changed, 16 insertions, 126 deletions
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 86428e3fe91..e185ac8db0c 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2002/08/21 02:43:45 grant Exp $
+# $NetBSD: Makefile,v 1.44 2002/09/05 16:56:54 fredb Exp $
-DISTNAME= wwwoffle-2.7d
+DISTNAME= wwwoffle-2.7e
CATEGORIES= www
-MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/httpd/ \
- http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \
- ${MASTER_SITE_SUNSITE:=apps/www/servers/}
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/www/servers/} \
+ ftp://ftp.demon.co.uk/pub/unix/httpd/ \
+ http://www.gedanken.freeserve.co.uk/download-wwwoffle/
EXTRACT_SUFX= .tgz
MAINTAINER= fredb@netbsd.org
@@ -35,6 +35,13 @@ post-build:
${SED} -e 's#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g' \
INSTALL > ${WRKDIR}/INSTALL
+# For bulk-build machines: a one-time install/deinstall, if wwwoffle
+# is never run, leaves an incomplete cache directory, which the install
+# target incorrectly calculates to be a pre-2.2 cache. This tricks it
+# into setting up the cache directory properly.
+pre-install:
+ ${MKDIR} /var/wwwoffle/prevtime1
+
post-install:
if [ -f ${PKG_SYSCONFDIR}/wwwoffle.conf.install ]; then \
${CP} -p ${PKG_SYSCONFDIR}/wwwoffle.conf.install \
diff --git a/www/wwwoffle/PLIST b/www/wwwoffle/PLIST
index 8179594960e..9041ace9261 100644
--- a/www/wwwoffle/PLIST
+++ b/www/wwwoffle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/10 17:03:26 fredb Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/09/05 16:56:54 fredb Exp $
bin/wwwoffle
bin/wwwoffle-hash
bin/wwwoffle-ls
@@ -69,10 +69,6 @@ share/examples/wwwoffle.conf
@dirrm share/doc/wwwoffle/de
@dirrm share/doc/wwwoffle
@exec ${GTAR} xzCf / %D/libdata/wwwoffle-spool.tar.gz
-@comment exec ${MKDIR} /var/wwwoffle/outgoing
-@comment exec ${MKDIR} /var/wwwoffle/monitor
-@comment exec ${MKDIR} /var/wwwoffle/lastime
-@comment exec ${MKDIR} /var/wwwoffle/prevtime1
@unexec cd /var/wwwoffle && ${RM} -rf html* search*
@unexec ${RMDIR} /var/wwwoffle/* 2>/dev/null && ${RMDIR} /var/wwwoffle 2>/dev/null || true
@unexec if [ -d /var/wwwoffle ]; then echo "If you won't use the WWWOFFLE package anymore, remove the cache manually by"; echo ' rm -rf /var/wwwoffle'; fi
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index 2a58e1da354..d8379270511 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.17 2002/08/19 22:03:04 fredb Exp $
+$NetBSD: distinfo,v 1.18 2002/09/05 16:56:54 fredb Exp $
-SHA1 (wwwoffle-2.7d.tgz) = 6a7595c4a8f2bd1b4918b3b5118c90b8afd4a3e9
-Size (wwwoffle-2.7d.tgz) = 867987 bytes
+SHA1 (wwwoffle-2.7e.tgz) = 94d8ae0cc4f62ee3aaa50341a84210ade770d015
+Size (wwwoffle-2.7e.tgz) = 863964 bytes
SHA1 (patch-aa) = 897de385a47826e16a8a09b1bc1c207a2d350f94
-SHA1 (patch-ac) = 5cfe930c2b6df543ed214f599eda4bab7a1c0a90
diff --git a/www/wwwoffle/patches/patch-ac b/www/wwwoffle/patches/patch-ac
deleted file mode 100644
index f7d7921cf78..00000000000
--- a/www/wwwoffle/patches/patch-ac
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2002/08/10 13:43:09 fredb Exp $
-
---- src/wwwoffled.c.orig Sun Jun 23 06:02:35 2002
-+++ src/wwwoffled.c
-@@ -279,8 +279,7 @@
- if(uid!=-1 || gid!=-1)
- PrintMessage(Inform,"Running with uid=%d, gid=%d.",geteuid(),getegid());
-
--
-- /* Bind the HTTP proxy sockets. */
-+ /* Bind the HTTP proxy socket(s). */
-
- #if USE_IPV6
- if(ConfigString(Bind_IPv6))
-@@ -291,40 +290,33 @@
- }
- #endif
-
--#if USE_IPV6
-- if(http_fd[1]!=-1 && ConfigString(Bind_IPv4) && ConfigString(Bind_IPv6) &&
-- !strcmp(ConfigString(Bind_IPv6),"0:0:0:0:0:0:0:0") && !strcmp(ConfigString(Bind_IPv4),"0.0.0.0"))
-- PrintMessage(Inform,"Not creating HTTP IPv4 server socket on all addresses since IPv6 one is bound to all addresses.");
-- else
-+ if(ConfigString(Bind_IPv4))
- {
--#endif
-- if(ConfigString(Bind_IPv4))
-+ http_fd[0]=OpenServerSocket(ConfigString(Bind_IPv4),ConfigInteger(HTTP_Port));
-+ if(http_fd[0]==-1)
- {
-- http_fd[0]=OpenServerSocket(ConfigString(Bind_IPv4),ConfigInteger(HTTP_Port));
-- if(http_fd[0]==-1)
-- {
- #if USE_IPV6
-+ if(http_fd[1]!=-1 && ConfigString(Bind_IPv4) && !strcmp(ConfigString(Bind_IPv4),"0.0.0.0") &&
-+ ConfigString(Bind_IPv6) && !strcmp(ConfigString(Bind_IPv6),"0:0:0:0:0:0:0:0"))
-+ PrintMessage(Warning,"Cannot create HTTP IPv4 server socket (but the IPv6 one might accept IPv4 connections).");
-+ else
- PrintMessage(Fatal,"Cannot create HTTP IPv4 server socket.");
- #else
-- PrintMessage(Fatal,"Cannot create HTTP server socket.");
-+ PrintMessage(Fatal,"Cannot create HTTP server socket.");
- #endif
-- }
- }
--#if USE_IPV6
- }
--#endif
-
- if(http_fd[0]==-1 && http_fd[1]==-1)
- {
- #if USE_IPV6
-- PrintMessage(Fatal,"Neither IPv4 or IPv6 HTTP socket could be bound.");
-+ PrintMessage(Fatal,"The IPv4 and IPv6 HTTP sockets were not bound; are they disabled in the config file?");
- #else
-- PrintMessage(Fatal,"The HTTP socket could not be bound.");
-+ PrintMessage(Fatal,"The HTTP socket was not bound; are they disabled in the config file?");
- #endif
- }
-
--
-- /* Bind the WWWOFFLE control sockets. */
-+ /* Bind the WWWOFFLE control socket(s). */
-
- #if USE_IPV6
- if(ConfigString(Bind_IPv6))
-@@ -335,35 +327,29 @@
- }
- #endif
-
--#if USE_IPV6
-- if(wwwoffle_fd[1]!=-1 && ConfigString(Bind_IPv4) && ConfigString(Bind_IPv6) &&
-- !strcmp(ConfigString(Bind_IPv6),"0:0:0:0:0:0:0:0") && !strcmp(ConfigString(Bind_IPv4),"0.0.0.0"))
-- PrintMessage(Inform,"Not creating WWWOFFLE IPv4 server socket on all addresses since IPv6 one is bound to all addresses.");
-- else
-+ if(ConfigString(Bind_IPv4))
- {
--#endif
-- if(ConfigString(Bind_IPv4))
-+ wwwoffle_fd[0]=OpenServerSocket(ConfigString(Bind_IPv4),ConfigInteger(WWWOFFLE_Port));
-+ if(wwwoffle_fd[0]==-1)
- {
-- wwwoffle_fd[0]=OpenServerSocket(ConfigString(Bind_IPv4),ConfigInteger(WWWOFFLE_Port));
-- if(wwwoffle_fd[0]==-1)
-- {
- #if USE_IPV6
-+ if(wwwoffle_fd[1]!=-1 && ConfigString(Bind_IPv4) && !strcmp(ConfigString(Bind_IPv4),"0.0.0.0") &&
-+ ConfigString(Bind_IPv6) && !strcmp(ConfigString(Bind_IPv6),"0:0:0:0:0:0:0:0"))
-+ PrintMessage(Warning,"Cannot create WWWOFFLE IPv4 server socket (but the IPv6 one might accept IPv4 connections).");
-+ else
- PrintMessage(Fatal,"Cannot create WWWOFFLE IPv4 server socket.");
- #else
-- PrintMessage(Fatal,"Cannot create WWWOFFLE server socket.");
-+ PrintMessage(Fatal,"Cannot create WWWOFFLE server socket.");
- #endif
-- }
- }
--#if USE_IPV6
- }
--#endif
-
- if(wwwoffle_fd[0]==-1 && wwwoffle_fd[1]==-1)
- {
- #if USE_IPV6
-- PrintMessage(Fatal,"Neither IPv4 or IPv6 WWWOFFLE socket could be bound.");
-+ PrintMessage(Fatal,"The IPv4 and IPv6 WWWOFFLE sockets were not bound; are they disabled in the config file?");
- #else
-- PrintMessage(Fatal,"The WWWOFFLE socket could not be bound.");
-+ PrintMessage(Fatal,"The WWWOFFLE socket was not bound; are they disabled in the config file?");
- #endif
- }
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 18:31:21 +0000