pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q2]: pkgsrc/databases/gnats Pullup ticket 720 - requested ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b9f647abd29f
branches: pkgsrc-2005Q2
changeset: 496045:b9f647abd29f
user: salo <salo%pkgsrc.org@localhost>
date: Mon Aug 29 13:41:42 2005 +0000
description:
Pullup ticket 720 - requested by Adrian Portelli
update and security fix for gnats
Revisions pulled up:
- pkgsrc/databases/gnats/Makefile 1.20 (partially), 1.21
- pkgsrc/databases/gnats/MESSAGE 1.7
- pkgsrc/databases/gnats/PLIST 1.9
- pkgsrc/databases/gnats/distinfo 1.7, 1.8
- pkgsrc/databases/gnats/patches/patch-aa 1.3, 1.4
- pkgsrc/databases/gnats/patches/patch-ab 1.4
- pkgsrc/databases/gnats/patches/patch-ac 1.4
- pkgsrc/databases/gnats/patches/patch-ad 1.3
- pkgsrc/databases/gnats/patches/patch-ae 1.3
Module Name: pkgsrc
Committed By: recht
Date: Sat Aug 27 22:24:02 UTC 2005
Modified Files:
pkgsrc/databases/gnats: MESSAGE Makefile PLIST distinfo
pkgsrc/databases/gnats/patches: patch-aa patch-ab
Added Files:
pkgsrc/databases/gnats/patches: patch-ac patch-ad patch-ae
Log Message:
Update to gnats 4.1.0.
Make a overhaul of the package and bring it closer to pkgsrc standards.
Addresses PR 26174 by Hauke Fath.
changes:
This is GNATS 4.1.0, a release that incorporates multiple bug fixes
and enhancements that have been committed to CVS since the release of
GNATS 4.0. Notable enhancements include:
- Upgrade to autoconf 2.59 generated configure scripts.
- New PR numbers are reported to the client upon new submissions
- Rewrite of install-sid. Now, rather than editing send-pr, which can
be installed on a read-only partition, install-sid creates or edits
user or site configuration files ~/.send-pr.conf or
/etc/gnats/send-pr.conf.
- Removal of libiberty, old manpages, and old build framework cruft
- Performance enhancements to indexing code
- Various cleanups and bugfixes. See the ChangeLog files for details.
---
Module Name: pkgsrc
Committed By: recht
Date: Sun Aug 28 12:36:42 UTC 2005
Modified Files:
pkgsrc/databases/gnats: Makefile distinfo
pkgsrc/databases/gnats/patches: patch-aa
Log Message:
Add a patch from gnats CSV to fix the security problem noted in:
http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2180
Patch by adrianp@.
ChangeLog from gnats CSV:
* Makefile.in (install-gnats-tools, install-gnats-bin): Removed chown
and chmod entries for setting binaries suid. CAN-2005-2180 advisory.
gen-index as setuid root can overwrite any system file.
Bump PKGREVISION to 1.
diffstat:
databases/gnats/MESSAGE | 7 +-
databases/gnats/Makefile | 57 +++++++++++---
databases/gnats/PLIST | 41 +++++-----
databases/gnats/distinfo | 15 ++-
databases/gnats/patches/patch-aa | 147 +++++++++++++++++++++++++++++++++++---
databases/gnats/patches/patch-ab | 22 ++++-
databases/gnats/patches/patch-ac | 13 +++
databases/gnats/patches/patch-ad | 23 ++++++
databases/gnats/patches/patch-ae | 23 ++++++
9 files changed, 289 insertions(+), 59 deletions(-)
diffs (truncated from 451 to 300 lines):
diff -r c0d01a21331e -r b9f647abd29f databases/gnats/MESSAGE
--- a/databases/gnats/MESSAGE Mon Aug 29 09:26:35 2005 +0000
+++ b/databases/gnats/MESSAGE Mon Aug 29 13:41:42 2005 +0000
@@ -1,11 +1,12 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.6 2004/11/10 21:34:46 soren Exp $
+$NetBSD: MESSAGE,v 1.6.6.1 2005/08/29 13:41:42 salo Exp $
See http://www.gnu.org/software/gnats/ for the official web page
-and don't forget to run ${PREFIX}/libexec/gnats/mkcat as gnats.
+and don't forget to run ${PREFIX}/libexec/gnats/mkdb default
+as user ${GNATS_USER} to create the default database.
Add the following line to /etc/inetd.conf to activate GNATS:
- support stream tcp nowait gnats ${PREFIX}/libexec/gnats/gnatsd gnatsd
+ ${GNATS_SERVICE} stream tcp nowait ${GNATS_USER} ${PREFIX}/libexec/gnats/gnatsd gnatsd
Add something like this into the crontab to process incoming bug reports:
*/5 * * * * ${PREFIX}/libexec/gnats/queue-pr -r
diff -r c0d01a21331e -r b9f647abd29f databases/gnats/Makefile
--- a/databases/gnats/Makefile Mon Aug 29 09:26:35 2005 +0000
+++ b/databases/gnats/Makefile Mon Aug 29 13:41:42 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:45 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.17.2.1 2005/08/29 13:41:42 salo Exp $
-DISTNAME= gnats-4.0.1
+DISTNAME= gnats-4.1.0
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_GNU:=gnats/}
@@ -10,28 +10,59 @@
COMMENT= GNATS bug tracking system
USE_PKGLOCALEDIR= yes
+USE_PKGINSTALL= yes
USE_TOOLS+= gm4 gmake
USE_BISON= yes
USE_MAKEINFO= yes
TEXINFO_REQD= 4.6
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --with-gnats-service=service-name=${GNATS_SERVICE}
+CONFIGURE_ARGS+= --with-gnats-user=${GNATS_USER}
+CONFIGURE_ARGS+= --with-gnatsd-user-access-file=${GNATS_USER_FILE:Q}
+CONFIGURE_ARGS+= --with-gnatsd-host-access-file=${GNATS_HOST_FILE:Q}
+CONFIGURE_ARGS+= --with-gnats-dblist-file=${GNATS_DB_FILE:Q}
+CONFIGURE_ARGS+= --with-gnats-default-db=${GNATS_DBHOME:Q}
+CONFIGURE_ARGS+= --with-lispdir=${PREFIX}/share/gnats
INFO_FILES= gnats.info gnats-faq.info
-CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
+PKG_SYSCONFSUBDIR= gnats
-GNATS_HOME= ${PREFIX}/share/gnats/gnats-db
-PKG_USERS= gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:${SH}
+GNATS_USER?= gnats
+GNATS_GROUP?= daemon
+GNATS_SERVICE?= support
+GNATS_HOME?= ${VARBASE}/db/gnats
+PKG_USERS= ${GNATS_USER}:${GNATS_GROUP}::GNATS\\ database\\ owner:${GNATS_HOME}:${SH}
-MAKE_DIRS= ${PREFIX}/share/gnats
+GNATS_USER_FILE?= ${PKG_SYSCONFDIR}/gnatsd.user_access
+GNATS_HOST_FILE?= ${PKG_SYSCONFDIR}/gnatsd.host_access
+GNATS_DB_FILE?= ${PKG_SYSCONFDIR}/databases
+GNATS_DBHOME?= ${GNATS_HOME}/gnatsdb
+
+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
-OWN_DIRS_PERMS+= ${GNATS_HOME}/gnats-adm gnats daemon 755
-OWN_DIRS_PERMS+= ${GNATS_HOME}/gnats-adm/locks gnats daemon 755
+MAKE_DIRS+= ${EGDIR}
+OWN_DIRS_PERMS+= ${GNATS_HOME} gnats daemon 755
-MESSAGE_SUBST+= PREFIX="${PREFIX}"
+EGDIR= ${PREFIX}/share/examples/gnats
+CONF_FILES_PERMS+= ${EGDIR}/gnatsd.user_access ${GNATS_USER_FILE} \
+ ${GNATS_USER} ${GNATS_GROUP} 0600
+CONF_FILES_PERMS+= ${EGDIR}/gnatsd.host_access ${GNATS_HOST_FILE} \
+ ${GNATS_USER} ${GNATS_GROUP} 0600
+CONF_FILES_PERMS+= ${EGDIR}/databases ${GNATS_DB_FILE} \
+ ${GNATS_USER} ${GNATS_GROUP} 0600
+CONF_FILES+= ${EGDIR}/send-pr.conf ${PKG_SYSCONFDIR}/send-pr.conf
+
+MESSAGE_SUBST+= PREFIX=${PREFIX}
+MESSAGE_SUBST+= GNATS_USER=${GNATS_USER}
+MESSAGE_SUBST+= GNATS_SERVICE=${GNATS_SERVICE}
+
+SUBST_CLASSES+= gnats
+SUBST_STAGE.gnats= pre-configure
+SUBST_FILES.gnats= gnats/Makefile.in gnats/mkdb.sh send-pr/Makefile.in
+SUBST_SED.gnats= -e "s,%%EGDIR%%,${EGDIR},g"
+SUBST_SED.gnats+= -e "s,%%GNATS_DEFAULTS%%,${PREFIX}/share/gnats/defaults,g"
.include "../../mk/bsd.pkg.mk"
diff -r c0d01a21331e -r b9f647abd29f databases/gnats/PLIST
--- a/databases/gnats/PLIST Mon Aug 29 09:26:35 2005 +0000
+++ b/databases/gnats/PLIST Mon Aug 29 13:41:42 2005 +0000
@@ -1,27 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/11/14 10:59:58 soren Exp $
+@comment $NetBSD: PLIST,v 1.8.6.1 2005/08/29 13:41:42 salo Exp $
bin/edit-pr
bin/getclose
bin/install-sid
bin/query-pr
bin/send-pr
-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
-info/gnats.info
-info/gnats.info-1
-info/gnats.info-2
-info/gnats.info-3
-info/gnats.info-4
-info/gnats.info-5
-info/gnats.info-6
-info/gnats-faq.info
libexec/gnats/at-pr
libexec/gnats/check-db
libexec/gnats/delete-pr
@@ -47,11 +29,28 @@
man/man8/delete-pr.8
man/man8/file-pr.8
man/man8/gen-index.8
+man/man8/getclose.8
man/man8/gnatsd.8
+man/man8/install-sid.8
man/man8/mkcat.8
man/man8/mkdb.8
man/man8/pr-edit.8
man/man8/queue-pr.8
man/man8/rmcat.8
-@dirrm etc/gnats/defaults
-@dirrm etc/gnats
+share/examples/gnats/databases
+share/examples/gnats/gnatsd.host_access
+share/examples/gnats/gnatsd.user_access
+share/examples/gnats/send-pr.conf
+share/gnats/defaults/addresses
+share/gnats/defaults/categories
+share/gnats/defaults/classes
+share/gnats/defaults/dbconfig
+share/gnats/defaults/gnatsd.user_access
+share/gnats/defaults/responsible
+share/gnats/defaults/states
+share/gnats/defaults/submitters
+share/gnats/gnats.el
+@dirrm share/gnats/defaults
+@dirrm share/gnats
+@dirrm share/examples/gnats
+@dirrm libexec/gnats
diff -r c0d01a21331e -r b9f647abd29f databases/gnats/distinfo
--- a/databases/gnats/distinfo Mon Aug 29 09:26:35 2005 +0000
+++ b/databases/gnats/distinfo Mon Aug 29 13:41:42 2005 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 16:33:05 agc Exp $
+$NetBSD: distinfo,v 1.6.4.1 2005/08/29 13:41:42 salo Exp $
-SHA1 (gnats-4.0.1.tar.gz) = 4139af3842ade6cdfe8b14eff50e49aff3d70c40
-RMD160 (gnats-4.0.1.tar.gz) = 9823920d3dc8fe9d70e47a3bc1c475776592b831
-Size (gnats-4.0.1.tar.gz) = 1477650 bytes
-SHA1 (patch-aa) = e7a000501277041a61475b5ad0df587e7a9d018d
-SHA1 (patch-ab) = 8f1b4c35629e70ed1a7c6e6ea0b9bb610cfd7d70
+SHA1 (gnats-4.1.0.tar.gz) = 7f8ce7fbb7594698c5ba71421cad3cbc7e079003
+RMD160 (gnats-4.1.0.tar.gz) = b16bfa3ffa4f1c7dc351d1c5639061c358c64afd
+Size (gnats-4.1.0.tar.gz) = 1221364 bytes
+SHA1 (patch-aa) = 46ee888dd1726d7c7178247dd8c11c3bc8790911
+SHA1 (patch-ab) = 605e0caaed659405fff46af6c610d52c9dca948e
+SHA1 (patch-ac) = f6fdd1c2353961d47bd0e58866b56ac6f0d6173a
+SHA1 (patch-ad) = ffacd88288036eb74eccd6687292c5a456e2f027
+SHA1 (patch-ae) = ff99ebd3f6d2d1aa75b32ead56db0082eeb69753
diff -r c0d01a21331e -r b9f647abd29f databases/gnats/patches/patch-aa
--- a/databases/gnats/patches/patch-aa Mon Aug 29 09:26:35 2005 +0000
+++ b/databases/gnats/patches/patch-aa Mon Aug 29 13:41:42 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/11/10 21:34:46 soren Exp $
+$NetBSD: patch-aa,v 1.2.6.1 2005/08/29 13:41:42 salo Exp $
---- 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 @@
+--- gnats/Makefile.in.orig 2005-02-24 21:35:55.000000000 +0100
++++ gnats/Makefile.in 2005-08-28 14:24:22.000000000 +0200
+@@ -93,7 +93,7 @@
INSTALL = $(srcdir)/../install-sh -c
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -11,12 +11,135 @@
INSTALL_DATA = @INSTALL_DATA@
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
+@@ -250,7 +250,7 @@
+
+ mkcat: mkcat.sh Makefile
+ @echo Creating mkcat...
+- @cat $(srcdir)/mkcat.sh > $@-t
++ @sed -e 's,xBINDIRx,$(bindir),g' $(srcdir)/mkcat.sh > $@-t
+ @mv $@-t $@
+ @chmod a+x $@
+
+@@ -265,7 +265,7 @@
+
+ rmcat: rmcat.sh Makefile
+ @echo Creating rmcat...
+- @cat $(srcdir)/rmcat.sh > $@-t
++ @sed -e 's,xBINDIRx,$(bindir),g' $(srcdir)/rmcat.sh > $@-t
+ @mv $@-t $@
+ @chmod a+x $@
+
+@@ -369,7 +369,7 @@
+
+ install-tools-arch-indep: all-tools
+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnats
+- $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sysconfdir)/gnats/defaults
++ $(SHELL) $(srcdir)/../mkinstalldirs %%GNATS_DEFAULTS%%
@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
+ echo "chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \
+ chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats ; \
+@@ -379,9 +379,9 @@
+ $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el
+ for i in categories submitters responsible gnatsd.user_access addresses states classes dbconfig ; do \
+ if [ -f "$$i" ] ; then \
+- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
++ $(INSTALL_DATA) $$i %%GNATS_DEFAULTS%%/$$i ; \
+ else \
+- $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
++ $(INSTALL_DATA) $(srcdir)/$$i %%GNATS_DEFAULTS%%/$$i ; \
+ fi ; \
+ done
+
+@@ -391,17 +391,9 @@
+ $(INSTALL_SCRIPT) edit-pr $(DESTDIR)$(bindir)/edit-pr
+ $(INSTALL_SCRIPT) diff-prs $(DESTDIR)$(libexecdir)/gnats/diff-prs
+ $(INSTALL_SCRIPT) mail-agent $(DESTDIR)$(libexecdir)/gnats/mail-agent
+- $(INSTALL_PROGRAM) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
++ $(INSTALL_SCRIPT) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
+ $(INSTALL_PROGRAM) pr-age $(DESTDIR)$(libexecdir)/gnats/pr-age
+ $(INSTALL_PROGRAM) pr-edit $(DESTDIR)$(libexecdir)/gnats/pr-edit
+- @if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
+- echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \
+- echo "chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \
+- chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \
+- chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \
+- else \
+- echo "*** Warning: Must make pr-edit suid $(DESTDIR)$(GNATS_USER)" ; \
+- fi
+
+ EXTRA_INSTALL =
+
+@@ -409,29 +401,42 @@
+ install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL)
+
+ install-gnats-arch-indep: all-gnats install-tools-arch-indep
+- @if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ]; then \
+- echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE), it's already there." ; \
++ @if [ -f %%EGDIR%%/databases ]; then \
++ echo "Not putting gnats-databases file in %%EGDIR%%/databases, it's already there." ; \
+ true ; \
+ else \
+ if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
+ $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \
+- $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
++ %%EGDIR%%/databases ; \
+ else \
+- $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
+- echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE)" ; \
++ $(INSTALL_DATA) gnats-databases %%EGDIR%%/databases ; \
++ echo "*** Warning: Must chown $(GNATS_USER) %%EGDIR%%/databases" ; \
+ fi \
+ fi
+- @if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ]; then \
+- echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE), it's already there." ; \
++ @if [ -f %%EGDIR%%/gnatsd.host_access ]; then \
++ echo "Not putting gnats.host_access file in %%EGDIR%%/gnatsd.host_access, it's already there." ; \
+ true ; \
+ else \
+ if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
Home |
Main Index |
Thread Index |
Old Index