diff options
author | hasso <hasso@pkgsrc.org> | 2008-12-26 21:41:40 +0000 |
---|---|---|
committer | hasso <hasso@pkgsrc.org> | 2008-12-26 21:41:40 +0000 |
commit | 281c87b07e99f7f1e6c4aff4344cbe91248ca58e (patch) | |
tree | f6db1f840c01fc84791553813cc0c10baeabf42f /net | |
parent | 7685b099a4d40a430a1c18d91eb509de1c173b92 (diff) | |
download | pkgsrc-281c87b07e99f7f1e6c4aff4344cbe91248ca58e.tar.gz |
Make it work on DragonFly. Slightly modified patch from PR 40155.
Diffstat (limited to 'net')
-rw-r--r-- | net/pppd/Makefile | 4 | ||||
-rw-r--r-- | net/pppd/distinfo | 10 | ||||
-rw-r--r-- | net/pppd/patches/patch-ae | 16 | ||||
-rw-r--r-- | net/pppd/patches/patch-aj | 12 | ||||
-rw-r--r-- | net/pppd/patches/patch-az | 8 | ||||
-rw-r--r-- | net/pppd/patches/patch-bi | 24 |
6 files changed, 44 insertions, 30 deletions
diff --git a/net/pppd/Makefile b/net/pppd/Makefile index 408b5ae1f13..3ec3bac1c9a 100644 --- a/net/pppd/Makefile +++ b/net/pppd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/06/11 12:36:23 tron Exp $ +# $NetBSD: Makefile,v 1.8 2008/12/26 21:41:40 hasso Exp $ DISTNAME= ppp-${PPPD_VERSION} PKGNAME= ${DISTNAME:S/ppp/&d/} @@ -14,7 +14,7 @@ USE_PKGLOCALEDIR= yes HAS_CONFIGURE= yes USE_TOOLS+= gmake -ONLY_FOR_PLATFORM+= NetBSD-*-* Linux-*-* +ONLY_FOR_PLATFORM+= NetBSD-*-* Linux-*-* DragonFly* PKG_SYSCONFSUBDIR= ppp CONFIGURE_ENV+= PREFIX=${PREFIX:Q} PKGSYSCONFDIR=${PKG_SYSCONFDIR:Q} diff --git a/net/pppd/distinfo b/net/pppd/distinfo index e3b2f7a2336..b4d8d638898 100644 --- a/net/pppd/distinfo +++ b/net/pppd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2008/07/29 21:02:23 tnn Exp $ +$NetBSD: distinfo,v 1.7 2008/12/26 21:41:40 hasso Exp $ SHA1 (ppp-2.4.3.tar.gz) = 5e2789f4dedc81943fa9f94c840cccc2407056f7 RMD160 (ppp-2.4.3.tar.gz) = 845821496bacb07d93bb7572a171854853ef722b @@ -7,12 +7,12 @@ SHA1 (patch-aa) = 8814f0f389971d07368bef95fbadbb5d7562d0a9 SHA1 (patch-ab) = 1cd0d99dac316b1c5a48c9a41104c2c25e9bb920 SHA1 (patch-ac) = 9bc88cfcd7b1a09e92aaa919f35e39afb3b45803 SHA1 (patch-ad) = a3140bc6cfa9fe8d4548b118e9918308f7673e24 -SHA1 (patch-ae) = 3cb3f64ad7c209a8283a92c50bdb4071c6f8ad38 +SHA1 (patch-ae) = 9e45283b07dac0d3422b25ea80b4ebe0c18a10b7 SHA1 (patch-af) = 178a2a2a716d6ff8e9bd0cc36ff72d8a138f6989 SHA1 (patch-ag) = f989f71dbb164e53157ba2677f29737862e137f2 SHA1 (patch-ah) = 6bca5470590c5a9c9aa9de64abf21e44c770d1b5 SHA1 (patch-ai) = a0e5fcd766980e20ee3737273833e743dee58bf5 -SHA1 (patch-aj) = 01f7b864769f98d65d24294307932c3fb02162f4 +SHA1 (patch-aj) = 9c7ff13e0a0b7e577ccfb86e474594118d2cadc2 SHA1 (patch-ak) = d38d646fad05418d1271918af53569bb40f12812 SHA1 (patch-al) = 1c76f6c2fa6a9a3ea4d79e23d4ecf449c5260d8d SHA1 (patch-am) = 4d017c416611ca3bc91f1292d7fad2bffffa638d @@ -28,7 +28,7 @@ SHA1 (patch-av) = 6ae49e8f2d5d74fa437e100b27a021451feb8f28 SHA1 (patch-aw) = 7fb53f72216ffe34720b76fc122e87f4762a6696 SHA1 (patch-ax) = 0b9583346009b94f29084bd69963ad2d2e80ed5d SHA1 (patch-ay) = 93ccd90f6efa58bfe31105526499308ed35b9522 -SHA1 (patch-az) = 76f29697ad08bfb6aee2bfafca4a49aa706c08fb +SHA1 (patch-az) = 9c7d9294325f84cb6fc2c6d17fdbc038d27d9a2a SHA1 (patch-ba) = 4293edb8b490fe31e07268a6d7001e1c9db8f323 SHA1 (patch-bb) = 9b17b12b45d9857eea42c2a6dc3704392c4df7c0 SHA1 (patch-bc) = d53a2226166e84fa9ea049cdbfb52c1dcd0f1ed9 @@ -37,7 +37,7 @@ SHA1 (patch-be) = e216f70f5fd2d6f5ad44a3c3ebc6146557a2deb9 SHA1 (patch-bf) = 16788a1508cd981ff8967915a86a1fb02e55330c SHA1 (patch-bg) = 66b7d5a1ac2816f36a656c7c16a4862f313633f0 SHA1 (patch-bh) = 8136e968fadbc2cc08006651772b943313cb6641 -SHA1 (patch-bi) = 56d8389724807a8317b16219fbfb81b6da623d10 +SHA1 (patch-bi) = 75a3260bc8ddb7abf21e21656d95c5a47931c493 SHA1 (patch-bj) = ad5618b6243414ce2649b200096a53194f48c735 SHA1 (patch-bk) = 2ebb4e4133c22775e374990a6e05390f826d3e91 SHA1 (patch-bl) = 31525cf95919a534804c95121f7e69289c4220cb diff --git a/net/pppd/patches/patch-ae b/net/pppd/patches/patch-ae index 418b29ec9e8..db959ddd82f 100644 --- a/net/pppd/patches/patch-ae +++ b/net/pppd/patches/patch-ae @@ -1,8 +1,9 @@ -$NetBSD: patch-ae,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $ +$NetBSD: patch-ae,v 1.2 2008/12/26 21:41:40 hasso Exp $ ---- configure.orig 2004-11-06 12:36:54.000000000 +0100 -+++ configure -@@ -3,6 +3,6 @@ +--- configure.orig 2004-11-06 03:36:54 -0800 ++++ configure 2008-12-10 03:05:00 -0800 +@@ -2,8 +2,8 @@ + # $Id: patch-ae,v 1.2 2008/12/26 21:41:40 hasso Exp $ # Where to install stuff by default -DESTDIR=/usr/local @@ -11,7 +12,9 @@ $NetBSD: patch-ae,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $ +SYSCONF=${PKGSYSCONFDIR} # if [ -d /NextApps ]; then -@@ -51,5 +51,10 @@ case $system in + # system="NeXTStep" +@@ -50,7 +50,14 @@ + else echo "C compiler not found; hoping for the best." fi;; - NetBSD|FreeBSD|ULTRIX|OSF1|NeXTStep|SINIX-?|UNIX_SV|UNIX_System_V) @@ -20,6 +23,9 @@ $NetBSD: patch-ae,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $ + [01].*) state="notincluded";; + *) state="known"; ksrc="netbsd"; makext="netbsd";; + esac;; ++ DragonFly) ++ state="known"; ksrc="netbsd"; makext="netbsd";; + FreeBSD|ULTRIX|OSF1|NeXTStep|SINIX-?|UNIX_SV|UNIX_System_V) state="notincluded";; # NetBSD) + # makext="bsd"; diff --git a/net/pppd/patches/patch-aj b/net/pppd/patches/patch-aj index c14e1771274..ea8e7522592 100644 --- a/net/pppd/patches/patch-aj +++ b/net/pppd/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $ +$NetBSD: patch-aj,v 1.2 2008/12/26 21:41:40 hasso Exp $ ---- pppd/Makefile.netbsd.orig 2004-12-31 23:50:59.000000000 +0100 -+++ pppd/Makefile.netbsd -@@ -0,0 +1,222 @@ +--- pppd/Makefile.netbsd.orig 2008-12-19 11:48:24 +0200 ++++ pppd/Makefile.netbsd 2008-12-19 12:14:52 +0200 +@@ -0,0 +1,226 @@ +# +# pppd makefile for NetBSD +# @@ -39,6 +39,10 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $ +COPTS = -O2 -pipe -Wall -g +LIBS = -lutil + ++ifeq ($(shell /usr/bin/uname -s),DragonFly) ++LIBS += -lcipher -lmd ++endif ++ +# Uncomment the next 2 lines to include support for Microsoft's +# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. +CHAPMS=y diff --git a/net/pppd/patches/patch-az b/net/pppd/patches/patch-az index c01cbdd5197..f7179d50c93 100644 --- a/net/pppd/patches/patch-az +++ b/net/pppd/patches/patch-az @@ -1,7 +1,7 @@ -$NetBSD: patch-az,v 1.3 2005/01/02 22:28:31 cube Exp $ +$NetBSD: patch-az,v 1.4 2008/12/26 21:41:40 hasso Exp $ ---- pppd/sys-bsd.c.orig 2005-01-02 23:24:27.000000000 +0100 -+++ pppd/sys-bsd.c +--- pppd/sys-bsd.c.orig 2008-12-26 23:11:29 +0200 ++++ pppd/sys-bsd.c 2008-12-26 23:12:45 +0200 @@ -0,0 +1,2184 @@ +/* NetBSD: sys-bsd.c,v 1.50 2004/12/05 04:16:22 christos Exp */ + @@ -131,7 +131,7 @@ $NetBSD: patch-az,v 1.3 2005/01/02 22:28:31 cube Exp $ +#if defined(NetBSD) && (NetBSD >= 199703) +#include <netinet/if_inarp.h> +#else /* NetBSD 1.2D or later */ -+#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) +#include <netinet/if_ether.h> +#else +#include <net/if_ether.h> diff --git a/net/pppd/patches/patch-bi b/net/pppd/patches/patch-bi index 8a5c2cff087..298f8841a56 100644 --- a/net/pppd/patches/patch-bi +++ b/net/pppd/patches/patch-bi @@ -1,14 +1,18 @@ -$NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ +$NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ ---- pppdump/pppdump.c.orig 2004-02-02 04:36:46.000000000 +0100 -+++ pppdump/pppdump.c -@@ -38,8 +38,13 @@ +--- pppdump/pppdump.c.orig 2004-02-01 19:36:46 -0800 ++++ pppdump/pppdump.c 2008-12-10 03:22:59 -0800 +@@ -38,8 +38,17 @@ #include <stdlib.h> #include <time.h> #include <sys/types.h> -#include "ppp_defs.h" +#include "pppdump.h" ++#ifdef __DragonFly__ ++#include <net/ppp_layer/ppp_defs.h> ++#else +#include <net/ppp_defs.h> ++#endif +#ifdef __NetBSD__ +#include <net/ppp-comp.h> +#else @@ -17,7 +21,7 @@ $NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ int hexmode; int pppmode; -@@ -51,6 +56,15 @@ time_t start_time; +@@ -51,6 +60,15 @@ int start_time_tenths; int tot_sent, tot_rcvd; @@ -33,7 +37,7 @@ $NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ extern int optind; extern char *optarg; -@@ -191,7 +205,7 @@ dumplog(f) +@@ -191,7 +209,7 @@ show_time(f, c); break; default: @@ -42,7 +46,7 @@ $NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ } } } -@@ -234,15 +248,6 @@ static u_short fcstab[256] = { +@@ -234,15 +252,6 @@ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; @@ -58,7 +62,7 @@ $NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ /* Values for flags */ #define CCP_ISUP 1 #define CCP_ERROR 2 -@@ -321,7 +326,7 @@ dumpppp(f) +@@ -321,7 +330,7 @@ ++r; if (endp - r > mru) printf(" ERROR: length (%d) > MRU (%d)\n", @@ -67,7 +71,7 @@ $NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ if (decompress && fcs == PPP_GOODFCS) { /* See if this is a CCP or compressed packet */ d = dbuf; -@@ -340,8 +345,15 @@ dumpppp(f) +@@ -340,8 +349,15 @@ && (pkt->flags & CCP_DECOMP_RUN) && pkt->state && (pkt->flags & CCP_ERR) == 0) { @@ -85,7 +89,7 @@ $NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ switch (rv) { case DECOMP_OK: p = dbuf; -@@ -364,7 +376,10 @@ dumpppp(f) +@@ -364,7 +380,10 @@ } } else if (pkt->state && (pkt->flags & CCP_DECOMP_RUN)) { |