Attachment 138130 Details for Bug 183988 – munge-0.5.11.patch

[patch] munge-0.5.11.patch

munge-0.5.11.patch (text/plain), 6.05 KB, created by Muhammad Moinur Rahman on 2013-11-15 10:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2013-11-15 10:30:02 UTC

Size: 6.05 KB

patch

obsolete

>diff -ruN /usr/ports//security/munge/Makefile ./Makefile
>--- /usr/ports//security/munge/Makefile	2013-09-21 04:55:24.000000000 +0600
>+++ ./Makefile	2013-11-15 03:22:54.000000000 +0600
>@@ -1,41 +1,21 @@
> # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
>-# $FreeBSD: security/munge/Makefile 327769 2013-09-20 22:55:24Z bapt $
>+# $FreeBSD: head/security/munge/Makefile 327769 2013-09-20 22:55:24Z bapt $
> 
> PORTNAME=	munge
>-PORTVERSION=	0.5.10
>-PORTREVISION=	1
>+PORTVERSION=	0.5.11
> CATEGORIES=	security
> MASTER_SITES=	GOOGLE_CODE
> 
> MAINTAINER=	5u623l20@gmail.com
> COMMENT=	Authentication service for creating and validating credentials
> 
>+LICENSE=	GPLv3 LGPL3
>+LICENSE_COMB=	dual
>+
> USE_BZIP2=	yes
> GNU_CONFIGURE=	yes
> USES=		perl5
> USE_LDCONFIG=	yes
> USE_RC_SUBR=	munged
> 
>-MAN1=		unmunge.1 \
>-	       	munge.1 \
>-	       	remunge.1
>-MAN3=		munge.3 \
>-		munge_ctx_copy.3 \
>-	       	munge_ctx_get.3 \
>-	       	munge_ctx.3 \
>-	       	munge_enum_int_to_str.3 \
>-	       	munge_enum_is_valid.3 \
>-	       	munge_enum_str_to_int.3 \
>-	       	munge_enum.3
>-MAN7=		munge.7
>-MAN8=		munged.8
>-MLINKS=		munge.3 munge_strerror.3 \
>-		munge.3 munge_encode.3 \
>-		munge.3 munge_decode.3 \
>-	       	munge_ctx.3 munge_ctx_create.3 \
>-	       	munge_ctx.3 munge_ctx_destroy.3 \
>-		munge_ctx.3 munge_ctx_set.3 \
>-		munge_ctx.3 munge_ctx_strerror.3
>-
>-NO_STAGE=	yes
> .include <bsd.port.mk>
>diff -ruN /usr/ports//security/munge/distinfo ./distinfo
>--- /usr/ports//security/munge/distinfo	2012-07-14 20:29:18.000000000 +0600
>+++ ./distinfo	2013-11-15 02:49:31.000000000 +0600
>@@ -1,2 +1,2 @@
>-SHA256 (munge-0.5.10.tar.bz2) = 00e0125c2895877b555872647b0a98d13838a54acda78614bb6c6e70daadabc6
>-SIZE (munge-0.5.10.tar.bz2) = 424285
>+SHA256 (munge-0.5.11.tar.bz2) = 8e075614f81cb0a6df21a0aafdc825498611a04429d0876f074fc828739351a5
>+SIZE (munge-0.5.11.tar.bz2) = 423232
>diff -ruN /usr/ports//security/munge/files/patch-src-Makefile.in ./files/patch-src-Makefile.in
>--- /usr/ports//security/munge/files/patch-src-Makefile.in	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-Makefile.in	2013-11-15 02:54:01.000000000 +0600
>@@ -0,0 +1,10 @@
>+--- src/Makefile.in.orig	2013-11-15 02:53:07.000000000 +0600
>++++ src/Makefile.in	2013-11-15 02:53:15.000000000 +0600
>+@@ -284,7 +284,6 @@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+ SUBDIRS = \
>+-	etc \
>+ 	libcommon \
>+ 	libmissing \
>+ 	libmunge \
>diff -ruN /usr/ports//security/munge/files/patch-src-etc-Makefile.in ./files/patch-src-etc-Makefile.in
>--- /usr/ports//security/munge/files/patch-src-etc-Makefile.in	2012-07-14 20:29:18.000000000 +0600
>+++ ./files/patch-src-etc-Makefile.in	1970-01-01 06:00:00.000000000 +0600
>@@ -1,28 +0,0 @@
>---- src/etc/Makefile.in.orig	2012-03-24 23:11:13.000000000 +0600
>-+++ src/etc/Makefile.in	2012-03-24 23:14:23.000000000 +0600
>-@@ -431,24 +431,7 @@
>- 	-rm -f *~ \#* .\#* cscope*.out core core.* tags TAGS
>- 
>- 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" \
>--	  || cmp "$(builddir)/munge.init" \
>--	    "$(DESTDIR)$(sysconfdir)/init.d/munge" \
>--	  1>/dev/null 2>&1 || new=".new"; \
>--	$(INSTALL) -m 0755 "$(builddir)/munge.init" \
>--	  "$(DESTDIR)$(sysconfdir)/init.d/munge$${new}"; \
>--	test -d "/etc/sysconfig" && d="sysconfig" || d="default"; \
>--	new=""; test ! -f "$(DESTDIR)$(sysconfdir)/$${d}/munge" \
>--	  || cmp "$(srcdir)/munge.sysconfig" \
>--	    "$(DESTDIR)$(sysconfdir)/$${d}/munge" \
>--	  1>/dev/null 2>&1 || new=".new"; \
>--	$(INSTALL) -m 0755 -d "$(DESTDIR)$(sysconfdir)/$${d}"; \
>--	$(INSTALL) -m 0644 "$(srcdir)/munge.sysconfig" \
>--	  "$(DESTDIR)$(sysconfdir)/$${d}/munge$${new}"; \
>--	$(INSTALL) $${OWNER} -m 0700 -d \
>--	  "$(DESTDIR)$(sysconfdir)/munge"; \
>-+	expr "`id`" : 'uid=0(' >/dev/null && OWNER="-o root" || OWNER=""; \
>- 	$(INSTALL) -m 0711 -d "$(DESTDIR)$(localstatedir)/lib"; \
>- 	$(INSTALL) $${OWNER} -m 0711 -d \
>- 	  "$(DESTDIR)$(localstatedir)/lib/munge"; \
>diff -ruN /usr/ports//security/munge/files/patch-src-munged-xgetgrent.c ./files/patch-src-munged-xgetgrent.c
>--- /usr/ports//security/munge/files/patch-src-munged-xgetgrent.c	2012-10-20 13:53:53.000000000 +0600
>+++ ./files/patch-src-munged-xgetgrent.c	1970-01-01 06:00:00.000000000 +0600
>@@ -1,11 +0,0 @@
>---- src/munged/xgetgrent.c.orig	2012-10-18 16:42:46.000000000 +0200
>-+++ src/munged/xgetgrent.c	2012-10-18 16:43:17.000000000 +0200
>-@@ -194,7 +194,7 @@
>- 
>- #if   HAVE_GETGRENT_R_GNU
>-     rv = getgrent_r (gr, buf, buflen, &gr_ptr);
>--    if (rv == ENOENT) {
>-+    if (((rv == ENOENT) || (rv == 0)) && (gr_ptr == NULL)) {
>-         got_eof = 1;
>-     }
>-     else if (rv != 0) {
>diff -ruN /usr/ports//security/munge/pkg-descr ./pkg-descr
>--- /usr/ports//security/munge/pkg-descr	2012-07-14 20:29:18.000000000 +0600
>+++ ./pkg-descr	2013-11-15 03:02:11.000000000 +0600
>@@ -7,4 +7,4 @@
> credentials without the use of root privileges, reserved ports, or
> platform-specific methods.
> 
>-WWW:	http://code.google.com/p/munge/
>+WWW: http://code.google.com/p/munge/
>diff -ruN /usr/ports//security/munge/pkg-plist ./pkg-plist
>--- /usr/ports//security/munge/pkg-plist	2012-07-14 20:29:18.000000000 +0600
>+++ ./pkg-plist	2013-11-15 03:25:02.000000000 +0600
>@@ -8,7 +8,26 @@
> lib/libmunge.a
> lib/libmunge.so
> sbin/munged
>-@cwd /
>-@exec rm /var/run/${PORTNAME}
>-@exec rm /var/log/${PORTNAME}
>-@exec rm /var/lib/${PORTNAME}
>+man/man1/munge.1.gz
>+man/man1/remunge.1.gz
>+man/man1/unmunge.1.gz
>+man/man3/munge.3.gz
>+man/man3/munge_ctx.3.gz
>+man/man3/munge_ctx_copy.3.gz
>+man/man3/munge_ctx_create.3.gz
>+man/man3/munge_ctx_destroy.3.gz
>+man/man3/munge_ctx_get.3.gz
>+man/man3/munge_ctx_set.3.gz
>+man/man3/munge_ctx_strerror.3.gz
>+man/man3/munge_decode.3.gz
>+man/man3/munge_encode.3.gz
>+man/man3/munge_enum.3.gz
>+man/man3/munge_enum_int_to_str.3.gz
>+man/man3/munge_enum_is_valid.3.gz
>+man/man3/munge_enum_str_to_int.3.gz
>+man/man3/munge_strerror.3.gz
>+man/man7/munge.7.gz
>+man/man8/munged.8.gz
>+@unexec rm %D/var/run/munge 2>&1 >/dev/null || true
>+@unexec rm %D/var/log/munge 2>&1 >/dev/null || true
>+@unexec rm %D/var/lib/munge 2>&1 >/dev/null || true

Actions: View | Diff

Attachments on bug 183988: 138130