- Update to 1.3.0

- Drop maintainership
- Fix a reference to /usr/pkg that was committed by accident in a file
  [hi joerg!]
- Remove MESSAGE because it's about NetBSD 1.6 and older
- Add USE_DESTDIR support

1.3.0: released 2005-08-03

- disable Van Jacobson compression by default [Pokrywka]
- prototype packet buffering and reordering [Cameron/Anonymous]
- comply with RFC2637 on echo wait and idle wait parameters [Brox]
- new pptpd-logwtmp-strip-domain option [Cameron]
- defer writes to pty until pppd has set it up properly [Cameron]
- process initial packet length header properly [Beregszaszi]
- ignore ENETDOWN and ENXIO on sendto in bcrelay [Cameron]
- add section on debugging to pptpd.8 [Mueller]

1.2.3: released 2005-02-17

- error check critical dup2 calls [Cameron]
- performance, use writev() if available, avoiding memcpy() [Sundberg]
- compilation fix for gcc old versions [Cameron]

1.2.2: released 2005-01-05

- fix deadlock hang due to syslog(3) called by signal handler [Cameron]
- turn off logging to stderr, to prevent loopback [Hall]
This commit is contained in:
cube 2009-02-24 21:22:41 +00:00
parent e0fd67825b
commit 4a6d6803bb
7 changed files with 42 additions and 377 deletions

View file

@ -1,8 +0,0 @@
===========================================================================
$NetBSD: MESSAGE,v 1.4 2005/01/01 06:26:41 cube Exp $
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!
===========================================================================

View file

@ -1,16 +1,17 @@
# $NetBSD: Makefile,v 1.16 2006/11/11 16:50:54 rillig Exp $
# $NetBSD: Makefile,v 1.17 2009/02/24 21:22:41 cube Exp $
#
DISTNAME= pptpd-1.2.1
DISTNAME= pptpd-1.3.0
PKGNAME= ${DISTNAME:S/pptpd/poptop/}
PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poptop/}
MAINTAINER= cube@NetBSD.org
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.poptop.org/
COMMENT= PPTP server with support for Microsoft VPN clients
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
USE_TOOLS+= gmake

View file

@ -1,14 +1,15 @@
$NetBSD: distinfo,v 1.8 2006/03/23 00:53:48 joerg Exp $
$NetBSD: distinfo,v 1.9 2009/02/24 21:22:41 cube Exp $
SHA1 (pptpd-1.2.1.tar.gz) = ffbeff5d8a8c0725125ec0682b0871e927aefba4
RMD160 (pptpd-1.2.1.tar.gz) = c51eaf792d526755dde0aae591a598e02667bb1d
Size (pptpd-1.2.1.tar.gz) = 180974 bytes
SHA1 (pptpd-1.3.0.tar.gz) = 9aa12346afa607651f16e1dd7df0356d717b63af
RMD160 (pptpd-1.3.0.tar.gz) = 01bb976b56589d7fd264653c394abe3c883e055b
Size (pptpd-1.3.0.tar.gz) = 204099 bytes
SHA1 (patch-aa) = 40e5873fc582040112e97477e3709e729245d4c9
SHA1 (patch-ab) = 43741ecf4f1f52113814ccd0f70a9ab173c0667f
SHA1 (patch-ac) = 448650262bdb4ac13c06786a0e2fbdb961788730
SHA1 (patch-ab) = f9c2ff75976a59da67de9b65d2261d29daec1865
SHA1 (patch-ac) = d8ec7a772f2496fad220f8608fe0cfe474352765
SHA1 (patch-ad) = 451e6811622114c4e99df3b9ff31238bfa6623ed
SHA1 (patch-ae) = 7072ce9eacbdc52632c2eb8341dc4519d6d79d78
SHA1 (patch-ae) = 3e84b13d4961e11e8c45ef81ae1dd44551da073f
SHA1 (patch-af) = f087f8b16566701ab51dbb967a126c710f785213
SHA1 (patch-ag) = 7810baae4607113684a00bcdf13140242f8744b9
SHA1 (patch-ah) = 54506391dfc52ce71550aec6225d96b069560581
SHA1 (patch-ai) = c03b43e2d3c1df51df8ab030560a44949557046f
SHA1 (patch-aj) = 3e3a2fbdd1f7e5ec2f3b76c9719e8d604ec8a958

View file

@ -1,327 +1,8 @@
$NetBSD: patch-ab,v 1.4 2005/01/01 06:26:41 cube Exp $
$NetBSD: patch-ab,v 1.5 2009/02/24 21:22:41 cube Exp $
--- configure.orig 2004-06-23 09:39:15.000000000 +0200
--- configure.orig 2005-08-03 07:47:32.000000000 +0000
+++ configure
@@ -958,7 +958,7 @@ esac
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -2301,7 +2301,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2359,7 +2360,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2475,7 +2477,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2529,7 +2532,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2574,7 +2578,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2618,7 +2623,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3107,7 +3113,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3167,7 +3174,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3309,7 +3317,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3625,7 +3634,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3795,7 +3805,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3862,7 +3873,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4011,7 +4023,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4160,7 +4173,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4309,7 +4323,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4458,7 +4473,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4606,7 +4622,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4671,7 +4688,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4736,7 +4754,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4801,7 +4820,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4866,7 +4886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4971,7 +4992,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5024,7 +5046,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5101,7 +5124,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5174,7 +5198,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5247,7 +5272,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5320,7 +5346,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5393,7 +5420,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5466,7 +5494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5539,7 +5568,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5612,7 +5642,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5683,7 +5714,7 @@ fi
@@ -5846,7 +5846,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
@ -330,28 +11,3 @@ $NetBSD: patch-ab,v 1.4 2005/01/01 06:26:41 cube Exp $
else
echo "Have libintl.h but no usable gettext!" 1>&2
exit 1
@@ -6712,6 +6743,11 @@ esac
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -6750,12 +6786,6 @@ echo "$as_me: error: cannot find input f
fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.3 2006/03/23 00:53:48 joerg Exp $
$NetBSD: patch-ac,v 1.4 2009/02/24 21:22:41 cube Exp $
--- pptpctrl.c.orig 2004-04-28 11:36:07.000000000 +0000
+++ pptpctrl.c
@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.3 2006/03/23 00:53:48 joerg Exp $
if (pptp_logwtmp) {
pppd_argv[an++] = "plugin";
- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
+ pppd_argv[an++] = "/usr/pkg/lib/pptpd/pptpd-logwtmp.so";
+ pppd_argv[an++] = "@@PREFIX@@/lib/pptpd/pptpd-logwtmp.so";
pppd_argv[an++] = "pptpd-original-ip";
pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
}

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ae,v 1.1 2005/01/01 06:26:41 cube Exp $
$NetBSD: patch-ae,v 1.2 2009/02/24 21:22:41 cube Exp $
--- Makefile.in.orig 2004-12-30 19:56:10.000000000 +0100
--- Makefile.in.orig 2005-08-03 07:47:42.000000000 +0000
+++ Makefile.in
@@ -14,7 +14,7 @@
@ -20,17 +20,17 @@ $NetBSD: patch-ae,v 1.1 2005/01/01 06:26:41 cube Exp $
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -55,9 +55,6 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
@@ -56,9 +56,6 @@ am__installdirs = "$(DESTDIR)$(sbindir)"
"$(DESTDIR)$(man8dir)"
sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(sbin_PROGRAMS)
-am_bcrelay_OBJECTS = bcrelay.$(OBJEXT)
-bcrelay_OBJECTS = $(am_bcrelay_OBJECTS)
-bcrelay_LDADD = $(LDADD)
am_pptpctrl_OBJECTS = pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \
inststr.$(OBJEXT) compat.$(OBJEXT) pptpgre.$(OBJEXT) \
ppphdlc.$(OBJEXT)
@@ -76,8 +73,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
am_pptpctrl_OBJECTS = pqueue.$(OBJEXT) pptpctrl.$(OBJEXT) \
ctrlpacket.$(OBJEXT) inststr.$(OBJEXT) compat.$(OBJEXT) \
pptpgre.$(OBJEXT) ppphdlc.$(OBJEXT)
@@ -77,8 +74,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.1 2005/01/01 06:26:41 cube Exp $
man5dir = $(mandir)/man5
man8dir = $(mandir)/man8
NROFF = nroff
@@ -285,9 +282,6 @@ uninstall-sbinPROGRAMS:
@@ -288,9 +285,6 @@ uninstall-sbinPROGRAMS:
clean-sbinPROGRAMS:
-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)

View file

@ -0,0 +1,15 @@
$NetBSD: patch-aj,v 1.1 2009/02/24 21:22:41 cube Exp $
--- plugins/Makefile.orig 2004-05-21 09:26:37.000000000 +0000
+++ plugins/Makefile
@@ -20,8 +20,8 @@ all: $(PLUGINS)
LIBDIR = $(DESTDIR)$(prefix)/lib/pptpd
install: $(PLUGINS)
- $(INSTALL) -d $(LIBDIR)
- $(INSTALL) $? $(LIBDIR)
+ $(BSD_INSTALL_LIB_DIR) $(LIBDIR)
+ $(BSD_INSTALL_LIB) $? $(LIBDIR)
uninstall:
rm -f $(LIBDIR)$(PLUGINS)