diff options
author | joerg <joerg@pkgsrc.org> | 2011-11-23 23:31:22 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-11-23 23:31:22 +0000 |
commit | 5a0a3e2375f13039dececae3bb0f1cc21a551e5f (patch) | |
tree | 9626260997859d4533cdb5da8438c3e56f4cab4f | |
parent | 130ec41e8378cba3d79146d630ab009c62e4a207 (diff) | |
download | pkgsrc-5a0a3e2375f13039dececae3bb0f1cc21a551e5f.tar.gz |
Fix unprivileged build. Use SPECIAL_PERMS. Sort PLIST. Bump revision.
-rw-r--r-- | net/openvpn-acct-wtmpx/Makefile | 5 | ||||
-rw-r--r-- | net/openvpn-acct-wtmpx/PLIST | 4 | ||||
-rw-r--r-- | net/openvpn-acct-wtmpx/distinfo | 4 | ||||
-rw-r--r-- | net/openvpn-acct-wtmpx/patches/patch-aa | 14 |
4 files changed, 15 insertions, 12 deletions
diff --git a/net/openvpn-acct-wtmpx/Makefile b/net/openvpn-acct-wtmpx/Makefile index c315057379f..b5cd37f11e5 100644 --- a/net/openvpn-acct-wtmpx/Makefile +++ b/net/openvpn-acct-wtmpx/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/07/14 04:46:18 manu Exp $ +# $NetBSD: Makefile,v 1.2 2011/11/23 23:31:22 joerg Exp $ # DISTNAME= openvpn-acct-wtmpx-20091110 +PKGREVISION= 1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} openvpn-2.1_rc20.tar.gz CATEGORIES= net MASTER_SITES= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/ @@ -19,4 +20,6 @@ USE_TOOLS+= install WRKSRC= ${WRKDIR}/openvpn-acct-wtmpx +SPECIAL_PERMS+= bin/logwtmpx ${SETUID_ROOT_PERMS} + .include "../../mk/bsd.pkg.mk" diff --git a/net/openvpn-acct-wtmpx/PLIST b/net/openvpn-acct-wtmpx/PLIST index d14d7a864b6..1b6ce9bd160 100644 --- a/net/openvpn-acct-wtmpx/PLIST +++ b/net/openvpn-acct-wtmpx/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/14 04:46:18 manu Exp $ -lib/openvpn/openvpn-acct-wtmpx.la +@comment $NetBSD: PLIST,v 1.2 2011/11/23 23:31:22 joerg Exp $ bin/logwtmpx +lib/openvpn/openvpn-acct-wtmpx.la diff --git a/net/openvpn-acct-wtmpx/distinfo b/net/openvpn-acct-wtmpx/distinfo index a7356cab9c8..32b74a3d832 100644 --- a/net/openvpn-acct-wtmpx/distinfo +++ b/net/openvpn-acct-wtmpx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/07/14 04:46:18 manu Exp $ +$NetBSD: distinfo,v 1.2 2011/11/23 23:31:22 joerg Exp $ SHA1 (openvpn-2.1_rc20.tar.gz) = ab0e928bd7d4896ddb0061bf3aba9f3cd6cefe6e RMD160 (openvpn-2.1_rc20.tar.gz) = 4dd7924cb41a268e76a93af66fd05f948f22e5f3 @@ -6,4 +6,4 @@ Size (openvpn-2.1_rc20.tar.gz) = 844253 bytes SHA1 (openvpn-acct-wtmpx-20091110.tgz) = 3bbe32fdc4bf17f4decef2b3dfb2fb92885934c9 RMD160 (openvpn-acct-wtmpx-20091110.tgz) = 1146c27fe190a8b8d6ef863f1861acfeb1f61b39 Size (openvpn-acct-wtmpx-20091110.tgz) = 1983 bytes -SHA1 (patch-aa) = 08191614818fcb65608fb70abe35be440c211334 +SHA1 (patch-aa) = 399514cb7eabe9c589d56638e01034fbdb7208a6 diff --git a/net/openvpn-acct-wtmpx/patches/patch-aa b/net/openvpn-acct-wtmpx/patches/patch-aa index aa99f712196..17a41b9c7b7 100644 --- a/net/openvpn-acct-wtmpx/patches/patch-aa +++ b/net/openvpn-acct-wtmpx/patches/patch-aa @@ -1,7 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/07/14 04:46:25 manu Exp $ +$NetBSD: patch-aa,v 1.2 2011/11/23 23:31:22 joerg Exp $ + --- Makefile.orig 2009-11-07 04:12:24.000000000 +0000 -+++ Makefile 2010-04-21 17:18:41.000000000 +0000 -@@ -1,14 +1,14 @@ ++++ Makefile +@@ -1,13 +1,13 @@ -prefix=/usr/pkg -PLUGINDIR=$(prefix)/lib/openvpn -bindir=/usr/local/bin @@ -20,17 +21,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/07/14 04:46:25 manu Exp $ all: openvpn-acct-wtmpx.la logwtmpx - -@@ -22,10 +22,12 @@ - logwtmpx: logwtmpx.o +@@ -23,9 +23,11 @@ logwtmpx: logwtmpx.o $(CC) -o $@ -lutil $? install: openvpn-acct-wtmpx.la logwtmpx + $(INSTALL) -d -m 0755 $(PLUGINDIR) $(LIBTOOL) --mode=install cp openvpn-acct-wtmpx.la $(PLUGINDIR)/ $(LIBTOOL) --mode=finish +- $(INSTALL) -c -m 4754 -o root -g $(OPENVPN_GROUP) logwtmpx $(bindir)/ + $(INSTALL) -d -m 0755 $(bindir) - $(INSTALL) -c -m 4754 -o root -g $(OPENVPN_GROUP) logwtmpx $(bindir)/ ++ $(INSTALL) -c -m 0555 logwtmpx $(bindir)/ clean: rm -rf logwtmpx *.o *.so *.la *.lo .libs |