CVS commit: pkgsrc/net/userppp

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Mar 29 06:01:31 UTC 2020

Modified Files:
        pkgsrc/net/userppp: Makefile distinfo
Added Files:
        pkgsrc/net/userppp/patches: patch-ppp_route.c

Log Message:
net/userppp: fix build on NetBSD >= 8

The API of <net/route.h> has changed.

The hack for allowing isspace(char) is not needed anymore. The code
compiles fine even with -Werror=char-subscripts.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/userppp/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/userppp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/userppp/patches/patch-ppp_route.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/userppp/Makefile
diff -u pkgsrc/net/userppp/Makefile:1.26 pkgsrc/net/userppp/Makefile:1.27
--- pkgsrc/net/userppp/Makefile:1.26    Sun Nov  3 11:45:57 2019
+++ pkgsrc/net/userppp/Makefile Sun Mar 29 06:01:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:57 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/03/29 06:01:31 rillig Exp $
 
 DISTNAME=              ppp-001107.src
 PKGNAME=               userppp-001107
@@ -18,8 +18,6 @@ MANCOMPRESSED_IF_MANZ=        YES
 PKG_SYSCONFSUBDIR=     ppp
 
 CFLAGS+=               -fno-strict-aliasing
-# fix build on -current for wrong is* arguments (char instead of unsigned char)
-BUILDLINK_TRANSFORM+=  rm:-Werror
 
 SUBST_CLASSES+=                cfgdir
 SUBST_STAGE.cfgdir=    do-configure

Index: pkgsrc/net/userppp/distinfo
diff -u pkgsrc/net/userppp/distinfo:1.12 pkgsrc/net/userppp/distinfo:1.13
--- pkgsrc/net/userppp/distinfo:1.12    Wed Nov  4 00:35:43 2015
+++ pkgsrc/net/userppp/distinfo Sun Mar 29 06:01:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 00:35:43 agc Exp $
+$NetBSD: distinfo,v 1.13 2020/03/29 06:01:31 rillig Exp $
 
 SHA1 (ppp-001107.src.tar.gz) = 3ba073a99f747579d8ffbe7f80b72a2af924eca2
 RMD160 (ppp-001107.src.tar.gz) = 58ed989cef856d0f3004d7c4bffe2f97f784d797
@@ -20,3 +20,4 @@ SHA1 (patch-am) = 98afe1506ed01eac6f2790
 SHA1 (patch-an) = 1c4243df402c35160b6af9b481ace2e6ef5cf15c
 SHA1 (patch-ppp_defs.c) = 967ce9fd455c2000683fede6699bd3c54984751a
 SHA1 (patch-ppp_prompt.h) = c505d11f6921cbdfbaa9cc73d723333942205846
+SHA1 (patch-ppp_route.c) = d2c21e27e119919af291c2eb9cd37933c3c42207

Added files:

Index: pkgsrc/net/userppp/patches/patch-ppp_route.c
diff -u /dev/null pkgsrc/net/userppp/patches/patch-ppp_route.c:1.1
--- /dev/null   Sun Mar 29 06:01:31 2020
+++ pkgsrc/net/userppp/patches/patch-ppp_route.c        Sun Mar 29 06:01:31 2020
@@ -0,0 +1,26 @@
+$NetBSD: patch-ppp_route.c,v 1.1 2020/03/29 06:01:31 rillig Exp $
+
+Fix the build on NetBSD >= 8.
+
+https://github.com/NetBSD/src/commit/4b9481766e9fbdb9d5a37313b91bba3180607b1a
+
+--- ppp/route.c.orig   2000-11-07 05:45:45.000000000 +0000
++++ ppp/route.c
+@@ -223,9 +223,17 @@ static struct bits {
+   { RTF_DYNAMIC, 'D' },
+   { RTF_MODIFIED, 'M' },
+   { RTF_DONE, 'd' },
++#ifdef RTF_CLONING
+   { RTF_CLONING, 'C' },
++#else
++  { RTF_CONNECTED, 'C' }, // Since NetBSD 8.0
++#endif
++#ifdef RTF_XRESOLVE
+   { RTF_XRESOLVE, 'X' },
++#endif
++#ifdef RTF_LLINFO
+   { RTF_LLINFO, 'L' },
++#endif
+   { RTF_STATIC, 'S' },
+   { RTF_PROTO1, '1' },
+   { RTF_PROTO2, '2' },