Removed a dubious hunk from patch-ab that changed the order of two

arguments in a function call, which had been introduced some years ago.
Fixes PR 33232.

Added patch-ah, which allows the package to be installed by unprivileged
users. I had forgotten to add this to the last commit.

Bumped PKGREVISION.

4 files changed, 22 insertions, 14 deletions

diff --git a/net/pptp/Makefile b/net/pptp/Makefile
index 7bbf63dc6d0..c5b582a280f 100644
--- a/net/pptp/Makefile
+++ b/net/pptp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/03/14 13:53:57 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/14 10:32:02 rillig Exp $
 
 DISTNAME=	pptp-1.7.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pptpclient/}
 
@@ -10,6 +11,7 @@ COMMENT=	PPTP client package for Microsoft VPN servers (no encryption yet)
 
 NOT_FOR_PLATFORM=	Interix-*-*
 
+MAKE_ENV+=	ROOT_USER=${ROOT_USER}
 MAKE_FLAGS+=	BINDIR=${PREFIX:Q}/sbin
 MAKE_FLAGS+=	MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}/man8
 MAKE_FLAGS+=	PPPDIR=${PREFIX:Q}/share/examples/pptp
diff --git a/net/pptp/distinfo b/net/pptp/distinfo
index 272985040ae..6b56ba0ce9d 100644
--- a/net/pptp/distinfo
+++ b/net/pptp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/03/14 13:53:57 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/04/14 10:32:02 rillig Exp $
 
 SHA1 (pptp-1.7.0.tar.gz) = fc96e8a765bf17eb02ce1584d8e9d024b68ab5a7
 RMD160 (pptp-1.7.0.tar.gz) = 62c947379c44102945a198ddc914d5aa634db13c
 Size (pptp-1.7.0.tar.gz) = 227699 bytes
-SHA1 (patch-ab) = 564949ffc4ab97af5e0845b930880cc48ee00a6b
+SHA1 (patch-ab) = a03b32272157ccfbc6d2836a3220dfc2d7fbdb97
 SHA1 (patch-ac) = 8a0dd645ed0a766375a803fecda80d716c441d52
 SHA1 (patch-ad) = a037ba927c181f812ecd5c1ea2d344483d8ad4bf
-SHA1 (patch-ah) = 9f1739cbb375c1c5d15c559490d2ec44abc72ce6
+SHA1 (patch-ah) = 3a08c64c0cff8ca3d7e78ce445e7b126076c1425
diff --git a/net/pptp/patches/patch-ab b/net/pptp/patches/patch-ab
index c192dbf7644..bd25f6b4968 100644
--- a/net/pptp/patches/patch-ab
+++ b/net/pptp/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2006/03/14 13:53:57 rillig Exp $
+$NetBSD: patch-ab,v 1.3 2006/04/14 10:32:02 rillig Exp $
 
 Added more logging.
 
@@ -13,15 +13,6 @@ Added more logging.
      /* Find the ppp options, extract phone number */
      pppdargc = argc - optind;
      pppdargv = argv + optind;
-@@ -356,7 +358,7 @@ int main(int argc, char **argv, char **e
-     signal(SIGUSR1, sigstats);
- 
-     /* Do GRE copy until close. */
--    pptp_gre_copy(call_id, peer_call_id, pty_fd, gre_fd);
-+    pptp_gre_copy(peer_call_id, call_id, pty_fd, gre_fd);
- 
- shutdown:
-     /* on close, kill all. */
 @@ -504,6 +506,12 @@ void launch_pppd(char *ttydev, int argc,
      for (j = 0; j < argc; j++)
          new_argv[i++] = argv[j];
diff --git a/net/pptp/patches/patch-ah b/net/pptp/patches/patch-ah
new file mode 100644
index 00000000000..0831bccdcdc
--- /dev/null
+++ b/net/pptp/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2006/04/14 10:32:02 rillig Exp $
+
+Not everyone wants to install this as root.
+
+--- Makefile.orig	2005-07-28 03:15:10.000000000 +0200
++++ Makefile	2006-03-14 14:41:35.000000000 +0100
+@@ -55,7 +55,7 @@ test: vector_test
+ 
+ install:
+ 	mkdir -p $(BINDIR)
+-	install -o root -m 555 pptp $(BINDIR)
++	install -o ${ROOT_USER} -m 555 pptp $(BINDIR)
+ 	mkdir -p $(MANDIR)
+ 	install -m 644 pptp.8 $(MANDIR)
+ 	mkdir -p $(PPPDIR)