- Upgrade to 2.6 and use IPv6 patch.

- I(sumikawa) take over this port.

2 files changed, 28 insertions, 120 deletions

diff --git a/www/wwwoffle/files/patch-aa b/www/wwwoffle/files/patch-aa
index d4675aa19c49..caf818c6aff6 100644
--- a/www/wwwoffle/files/patch-aa
+++ b/www/wwwoffle/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri May 19 11:35:02 2000
-+++ Makefile	Fri May 19 11:35:55 2000
+--- Makefile.orig	Sun Oct 22 03:32:41 2000
++++ Makefile	Tue Nov 21 01:17:12 2000
 @@ -16,9 +16,9 @@
  
  LOCALHOST=localhost:8080
@@ -36,55 +36,47 @@
  
  INCLUDE=
 -LIBRARY=
-+LIBRARY= -lmd
++LIBRARY+= -lmd
  
  # For Solaris you need the following instead.
  #LIBRARY=-lnsl -lsocket
-@@ -123,7 +122,7 @@
- WWWOFFLE_OBJ=wwwoffle.o \
+@@ -124,7 +123,7 @@
+ 	     http.o ftp.o finger.o ssl.o \
  	     refresh.o messages.o parse.o spool.o \
  	     $(DOC_PARSERS)\
--	     config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
-+	     config-startup.o errors.o io.o misc.o proto-none.o sockets.o
+-	     configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
++	     configfile.o config.o errors.o io.o misc.o proto.o sockets.o
  
  wwwoffle : $(WWWOFFLE_OBJ)
  	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
-@@ -135,7 +134,7 @@
+@@ -136,7 +135,7 @@
  	      $(DOC_PARSERS) \
  	      gifmodify.o htmlmodify.o \
- 	      connect.o control.o configedit.o htdig.o index.o messages.o monitor.o parse.o purge.o refresh.o spool.o \
--	      config.o errors.o io.o misc.o proto.o sockets.o md5.o
-+	      config.o errors.o io.o misc.o proto.o sockets.o
+ 	      connect.o control.o configedit.o search.o index.o messages.o monitor.o parse.o purge.o refresh.o spool.o \
+-	      configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
++	      configfile.o config.o errors.o io.o misc.o proto.o sockets.o
  
  wwwoffled : $(WWWOFFLED_OBJ)
  	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
-@@ -144,7 +143,7 @@
+@@ -145,7 +144,7 @@
  
  WWWOFFLE_TOOLS_OBJ=wwwoffle-tools.o \
  	           spool.o \
--	           config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
-+	           config-startup.o errors.o io.o misc.o proto-none.o sockets.o
+-	           configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o md5.o
++	           configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o
  
  wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
  	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
-@@ -152,14 +151,14 @@
+@@ -153,7 +152,7 @@
  ####
  
- UPGRADE_OBJ=upgrade-cache.o \
--	    config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
-+	    config-startup.o errors.o io.o misc.o proto-none.o sockets.o
+ CONVERT_OBJ=convert-cache.o \
+-	    configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o md5.o
++	    configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o
  
- upgrade-cache : $(UPGRADE_OBJ)
- 	$(LINK) $(UPGRADE_OBJ) -o $@ $(LIBRARY)
- 
- ENDIAN_OBJ=endian-cache.o \
- 	   spool.o \
--	   config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
-+	   config-startup.o errors.o io.o misc.o proto-none.o sockets.o
- 
- endian-cache : $(ENDIAN_OBJ)
- 	$(LINK) $(ENDIAN_OBJ) -o $@ $(LIBRARY)
-@@ -257,15 +256,15 @@
+ convert-cache : $(CONVERT_OBJ)
+ 	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
+@@ -248,15 +247,15 @@
  
  install_binary : programs
  	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
@@ -103,7 +95,7 @@
  
  install_binary-win32 : programs
  	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
-@@ -283,19 +282,19 @@
+@@ -274,19 +273,19 @@
  install_doc :
  	[ -x $(INSTDIR)/man ] || $(INSTALL) -d -m 755 $(INSTDIR)/man
  	[ -x $(INSTDIR)/man/man1 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man1
@@ -118,18 +110,18 @@
 -	[ -x $(INSTDIR)/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/doc/wwwoffle
 +	$(INSTALL_MAN) wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
 +	[ -x $(INSTDIR)/share/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle
- 	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \
+ 	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \
 -	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\
 +	  $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
  	done
  	[ "x$(LANG)" = "x" ] || [ ! -d lang-$(LANG) ] || ( cd lang-$(LANG) && \
- 	  for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \
+ 	  for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \
 -	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\
 +	    [ ! -f $$file ] || $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
  	  done )
  
  
-@@ -354,8 +353,8 @@
+@@ -345,8 +344,8 @@
  	cd $(SPOOLDIR)/html && ./fixup-install.sh $(SPOOLDIR) $(LOCALHOST) && rm ./fixup-install.sh
  # Now fix the permissions that tar preserved, we needed to use 'tar xpf' to get round root's umask.
  # These two will fail unless you are root, that is OK because the owner is already you.
@@ -140,9 +132,9 @@
  
  install_config :
  	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
-@@ -365,7 +364,7 @@
- 	  echo "WWWOFFLE: There is already a configuration file $(CONFDIR)/wwwoffle.conf." ;\
- 	  echo "WWWOFFLE: Run 'perl upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
+@@ -356,7 +355,7 @@
+ 	  echo "WWWOFFLE: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\
+ 	  echo "WWWOFFLE: Run 'upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
  	  echo "WWWOFFLE: " )
 -	[  ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
 +	$(INSTALL_DATA) wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.default
diff --git a/www/wwwoffle/files/patch-ac b/www/wwwoffle/files/patch-ac
deleted file mode 100644
index 7134de8be169..000000000000
--- a/www/wwwoffle/files/patch-ac
+++ /dev/null
@@ -1,84 +0,0 @@
---- io.c.orig	Sun Jan  2 19:55:12 2000
-+++ io.c	Mon May 29 20:40:30 2000
-@@ -135,14 +135,17 @@
-     fd_set readfd;
-     struct timeval tv;
- 
--    FD_ZERO(&readfd);
--
--    FD_SET(fd,&readfd);
--
--    tv.tv_sec=tv.tv_usec=0;
--
--    if(select(fd+1,&readfd,NULL,NULL,&tv)<=0)
--       return(nr);
-+    while(1)
-+      {
-+       tv.tv_sec=tv.tv_usec=0;
-+       FD_ZERO(&readfd);
-+       FD_SET(fd,&readfd);
-+       n=select(fd+1,&readfd,NULL,NULL,&tv);
-+       if(n>0)
-+          break;
-+       if(n==0 || errno!=EINTR)
-+          return(nr);
-+      }
- 
-     n=read(fd,fdbuf[fd],BUFSIZE);
- 
-@@ -206,15 +209,18 @@
-     fd_set readfd;
-     struct timeval tv;
- 
--    FD_ZERO(&readfd);
--
--    FD_SET(fd,&readfd);
--
--    tv.tv_sec=timeout;
--    tv.tv_usec=0;
--
--    if(select(fd+1,&readfd,NULL,NULL,&tv)<=0)
--       return(-1);
-+    while(1)
-+      {
-+       tv.tv_sec=timeout;
-+       tv.tv_usec=0;
-+       FD_ZERO(&readfd);
-+       FD_SET(fd,&readfd);
-+       nr=select(fd+1,&readfd,NULL,NULL,&tv);
-+       if(nr>0)
-+          break;
-+       if(nr==0 || errno!=EINTR)
-+          return(-1);
-+      }
- 
-     nr=read(fd,buffer,n);
-    }
-@@ -364,15 +370,18 @@
-  fd_set readfd;
-  struct timeval tv;
- 
-- FD_ZERO(&readfd);
--
-- FD_SET(fd,&readfd);
--
-- tv.tv_sec=timeout;
-- tv.tv_usec=0;
--
-- if(select(fd+1,&readfd,NULL,NULL,&tv)<=0)
--    return(-1);
-+ while(1)
-+   {
-+    tv.tv_sec=timeout;
-+    tv.tv_usec=0;
-+    FD_ZERO(&readfd);
-+    FD_SET(fd,&readfd);
-+    n=select(fd+1,&readfd,NULL,NULL,&tv);
-+    if(n>0)
-+       break;
-+    if(n==0 || errno!=EINTR)
-+       return(-1);
-+   }
- 
-  n=read(fd,fdbuf[fd]+fdbytes[fd],BUFSIZE-fdbytes[fd]);
-  fdbytes[fd]+=n;