Update using the databases/gnats4 package. gnats3 has numerous security

problems and is no longer supported.

12 files changed, 88 insertions, 236 deletions

diff --git a/databases/gnats/DESCR b/databases/gnats/DESCR
index a7e38a43529..5439e4f8fa1 100644
--- a/databases/gnats/DESCR
+++ b/databases/gnats/DESCR
@@ -1,7 +1,6 @@
-GNATS is the GNU Problem Report Management System.
-
-GNATS is a problem tracking system written to help report on, and track,
-problem reports or bugs. GNATS is currently in use at Cygnus to help track
-all incoming bug reports.  There are many concepts or approaches to GNATS
-which are only useful to organizations which track bugs related by
-customers as well as by bug type.
+GNATS was designed as a tool for software maintainers. It consists of several
+utilities which, when used in concert, formulate and administer a database of
+Problem Reports grouped by site-defined problem categories. It allows a
+support organization to keep track of problems (hence the term Problem Report)
+in an organized fashion. Essentially, GNATS acts as an active archive for
+field-separated textual data.
diff --git a/databases/gnats/MESSAGE b/databases/gnats/MESSAGE
index d69030fd5de..a608b23182c 100644
--- a/databases/gnats/MESSAGE
+++ b/databases/gnats/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2003/05/30 22:14:29 seb Exp $
+$NetBSD: MESSAGE,v 1.6 2004/11/10 21:34:46 soren Exp $
 
-See http://sourceware.cygnus.com/gnats/ for the official web page
+See http://www.gnu.org/software/gnats/ for the official web page
 and don't forget to run ${PREFIX}/libexec/gnats/mkcat as gnats.
 
 Add the following line to /etc/inetd.conf to activate GNATS:
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 66be0ac5570..d4cdc8dc599 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,28 +1,32 @@
-# $NetBSD: Makefile,v 1.13 2004/03/06 18:27:47 recht Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/10 21:34:46 soren Exp $
+#
 
-DISTNAME=	gnats-3.113.1
-CATEGORIES=	devel
+DISTNAME=	gnats-4.0
+CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GNU:=gnats/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gnats/
-COMMENT=	Cygnus GNATS bug tracking system
+COMMENT=	GNATS bug tracking system
 
-USE_PKGINSTALL=	YES
-GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	m4 make
-USE_BISON=	yes
+USE_BUILDLINK3=		yes
+USE_PKGLOCALEDIR=	yes
+USE_GNU_TOOLS+=		m4 make
+USE_BISON=		yes
+USE_MAKEINFO=		yes
+TEXINFO_REQD=		4.6
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
-USE_MAKEINFO=	YES
-INFO_FILES=	gnats.info send-pr.info
+INFO_FILES=	gnats.info gnats-faq.info
 
-CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/share/emacs/site-lisp \
-		--with-full-gnats \
-		--with-release-based
+CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
 
 GNATS_HOME=	${PREFIX}/share/gnats/gnats-db
-PKG_USERS=	gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:/bin/sh
+PKG_USERS=	gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:${SH}
+
 MAKE_DIRS=		${PREFIX}/share/gnats
+MAKE_DIRS+=		${PREFIX}/libexec/gnats
 OWN_DIRS_PERMS=		${GNATS_HOME} gnats daemon 755
 OWN_DIRS_PERMS+=	${GNATS_HOME}/gnats-queue gnats daemon 755
 OWN_DIRS_PERMS+=	${GNATS_HOME}/pending gnats daemon 755
@@ -31,25 +35,4 @@ OWN_DIRS_PERMS+=	${GNATS_HOME}/gnats-adm/locks gnats daemon 755
 
 MESSAGE_SUBST+=		PREFIX="${PREFIX}"
 
-# this stops the configuration program from pulling installation
-# information in from the standard NetBSD send-pr program
-CONFIGURE_ENV=	SEND_PR=/dev/null
-
-# the gnats distribution comes with a lot of baggage we don't want to install
-# just install gnats
-INSTALL_TARGET=	install-gnats install-send-pr
-
-PLIST_SRC=	${WRKSRC}/.PLIST
-
-post-build:
-	(cd ${WRKSRC}/gnats;   ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info)
-	(cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info)
-
-post-install:
-	(cd ${WRKSRC}/gnats;   ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info)
-	(cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info)
-	${LS} ${PREFIX}/share/gnats/dist/send-pr.info* | \
-		${SED} -e 's,^${PREFIX}/,,' > ${PLIST_SRC}
-	${CAT} ${.CURDIR}/PLIST >> ${PLIST_SRC}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST
index ccc0811c4e4..cdfb9155a1e 100644
--- a/databases/gnats/PLIST
+++ b/databases/gnats/PLIST
@@ -1,66 +1,49 @@
-@comment $NetBSD: PLIST,v 1.6 2004/01/20 18:05:35 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/11/10 21:34:46 soren Exp $
 bin/edit-pr
 bin/getclose
 bin/install-sid
-bin/nedit-pr
-bin/nquery-pr
 bin/query-pr
 bin/send-pr
-bin/sub-type
+etc/gnats/databases
+etc/gnats/defaults/addresses
+etc/gnats/defaults/categories
+etc/gnats/defaults/classes
+etc/gnats/defaults/dbconfig
+etc/gnats/defaults/gnatsd.user_access
+etc/gnats/defaults/responsible
+etc/gnats/defaults/states
+etc/gnats/defaults/submitters
+etc/gnats/gnatsd.host_access
 libexec/gnats/at-pr
 libexec/gnats/check-db
 libexec/gnats/delete-pr
+libexec/gnats/diff-prs
 libexec/gnats/file-pr
 libexec/gnats/gen-index
-libexec/gnats/gnats-edit-pr
+libexec/gnats/gnats-pwconv
 libexec/gnats/gnatsd
+libexec/gnats/mail-agent
 libexec/gnats/mail-query
 libexec/gnats/mkcat
-libexec/gnats/mkdist
-libexec/gnats/npr-addr
-libexec/gnats/npr-edit
-libexec/gnats/pr-addr
+libexec/gnats/mkdb
 libexec/gnats/pr-age
 libexec/gnats/pr-edit
-libexec/gnats/pr-mail
 libexec/gnats/queue-pr
 libexec/gnats/rmcat
 man/man1/edit-pr.1
 man/man1/query-pr.1
 man/man1/send-pr.1
+man/man5/databases.5
+man/man5/dbconfig.5
 man/man7/gnats.7
+man/man8/delete-pr.8
+man/man8/file-pr.8
+man/man8/gen-index.8
+man/man8/gnatsd.8
 man/man8/mkcat.8
-man/man8/mkdist.8
+man/man8/mkdb.8
+man/man8/pr-edit.8
 man/man8/queue-pr.8
-man/man8/file-pr.8
 man/man8/rmcat.8
-man/man8/gen-index.8
-share/emacs/site-lisp/gnats.el
-share/emacs/site-lisp/send-pr.el
-share/gnats/cygnus
-share/gnats/dist/COPYING
-share/gnats/dist/INSTALL
-share/gnats/dist/MANIFEST
-share/gnats/dist/README
-share/gnats/dist/categ.texi
-share/gnats/dist/fields.texi
-share/gnats/dist/install-sid.sh
-share/gnats/dist/s-usage.texi
-share/gnats/dist/send-pr-el.in
-share/gnats/dist/send-pr.1
-share/gnats/dist/send-pr.sh
-share/gnats/dist/send-pr.texi
-share/gnats/dist/states.texi
-share/gnats/dist/texinfo.tex
-share/gnats/dist/version.texi
-share/gnats/gnats-db/gnats-adm/addresses
-share/gnats/gnats-db/gnats-adm/categories
-share/gnats/gnats-db/gnats-adm/classes
-share/gnats/gnats-db/gnats-adm/config
-share/gnats/gnats-db/gnats-adm/gnatsd.access
-share/gnats/gnats-db/gnats-adm/gnatsd.conf
-share/gnats/gnats-db/gnats-adm/responsible
-share/gnats/gnats-db/gnats-adm/states
-share/gnats/gnats-db/gnats-adm/submitters
-@dirrm libexec/gnats
-@dirrm share/gnats/dist
+@dirrm etc/gnats/defaults
+@dirrm etc/gnats
diff --git a/databases/gnats/distinfo b/databases/gnats/distinfo
index 248b8fe6119..531c8e76ed5 100644
--- a/databases/gnats/distinfo
+++ b/databases/gnats/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/01/20 17:37:58 seb Exp $
+$NetBSD: distinfo,v 1.4 2004/11/10 21:34:46 soren Exp $
 
-SHA1 (gnats-3.113.1.tar.gz) = ad4dbafae3e643c61dbcacb721a1e11a803c67aa
-Size (gnats-3.113.1.tar.gz) = 1120985 bytes
-SHA1 (patch-aa) = f9fda77cd1d7bd3fc320ce70c258ed199201cd6f
-SHA1 (patch-ab) = 2622209755ad5a23f59c816fc949df9260bd16bf
-SHA1 (patch-ac) = 350a1a408b6a50604978e085f7363be30d3d7c50
-SHA1 (patch-ad) = 84e99baec317293d902bc684ca49f290c4e1272a
-SHA1 (patch-ae) = 65bf94093274397e857a4138d48ff98cbd9be38a
-SHA1 (patch-af) = 5ef643f2f5d3c7b3f124afcb7a7ffe69ef748bb1
-SHA1 (patch-ag) = ae8f5cbd1b5bc71fb6c6a88992c66d3e9d21534a
+SHA1 (gnats-4.0.tar.gz) = 910c87aa4fa95277f96e3277b225a196bf235684
+Size (gnats-4.0.tar.gz) = 1561192 bytes
+SHA1 (patch-aa) = e7a000501277041a61475b5ad0df587e7a9d018d
+SHA1 (patch-ab) = 8f1b4c35629e70ed1a7c6e6ea0b9bb610cfd7d70
diff --git a/databases/gnats/patches/patch-aa b/databases/gnats/patches/patch-aa
index bf7fa9b8ed1..2a10afcdc1d 100644
--- a/databases/gnats/patches/patch-aa
+++ b/databases/gnats/patches/patch-aa
@@ -1,31 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/11 11:42:26 martti Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/10 21:34:46 soren Exp $
 
---- Makefile.in.orig	Thu Nov  5 11:54:07 1998
-+++ Makefile.in	Fri Jan 21 10:04:50 2000
-@@ -68,7 +68,7 @@
- HOST_PREFIX_1 = loser-
+--- gnats/Makefile.in.orig	2003-07-27 01:23:17.000000000 +0200
++++ gnats/Makefile.in	2003-10-16 15:46:10.000000000 +0200
+@@ -91,7 +91,7 @@
  
- # These flag values are normally overridden by the configure script.
--CFLAGS = -g
-+CFLAGS+= -g
- CXXFLAGS = -g -O2
+ INSTALL = $(srcdir)/../install-sh -c
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
  
- LIBCFLAGS = $(CFLAGS)
-@@ -121,7 +121,7 @@
- 
- M4 = `if [ -f $$r/m4/m4 ] ; \
- 	then echo $$r/m4/m4 ; \
--	else echo m4 ; fi`
-+	else echo gm4 ; fi`
- 
- MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
- 	then echo $$r/texinfo/makeinfo/makeinfo ; \
-@@ -313,7 +313,7 @@
- 	"AR_FLAGS=$(AR_FLAGS)" \
- 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
- 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
--	"BISON=$(BISON)" \
-+	"BISON=$(YACC)" \
- 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
- 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
- 	"CFLAGS=$(CFLAGS)" \
+ SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'`
+@@ -386,7 +386,7 @@
+ 	$(INSTALL_SCRIPT) edit-pr $(bindir)/edit-pr
+ 	$(INSTALL_SCRIPT) $(srcdir)/diff-prs $(libexecdir)/gnats/diff-prs
+ 	$(INSTALL_SCRIPT) mail-agent $(libexecdir)/gnats/mail-agent
+-	$(INSTALL_PROGRAM) file-pr $(libexecdir)/gnats/file-pr
++	$(INSTALL_SCRIPT) file-pr $(libexecdir)/gnats/file-pr
+ 	$(INSTALL_PROGRAM) pr-age $(libexecdir)/gnats/pr-age
+ 	$(INSTALL_PROGRAM) pr-edit $(libexecdir)/gnats/pr-edit
+ 	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
diff --git a/databases/gnats/patches/patch-ab b/databases/gnats/patches/patch-ab
index 734e0becaa1..15f21c1efbc 100644
--- a/databases/gnats/patches/patch-ab
+++ b/databases/gnats/patches/patch-ab
@@ -1,30 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2003/06/29 12:54:58 seb Exp $
+$NetBSD: patch-ab,v 1.3 2004/11/10 21:34:46 soren Exp $
 
---- gnats/Makefile.in.orig	2001-05-08 17:23:36.000000000 +0000
-+++ gnats/Makefile.in
-@@ -127,7 +127,6 @@ LIBS = @LIBS@
- KRBINCLUDE = @KRBINCLUDE@
- 
- M4 = @M4@
--MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
- # Where to find texinfo.tex to format docs with TeX
-@@ -465,7 +464,7 @@ gnats.elc: gnats.el $(srcdir)/../send-pr
- 
- getdate.c: getdate.y
- 	@echo expect 10 shift/reduce conflicts
--	$(BISON) $(srcdir)/getdate.y -o getdate.c
-+	$(BISON) -o getdate.c $(srcdir)/getdate.y
- 
- config-send-pr:
- 	@if [ ! -d ../send-pr ]; then \
-@@ -496,7 +495,7 @@ install-tools-arch-indep: all-tools
- 	  echo "*** Warning: Must chown $(GNATS_USER) $(datadir)/gnats" ; \
- 	fi
- 	$(INSTALL_DATA) gnats.el $(lispdir)/gnats.el
--	test -f gnats.elc && $(INSTALL_DATA) gnats.elc $(lispdir)/gnats.elc
-+#	test -f gnats.elc && $(INSTALL_DATA) gnats.elc $(lispdir)/gnats.elc
- 
- install-tools-bin: all-tools
- 	$(INSTALL_PROGRAM) query-pr $(bindir)/query-pr
+--- send-pr/Makefile.in.orig	2003-10-16 15:36:52.000000000 +0200
++++ send-pr/Makefile.in	2003-10-16 15:37:04.000000000 +0200
+@@ -59,7 +59,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ 
+ CFLAGS = -g
+ LDFLAGS = -g
diff --git a/databases/gnats/patches/patch-ac b/databases/gnats/patches/patch-ac
deleted file mode 100644
index 1e975196703..00000000000
--- a/databases/gnats/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/01/20 17:37:58 seb Exp $
-
---- libiberty/strerror.c.orig	1998-11-05 19:54:16.000000000 +0000
-+++ libiberty/strerror.c
-@@ -462,8 +464,11 @@ static const char **sys_errlist;
- 
- #else
- 
-+#include <sys/param.h>
-+#ifndef __NetBSD__
- extern int sys_nerr;
- extern char *sys_errlist[];
-+#endif
- 
- #endif
- 
diff --git a/databases/gnats/patches/patch-ad b/databases/gnats/patches/patch-ad
deleted file mode 100644
index a3a2607332c..00000000000
--- a/databases/gnats/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/06/29 12:54:59 seb Exp $
-
---- send-pr/Makefile.in.orig	2001-05-08 17:22:21.000000000 +0000
-+++ send-pr/Makefile.in
-@@ -67,7 +67,6 @@ TEXIDIR = $(srcdir)/../texinfo
- # Where to find sundry TeX/Texinfo files
- TEXINPUTS = $(srcdir):$(srcdir)/../gnats:$(srcdir)/../send-pr:$(TEXIDIR)
- 
--MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
- INSTALL = @INSTALL@
diff --git a/databases/gnats/patches/patch-ae b/databases/gnats/patches/patch-ae
deleted file mode 100644
index d7758807416..00000000000
--- a/databases/gnats/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/01/20 17:37:58 seb Exp $
-
---- libiberty/functions.def.orig	1998-11-05 19:54:15.000000000 +0000
-+++ libiberty/functions.def
-@@ -34,15 +34,15 @@ DEF(strncasecmp, int, (s1, s2, n), char 
- DEF(strchr, char*, (s, c), CONST char *s AND int c)
- DEF(strdup, char*, (s1), char * s1)
- DEF(strrchr, char*, (s, c), CONST char *s AND int c)
--DEF(strstr, char*, (), NOTHING)
-+DEF(strstr, char*, (s1, s2), CONST char *s1 AND CONST char *s2)
- DEF(strtod, double, (), NOTHING)
- DEF(strtol, long, (), NOTHING)
- DEF(strtoul, unsigned long, (), NOTHING)
- DEF(tmpnam, char *, (s), char * s)
- DEF(vfork, int, (), NOTHING)
--DEF(vfprintf, int, (), NOTHING)
--DEF(vprintf, int, (), NOTHING)
--DEF(vsprintf, int, (), NOTHING)
-+DEF(vfprintf, int, (s, f), PTR s AND CONST char *f)
-+DEF(vprintf, int, (f), CONST char *f)
-+DEF(vsprintf, int, (s, f), char *s AND CONST char *f)
- DEF(sigsetmask, int, (), NOTHING)
- DEF(alloca, PTR, (size), size_t size)
- DEF(waitpid, int, (pid, statp, opts), int pid AND int* statp AND int opts )
diff --git a/databases/gnats/patches/patch-af b/databases/gnats/patches/patch-af
deleted file mode 100644
index e7a5da41946..00000000000
--- a/databases/gnats/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/01/20 17:37:58 seb Exp $
-
---- libiberty/Makefile.in.orig	1998-11-05 19:54:14.000000000 +0000
-+++ libiberty/Makefile.in
-@@ -236,7 +236,7 @@ needed2.awk: $(srcdir)/functions.def Mak
- 	echo "# !Automatically generated from $(srcdir)/functions.def"\
- 	  "- DO NOT EDIT!" >needed2.awk
- 	grep '^DEFVAR(' < $(srcdir)/functions.def \
--	 | sed -e '/DEFVAR/s|DEFVAR.\([^,]*\).*|/\1/ { printf "#ifndef NEED_\1\\n#define NEED_\1\\n#endif\\n" }|' \
-+	 | sed -e '/DEFVAR/s|DEFVAR.\([^,]*\).*|/\1/ \&\& $$0 !~ /warning: reference to compatibility .*; include .* for correct reference/ { printf "#ifndef NEED_\1\\n#define NEED_\1\\n#endif\\n" }|' \
- 	 >>needed2.awk
- 	grep '^DEFFUNC(' < $(srcdir)/functions.def \
- 	 | sed -e '/DEFFUNC/s|DEFFUNC.\([^,]*\).*|/\1/ { printf "#ifndef NEED_\1\\n#define NEED_\1\\n#endif\\n" }|' \
diff --git a/databases/gnats/patches/patch-ag b/databases/gnats/patches/patch-ag
deleted file mode 100644
index 8b6fa463694..00000000000
--- a/databases/gnats/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/01/20 17:37:58 seb Exp $
-
---- libiberty/strsignal.c.orig	1998-11-05 19:54:16.000000000 +0000
-+++ libiberty/strsignal.c
-@@ -243,8 +243,12 @@ static const char **sys_siglist;
- 
- #else
- 
-+#include <sys/param.h>
-+
-+#ifndef __NetBSD__
- static int sys_nsig = NSIG;
- extern const char * const sys_siglist[];
-+#endif
- 
- #endif
-