Update to MUNGE 0.5.11

munge-0.5.11 (2013-08-27):
- Added --mlockall cmdline opt to munged.
- Added --syslog cmdline opt to munged.
- Added --uid and --gid cmdline opts to munge.
- Added numeric timezone to unmunge timestamp output.
- Added timer to munged for periodically stirring PRNG entropy pool.
- Added support for pkg-config.
- Added support for systemd.
- Changed timer thread to better accommodate misbehaving system clocks.
- Changed behavior of munge --string cmdline opt to not append newline.
- Changed init script chkconfig priority levels to start after ntpd/ntpdate.
- Changed init script so munged runs as munge user by default.
- Fixed HMAC validation timing attack vulnerability.
- Fixed bug with munged being unable to restart if daemon not cleanly shutdown.
- Fixed bug with large groups triggering "numerical result out of range" error.
- Fixed bug causing high CPU utilization on FreeBSD when processing group info.
- Fixed bug causing IPv6-only hosts to exit due to failed hostname resolution.
- Fixed autoconf check that was not portable across shells.
- Fixed init script LSB Header on openSUSE.
- Replaced perl build-time dependency with awk.

6 files changed, 41 insertions, 99 deletions

diff --git a/security/munge/Makefile b/security/munge/Makefile
index 1bc1f87e621..7b2b34863a8 100644
--- a/security/munge/Makefile
+++ b/security/munge/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/08/30 20:16:53 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/12/06 00:24:10 asau Exp $
 
-DISTNAME=	munge-0.5.10
-PKGREVISION=	4
+DISTNAME=	munge-0.5.11
 CATEGORIES=	security
 MASTER_SITES=	http://munge.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +9,7 @@ MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://code.google.com/p/munge/
 COMMENT=	Authentication service for creating and validating credentials
 
-USE_TOOLS=	perl
+USE_TOOLS=	perl pkg-config
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--localstatedir=$(VARBASE)
diff --git a/security/munge/PLIST b/security/munge/PLIST
index 5e2b1ad699b..d7900f6c147 100644
--- a/security/munge/PLIST
+++ b/security/munge/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2013/08/30 20:16:53 asau Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/12/06 00:24:10 asau Exp $
 bin/munge
 bin/remunge
 bin/unmunge
 include/munge.h
 lib/libmunge.la
+lib/pkgconfig/munge.pc
 man/man1/munge.1
 man/man1/remunge.1
 man/man1/unmunge.1
diff --git a/security/munge/distinfo b/security/munge/distinfo
index f5792945ba7..9aec9e09352 100644
--- a/security/munge/distinfo
+++ b/security/munge/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/02/19 03:51:17 asau Exp $
+$NetBSD: distinfo,v 1.2 2013/12/06 00:24:10 asau Exp $
 
-SHA1 (munge-0.5.10.tar.bz2) = 2abd4103dc99549e2d8d002d845e301304f3fbbf
-RMD160 (munge-0.5.10.tar.bz2) = d461bd002dde7114608993dacb6a5535a9047f2b
-Size (munge-0.5.10.tar.bz2) = 424285 bytes
-SHA1 (patch-config_x__ac__arch.m4) = c55f74140c7e4234fcbbbee8ba46069745c03994
-SHA1 (patch-configure) = 52b13fea580e2a80ba352475d6486b87d199283d
-SHA1 (patch-src_etc_Makefile.in) = bd0963657918d70bcb03c12cff80831f96d8f4a7
+SHA1 (munge-0.5.11.tar.bz2) = 6939ddabc4bc2b3bacdb8bb2bf24766b666d1c0d
+RMD160 (munge-0.5.11.tar.bz2) = f7908ba980570519dab99f81023201fb0bd3c195
+Size (munge-0.5.11.tar.bz2) = 423232 bytes
+SHA1 (patch-src_etc_Makefile.in) = f2045da279266e4f89ad9302a72cb2c1875d3840
diff --git a/security/munge/patches/patch-config_x__ac__arch.m4 b/security/munge/patches/patch-config_x__ac__arch.m4
deleted file mode 100644
index 18c8d6e5840..00000000000
--- a/security/munge/patches/patch-config_x__ac__arch.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-config_x__ac__arch.m4,v 1.1.1.1 2012/02/19 03:51:17 asau Exp $
-
---- config/x_ac_arch.m4.orig	2006-10-31 01:17:13.000000000 +0000
-+++ config/x_ac_arch.m4
-@@ -57,7 +57,7 @@ AC_DEFUN([X_AC_ARCH], [
-     fi
-   fi
- 
--  if test "$x_ac_arch" == "32"; then
-+  if test "$x_ac_arch" = "32"; then
-     if expr "$host_os" : "aix" >/dev/null 2>&1; then
-       test -z "$OBJECT_MODE" && AC_MSG_ERROR(
-         [The OBJECT_MODE variable must be exported to the shell.])
-@@ -67,7 +67,7 @@ AC_DEFUN([X_AC_ARCH], [
-       test -d /lib -o -d /usr/lib \
-         && LDFLAGS="-L/lib -L/usr/lib $LDFLAGS"
-     fi
--  elif test "$x_ac_arch" == "64"; then
-+  elif test "$x_ac_arch" = "64"; then
-     if expr "$host_os" : "aix" >/dev/null 2>&1; then
-       test -z "$OBJECT_MODE" && AC_MSG_ERROR(
-         [The OBJECT_MODE variable must be exported to the shell.])
diff --git a/security/munge/patches/patch-configure b/security/munge/patches/patch-configure
deleted file mode 100644
index e127f95ebe6..00000000000
--- a/security/munge/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-configure,v 1.1.1.1 2012/02/19 03:51:17 asau Exp $
-
---- configure.orig	2012-01-24 14:54:58.000000000 +0000
-+++ configure
-@@ -4864,7 +4864,7 @@ $as_echo "${x_ac_arch_prog_cc_maix=no}" 
-     fi
-   fi
- 
--  if test "$x_ac_arch" == "32"; then
-+  if test "$x_ac_arch" = "32"; then
-     if expr "$host_os" : "aix" >/dev/null 2>&1; then
-       test -z "$OBJECT_MODE" && as_fn_error $? "The OBJECT_MODE variable must be exported to the shell." "$LINENO" 5
-       OBJECT_MODE=32
-@@ -4873,7 +4873,7 @@ $as_echo "${x_ac_arch_prog_cc_maix=no}" 
-       test -d /lib -o -d /usr/lib \
-         && LDFLAGS="-L/lib -L/usr/lib $LDFLAGS"
-     fi
--  elif test "$x_ac_arch" == "64"; then
-+  elif test "$x_ac_arch" = "64"; then
-     if expr "$host_os" : "aix" >/dev/null 2>&1; then
-       test -z "$OBJECT_MODE" && as_fn_error $? "The OBJECT_MODE variable must be exported to the shell." "$LINENO" 5
-       OBJECT_MODE=64
diff --git a/security/munge/patches/patch-src_etc_Makefile.in b/security/munge/patches/patch-src_etc_Makefile.in
index 2c83a2dce0b..50f0e941e3b 100644
--- a/security/munge/patches/patch-src_etc_Makefile.in
+++ b/security/munge/patches/patch-src_etc_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_etc_Makefile.in,v 1.1.1.1 2012/02/19 03:51:17 asau Exp $
+$NetBSD: patch-src_etc_Makefile.in,v 1.2 2013/12/06 00:24:10 asau Exp $
 
---- src/etc/Makefile.in.orig	2011-01-20 01:41:36.000000000 +0000
+--- src/etc/Makefile.in.orig	2013-08-27 18:35:31.000000000 +0000
 +++ src/etc/Makefile.in
-@@ -217,6 +217,7 @@ sbindir = @sbindir@
+@@ -242,6 +242,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -10,45 +10,33 @@ $NetBSD: patch-src_etc_Makefile.in,v 1.1.1.1 2012/02/19 03:51:17 asau Exp $
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
-@@ -432,23 +433,23 @@ distclean-local::
+@@ -465,14 +466,14 @@ distclean-local::
  
  install-data-local:
- 	expr "`id`" : 'uid=0(' >/dev/null && OWNER="-o daemon" || OWNER=""; \
--	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)/init.d"; \
--	new=""; test ! -f "$(DESTDIR)$(sysconfdir)/init.d/munge" \
-+	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfexampledir)/init.d"; \
-+	new=""; test ! -f "$(DESTDIR)$(sysconfexampledir)/init.d/munge" \
- 	  || cmp "$(builddir)/munge.init" \
--	    "$(DESTDIR)$(sysconfdir)/init.d/munge" \
-+	    "$(DESTDIR)$(sysconfexampledir)/init.d/munge" \
- 	  1>/dev/null 2>&1 || new=".new"; \
- 	$(INSTALL) -m 0755 "$(builddir)/munge.init" \
--	  "$(DESTDIR)$(sysconfdir)/init.d/munge$${new}"; \
-+	  "$(DESTDIR)$(sysconfexampledir)/init.d/munge$${new}"; \
- 	test -d "/etc/sysconfig" && d="sysconfig" || d="default"; \
--	new=""; test ! -f "$(DESTDIR)$(sysconfdir)/$${d}/munge" \
-+	new=""; test ! -f "$(DESTDIR)$(sysconfexampledir)/$${d}/munge" \
- 	  || cmp "$(srcdir)/munge.sysconfig" \
--	    "$(DESTDIR)$(sysconfdir)/$${d}/munge" \
-+	    "$(DESTDIR)$(sysconfexampledir)/$${d}/munge" \
- 	  1>/dev/null 2>&1 || new=".new"; \
--	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)/$${d}"; \
-+	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfexampledir)/$${d}"; \
- 	$(INSTALL) -m 0644 "$(srcdir)/munge.sysconfig" \
--	  "$(DESTDIR)$(sysconfdir)/$${d}/munge$${new}"; \
-+	  "$(DESTDIR)$(sysconfexampledir)/$${d}/munge$${new}"; \
- 	$(INSTALL) $${OWNER} -m 0700 -d \
--	  "$(DESTDIR)$(sysconfdir)/munge"; \
-+	  "$(DESTDIR)$(sysconfexampledir)/munge"; \
- 	$(INSTALL) -m 0711 -d "$(DESTDIR)$(localstatedir)/lib"; \
- 	$(INSTALL) $${OWNER} -m 0711 -d \
- 	  "$(DESTDIR)$(localstatedir)/lib/munge"; \
-@@ -458,7 +459,7 @@ install-data-local:
- 	$(INSTALL) -m 0711 -d "$(DESTDIR)$(localstatedir)/run"; \
- 	$(INSTALL) $${OWNER} -m 0755 -d \
- 	  "$(DESTDIR)$(localstatedir)/run/munge"
--	chmod 755 "$(DESTDIR)$(sysconfdir)"
-+	chmod 755 "$(DESTDIR)$(sysconfexampledir)"
- 	chmod 755 "$(DESTDIR)$(localstatedir)"
- 	chmod 755 "$(DESTDIR)$(localstatedir)/lib"
- 	chmod 755 "$(DESTDIR)$(localstatedir)/log"
+ 	test -d "/etc/rc.d/init.d" \
+-	    && INITDIR="$(sysconfdir)/rc.d/init.d" \
+-	    || INITDIR="$(sysconfdir)/init.d"; \
++	    && INITDIR="$(sysconfexampledir)/rc.d/init.d" \
++	    || INITDIR="$(sysconfexampledir)/init.d"; \
+ 	  $(INSTALL) -m 0755 -d "$(DESTDIR)$${INITDIR}"; \
+ 	  $(INSTALL) -m 0755 \
+ 	    "$(builddir)/munge.init" "$(DESTDIR)$${INITDIR}/munge"
+ 	test -d "/etc/sysconfig" \
+-	    && CONFDIR="$(sysconfdir)/sysconfig" \
+-	    || CONFDIR="$(sysconfdir)/default"; \
++	    && CONFDIR="$(sysconfexampledir)/sysconfig" \
++	    || CONFDIR="$(sysconfexampledir)/default"; \
+ 	  $(INSTALL) -m 0755 -d "$(DESTDIR)$${CONFDIR}"; \
+ 	  $(INSTALL) -m 0644 \
+ 	    "$(srcdir)/munge.sysconfig" "$(DESTDIR)$${CONFDIR}/munge"
+@@ -500,8 +501,8 @@ install-data-local:
+ 	    "$(srcdir)/munge-tmpfiles.conf" \
+ 	    "$(DESTDIR)$(prefix)/lib/tmpfiles.d/munge.conf"; \
+ 	fi
+-	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)"
+-	$(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfdir)/munge"
++	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfexampledir)"
++	$(INSTALL) -m 0700 -d "$(DESTDIR)$(sysconfexampledir)/munge"
+ 	$(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)"
+ 	$(INSTALL) -m 0755 -d "$(DESTDIR)$(localstatedir)/lib"
+ 	$(INSTALL) -m 0711 -d "$(DESTDIR)$(localstatedir)/lib/munge"