CVS commit: pkgsrc/databases/gnats

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sat Jan  3 13:25:25 UTC 2026

Modified Files:
        pkgsrc/databases/gnats: Makefile distinfo
        pkgsrc/databases/gnats/patches: patch-gnats_ds-file_mkdb.sh

Log Message:
Fix mkdb to deal with pkgsrc recommendations and location changes:
don't call chown as non-root and don't try to copy gnatsd access config
files to gnatsdb/gnats-adm from a location where they aren't, in the
pkgsrc case.

Fixes
PR pkg/59879


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/databases/gnats/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/gnats/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/gnats/Makefile
diff -u pkgsrc/databases/gnats/Makefile:1.47 pkgsrc/databases/gnats/Makefile:1.48
--- pkgsrc/databases/gnats/Makefile:1.47        Mon Jan 15 08:23:57 2024
+++ pkgsrc/databases/gnats/Makefile     Sat Jan  3 13:25:25 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2024/01/15 08:23:57 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2026/01/03 13:25:25 spz Exp $
 
 DISTNAME=      gnats-4.2.0
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GNU:=gnats/}
-PKGREVISION=   5
+PKGREVISION=   6
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.gnu.org/software/gnats/

Index: pkgsrc/databases/gnats/distinfo
diff -u pkgsrc/databases/gnats/distinfo:1.20 pkgsrc/databases/gnats/distinfo:1.21
--- pkgsrc/databases/gnats/distinfo:1.20        Mon Jan 15 08:23:57 2024
+++ pkgsrc/databases/gnats/distinfo     Sat Jan  3 13:25:25 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2024/01/15 08:23:57 rillig Exp $
+$NetBSD: distinfo,v 1.21 2026/01/03 13:25:25 spz Exp $
 
 BLAKE2s (gnats-4.2.0.tar.gz) = b02dc2a4ab9220469eee6d88de21a81a62097963bf9bd0df980b57df6a29791f
 SHA512 (gnats-4.2.0.tar.gz) = 650faa87206889912e27a27daba4c86292fac90250a88e7e6272cc8488fc19dfd6098bdd450553cd6c2c1d446072a8da9395f1ce7b1cd284596994ce53744152
@@ -6,7 +6,7 @@ Size (gnats-4.2.0.tar.gz) = 1264845 byte
 SHA1 (patch-aa) = bdbfb76857a4be774490f30bf895929138e46f27
 SHA1 (patch-configure) = e31b335643fa2b2cfbbdd11e299183b3e93ce59c
 SHA1 (patch-gnats_ds-file_mkcat.sh) = b3eff03ae12e9bf3e4e33c3fa8f6d62dbe9ec49c
-SHA1 (patch-gnats_ds-file_mkdb.sh) = 40dd8276d9e43cd48c7ef1011f84049c29670a79
+SHA1 (patch-gnats_ds-file_mkdb.sh) = 8b0e112cb2f412a752771ff9aa6079061ddb8612
 SHA1 (patch-gnats_ds-file_rmcat.sh) = 63eee5890e09311c0d986cff081b131f2d350d11
 SHA1 (patch-gnats_edit-pr.sh) = 7f7244975dd70d13714d48a14ec82ddc63cde7b3
 SHA1 (patch-gnats_gnats_h) = e6838f94a8f83551efc8808c9b7ba64f5b506f29

Index: pkgsrc/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh
diff -u pkgsrc/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh:1.1 pkgsrc/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh:1.2
--- pkgsrc/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh:1.1      Sun Apr 19 19:35:00 2015
+++ pkgsrc/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh  Sat Jan  3 13:25:25 2026
@@ -1,10 +1,15 @@
-$NetBSD: patch-gnats_ds-file_mkdb.sh,v 1.1 2015/04/19 19:35:00 spz Exp $
+$NetBSD: patch-gnats_ds-file_mkdb.sh,v 1.2 2026/01/03 13:25:25 spz Exp $
 
 pkgsrcification
 
+we say to run this as GNATS_USER, the chowns don't do anything useful
+
+we copy the gnatsd config files to SYSCONFIGDIR, not to defaults,
+don't try to copy them from defaults to gnats-adm
+
 --- gnats/ds-file/mkdb.sh.orig 2015-01-17 16:41:05.000000000 +0000
 +++ gnats/ds-file/mkdb.sh
-@@ -27,7 +27,7 @@ export PATH
+@@ -27,16 +27,20 @@ export PATH
  
  GNATS_USER=@GNATS_USER@
  DATABASES=@GLOBAL_DB_LIST_FILE@
@@ -13,3 +18,45 @@ pkgsrcification
  
  domkdir() {
      mkdir -p "$1" || { echo "Can't create directory $1, exiting"; exit 1 ; }
+-    chown "${GNATS_USER}" "$1"
++    if [ `whoami` = "root" ]; then
++        chown "${GNATS_USER}" "$1"
++    fi
+ }
+ 
+ docp() {
+     cp $DEFAULTSDIR/"$1" "$2" || { echo "Can't copy file $DEFAULTSDIR/$1 to $2, exiting"; exit 1 ; }
+-    chown "${GNATS_USER}" "$2"
++    if [ `whoami` = "root" ]; then
++        chown "${GNATS_USER}" "$2"
++    fi
+ }
+ 
+ prog=mkdb
+@@ -45,10 +49,10 @@ while [ $# -gt 0 ]; do
+   case "$1" in
+     -*)  echo "$USAGE" ; exit 1 ;;
+      *)  if [ -n "$database" ] ; then
+-          echo "$USAGE" 1>&2 ; exit 1 ;
+-       else
+-          database="$1" ;
+-       fi ;;
++             echo "$USAGE" 1>&2 ; exit 1 ;
++         else
++             database="$1" ;
++         fi ;;
+   esac
+   shift
+ done
+@@ -85,8 +89,9 @@ echo "Copying default files from ${DEFAU
+ docp categories "${dbdir}/gnats-adm/categories"
+ docp submitters "${dbdir}/gnats-adm/submitters"
+ docp responsible "${dbdir}/gnats-adm/responsible"
+-docp gnatsd.user_access "${dbdir}/gnats-adm/gnatsd.user_access"
+-chmod 600 "${dbdir}/gnats-adm/gnatsd.user_access"
++# pkgsrc has the *_access files in SYSCONFIGDIR
++#docp gnatsd.user_access "${dbdir}/gnats-adm/gnatsd.user_access"
++#chmod 600 "${dbdir}/gnats-adm/gnatsd.user_access"
+ docp addresses "${dbdir}/gnats-adm/addresses"
+ docp states "${dbdir}/gnats-adm/states"
+ docp classes "${dbdir}/gnats-adm/classes"