CVS commit: pkgsrc/security/munge

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security/munge
From: "Jason Bacon" <bacon%netbsd.org@localhost>
Date: Sat, 24 Mar 2018 18:05:59 +0000

Module Name:    pkgsrc
Committed By:   bacon
Date:           Sat Mar 24 18:05:58 UTC 2018

Modified Files:
        pkgsrc/security/munge: Makefile PLIST PLIST.FreeBSD PLIST.Linux
            PLIST.NetBSD distinfo
        pkgsrc/security/munge/patches: patch-src_etc_Makefile.in

Log Message:
security/munge: Fix PLIST issues, new maintainer bacon%NetBSD.org@localhost

Also add LICENSE, patch Linux init scripts, create etc/munge dir


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/munge/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/munge/PLIST \
    pkgsrc/security/munge/PLIST.NetBSD pkgsrc/security/munge/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/munge/PLIST.FreeBSD
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/munge/PLIST.Linux
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/security/munge/patches/patch-src_etc_Makefile.in

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

Modified files:

Index: pkgsrc/security/munge/Makefile
diff -u pkgsrc/security/munge/Makefile:1.18 pkgsrc/security/munge/Makefile:1.19
--- pkgsrc/security/munge/Makefile:1.18 Wed Feb 28 09:20:29 2018
+++ pkgsrc/security/munge/Makefile      Sat Mar 24 18:05:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/02/28 09:20:29 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/03/24 18:05:58 bacon Exp $
 
 DISTNAME=      munge-0.5.13
 CATEGORIES=    security
@@ -6,20 +6,33 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=dun/
 GITHUB_RELEASE=        ${DISTNAME}
 EXTRACT_SUFX=  .tar.xz
 
-MAINTAINER=    asau%inbox.ru@localhost
+MAINTAINER=    bacon%NetBSD.org@localhost
 HOMEPAGE=      https://dun.github.io/munge/
 COMMENT=       Authentication service for creating and validating credentials
+LICENSE=       gnu-gpl-v3
 
-USE_TOOLS=     perl pkg-config
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
+USE_TOOLS+=            perl pkg-config
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 INSTALLATION_DIRS+=    lib/pkgconfig
 
-OWN_DIRS=      ${VARBASE}/lib/munge ${VARBASE}/log/munge ${VARBASE}/run/munge
+OWN_DIRS=      ${VARBASE}/lib/munge
+OWN_DIRS+=     ${VARBASE}/log/munge
+OWN_DIRS+=     ${VARBASE}/run/munge
+OWN_DIRS+=     etc/munge
+
+BUILD_DEFS+=   VARBASE
 
 RCD_SCRIPTS+=  munge
 
+SUBST_CLASSES+=                init
+SUBST_STAGE.init=      post-build
+SUBST_FILES.init=      ${WRKSRC}/src/etc/munge.init
+SUBST_FILES.init+=     ${WRKSRC}/src/etc/munge.sysconfig
+SUBST_SED.init=                -e 's|USER="munge"|USER="daemon"|g'
+SUBST_SED.init+=       -e 's|GROUP="munge"|GROUP="daemon"|g'
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"

Index: pkgsrc/security/munge/PLIST
diff -u pkgsrc/security/munge/PLIST:1.5 pkgsrc/security/munge/PLIST:1.6
--- pkgsrc/security/munge/PLIST:1.5     Wed Feb 28 09:20:29 2018
+++ pkgsrc/security/munge/PLIST Sat Mar 24 18:05:58 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/02/28 09:20:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/03/24 18:05:58 bacon Exp $
 bin/munge
 bin/remunge
 bin/unmunge
@@ -28,3 +28,6 @@ man/man3/munge_strerror.3
 man/man7/munge.7
 man/man8/munged.8
 sbin/munged
+@pkgdir var/run/munge
+@pkgdir var/log/munge
+@pkgdir var/lib/munge
Index: pkgsrc/security/munge/PLIST.NetBSD
diff -u pkgsrc/security/munge/PLIST.NetBSD:1.5 pkgsrc/security/munge/PLIST.NetBSD:1.6
--- pkgsrc/security/munge/PLIST.NetBSD:1.5      Wed Feb 28 09:20:29 2018
+++ pkgsrc/security/munge/PLIST.NetBSD  Sat Mar 24 18:05:58 2018
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.5 2018/02/28 09:20:29 wiz Exp $
-share/munge/examples/default/munge
-share/munge/examples/init.d/munge
+@comment $NetBSD: PLIST.NetBSD,v 1.6 2018/03/24 18:05:58 bacon Exp $
+share/examples/munge/default/munge
+share/examples/munge/init.d/munge
Index: pkgsrc/security/munge/distinfo
diff -u pkgsrc/security/munge/distinfo:1.5 pkgsrc/security/munge/distinfo:1.6
--- pkgsrc/security/munge/distinfo:1.5  Wed Feb 28 09:20:29 2018
+++ pkgsrc/security/munge/distinfo      Sat Mar 24 18:05:58 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2018/02/28 09:20:29 wiz Exp $
+$NetBSD: distinfo,v 1.6 2018/03/24 18:05:58 bacon Exp $
 
 SHA1 (munge-0.5.13.tar.xz) = bcb0b89e44c5c0ec21f4bcfaacb4493b82aace61
 RMD160 (munge-0.5.13.tar.xz) = 77c6e9df935ddc1ffe6cd481e015f59e2f74e1b7
 SHA512 (munge-0.5.13.tar.xz) = 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
 Size (munge-0.5.13.tar.xz) = 389952 bytes
-SHA1 (patch-src_etc_Makefile.in) = ca2e4a47a9a6986c962675368eab5e770df99ad3
+SHA1 (patch-src_etc_Makefile.in) = 2133f8cf5e718d786bf2ec86c2f7fd3e2a4cdfee

Index: pkgsrc/security/munge/PLIST.FreeBSD
diff -u pkgsrc/security/munge/PLIST.FreeBSD:1.4 pkgsrc/security/munge/PLIST.FreeBSD:1.5
--- pkgsrc/security/munge/PLIST.FreeBSD:1.4     Mon Jan  1 22:29:54 2018
+++ pkgsrc/security/munge/PLIST.FreeBSD Sat Mar 24 18:05:58 2018
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.4 2018/01/01 22:29:54 rillig Exp $
-share/examples/default/munge
-share/examples/init.d/munge
+@comment $NetBSD: PLIST.FreeBSD,v 1.5 2018/03/24 18:05:58 bacon Exp $
+share/examples/munge/default/munge
+share/examples/munge/init.d/munge

Index: pkgsrc/security/munge/PLIST.Linux
diff -u pkgsrc/security/munge/PLIST.Linux:1.3 pkgsrc/security/munge/PLIST.Linux:1.4
--- pkgsrc/security/munge/PLIST.Linux:1.3       Tue Dec 29 04:04:31 2015
+++ pkgsrc/security/munge/PLIST.Linux   Sat Mar 24 18:05:58 2018
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2015/12/29 04:04:31 dholland Exp $
-share/examples/rc.d/init.d/munge
-share/examples/sysconfig/munge
+@comment $NetBSD: PLIST.Linux,v 1.4 2018/03/24 18:05:58 bacon Exp $
+share/examples/munge/rc.d/init.d/munge
+share/examples/munge/sysconfig/munge

Index: pkgsrc/security/munge/patches/patch-src_etc_Makefile.in
diff -u pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.4 pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.5
--- pkgsrc/security/munge/patches/patch-src_etc_Makefile.in:1.4 Wed Feb 28 09:20:29 2018
+++ pkgsrc/security/munge/patches/patch-src_etc_Makefile.in     Sat Mar 24 18:05:58 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_etc_Makefile.in,v 1.4 2018/02/28 09:20:29 wiz Exp $
+$NetBSD: patch-src_etc_Makefile.in,v 1.5 2018/03/24 18:05:58 bacon Exp $
+
+Install configuration into example directory.
 
 --- src/etc/Makefile.in.orig   2017-09-26 21:57:53.000000000 +0000
 +++ src/etc/Makefile.in
@@ -6,7 +8,7 @@ $NetBSD: patch-src_etc_Makefile.in,v 1.4
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
-+sysconfexampledir = $(pkgdatadir)/examples
++sysconfexampledir = $(prefix)/share/examples/munge
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@

Follow-Ups:
- Re: CVS commit: pkgsrc/security/munge
  - From: Joerg Sonnenberger

Prev by Date: CVS commit: pkgsrc/fonts/fontconfig
Next by Date: CVS commit: pkgsrc/devel/extra-cmake-modules
Previous by Thread: CVS commit: pkgsrc/fonts/fontconfig
Next by Thread: Re: CVS commit: pkgsrc/security/munge
Indexes:

Home | Main Index | Thread Index | Old Index