10 files changed, 1 insertions, 406 deletions

diff --git a/MOVED b/MOVED
index eedfa0f65161..7512d0728e6d 100644
--- a/MOVED
+++ b/MOVED
@@ -2176,3 +2176,4 @@ korean/acroread5-korfont||2006-02-09|Remove expired print/acroread and related p
 print/acroread||2006-02-09|Remove expired print/acroread and related ports
 print/acroread5-commfont||2006-02-09|Remove expired print/acroread and related ports
 chinese/pcmanfm|x11-fm/pcmanfm|2006-02-09|Move to new category
+www/gnuinfo||2006-02-14|Remove expired port
diff --git a/www/Makefile b/www/Makefile
index 508e623d0731..a6f57d119c0d 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -158,7 +158,6 @@
     SUBDIR += glibwww
     SUBDIR += gnome-user-share
     SUBDIR += gnome-web-photo
-    SUBDIR += gnuinfo
     SUBDIR += google-sitemapgen
     SUBDIR += goose
     SUBDIR += gtkhtml
diff --git a/www/gnuinfo/Makefile b/www/gnuinfo/Makefile
deleted file mode 100644
index 2f418269600e..000000000000
--- a/www/gnuinfo/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	gnuinfo
-# Date created:		Tue Oct 12 00:02:04 MET DST 1999
-# Whom:			Juergen Lock <nox@jelal.kn-bremen.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnuinfo
-PORTVERSION=	1.3
-PORTREVISION=	1
-CATEGORIES=	www
-MASTER_SITES=	# disappeared
-
-MAINTAINER=	nox@jelal.kn-bremen.de
-COMMENT=	CGI program to convert GNU .info files into html
-
-DEPRECATED=	mastersite disappeared
-EXPIRATION_DATE=	2006-01-24
-
-NO_WRKSUBDIR=	yes
-
-###
-# Use these options for Apache:
-###
-CGIDIR=		${PREFIX}/share/apache/cgi-bin
-
-do-install:
-	${MKDIR} ${CGIDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/gnuinfo ${CGIDIR}
-	${INSTALL_SCRIPT} ${FILESDIR}/gnuinfo.local ${FILESDIR}/gnuinfo.X11R6 ${CGIDIR}
-
-.include <bsd.port.mk>
diff --git a/www/gnuinfo/distinfo b/www/gnuinfo/distinfo
deleted file mode 100644
index 623ff102b3e6..000000000000
--- a/www/gnuinfo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnuinfo-1.3.tar.gz) = 80fb4f812d50a3d85fc5158aeb57e006
-SHA256 (gnuinfo-1.3.tar.gz) = 935373a8ebe54f49d65207afc79c301024386ec9d58a25655717c079673da372
-SIZE (gnuinfo-1.3.tar.gz) = 13461
diff --git a/www/gnuinfo/files/gnuinfo.X11R6 b/www/gnuinfo/files/gnuinfo.X11R6
deleted file mode 100644
index 3e5a5c75a833..000000000000
--- a/www/gnuinfo/files/gnuinfo.X11R6
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-export INFOPATH=/usr/X11R6/info:/usr/share/info:/usr/local/info
-exec ${SCRIPT_FILENAME%/*}/gnuinfo
diff --git a/www/gnuinfo/files/gnuinfo.local b/www/gnuinfo/files/gnuinfo.local
deleted file mode 100644
index 4b8e131eb5d4..000000000000
--- a/www/gnuinfo/files/gnuinfo.local
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-export INFOPATH=/usr/local/info:/usr/share/info:/usr/X11R6/info
-exec ${SCRIPT_FILENAME%/*}/gnuinfo
diff --git a/www/gnuinfo/files/patch-aa b/www/gnuinfo/files/patch-aa
deleted file mode 100644
index ca79c60c9f2e..000000000000
--- a/www/gnuinfo/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: Makefile
-@@ -1,9 +1,10 @@
- 
--INFO_DIRS=\"/usr/info\"
-+INFO_DIRS=\"/usr/share/info:/usr/local/info:/usr/X11R6/info\"
- GZIP=\"/usr/bin/gzip\"
- 
--CC=gcc
--CFLAGS=-g -Wall -ansi -pedantic -O2 -DINFODIRS=$(INFO_DIRS) -DGZIP=$(GZIP)
-+#CC=gcc
-+#CFLAGS=-g -Wall -ansi -pedantic -O2 -DINFODIRS=$(INFO_DIRS) -DGZIP=$(GZIP)
-+CFLAGS+=-Wall -ansi -pedantic -DINFODIRS=$(INFO_DIRS) -DGZIP=$(GZIP)
- 
- VERSION=1.3
- OBJS=info2html.o convert.o
-@@ -18,7 +19,7 @@
- convert.o: convert.c info2html.h
- 
- convert.c: convert.lex
--	flex -t convert.lex > convert.c
-+	lex -t convert.lex > convert.c
- 
- 
- install: gnuinfo
diff --git a/www/gnuinfo/files/patch-security b/www/gnuinfo/files/patch-security
deleted file mode 100644
index 3e0bf002079b..000000000000
--- a/www/gnuinfo/files/patch-security
+++ /dev/null
@@ -1,315 +0,0 @@
-Index: convert.lex
-@@ -140,50 +140,66 @@
- 
- void print_longlink(char *link)
- {
--  char linknode[LINK_LENGTH];
-+  char linknode[LINK_LENGTH * 3];
-   char linkfile[LINK_LENGTH];
-   char text[LINK_LENGTH];
-   char *h;
- 
-   /* text */
--  strcpy(text,link+(link[1]==' ' ? 2 : 6));
--  *(strchr(text,':')) = '\0';
-+  snprintf(text, sizeof text, "%s", link+(link[1]==' ' ? 2 : 6));
-+  h = strchr(text,':');
-+  if (h) *h = '\0';
- 
-   /* link */
-   h = strchr(link,':');
-   do h++; while (*h == ' ');
-   if (*h == '(') {
-     /* we have a file */
--    strcpy(linkfile,h+1);
--    *(h=strchr(linkfile,')')) = '\0';
--    do h++; while (*h == ' ');
-+    if (strlen(h) > sizeof linkfile) {
-+      snprintf(linkfile, sizeof linkfile, "%s", file);
-+      h = NULL;
-+    } else {
-+      snprintf(linkfile, sizeof linkfile, "%s", h+1);
-+      h=strchr(linkfile,')');
-+      if (h) *h = '\0';
-+    }
-+    if (h) {
-+      do h++; while (*h == ' ');
-+    }
-     strcpy(linknode,"Top"); /* default node, may be overwritten later */
-   } else {
--    strcpy(linkfile,file);
-+    snprintf(linkfile, sizeof linkfile, "%s", file);
-   }
--  if (*h != '.' && *h != ',') {
-+  if (h && *h != '.' && *h != ',' && strlen(h) * 3 < sizeof linknode - 1) {
-     /* we have a node */
--    quote(linknode,h);
-+    quote(linknode, sizeof linknode, h);
-     h = strstr(linknode,"%2e"); /* quoted '.' */
-     if (!h)
-       h = strstr(linknode,"%2c"); /* quoted ',' */
--    *h = '\0';
-+    if (h) *h = '\0';
-   }
-   printf("<a href=\"%s/%s/%s\">*",whoami,linkfile,linknode);
-   if (link[1] != ' ') printf("note");
-   printf(" %s:</a>",text);
-   if (link[1] == ' ') printf(MENU_DESC);
-   h = strchr(link,':');
--  do h++; while (*h == ' ');
--  printf("%s",h); 
-+  if (h) {
-+    do h++; while (*h == ' ');
-+    printf("%s",h); 
-+  }
- }
- 
- void print_shortlink(char *link)
- {
--  char linknode[LINK_LENGTH];
-+  char linknode[LINK_LENGTH * 3], *h;
- 
--  quote(linknode,link+(link[1]==' ' ? 2 : 6));
--  *(strstr(linknode,"%3a")) = '\0'; /* ':' -> "%3a" (URL-Quoting) */
-+  if (strlen(link) * 3 > sizeof linknode - 1)
-+    strcpy(linknode, "Top");
-+  else {
-+    quote(linknode, sizeof linknode, link+(link[1]==' ' ? 2 : 6));
-+    h = strstr(linknode,"%3a");
-+    if (h) *h = '\0'; /* ':' -> "%3a" (URL-Quoting) */
-+  }
- 
-   printf("<a href=\"%s/%s/%s\">",whoami,file,linknode);
-   printf("%s</a>",link); 
-Index: info2html.c
-@@ -22,12 +22,12 @@
- 
- /*-------------------------------------------------------------*/
- 
--void quote(char *dest, char *src)
-+void quote(char *dest, size_t bufsize, char *src)
- {
-   static const char lookup[16] = "0123456789abcdef";
-   int  i,j;
-   
--  for (i=0, j=0; src[j] != '\0';) {
-+  for (i=0, j=0; src[j] != '\0' && i < bufsize - 4 ;) {
-     if (isalnum(src[j])) {
-       dest[i++] = src[j++];
-     } else {
-@@ -41,12 +41,12 @@
- }
- 
- /* copy string and convert the "%??" to normal char's */
--void unquote(char *dest, char *src)
-+void unquote(char *dest, size_t bufsize, char *src)
- {
-   int  i,j,hex;
-   char nr[3];
-   
--  for (i=0, j=0; src[j] != '?' && src[j] != '\0'; i++) {
-+  for (i=0, j=0; src[j] != '?' && src[j] != '\0' && i < bufsize - 1 ; i++) {
-     if (src[j] == '%') {
-       nr[0] = src[j+1];
-       nr[1] = src[j+2];
-@@ -72,12 +72,12 @@
-   file[0] = 0;
-   node[0] = 0;
-   path = getenv("PATH_INFO");
--  if (path && *path) {
--    strcpy(file,path+1);
-+  if (path && *path && strlen(path) < sizeof file) {
-+    snprintf(file, sizeof file, "%s", path+1);
-     h = strchr(file,'/');
-     if (h) {
-       *(h++) = 0;
--      if (*h) strcpy(node,h);
-+      if (*h) snprintf(node, sizeof node, "%s", h);
-       /* workaround: Spinner appends a slash to the URL */
-       if (NULL != (h = strchr(node,'/'))) *h = 0;
-     }
-@@ -100,11 +100,13 @@
-       h++;
-     }
-   }
--  strcpy(whoami,h);
-+  if (strlen(h) >= sizeof whoami)
-+    h = argv0;
-+  snprintf(whoami, sizeof whoami, "%s", h);
- }
- 
- /*-------------------------------------------------------------*/
--
-+ 
- char infodirs[]=INFODIRS;
- char *dirs[20];
- 
-@@ -119,7 +121,7 @@
-   else
-     dirs[0] = infodirs;
- 
--  for (i = 0; dirs[i] != NULL ; i++) {
-+  for (i = 0; dirs[i] != NULL && i < sizeof dirs - 1; i++) {
-     h = strchr(dirs[i],':');
-     if (h) {
-       *h = 0;
-@@ -135,7 +137,7 @@
- /* open an infofile. The indir-parameter is for indirections */
- FILE *open_infofile(int indir)
- {
--  char         filename[LINK_LENGTH],nr[10],last_modi[80];
-+  char         *filename = NULL,nr[10],last_modi[80];
-   struct stat  st;
-   int          fd_pipe[2];
-   int          i,d,gzip;
-@@ -149,29 +151,29 @@
-     for (i = 0; i < 4 /* 8 */; i++) {
-       switch (i) {
-       case 0:
--	gzip = FALSE;sprintf(filename,"%s/%s%s",dirs[d],file,nr);
-+	gzip = FALSE;asprintf(&filename,"%s/%s%s",dirs[d],file,nr);
- 	break;
-       case 1:
--	gzip = FALSE;sprintf(filename,"%s/%s.info%s",dirs[d],file,nr);
-+	gzip = FALSE;asprintf(&filename,"%s/%s.info%s",dirs[d],file,nr);
- 	break;
-       case 2:
--	gzip = TRUE; sprintf(filename,"%s/%s%s.gz",dirs[d],file,nr);
-+	gzip = TRUE; asprintf(&filename,"%s/%s%s.gz",dirs[d],file,nr);
- 	break;
-       case 3:
--	gzip = TRUE; sprintf(filename,"%s/%s.info%s.gz",dirs[d],file,nr);
-+	gzip = TRUE; asprintf(&filename,"%s/%s.info%s.gz",dirs[d],file,nr);
- 	break;
- /*
-       case 4:
--	gzip = TRUE; sprintf(filename,"%s/%s%s.z",dirs[d],file,nr);
-+	gzip = TRUE; asprintf(&filename,"%s/%s%s.z",dirs[d],file,nr);
- 	break;
-       case 5:
--	gzip = TRUE; sprintf(filename,"%s/%s.info%s.z",dirs[d],file,nr);
-+	gzip = TRUE; asprintf(&filename,"%s/%s.info%s.z",dirs[d],file,nr);
- 	break;
-       case 6:
--	gzip = TRUE; sprintf(filename,"%s/%s%s.Z",dirs[d],file,nr);
-+	gzip = TRUE; asprintf(&filename,"%s/%s%s.Z",dirs[d],file,nr);
- 	break;
-       case 7:
--	gzip = TRUE; sprintf(filename,"%s/%s.info%s.Z",dirs[d],file,nr);
-+	gzip = TRUE; asprintf(&filename,"%s/%s.info%s.Z",dirs[d],file,nr);
- 	break;
- */
-       default: return NULL; /* keep compiler happy */
-@@ -191,6 +193,7 @@
- 	  pipe(fd_pipe);
- 	  switch (fork()) {
- 	  case -1:
-+	    if (filename) free(filename);
- 	    return NULL;
- 	  case 0:
- 	    /* child */
-@@ -204,14 +207,20 @@
- 	    dup2(fd_pipe[0],0);
- 	    close(fd_pipe[0]);
- 	    close(fd_pipe[1]);
-+	    if (filename) free(filename);
- 	    return stdin;
- 	  }
- 	} else {
--	  return fopen(filename,"r");
-+	  if (filename) {
-+	    FILE *ret = fopen(filename,"r");
-+	    free(filename);
-+	    return ret;
-+	  }
- 	}
-       }
-     }
-   }
-+  if (filename) free(filename);
-   return NULL;
- }
- 
-@@ -221,23 +230,25 @@
- {
-   char text[LINK_LENGTH];
-   char linkfile[LINK_LENGTH];
--  char linknode[LINK_LENGTH];
-+  char linknode[LINK_LENGTH * 3];
-   char *h;
- 
-+  if (strlen(buf) >= LINK_LENGTH) return;
-   h = strstr(buf,what);
-   if (!h) return;
-   h += strlen(what);
--  strcpy(text,h);
-+  snprintf(text, sizeof text, "%s", h);
-   h = strchr(text,',' ); if (h) *h = '\0';
-   h = strchr(text,'\t'); if (h) *h = '\0';
-   h = strchr(text,'\n'); if (h) *h = '\0';
-   if (text[0] == '(') {
--    strcpy(linkfile,text+1);
--    *(strchr(linkfile,')')) = '\0';
-+    snprintf(linkfile, sizeof linkfile, "%s", text+1);
-+    h = strchr(linkfile,')');
-+    if (h) *h = '\0';
-     strcpy(linknode,"Top");
-   } else {
--    strcpy(linkfile,file);
--    quote(linknode,text);
-+    snprintf(linkfile, sizeof linkfile, "%s", file);
-+    quote(linknode, sizeof linknode, text);
-   }
-   printf("%s <a href=\"%s/%s/%s\">%s</a> \n",
- 	 what,whoami,linkfile,linknode,text);
-@@ -249,21 +260,22 @@
- log_error(int node_failed)
- {
-   time_t tm;
--  char   timestr[64],from[256];
-+  char   timestr[64], *from = strdup("");
- 
-   time(&tm);
-   strftime(timestr,64,"%a %h %d %T %Y",
- 	   localtime(&tm));
--  if (getenv("HTTP_REFERER")) /* be sure we have a referer */
--    sprintf(from," from %250s",getenv("HTTP_REFERER"));
--  else
--    from[0] = 0;
-+  if (getenv("HTTP_REFERER")) { /* be sure we have a referer */
-+    free(from);
-+    asprintf(&from," from %250s",getenv("HTTP_REFERER"));
-+  }
-   if (node_failed)
-     fprintf(stderr,"[%s] gnuinfo: access to node %s, info file %s failed%s\n",
- 	    timestr,node,file,from);
-   else
-     fprintf(stderr,"[%s] gnuinfo: access to info file %s failed%s\n",
- 	    timestr,file,from);
-+  if (from) free(from);
- }
- 
- /*-------------------------------------------------------------*/
-@@ -366,8 +378,11 @@
-     }
- 
-     /* find out which file */
--    h = strchr(buf,127); h++;
--    line = atoi(h);
-+    if ((h = strchr(buf,127))) {
-+      h++;
-+      line = atoi(h);
-+    } else
-+      line = 0;
-     for (i = 0; indir_table[i] != 0 && line >= indir_table[i] ; i++);
- 
-     /* play it again... */
-Index: info2html.h
-@@ -17,5 +17,5 @@
- extern FILE *yyin;
- int yylex();
- 
--void quote(char*, char*);
--void unquote(char* , char*);
-+void quote(char*, size_t bufsize, char*);
-+void unquote(char*, size_t bufsize, char*);
diff --git a/www/gnuinfo/pkg-descr b/www/gnuinfo/pkg-descr
deleted file mode 100644
index 74297b364572..000000000000
--- a/www/gnuinfo/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a cgi program that allows you to read the GNU .info files
-installed on a machine with any web browser.  Needs a running web
-server (like apache, in /usr/ports/www).  The quality of the html
-isn't as good as that generated by the texi2html converter (in
-/usr/ports/textproc) but the advantage of this one is that it
-doesn't need access to the .texinfo files which are usually only
-available in the original source archives of the installed programs
-and not installed by default.
-
-The port actually installs three cgis:  gnuinfo, with the search
-path preset to /usr/share/info:/usr/local/info:/usr/X11R6/info,
-and gnuinfo.local as well as gnuinfo.X11R6, with just /usr/local/info
-and /usr/X11R6/info, respectively.  Use these to get at the toplevel
-`dir' files for the other dirs, and to get at info pages for which
-there are different versions with the same name in the different
-directories, like the two gcc.info* you have when you installed
-gcc 2.95.1 (/usr/ports/lang/egcs) in addition to the (less recent)
-system compiler.
-
-WWW: http://www.wohnheim.uni-ulm.de/allerlei/gnuinfo.html
diff --git a/www/gnuinfo/pkg-plist b/www/gnuinfo/pkg-plist
deleted file mode 100644
index 2633d368e77b..000000000000
--- a/www/gnuinfo/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-share/apache/cgi-bin/gnuinfo
-share/apache/cgi-bin/gnuinfo.local
-share/apache/cgi-bin/gnuinfo.X11R6
-@dirrm share/apache/cgi-bin
-@dirrm share/apache