CVS commit: pkgsrc/sysutils/gam

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Aug 28 13:20:34 UTC 2024

Modified Files:
        pkgsrc/sysutils/gam: Makefile PLIST distinfo
        pkgsrc/sysutils/gam/patches: patch-src_gam___init.py
            patch-src_gam_var.py
Added Files:
        pkgsrc/sysutils/gam: MESSAGE
        pkgsrc/sysutils/gam/files: README.in

Log Message:
gam: fix and document locations of authorisation files

By default gam creates and stores authorisation files in its installation
directory which is not suitable for pkgsrc (site-packages).
Move authorisation files to PKG_SYSCONFDIR and document the new location.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/gam/MESSAGE
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/gam/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/gam/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/gam/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/gam/files/README.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/gam/patches/patch-src_gam___init.py
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/gam/patches/patch-src_gam_var.py

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

Modified files:

Index: pkgsrc/sysutils/gam/Makefile
diff -u pkgsrc/sysutils/gam/Makefile:1.6 pkgsrc/sysutils/gam/Makefile:1.7
--- pkgsrc/sysutils/gam/Makefile:1.6    Tue Aug 27 16:04:44 2024
+++ pkgsrc/sysutils/gam/Makefile        Wed Aug 28 13:20:33 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2024/08/27 16:04:44 sborrill Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/28 13:20:33 sborrill Exp $
 
 DISTNAME=      gam-6.58
+PKGREVISION=   1
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GAM-team/}
 GITHUB_PROJECT=        GAM
@@ -30,11 +31,24 @@ WRKSRC=             ${WRKDIR}/GAM-${PKGVERSION_NORE
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     gam/var.py
-SUBST_VARS.paths=      LOCALBASE
+SUBST_FILES.paths+=    README.in
+SUBST_VARS.paths=      LOCALBASE PKG_SYSCONFDIR
 
-INSTALLATION_DIRS=     bin ${PYSITELIB}
+PKG_SYSCONFSUBDIR=     gam
+
+EGDIR=         ${PREFIX}/share/examples/gam
+CONF_FILES=    ${EGDIR}/README ${PKG_SYSCONFDIR}/README
+
+INSTALLATION_DIRS=     bin ${PYSITELIB} ${EGDIR}
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
+post-extract:
+       ${CP} ${FILESDIR}/README.in ${WRKSRC}/README.in
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/README.in \
+       ${DESTDIR}${EGDIR}/README
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/gam/PLIST
diff -u pkgsrc/sysutils/gam/PLIST:1.2 pkgsrc/sysutils/gam/PLIST:1.3
--- pkgsrc/sysutils/gam/PLIST:1.2       Tue Aug 27 16:04:44 2024
+++ pkgsrc/sysutils/gam/PLIST   Wed Aug 28 13:20:33 2024
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2024/08/27 16:04:44 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/08/28 13:20:33 sborrill Exp $
 bin/gam
+share/examples/gam/README
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt

Index: pkgsrc/sysutils/gam/distinfo
diff -u pkgsrc/sysutils/gam/distinfo:1.3 pkgsrc/sysutils/gam/distinfo:1.4
--- pkgsrc/sysutils/gam/distinfo:1.3    Tue Aug 27 16:04:44 2024
+++ pkgsrc/sysutils/gam/distinfo        Wed Aug 28 13:20:33 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2024/08/27 16:04:44 sborrill Exp $
+$NetBSD: distinfo,v 1.4 2024/08/28 13:20:33 sborrill Exp $
 
 BLAKE2s (gam-6.58.tar.gz) = 2d2cf4f2ca2666efe9aab226f136272e1eb97864361eba5b32370b1174c57678
 SHA512 (gam-6.58.tar.gz) = 65f0cbab7ed181c8d01b5d9dd7238ccca59124117656ad8a76ed8263f0b864dec36b19bcff81ff656a24ec351ab250f75493173d81354f961006d118763a6119
 Size (gam-6.58.tar.gz) = 370216 bytes
 SHA1 (patch-src_gam___init.py) = 376ac13908171f4db9a52a07c211c751caa351c1
-SHA1 (patch-src_gam_var.py) = f64dc26cd4e83a56aca4caced3c0e9d7e4f73c86
+SHA1 (patch-src_gam_var.py) = 37470fb6acf56b85b8ffe01a138e33b06abb5073

Index: pkgsrc/sysutils/gam/patches/patch-src_gam___init.py
diff -u pkgsrc/sysutils/gam/patches/patch-src_gam___init.py:1.2 pkgsrc/sysutils/gam/patches/patch-src_gam___init.py:1.3
--- pkgsrc/sysutils/gam/patches/patch-src_gam___init.py:1.2     Tue Aug 27 16:04:44 2024
+++ pkgsrc/sysutils/gam/patches/patch-src_gam___init.py Wed Aug 28 13:20:34 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_gam___init.py,v 1.2 2024/08/27 16:04:44 sborrill Exp $
+$NetBSD: patch-src_gam___init.py,v 1.3 2024/08/28 13:20:34 sborrill Exp $
 
 Don't check for updates
 

Index: pkgsrc/sysutils/gam/patches/patch-src_gam_var.py
diff -u pkgsrc/sysutils/gam/patches/patch-src_gam_var.py:1.1 pkgsrc/sysutils/gam/patches/patch-src_gam_var.py:1.2
--- pkgsrc/sysutils/gam/patches/patch-src_gam_var.py:1.1        Tue Aug 27 16:04:44 2024
+++ pkgsrc/sysutils/gam/patches/patch-src_gam_var.py    Wed Aug 28 13:20:34 2024
@@ -1,14 +1,21 @@
-$NetBSD: patch-src_gam_var.py,v 1.1 2024/08/27 16:04:44 sborrill Exp $
+$NetBSD: patch-src_gam_var.py,v 1.2 2024/08/28 13:20:34 sborrill Exp $
 
-Use roots.pem from grpc
+Use roots.pem from grpc.
+Place generated authentication token into PKG_SYSCONFDIR/gam
 
 --- gam/var.py.orig    2024-08-27 16:22:42.815476055 +0100
 +++ gam/var.py 2024-08-27 16:30:07.436182070 +0100
-@@ -1249,7 +1249,7 @@
- _FN_CLIENT_SECRETS_JSON = 'client_secrets.json'
- _FN_OAUTH2SERVICE_JSON = 'oauth2service.json'
- _FN_OAUTH2_TXT = 'oauth2.txt'
+@@ -1246,10 +1246,10 @@
+ 
+ #
+ _DEFAULT_CHARSET = UTF8
+-_FN_CLIENT_SECRETS_JSON = 'client_secrets.json'
+-_FN_OAUTH2SERVICE_JSON = 'oauth2service.json'
+-_FN_OAUTH2_TXT = 'oauth2.txt'
 -_FN_ROOTS_PEM = 'roots.pem'
++_FN_CLIENT_SECRETS_JSON = '@PKG_SYSCONFDIR@/client_secrets.json'
++_FN_OAUTH2SERVICE_JSON = '@PKG_SYSCONFDIR@/oauth2service.json'
++_FN_OAUTH2_TXT = '@PKG_SYSCONFDIR@/oauth2.txt'
 +_FN_ROOTS_PEM = '@LOCALBASE@/share/grpc/roots.pem'
  #
  GM_Globals = {

Added files:

Index: pkgsrc/sysutils/gam/MESSAGE
diff -u /dev/null pkgsrc/sysutils/gam/MESSAGE:1.1
--- /dev/null   Wed Aug 28 13:20:34 2024
+++ pkgsrc/sysutils/gam/MESSAGE Wed Aug 28 13:20:33 2024
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2024/08/28 13:20:33 sborrill Exp $
+
+From gam 6.58nb1 onwards, the default location for the generated
+authorisation files has been moved to ${PKG_SYSCONFDIR}.
+
+See ${PKG_SYSCONFDIR}/README for more details.
+
+===========================================================================

Index: pkgsrc/sysutils/gam/files/README.in
diff -u /dev/null pkgsrc/sysutils/gam/files/README.in:1.1
--- /dev/null   Wed Aug 28 13:20:34 2024
+++ pkgsrc/sysutils/gam/files/README.in Wed Aug 28 13:20:34 2024
@@ -0,0 +1,16 @@
+$NetBSD: README.in,v 1.1 2024/08/28 13:20:34 sborrill Exp $
+
+When gam is first run, it will walk you through the steps to create
+a Google project and use oauth2 to grant access to the required
+scope. This setup procedure will generate 3 files (oauth2.txt,
+oauth2service.json and client_secrets.json) which are used by gam
+to access your Google tenancy. It is important that they are kept
+secure as anyone who has access to those files can make changes
+to your Google settings.
+
+The files will be placed in @PKG_SYSCONFDIR@ by default.
+To override this location, set the following environmental variables:
+
+OAUTHFILE = path to oauth2.txt
+OAUTHSERVICEFILE = path to oauth2service.json
+CLIENTSECRETS = path to client_secrets.json