>Number:         22706
>Category:       pkg
>Synopsis:       Package update: poptop-1.1.3-20030403
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 06 20:41:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Quentin Garnier
>Release:        NetBSD 1.6Y
>Organization:
Quentin Garnier - cube@cubidou.net
"Feels like I'm fiddling while Rome is burning down.
Should I lay my fiddle down and take a rifle from the ground ?"
Leigh Nash/Sixpence None The Richer, Paralyzed, Divine Discontents, 2002.
>Environment:
System: NetBSD padme 1.6Y NetBSD 1.6Y (PADME) #1: Sat Sep 6 09:39:49 CEST 2003 cube@padme:/amd/c3po/rep/NetBSD-src/padme/obj/amd/c3po/rep/NetBSD-src/current/src/sys/arch/i386/compile/NVIDIA i386
Architecture: i386
Machine: i386
>Description:
	poptop in pkgsrc is outdated. Latest version is 1.1.3. Changelog is
	probably not complete, since maintainers of the project changed. It is
	now hosted at SourceForge.

---------------------------------------------------------------------------
v1.1.3
* Thu Aug 22 2002 Richard de Vroede <richard@linvision.com>
- added stimeout option to pptpd.conf manpage
- updated the Changelog file ;-)

* Tue Aug 20 2002 Richard de Vroede <richard@linvision.com>
- removed debug commandline option from pptpd.init

* Thu Aug  1 2002 Richard de Vroede <richard@linvision.com>
- added config(noreplace) so old configs don't get replaced
- fixed postscriptlet
- adapted spec to cvs tree

* Wed Jun 26 2002 Richard de Vroede <richard@linvision.com>
- specfile now supports --with[out] options

---------------------------------------------------------------------------
v0.9.13 -> v1.1.3
* June 18 2002 Richard de Vroede <richard@linvision.com>
- migrated to version higher than last poptop release
- bugfixed

>How-To-Repeat:
	N/A
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/poptop/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	2003/07/17 22:51:39	1.6
+++ Makefile	2003/09/06 20:26:16
@@ -1,10 +1,11 @@
 # $NetBSD: Makefile,v 1.6 2003/07/17 22:51:39 grant Exp $
 #
 
-DISTNAME=	pptpd-1.0.1
+DISTNAME=	pptpd-1.1.3-20030409
 PKGNAME=	${DISTNAME:S/pptpd/poptop/}
+WRKSRC=		${WRKDIR}/poptop
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.snapgear.com/poptop/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poptop/}
 
 MAINTAINER=	dbj@NetBSD.org
 HOMEPAGE=	http://www.snapgear.com/vpn/pptp.html
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/poptop/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2001/12/23 17:18:12	1.3
+++ distinfo	2003/09/06 20:26:16
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.3 2001/12/23 17:18:12 kim Exp $
 
-SHA1 (pptpd-1.0.1.tar.gz) = 844615d46040b5aa724aac049b91dfc6d688dab8
-Size (pptpd-1.0.1.tar.gz) = 111195 bytes
+SHA1 (pptpd-1.1.3-20030409.tar.gz) = b4b7e2c5dc17b962fafb2aebff780fdcfa666551
+Size (pptpd-1.1.3-20030409.tar.gz) = 148934 bytes
 SHA1 (patch-aa) = 11bf3a2c6fb445c90c01389f98b3a339a052b53a
-SHA1 (patch-ab) = 811ecf9f54bf5468a0b6a92b49c613f3d5b438c4
+SHA1 (patch-ab) = eef1e6eff557387e438561b3c3616744a95c6759
 SHA1 (patch-ac) = 9414c9d086913d8a322629d87f3ed79ecbd4059f
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/poptop/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patches/patch-ab	2001/12/23 17:18:12	1.2
+++ patches/patch-ab	2003/09/06 20:26:17
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $
+$NetBSD$
 
---- configure.orig	Sun Sep 24 21:29:23 2000
-+++ configure	Sun Dec 23 12:10:15 2001
+--- configure.orig	2003-02-06 17:39:46.000000000 +0100
++++ configure
 @@ -21,6 +21,8 @@
-   --with-pppd-ip-alloc    Let pppd allocate IP (and IPX) addresses "
+   --with-pppd-ip-alloc    Let pppd allocate IP addresses "
  ac_help="$ac_help
    --with-pns-mode         Option is NOT FUNCTIONAL YET "
 +ac_help="$ac_help
@@ -203,7 +203,7 @@
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1153,18 +1155,18 @@
+@@ -1153,12 +1155,12 @@
  
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
@@ -218,13 +218,6 @@
  #include "confdefs.h"
  
  int main() {
- 
- /* Ultrix mips cc rejects this.  */
--typedef int charset[2]; const charset x = {0,0};
-+typedef int charset[2]; const charset x;
- /* SunOS 4.1.1 cc rejects this.  */
- char const *const *ccp;
- char **p;
 @@ -1207,7 +1209,7 @@
  
  ; return 0; }
@@ -251,8 +244,7 @@
  #include "confdefs.h"
  
  int main() {
--} int $ac_kw foo() {
-+} $ac_kw foo() {
+ } $ac_kw foo() {
  ; return 0; }
  EOF
 -if { (eval echo configure:1246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -953,7 +945,7 @@
      else
        echo "Have libintl.h but no usable gettext!" 1>&2
        exit 1
-@@ -2590,24 +2592,34 @@
+@@ -2590,25 +2592,35 @@
  fi
  
  
@@ -992,7 +984,8 @@
 +	    fi
 +	  fi
  fi
-+
  
++
  if test "$SLIRP" = "yes"; then
    if test "$PPPD_IP_ALLOC" = "yes"; then
+     true
>Release-Note:
>Audit-Trail:
>Unformatted: