[pkgsrc/trunk]: pkgsrc/net/poptop Update poptop to version 1.2.1.

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03cb12c32b92
branches:  trunk
changeset: 486707:03cb12c32b92
user:      cube <cube%pkgsrc.org@localhost>
date:      Sat Jan 01 06:26:41 2005 +0000

description:
Update poptop to version 1.2.1.

pkgsrc changes and patches:
 o As pppd binary location is configurable at run-time, it is no longer
   necessary to use ./configure tricks to use another pppd.
 o Add a rc.d script.
 o Disable bcrelay build unconditonally, until it is made portable.
 o Move configuration file over to PKG_SYSCONFDIR.

Changes:

1.2.1: released 2004-06-23

[* Nothing relevant *]

1.2.0-b4: released 2004-05-25

- fix for options file check when no options file wanted [Cameron]
- fix for SIGTERM handling [Guraj]
- minor manual page edits [Wilson]
- fix printing of connection speed [Dubiec]
- fix segfault if built --with-bcrelay but no option used [Cameron]
- add --logwtmp option to track users online [Cameron/Guraj]
- remove vpnwho.pl from package (due to --logwtmp) [Cameron]
- include README.portslave in distribution [Cameron]

1.2.0-b3: released 2004-04-25 (ANZAC day)

- add hint for EIO to suggest pppd option syntax [Cameron]
- add routing checklists to pptpd.conf man page [Cameron]
- fix broken --stimeout option [Cameron]
- rework all manual pages, cross check against programs [Cameron]
- add --ppp option for portslave support [Cameron]
- fix unanticipated exit() when --noipparam option used [Cameron]
- fix segfault on pptpctrl called with no arguments [Cameron]
  {closes: Bug#140709}
- include vpnwho.pl in package [!3runo]
- note that speed is ineffective on Linux [Cameron]
- rework comments in sample configuration files [Cameron]
- update references to web sites [Cameron]
- minor edits to manual pages [Cameron]
- improve script comments [Cameron]

1.2.0-b2: released 2004-04-22 to test team (Peter & Bruno)

- fix build without bcrelay [Cameron]
- adopt bcrelay version from main package [Cameron]
- when built without bcrelay, the bcrelay will exit [Cameron]

1.1.4-b4:

- terminate call on any CALL_CLR_RQST [!3runo]
- unblock SIGCHLD [Stamfest]
  {closes: Bug#248123}
- report pppd path in debug mode [Cameron]
- report cause of failed execvp() [Cameron]
- explain pppd launch failure [Cameron]
- pass ipparam to pppd [Ammirata]
- add bcrelay [Bolhuis]
- fix loss of first GRE packet [fghdgh]
- fix inheritance of console file descriptors [fghdgh]
- fix pidfile option [Mandzgaladze]
- fix two buffer overflows [Otero]
- fix potential buffer overflow [Vroede]
- enhance callid [Latypov] {does not close Bug#171831}

diffstat:

 net/poptop/MESSAGE          |     4 +-
 net/poptop/Makefile         |    20 +-
 net/poptop/distinfo         |    15 +-
 net/poptop/files/pptpd.sh   |    17 +
 net/poptop/patches/patch-aa |    36 +-
 net/poptop/patches/patch-ab |  1320 +++++++++++-------------------------------
 net/poptop/patches/patch-ad |    13 +
 net/poptop/patches/patch-ae |    53 +
 net/poptop/patches/patch-af |    13 +
 net/poptop/patches/patch-ag |    13 +
 net/poptop/patches/patch-ah |    13 +
 11 files changed, 492 insertions(+), 1025 deletions(-)

diffs (truncated from 1606 to 300 lines):

diff -r f4ddd8e0a9e6 -r 03cb12c32b92 net/poptop/MESSAGE
--- a/net/poptop/MESSAGE        Sat Jan 01 05:18:35 2005 +0000
+++ b/net/poptop/MESSAGE        Sat Jan 01 06:26:41 2005 +0000
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/09/07 14:40:32 hubertf Exp $
+$NetBSD: MESSAGE,v 1.4 2005/01/01 06:26:41 cube Exp $
 
-If you have trouble getting this to operate properly and run
+If you have trouble getting this to operate properly and run on
 NetBSD 1.6.x or earlier, try removing the "gre" network interface
 from your kernel!
 
diff -r f4ddd8e0a9e6 -r 03cb12c32b92 net/poptop/Makefile
--- a/net/poptop/Makefile       Sat Jan 01 05:18:35 2005 +0000
+++ b/net/poptop/Makefile       Sat Jan 01 06:26:41 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/04/25 08:10:20 snj Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/01 06:26:41 cube Exp $
 #
 
-DISTNAME=      pptpd-1.1.3-20030409
-PKGNAME=       poptop-1.1.3.20030409
+DISTNAME=      pptpd-1.2.1
+PKGNAME=       ${DISTNAME:S/pptpd/poptop/}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=poptop/}
 
@@ -10,17 +10,19 @@
 HOMEPAGE=      http://www.poptop.org/
 COMMENT=       PPTP server with support for Microsoft VPN clients
 
-WRKSRC=                ${WRKDIR}/poptop
 USE_BUILDLINK3=        YES
 GNU_CONFIGURE= YES
+USE_GNU_TOOLS+=        make
+USE_PKGINSTALL=        YES
 
 CONFIGURE_ARGS+=       --with-libwrap
 
-.include "../../mk/bsd.prefs.mk"
+SUBST_CLASSES+=                sysconf
+SUBST_STAGE.sysconf=   post-patch
+SUBST_FILES.sysconf=   defaults.h pptpd.8 pptpd.conf.5
+SUBST_SED.sysconf=     -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},
 
-.if defined(POPTOP_USE_MPPE)
-DEPENDS+=              ppp-mppe-2.3.9:../../net/ppp-mppe
-CONFIGURE_ARGS+=       --with-pppd=${PREFIX}/sbin/pppd
-.endif
+RCD_SCRIPTS=   pptpd
 
+.include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f4ddd8e0a9e6 -r 03cb12c32b92 net/poptop/distinfo
--- a/net/poptop/distinfo       Sat Jan 01 05:18:35 2005 +0000
+++ b/net/poptop/distinfo       Sat Jan 01 06:26:41 2005 +0000
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.4 2003/09/17 19:37:08 cube Exp $
+$NetBSD: distinfo,v 1.5 2005/01/01 06:26:41 cube Exp $
 
-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) = 878af32d56324ca4001488b3b05eae917011c2a3
+SHA1 (pptpd-1.2.1.tar.gz) = ffbeff5d8a8c0725125ec0682b0871e927aefba4
+Size (pptpd-1.2.1.tar.gz) = 180974 bytes
+SHA1 (patch-aa) = 40e5873fc582040112e97477e3709e729245d4c9
+SHA1 (patch-ab) = 43741ecf4f1f52113814ccd0f70a9ab173c0667f
 SHA1 (patch-ac) = 9414c9d086913d8a322629d87f3ed79ecbd4059f
+SHA1 (patch-ad) = 451e6811622114c4e99df3b9ff31238bfa6623ed
+SHA1 (patch-ae) = 7072ce9eacbdc52632c2eb8341dc4519d6d79d78
+SHA1 (patch-af) = f087f8b16566701ab51dbb967a126c710f785213
+SHA1 (patch-ag) = 7810baae4607113684a00bcdf13140242f8744b9
+SHA1 (patch-ah) = 54506391dfc52ce71550aec6225d96b069560581
diff -r f4ddd8e0a9e6 -r 03cb12c32b92 net/poptop/files/pptpd.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/poptop/files/pptpd.sh Sat Jan 01 06:26:41 2005 +0000
@@ -0,0 +1,17 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: pptpd.sh,v 1.1 2005/01/01 06:26:41 cube Exp $
+#
+
+# PROVIDE: pptpd
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="pptpd"
+rcvar=$name
+command="@PREFIX@/sbin/pptpd"
+required_files="@PKG_SYSCONFDIR@/pptpd.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff -r f4ddd8e0a9e6 -r 03cb12c32b92 net/poptop/patches/patch-aa
--- a/net/poptop/patches/patch-aa       Sat Jan 01 05:18:35 2005 +0000
+++ b/net/poptop/patches/patch-aa       Sat Jan 01 06:26:41 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/12/23 17:18:12 kim Exp $
+$NetBSD: patch-aa,v 1.3 2005/01/01 06:26:41 cube Exp $
 
---- configure.in.orig  Sun Sep 24 21:29:23 2000
-+++ configure.in       Sun Dec 23 12:09:28 2001
-@@ -112,7 +112,7 @@
+--- configure.in.orig  2004-06-23 09:38:43.000000000 +0200
++++ configure.in
+@@ -112,7 +112,7 @@ fi
  if test "$ac_cv_header_libintl_h" = yes; then
    if test "$ac_cv_lib_c_gettext" = no; then
      if test "$ac_cv_lib_intl_gettext" = yes; then
@@ -11,31 +11,3 @@
      else
        echo "Have libintl.h but no usable gettext!" 1>&2
        exit 1
-@@ -144,15 +144,18 @@
-       [ AC_DEFINE(PNS_MODE)
-         PNS_MODE = yes ])
- 
--if test "$BSDUSER_PPP" = "yes"; then
--  AC_DEFINE(PPP_BINARY, "/usr/sbin/ppp")
--else
--  if test "$SLIRP" = "yes"; then
--    AC_DEFINE(PPP_BINARY, "/bin/slirp")
--  else
--    AC_DEFINE(PPP_BINARY, "/usr/sbin/pppd")
--  fi
--fi
-+AC_ARG_WITH(pppd,
-+      [  --with-pppd=[ARG]       Path to pppd binary.],
-+      [ AC_DEFINE_UNQUOTED(PPP_BINARY,"$withval")],
-+      [ if test "$BSDUSER_PPP" = "yes"; then
-+          AC_DEFINE(PPP_BINARY, "/usr/sbin/ppp")
-+        else
-+          if test "$SLIRP" = "yes"; then
-+            AC_DEFINE(PPP_BINARY, "/bin/slirp")
-+          else
-+            AC_DEFINE(PPP_BINARY, "/usr/sbin/pppd")
-+          fi
-+        fi])
- 
- if test "$SLIRP" = "yes"; then
-   if test "$PPPD_IP_ALLOC" = "yes"; then
diff -r f4ddd8e0a9e6 -r 03cb12c32b92 net/poptop/patches/patch-ab
--- a/net/poptop/patches/patch-ab       Sat Jan 01 05:18:35 2005 +0000
+++ b/net/poptop/patches/patch-ab       Sat Jan 01 06:26:41 2005 +0000
@@ -1,942 +1,327 @@
-$NetBSD: patch-ab,v 1.3 2003/09/17 19:37:12 cube Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/01 06:26:41 cube Exp $
 
---- configure.orig     2003-02-06 17:39:46.000000000 +0100
+--- configure.orig     2004-06-23 09:39:15.000000000 +0200
 +++ configure
-@@ -21,6 +21,8 @@
-   --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
-+  --with-pppd=[ARG]       Path to pppd binary."
- 
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -566,7 +568,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:570: checking for a BSD compatible install" >&5
-+echo "configure:572: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -619,7 +621,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:623: checking whether build environment is sane" >&5
-+echo "configure:625: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -676,7 +678,7 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:680: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:682: checking whether ${MAKE-make} sets \${MAKE}" >&5
- 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
-@@ -722,7 +724,7 @@
- 
- missing_dir=`cd $ac_aux_dir && pwd`
- echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:726: checking for working aclocal" >&5
-+echo "configure:728: checking for working aclocal" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -735,7 +737,7 @@
- fi
- 
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:739: checking for working autoconf" >&5
-+echo "configure:741: checking for working autoconf" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -748,7 +750,7 @@
- fi
- 
- echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:752: checking for working automake" >&5
-+echo "configure:754: checking for working automake" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -761,7 +763,7 @@
- fi
- 
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:765: checking for working autoheader" >&5
-+echo "configure:767: checking for working autoheader" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -774,7 +776,7 @@
- fi
- 
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:778: checking for working makeinfo" >&5
-+echo "configure:780: checking for working makeinfo" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -790,7 +792,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:794: checking for $ac_word" >&5
-+echo "configure:796: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -820,7 +822,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:824: checking for $ac_word" >&5
-+echo "configure:826: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -871,7 +873,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:875: checking for $ac_word" >&5
-+echo "configure:877: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -903,7 +905,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:907: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:909: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -914,12 +916,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 918 "configure"
-+#line 920 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -945,12 +947,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:951: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:954: checking whether we are using GNU C" >&5
-+echo "configure:956: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6