[Glibc-bsd-commits] r3832 - in trunk/freebsd-utils/debian: . patches

Robert Millan rmh at alioth.debian.org
Tue Nov 8 20:20:42 UTC 2011


Author: rmh
Date: 2011-11-08 20:20:42 +0000 (Tue, 08 Nov 2011)
New Revision: 3832

Added:
   trunk/freebsd-utils/debian/freebsd-ppp.default
   trunk/freebsd-utils/debian/freebsd-ppp.dirs
   trunk/freebsd-utils/debian/freebsd-ppp.docs
   trunk/freebsd-utils/debian/freebsd-ppp.init
   trunk/freebsd-utils/debian/freebsd-ppp.install
   trunk/freebsd-utils/debian/freebsd-ppp.manpages
   trunk/freebsd-utils/debian/patches/042_ppp_unused.diff
   trunk/freebsd-utils/debian/patches/043_ppp.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/freebsd-net-tools.install
   trunk/freebsd-utils/debian/freebsd-net-tools.manpages
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
Add freebsd-ppp package.  Thanks Antoine Beaupr?\195?\169.  (Closes: #574789)

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-11-08 20:10:01 UTC (rev 3831)
+++ trunk/freebsd-utils/debian/changelog	2011-11-08 20:20:42 UTC (rev 3832)
@@ -1,3 +1,9 @@
+freebsd-utils (8.2+ds2-9) UNRELEASED; urgency=low
+
+  * Add freebsd-ppp package.  Thanks Antoine Beaupré.  (Closes: #574789)
+
+ -- Robert Millan <rmh at debian.org>  Tue, 08 Nov 2011 20:02:08 +0100
+
 freebsd-utils (8.2+ds2-8) unstable; urgency=low
 
   * Remove versioned dependency on sysvinit. It's useless as it turns

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2011-11-08 20:10:01 UTC (rev 3831)
+++ trunk/freebsd-utils/debian/control	2011-11-08 20:20:42 UTC (rev 3832)
@@ -36,6 +36,8 @@
  libjail-dev,
 # libssl-dev: geom
  libssl-dev,
+# liblockdev1-dev: ppp
+ liblockdev1-dev,
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-utils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-utils/
 Standards-Version: 3.9.2
@@ -176,7 +178,23 @@
  .
  This package provides FreeBSD GEOM and associated utilities.
 
+Package: freebsd-ppp
+Section: net
+Priority: optional
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: freebsd-hackedutils
+Replaces: freebsd-net-tools (<< 8.2+ds2-9)
+Homepage: http://www.freebsd.org/doc/handbook/userppp.html
+Description: FreeBSD Point-to-Point Protocol (PPP) userland daemon
+ The Point-to-Point Protocol provides a standard way to transmit
+ datagrams over a serial link, as well as a standard way for the
+ machines at either end of the link to negotiate various optional
+ characteristics of the link.
+ .
+ This package provides both a server and a client PPP daemon that runs
+ in userland.
+
 # FIXME:
-# - add ppp (ppp, pppd)
 # - add pf (pfctl + authpf + /etc stuff + init.d script)
 # - add ipfw (???)

Modified: trunk/freebsd-utils/debian/freebsd-net-tools.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.install	2011-11-08 20:10:01 UTC (rev 3831)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.install	2011-11-08 20:20:42 UTC (rev 3832)
@@ -6,5 +6,4 @@
 sbin/pfctl/pfctl		/sbin
 usr.sbin/authpf/authpf		/usr/sbin/
 usr.bin/netstat/netstat		/usr/bin/
-usr.sbin/pppctl/pppctl		/usr/sbin/
 usr.sbin/arp/arp                /usr/sbin/

Modified: trunk/freebsd-utils/debian/freebsd-net-tools.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.manpages	2011-11-08 20:10:01 UTC (rev 3831)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.manpages	2011-11-08 20:20:42 UTC (rev 3832)
@@ -4,5 +4,4 @@
 contrib/pf/pfctl/pfctl.8
 contrib/pf/man/*.5
 usr.bin/netstat/netstat.1
-usr.sbin/pppctl/pppctl.8
 usr.sbin/arp/arp.8

Added: trunk/freebsd-utils/debian/freebsd-ppp.default
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.default	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-ppp.default	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,17 @@
+# Defaults for ppp initscript
+# sourced by /etc/init.d/ppp
+# installed at /etc/default/ppp by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# uncomment to enable userland PPP
+# RUN="yes"
+
+# you probably want to set this to -ddial <yourisp>
+# see the manpage and FreeBSD handbook for more information
+DAEMON_OPTS=""
+
+# change this to another interface if you have multiple tunnel devices
+# IFACE="tun0"

Added: trunk/freebsd-utils/debian/freebsd-ppp.dirs
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.dirs	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-ppp.dirs	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/man/man8

Added: trunk/freebsd-utils/debian/freebsd-ppp.docs
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.docs	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-ppp.docs	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,2 @@
+usr.sbin/ppp/README.changes
+usr.sbin/ppp/README.nat

Added: trunk/freebsd-utils/debian/freebsd-ppp.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.init	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-ppp.init	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,295 @@
+#!/bin/sh
+#
+# Example init.d script with LSB support.
+#
+# Please read this init.d carefully and modify the sections to
+# adjust it to the program you want to run.
+#
+# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs at debian.org>
+#
+# This is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2,
+# or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License with
+# the Debian operating system, in /usr/share/common-licenses/GPL;  if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+#
+### BEGIN INIT INFO
+# Provides:          ppp
+# Required-Start:    $network $local_fs
+# Required-Stop:
+# Should-Start:      $named
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: <Enter a short description of the sortware>
+# Description:       <Enter a long description of the software>
+#                    <...>
+#                    <...>
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/sbin/ppp # Introduce the server's location here
+NAME=freebsd-ppp             # Introduce the short server's name here
+DESC="userland PPP"          # Introduce a short description here
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/$NAME
+DAEMON_OPTS=""          # Additional options given to the server
+
+IFACE="tun0"
+DIETIME=10              # Time to wait for the server to die, in seconds
+                        # If this value is set too low you might not
+                        # let some servers to die gracefully and
+                        # 'restart' will not work
+
+#STARTTIME=2             # Time to wait for the server to start, in seconds
+                        # If this value is set each time the server is
+                        # started (on start or restart) the script will
+                        # stall to try to determine if it is running
+                        # If it is not set and the server takes time
+                        # to setup a pid file the log message might
+                        # be a false positive (says it did not start
+                        # when it actually did)
+
+#DAEMONUSER=ppp   # Users to run the daemons as. If this value
+                        # is set start-stop-daemon will chuid the server
+
+# Include defaults if available
+if [ -f /etc/default/$NAME ] ; then
+    . /etc/default/$NAME
+fi
+
+PIDFILE=/var/run/$IFACE.pid
+
+# Use this if you want the user to explicitly set 'RUN' in
+# /etc/default/
+if [ "x$RUN" != "xyes" ] ; then
+    log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
+    log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
+    exit 0
+fi
+
+# Check that the user exists (if we set a user)
+# Does the user exist?
+if [ -n "$DAEMONUSER" ] ; then
+    if getent passwd | grep -q "^$DAEMONUSER:"; then
+        # Obtain the uid and gid
+        DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
+        DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
+    else
+        log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
+        exit 0
+    fi
+fi
+
+
+set -e
+
+running_pid() {
+# Check if a given process pid's cmdline matches a given name
+    pid=$1
+    name=$2
+    [ -z "$pid" ] && return 1
+    [ ! -d /proc/$pid ] &&  return 1
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+    # Is this the expected server
+    [ "$cmd" != "$name" ] &&  return 1
+    return 0
+}
+
+running() {
+# Check if the process is running looking at /proc
+# (works for all users)
+
+    # No pidfile, probably no daemon present
+    [ ! -f "$PIDFILE" ] && return 1
+    pid=`cat $PIDFILE`
+    running_pid $pid $DAEMON || return 1
+    return 0
+}
+
+start_server() {
+# Start the process using the wrapper
+        if [ -z "$DAEMONUSER" ] ; then
+            start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
+            errcode=$?
+        else
+# if we are using a daemonuser then change the user id
+            start-stop-daemon --start --quiet --pidfile $PIDFILE \
+                        --chuid $DAEMONUSER \
+                        --exec $DAEMON -- $DAEMON_OPTS
+            errcode=$?
+        fi
+        return $errcode
+}
+
+stop_server() {
+# Stop the process using the wrapper
+        if [ -z "$DAEMONUSER" ] ; then
+            killproc -p $PIDFILE $DAEMON
+            errcode=$?
+        else
+# if we are using a daemonuser then look for process that match
+            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+                        --user $DAEMONUSER \
+                        --exec $DAEMON
+            errcode=$?
+        fi
+
+        return $errcode
+}
+
+reload_server() {
+    [ ! -f "$PIDFILE" ] && return 1
+    pid=pidofproc $PIDFILE # This is the daemon's pid
+    # Send a SIGHUP
+    kill -1 $pid
+    return $?
+}
+
+force_stop() {
+# Force the process to die killing it manually
+    [ ! -e "$PIDFILE" ] && return
+    if running ; then
+        kill -15 $pid
+        # Is it really dead?
+        sleep "$DIETIME"s
+        if running ; then
+            kill -9 $pid
+            sleep "$DIETIME"s
+            if running ; then
+                echo "Cannot kill $NAME (pid=$pid)!"
+                exit 0
+            fi
+        fi
+    fi
+    rm -f $PIDFILE
+}
+
+
+case "$1" in
+  start)
+        log_daemon_msg "Starting $DESC " "$NAME"
+        # Check if it's running first
+        if running ;  then
+            log_progress_msg "apparently already running"
+            log_end_msg 0
+            exit 0
+        fi
+        if start_server ; then
+            # NOTE: Some servers might die some time after they start,
+            # this code will detect this issue if STARTTIME is set
+            # to a reasonable value
+            [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+            if  running ;  then
+                # It's ok, the server started and is running
+                log_end_msg 0
+            else
+                # It is not running after we did start
+                log_end_msg 1
+            fi
+        else
+            # Either we could not start it
+            log_end_msg 1
+        fi
+        ;;
+  stop)
+        log_daemon_msg "Stopping $DESC" "$NAME"
+        if running ; then
+            # Only stop the server if we see it running
+            errcode=0
+            stop_server || errcode=$?
+            log_end_msg $errcode
+        else
+            # If it's not running don't do anything
+            log_progress_msg "apparently not running"
+            log_end_msg 0
+            exit 0
+        fi
+        ;;
+  force-stop)
+        # First try to stop gracefully the program
+        $0 stop
+        if running; then
+            # If it's still running try to kill it more forcefully
+            log_daemon_msg "Stopping (force) $DESC" "$NAME"
+            errcode=0
+            force_stop || errcode=$?
+            log_end_msg $errcode
+        fi
+        ;;
+  restart|force-reload)
+        log_daemon_msg "Restarting $DESC" "$NAME"
+        errcode=0
+        stop_server || errcode=$?
+        # Wait some sensible amount, some server need this
+        [ -n "$DIETIME" ] && sleep $DIETIME
+        start_server || errcode=$?
+        [ -n "$STARTTIME" ] && sleep $STARTTIME
+        running || errcode=$?
+        log_end_msg $errcode
+        ;;
+  status)
+
+        log_daemon_msg "Checking status of $DESC" "$NAME"
+        if running ;  then
+            log_progress_msg "running"
+            log_end_msg 0
+        else
+            log_progress_msg "apparently not running"
+            log_end_msg 1
+            exit 0
+        fi
+        ;;
+  # Use this if the daemon cannot reload
+  reload)
+        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+        log_warning_msg "cannot re-read the config file (use restart)."
+        ;;
+  # And this if it cann
+  #reload)
+          #
+          # If the daemon can reload its config files on the fly
+          # for example by sending it SIGHUP, do it here.
+          #
+          # If the daemon responds to changes in its config file
+          # directly anyway, make this a do-nothing entry.
+          #
+          # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
+          # if running ; then
+          #    reload_server
+          #    if ! running ;  then
+          # Process died after we tried to reload
+          #       log_progress_msg "died on reload"
+          #       log_end_msg 1
+          #       exit 0
+          #    fi
+          # else
+          #    log_progress_msg "server is not running"
+          #    log_end_msg 1
+          #    exit 0
+          # fi
+                                                                                    #;;
+
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

Added: trunk/freebsd-utils/debian/freebsd-ppp.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.install	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-ppp.install	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,2 @@
+usr.sbin/ppp/ppp		/usr/sbin/
+usr.sbin/pppctl/pppctl		/usr/sbin/

Added: trunk/freebsd-utils/debian/freebsd-ppp.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.manpages	                        (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-ppp.manpages	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,2 @@
+usr.sbin/ppp/ppp.8
+usr.sbin/pppctl/pppctl.8

Added: trunk/freebsd-utils/debian/patches/042_ppp_unused.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/042_ppp_unused.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/042_ppp_unused.diff	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,1069 @@
+--- a/usr.sbin/ppp/acf.c
++++ b/usr.sbin/ppp/acf.c
+@@ -56,8 +56,8 @@
+ }
+ 
+ static struct mbuf *
+-acf_LayerPush(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-              int pri __unused, u_short *proto)
++acf_LayerPush(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++              int pri __attribute__((unused)), u_short *proto)
+ {
+   const u_char cp[2] = { HDLC_ADDR, HDLC_UI };
+ 
+@@ -70,8 +70,8 @@
+ }
+ 
+ static struct mbuf *
+-acf_LayerPull(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-	      u_short *proto __unused)
++acf_LayerPull(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++	      u_short *proto __attribute__((unused)))
+ {
+   struct physical *p = link2physical(l);
+   u_char cp[2];
+--- a/usr.sbin/ppp/async.c
++++ b/usr.sbin/ppp/async.c
+@@ -100,8 +100,8 @@
+ }
+ 
+ static struct mbuf *
+-async_LayerPush(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-                int pri __unused, u_short *proto)
++async_LayerPush(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++                int pri __attribute__((unused)), u_short *proto)
+ {
+   struct physical *p = link2physical(l);
+   u_char *cp, *sp, *ep;
+@@ -187,8 +187,8 @@
+ }
+ 
+ static struct mbuf *
+-async_LayerPull(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-                u_short *proto __unused)
++async_LayerPull(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++                u_short *proto __attribute__((unused)))
+ {
+   struct mbuf *nbp, **last;
+   struct physical *p = link2physical(l);
+--- a/usr.sbin/ppp/atm.c
++++ b/usr.sbin/ppp/atm.c
+@@ -106,7 +106,7 @@
+ 
+ static void
+ atm_device2iov(struct device *d, struct iovec *iov, int *niov,
+-               int maxiov __unused, int *auxfd __unused, int *nauxfd __unused)
++               int maxiov __attribute__((unused)), int *auxfd __attribute__((unused)), int *nauxfd __attribute__((unused)))
+ {
+   int sz = physical_MaxDeviceSize();
+ 
+@@ -142,7 +142,7 @@
+ 
+ struct device *
+ atm_iov2device(int type, struct physical *p, struct iovec *iov, int *niov,
+-               int maxiov __unused, int *auxfd __unused, int *nauxfd __unused)
++               int maxiov __attribute__((unused)), int *auxfd __attribute__((unused)), int *nauxfd __attribute__((unused)))
+ {
+   if (type == ATM_DEVICE) {
+     struct atmdevice *dev = (struct atmdevice *)iov[(*niov)++].iov_base;
+--- a/usr.sbin/ppp/bundle.c
++++ b/usr.sbin/ppp/bundle.c
+@@ -164,7 +164,7 @@
+ }
+ 
+ static void
+-bundle_LayerStart(void *v __unused, struct fsm *fp __unused)
++bundle_LayerStart(void *v __attribute__((unused)), struct fsm *fp __attribute__((unused)))
+ {
+   /* The given FSM is about to start up ! */
+ }
+@@ -529,7 +529,7 @@
+ }
+ 
+ static void
+-bundle_DescriptorRead(struct fdescriptor *d __unused, struct bundle *bundle,
++bundle_DescriptorRead(struct fdescriptor *d __attribute__((unused)), struct bundle *bundle,
+                       const fd_set *fdset)
+ {
+   struct datalink *dl;
+@@ -641,7 +641,7 @@
+ }
+ 
+ static int
+-bundle_DescriptorWrite(struct fdescriptor *d __unused, struct bundle *bundle,
++bundle_DescriptorWrite(struct fdescriptor *d __attribute__((unused)), struct bundle *bundle,
+                        const fd_set *fdset)
+ {
+   struct datalink *dl;
+--- a/usr.sbin/ppp/cbcp.c
++++ b/usr.sbin/ppp/cbcp.c
+@@ -619,7 +619,7 @@
+ }
+ 
+ extern struct mbuf *
+-cbcp_Input(struct bundle *bundle __unused, struct link *l, struct mbuf *bp)
++cbcp_Input(struct bundle *bundle __attribute__((unused)), struct link *l, struct mbuf *bp)
+ {
+   struct physical *p = link2physical(l);
+   struct cbcp_header *head;
+--- a/usr.sbin/ppp/ccp.c
++++ b/usr.sbin/ppp/ccp.c
+@@ -407,7 +407,7 @@
+ }
+ 
+ static void
+-CcpSentTerminateReq(struct fsm *fp __unused)
++CcpSentTerminateReq(struct fsm *fp __attribute__((unused)))
+ {
+   /* Term REQ just sent by FSM */
+ }
+@@ -715,7 +715,7 @@
+ }
+ 
+ static struct mbuf *
+-ccp_LayerPush(struct bundle *b __unused, struct link *l, struct mbuf *bp,
++ccp_LayerPush(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
+               int pri, u_short *proto)
+ {
+   if (PROTO_COMPRESSIBLE(*proto)) {
+@@ -745,7 +745,7 @@
+ }
+ 
+ static struct mbuf *
+-ccp_LayerPull(struct bundle *b __unused, struct link *l, struct mbuf *bp,
++ccp_LayerPull(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
+ 	      u_short *proto)
+ {
+   /*
+@@ -812,13 +812,13 @@
+ }
+ 
+ int
+-ccp_DefaultUsable(struct fsm *fp __unused)
++ccp_DefaultUsable(struct fsm *fp __attribute__((unused)))
+ {
+   return 1;
+ }
+ 
+ int
+-ccp_DefaultRequired(struct fsm *fp __unused)
++ccp_DefaultRequired(struct fsm *fp __attribute__((unused)))
+ {
+   return 0;
+ }
+--- a/usr.sbin/ppp/chap.c
++++ b/usr.sbin/ppp/chap.c
+@@ -393,8 +393,8 @@
+ }
+ 
+ static int
+-chap_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w __unused,
+-	       fd_set *e __unused, int *n)
++chap_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w __attribute__((unused)),
++	       fd_set *e __attribute__((unused)), int *n)
+ {
+   struct chap *chap = descriptor2chap(d);
+ 
+@@ -418,8 +418,8 @@
+ }
+ 
+ static void
+-chap_Read(struct fdescriptor *d, struct bundle *bundle __unused,
+-	  const fd_set *fdset __unused)
++chap_Read(struct fdescriptor *d, struct bundle *bundle __attribute__((unused)),
++	  const fd_set *fdset __attribute__((unused)))
+ {
+   struct chap *chap = descriptor2chap(d);
+   int got;
+@@ -475,8 +475,8 @@
+ }
+ 
+ static int
+-chap_Write(struct fdescriptor *d __unused, struct bundle *bundle __unused,
+-	   const fd_set *fdset __unused)
++chap_Write(struct fdescriptor *d __attribute__((unused)), struct bundle *bundle __attribute__((unused)),
++	   const fd_set *fdset __attribute__((unused)))
+ {
+   /* We never want to write here ! */
+   log_Printf(LogALERT, "chap_Write: Internal error: Bad call !\n");
+--- a/usr.sbin/ppp/chat.c
++++ b/usr.sbin/ppp/chat.c
+@@ -371,8 +371,8 @@
+ }
+ 
+ static void
+-chat_Read(struct fdescriptor *d, struct bundle *bundle __unused,
+-	  const fd_set *fdset __unused)
++chat_Read(struct fdescriptor *d, struct bundle *bundle __attribute__((unused)),
++	  const fd_set *fdset __attribute__((unused)))
+ {
+   struct chat *c = descriptor2chat(d);
+ 
+@@ -486,8 +486,8 @@
+ }
+ 
+ static int
+-chat_Write(struct fdescriptor *d, struct bundle *bundle __unused,
+-	   const fd_set *fdset __unused)
++chat_Write(struct fdescriptor *d, struct bundle *bundle __attribute__((unused)),
++	   const fd_set *fdset __attribute__((unused)))
+ {
+   struct chat *c = descriptor2chat(d);
+   int result = 0;
+--- a/usr.sbin/ppp/command.c
++++ b/usr.sbin/ppp/command.c
+@@ -383,7 +383,7 @@
+ }
+ 
+ static int
+-SaveCommand(struct cmdargs const *arg __unused)
++SaveCommand(struct cmdargs const *arg __attribute__((unused)))
+ {
+   log_Printf(LogWARN, "save command is not yet implemented.\n");
+   return 1;
+--- a/usr.sbin/ppp/deflate.c
++++ b/usr.sbin/ppp/deflate.c
+@@ -66,8 +66,8 @@
+ }
+ 
+ static struct mbuf *
+-DeflateOutput(void *v, struct ccp *ccp, struct link *l __unused,
+-	      int pri __unused, u_short *proto, struct mbuf *mp)
++DeflateOutput(void *v, struct ccp *ccp, struct link *l __attribute__((unused)),
++	      int pri __attribute__((unused)), u_short *proto, struct mbuf *mp)
+ {
+   struct deflate_state *state = (struct deflate_state *)v;
+   u_char *wp, *rp;
+@@ -440,7 +440,7 @@
+ }
+ 
+ static void
+-DeflateInitOptsOutput(struct bundle *bundle __unused, struct fsm_opt *o,
++DeflateInitOptsOutput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o,
+                       const struct ccp_config *cfg)
+ {
+   o->hdr.len = 4;
+@@ -449,8 +449,8 @@
+ }
+ 
+ static int
+-DeflateSetOptsOutput(struct bundle *bundle __unused, struct fsm_opt *o,
+-                     const struct ccp_config *cfg __unused)
++DeflateSetOptsOutput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o,
++                     const struct ccp_config *cfg __attribute__((unused)))
+ {
+   if (o->hdr.len != 4 || (o->data[0] & 15) != 8 || o->data[1] != '\0')
+     return MODE_REJ;
+@@ -464,7 +464,7 @@
+ }
+ 
+ static int
+-DeflateSetOptsInput(struct bundle *bundle __unused, struct fsm_opt *o,
++DeflateSetOptsInput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o,
+                     const struct ccp_config *cfg)
+ {
+   int want;
+@@ -486,7 +486,7 @@
+ }
+ 
+ static void *
+-DeflateInitInput(struct bundle *bundle __unused, struct fsm_opt *o)
++DeflateInitInput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o)
+ {
+   struct deflate_state *state;
+ 
+@@ -509,7 +509,7 @@
+ }
+ 
+ static void *
+-DeflateInitOutput(struct bundle *bundle __unused, struct fsm_opt *o)
++DeflateInitOutput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o)
+ {
+   struct deflate_state *state;
+ 
+--- a/usr.sbin/ppp/defs.c
++++ b/usr.sbin/ppp/defs.c
+@@ -443,7 +443,7 @@
+ }
+ #else
+ int
+-loadmodules(int how __unused, const char *module __unused, ...)
++loadmodules(int how __attribute__((unused)), const char *module __attribute__((unused)), ...)
+ {
+   return 0;
+ }
+--- a/usr.sbin/ppp/ether.c
++++ b/usr.sbin/ppp/ether.c
+@@ -191,7 +191,7 @@
+ 
+ static void
+ ether_device2iov(struct device *d, struct iovec *iov, int *niov,
+-                 int maxiov __unused, int *auxfd, int *nauxfd)
++                 int maxiov __attribute__((unused)), int *auxfd, int *nauxfd)
+ {
+   struct etherdevice *dev;
+   int sz = physical_MaxDeviceSize();
+@@ -344,7 +344,7 @@
+ 
+ struct device *
+ ether_iov2device(int type, struct physical *p, struct iovec *iov, int *niov,
+-                 int maxiov __unused, int *auxfd, int *nauxfd)
++                 int maxiov __attribute__((unused)), int *auxfd, int *nauxfd)
+ {
+   if (type == ETHER_DEVICE) {
+     struct etherdevice *dev = (struct etherdevice *)iov[(*niov)++].iov_base;
+--- a/usr.sbin/ppp/exec.c
++++ b/usr.sbin/ppp/exec.c
+@@ -94,7 +94,7 @@
+ 
+ static void
+ exec_device2iov(struct device *d, struct iovec *iov, int *niov,
+-               int maxiov __unused, int *auxfd, int *nauxfd)
++               int maxiov __attribute__((unused)), int *auxfd, int *nauxfd)
+ {
+   struct execdevice *dev;
+   int sz = physical_MaxDeviceSize();
+@@ -172,7 +172,7 @@
+ 
+ struct device *
+ exec_iov2device(int type, struct physical *p, struct iovec *iov,
+-                int *niov, int maxiov __unused, int *auxfd, int *nauxfd)
++                int *niov, int maxiov __attribute__((unused)), int *auxfd, int *nauxfd)
+ {
+   if (type == EXEC_DEVICE) {
+     struct execdevice *dev = (struct execdevice *)iov[(*niov)++].iov_base;
+--- a/usr.sbin/ppp/fsm.c
++++ b/usr.sbin/ppp/fsm.c
+@@ -771,7 +771,7 @@
+ }
+ 
+ static void
+-FsmRecvTermAck(struct fsm *fp, struct fsmheader *lhp __unused, struct mbuf *bp)
++FsmRecvTermAck(struct fsm *fp, struct fsmheader *lhp __attribute__((unused)), struct mbuf *bp)
+ /* RTA */
+ {
+   switch (fp->state) {
+@@ -867,14 +867,14 @@
+ }
+ 
+ static void
+-FsmRecvCodeRej(struct fsm *fp __unused, struct fsmheader *lhp __unused,
++FsmRecvCodeRej(struct fsm *fp __attribute__((unused)), struct fsmheader *lhp __attribute__((unused)),
+ 	       struct mbuf *bp)
+ {
+   m_freem(bp);
+ }
+ 
+ static void
+-FsmRecvProtoRej(struct fsm *fp, struct fsmheader *lhp __unused, struct mbuf *bp)
++FsmRecvProtoRej(struct fsm *fp, struct fsmheader *lhp __attribute__((unused)), struct mbuf *bp)
+ {
+   struct physical *p = link2physical(fp->link);
+   u_short proto;
+@@ -974,7 +974,7 @@
+ }
+ 
+ static void
+-FsmRecvEchoRep(struct fsm *fp, struct fsmheader *lhp __unused, struct mbuf *bp)
++FsmRecvEchoRep(struct fsm *fp, struct fsmheader *lhp __attribute__((unused)), struct mbuf *bp)
+ {
+   if (fsm2lcp(fp))
+     bp = lqr_RecvEcho(fp, bp);
+@@ -983,7 +983,7 @@
+ }
+ 
+ static void
+-FsmRecvDiscReq(struct fsm *fp __unused, struct fsmheader *lhp __unused,
++FsmRecvDiscReq(struct fsm *fp __attribute__((unused)), struct fsmheader *lhp __attribute__((unused)),
+ 	       struct mbuf *bp)
+ {
+   m_freem(bp);
+@@ -1012,7 +1012,7 @@
+ }
+ 
+ static void
+-FsmRecvTimeRemain(struct fsm *fp __unused, struct fsmheader *lhp __unused,
++FsmRecvTimeRemain(struct fsm *fp __attribute__((unused)), struct fsmheader *lhp __attribute__((unused)),
+ 		  struct mbuf *bp)
+ {
+   m_freem(bp);
+@@ -1103,7 +1103,7 @@
+ }
+ 
+ void
+-fsm_NullRecvResetAck(struct fsm *fp, u_char id __unused)
++fsm_NullRecvResetAck(struct fsm *fp, u_char id __attribute__((unused)))
+ {
+   log_Printf(fp->LogLevel, "%s: Oops - received unexpected reset ack\n",
+             fp->link->name);
+--- a/usr.sbin/ppp/hdlc.c
++++ b/usr.sbin/ppp/hdlc.c
+@@ -138,8 +138,8 @@
+ }
+ 
+ static struct mbuf *
+-hdlc_LayerPush(struct bundle *bundle __unused, struct link *l __unused,
+-	       struct mbuf *bp, int pri __unused, u_short *proto __unused)
++hdlc_LayerPush(struct bundle *bundle __attribute__((unused)), struct link *l __attribute__((unused)),
++	       struct mbuf *bp, int pri __attribute__((unused)), u_short *proto __attribute__((unused)))
+ {
+   struct mbuf *last;
+   u_char *cp;
+@@ -298,8 +298,8 @@
+ }
+ 
+ static struct mbuf *
+-hdlc_LayerPull(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-               u_short *proto __unused)
++hdlc_LayerPull(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++               u_short *proto __attribute__((unused)))
+ {
+   struct physical *p = link2physical(l);
+   u_short fcs;
+--- a/usr.sbin/ppp/ip.c
++++ b/usr.sbin/ppp/ip.c
+@@ -208,7 +208,7 @@
+ int
+ FilterCheck(const unsigned char *packet,
+ #ifdef NOINET6
+-	    u_int32_t family __unused,
++	    u_int32_t family __attribute__((unused)),
+ #else
+ 	    u_int32_t family,
+ #endif
+--- a/usr.sbin/ppp/ipcp.c
++++ b/usr.sbin/ppp/ipcp.c
+@@ -800,7 +800,7 @@
+ }
+ 
+ static void
+-IpcpSentTerminateReq(struct fsm *fp __unused)
++IpcpSentTerminateReq(struct fsm *fp __attribute__((unused)))
+ {
+   /* Term REQ just sent by FSM */
+ }
+--- a/usr.sbin/ppp/ipv6cp.c
++++ b/usr.sbin/ppp/ipv6cp.c
+@@ -376,14 +376,14 @@
+ }
+ 
+ void
+-ipv6cp_IfaceAddrAdded(struct ipv6cp *ipv6cp __unused,
+-		      const struct iface_addr *addr __unused)
++ipv6cp_IfaceAddrAdded(struct ipv6cp *ipv6cp __attribute__((unused)),
++		      const struct iface_addr *addr __attribute__((unused)))
+ {
+ }
+ 
+ void
+-ipv6cp_IfaceAddrDeleted(struct ipv6cp *ipv6cp __unused,
+-			const struct iface_addr *addr __unused)
++ipv6cp_IfaceAddrDeleted(struct ipv6cp *ipv6cp __attribute__((unused)),
++			const struct iface_addr *addr __attribute__((unused)))
+ {
+ }
+ 
+@@ -633,7 +633,7 @@
+ }
+ 
+ static void
+-ipv6cp_SentTerminateReq(struct fsm *fp __unused)
++ipv6cp_SentTerminateReq(struct fsm *fp __attribute__((unused)))
+ {
+   /* Term REQ just sent by FSM */
+ }
+--- a/usr.sbin/ppp/lcp.c
++++ b/usr.sbin/ppp/lcp.c
+@@ -532,7 +532,7 @@
+ }
+ 
+ static void
+-LcpSentTerminateReq(struct fsm *fp __unused)
++LcpSentTerminateReq(struct fsm *fp __attribute__((unused)))
+ {
+   /* Term REQ just sent by FSM */
+ }
+@@ -1296,7 +1296,7 @@
+ }
+ 
+ extern struct mbuf *
+-lcp_Input(struct bundle *bundle __unused, struct link *l, struct mbuf *bp)
++lcp_Input(struct bundle *bundle __attribute__((unused)), struct link *l, struct mbuf *bp)
+ {
+   /* Got PROTO_LCP from link */
+   m_settype(bp, MB_LCPIN);
+--- a/usr.sbin/ppp/lqr.c
++++ b/usr.sbin/ppp/lqr.c
+@@ -198,7 +198,7 @@
+ }
+ 
+ struct mbuf *
+-lqr_Input(struct bundle *bundle __unused, struct link *l, struct mbuf *bp)
++lqr_Input(struct bundle *bundle __attribute__((unused)), struct link *l, struct mbuf *bp)
+ {
+   struct physical *p = link2physical(l);
+   struct lcp *lcp = p->hdlc.lqm.owner;
+@@ -413,8 +413,8 @@
+ }
+ 
+ static struct mbuf *
+-lqr_LayerPush(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-              int pri __unused, u_short *proto)
++lqr_LayerPush(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++              int pri __attribute__((unused)), u_short *proto)
+ {
+   struct physical *p = link2physical(l);
+   int len, layer, extra_async_bytes;
+@@ -510,7 +510,7 @@
+ }
+ 
+ static struct mbuf *
+-lqr_LayerPull(struct bundle *b __unused, struct link *l __unused,
++lqr_LayerPull(struct bundle *b __attribute__((unused)), struct link *l __attribute__((unused)),
+ 	      struct mbuf *bp, u_short *proto)
+ {
+   /*
+--- a/usr.sbin/ppp/main.c
++++ b/usr.sbin/ppp/main.c
+@@ -158,14 +158,14 @@
+ }
+ 
+ static void
+-TerminalCont(int signo __unused)
++TerminalCont(int signo __attribute__((unused)))
+ {
+   signal(SIGCONT, SIG_DFL);
+   prompt_Continue(SignalPrompt);
+ }
+ 
+ static void
+-TerminalStop(int signo __unused)
++TerminalStop(int signo __attribute__((unused)))
+ {
+   prompt_Suspend(SignalPrompt);
+   signal(SIGCONT, TerminalCont);
+@@ -173,7 +173,7 @@
+ }
+ 
+ static void
+-BringDownServer(int signo __unused)
++BringDownServer(int signo __attribute__((unused)))
+ {
+   /* Drops all child prompts too ! */
+   if (server_Close(SignalBundle))
+@@ -181,7 +181,7 @@
+ }
+ 
+ static void
+-RestartServer(int signo __unused)
++RestartServer(int signo __attribute__((unused)))
+ {
+   /* Drops all child prompts and re-opens the socket */
+   server_Reopen(SignalBundle);
+--- a/usr.sbin/ppp/mp.c
++++ b/usr.sbin/ppp/mp.c
+@@ -161,13 +161,13 @@
+ }
+ 
+ static void
+-mp_LayerStart(void *v __unused, struct fsm *fp __unused)
++mp_LayerStart(void *v __attribute__((unused)), struct fsm *fp __attribute__((unused)))
+ {
+   /* The given FSM (ccp) is about to start up ! */
+ }
+ 
+ static void
+-mp_LayerUp(void *v __unused, struct fsm *fp)
++mp_LayerUp(void *v __attribute__((unused)), struct fsm *fp)
+ {
+   /* The given fsm (ccp) is now up */
+ 
+@@ -175,13 +175,13 @@
+ }
+ 
+ static void
+-mp_LayerDown(void *v __unused, struct fsm *fp __unused)
++mp_LayerDown(void *v __attribute__((unused)), struct fsm *fp __attribute__((unused)))
+ {
+   /* The given FSM (ccp) has been told to come down */
+ }
+ 
+ static void
+-mp_LayerFinish(void *v __unused, struct fsm *fp)
++mp_LayerFinish(void *v __attribute__((unused)), struct fsm *fp)
+ {
+   /* The given fsm (ccp) is now down */
+   if (fp->state == ST_CLOSED && fp->open_mode == OPEN_PASSIVE)
+@@ -1076,7 +1076,7 @@
+ 
+ static void
+ mpserver_Read(struct fdescriptor *d, struct bundle *bundle,
+-	      const fd_set *fdset __unused)
++	      const fd_set *fdset __attribute__((unused)))
+ {
+   struct mpserver *s = descriptor2mpserver(d);
+ 
+@@ -1084,8 +1084,8 @@
+ }
+ 
+ static int
+-mpserver_Write(struct fdescriptor *d __unused, struct bundle *bundle __unused,
+-               const fd_set *fdset __unused)
++mpserver_Write(struct fdescriptor *d __attribute__((unused)), struct bundle *bundle __attribute__((unused)),
++               const fd_set *fdset __attribute__((unused)))
+ {
+   /* We never want to write here ! */
+   log_Printf(LogALERT, "mpserver_Write: Internal error: Bad call !\n");
+--- a/usr.sbin/ppp/mppe.c
++++ b/usr.sbin/ppp/mppe.c
+@@ -155,7 +155,7 @@
+ }
+ 
+ static struct mbuf *
+-MPPEOutput(void *v, struct ccp *ccp, struct link *l __unused, int pri __unused,
++MPPEOutput(void *v, struct ccp *ccp, struct link *l __attribute__((unused)), int pri __attribute__((unused)),
+ 	   u_short *proto, struct mbuf *mp)
+ {
+   struct mppe_state *mop = (struct mppe_state *)v;
+@@ -232,7 +232,7 @@
+ }
+ 
+ static void
+-MPPEResetInput(void *v __unused)
++MPPEResetInput(void *v __attribute__((unused)))
+ {
+   log_Printf(LogCCP, "MPPE: Unexpected input channel ack\n");
+ }
+@@ -372,8 +372,8 @@
+ }
+ 
+ static void
+-MPPEDictSetup(void *v __unused, struct ccp *ccp __unused,
+-	      u_short proto __unused, struct mbuf *mp __unused)
++MPPEDictSetup(void *v __attribute__((unused)), struct ccp *ccp __attribute__((unused)),
++	      u_short proto __attribute__((unused)), struct mbuf *mp __attribute__((unused)))
+ {
+   /* Nothing to see here */
+ }
+@@ -470,7 +470,7 @@
+ }
+ 
+ static u_int32_t
+-MPPE_ConfigVal(struct bundle *bundle __unused, const struct ccp_config *cfg)
++MPPE_ConfigVal(struct bundle *bundle __attribute__((unused)), const struct ccp_config *cfg)
+ {
+   u_int32_t val;
+ 
+@@ -676,7 +676,7 @@
+ }
+ 
+ static void *
+-MPPEInitInput(struct bundle *bundle __unused, struct fsm_opt *o)
++MPPEInitInput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o)
+ {
+   struct mppe_state *mip;
+ 
+@@ -732,7 +732,7 @@
+ }
+ 
+ static void *
+-MPPEInitOutput(struct bundle *bundle __unused, struct fsm_opt *o)
++MPPEInitOutput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o)
+ {
+   struct mppe_state *mop;
+ 
+--- a/usr.sbin/ppp/nat_cmd.c
++++ b/usr.sbin/ppp/nat_cmd.c
+@@ -496,8 +496,8 @@
+ }
+ 
+ static struct mbuf *
+-nat_LayerPush(struct bundle *bundle, struct link *l __unused, struct mbuf *bp,
+-                int pri __unused, u_short *proto)
++nat_LayerPush(struct bundle *bundle, struct link *l __attribute__((unused)), struct mbuf *bp,
++                int pri __attribute__((unused)), u_short *proto)
+ {
+   if (!bundle->NatEnabled || *proto != PROTO_IP)
+     return bp;
+@@ -513,7 +513,7 @@
+ }
+ 
+ static struct mbuf *
+-nat_LayerPull(struct bundle *bundle, struct link *l __unused, struct mbuf *bp,
++nat_LayerPull(struct bundle *bundle, struct link *l __attribute__((unused)), struct mbuf *bp,
+                 u_short *proto)
+ {
+   static int gfrags;
+--- a/usr.sbin/ppp/ncp.c
++++ b/usr.sbin/ppp/ncp.c
+@@ -146,7 +146,7 @@
+ int
+ ncp_fsmStart(struct ncp *ncp,
+ #ifdef NOINET6
+-	     struct bundle *bundle __unused
++	     struct bundle *bundle __attribute__((unused))
+ #else
+ 	     struct bundle *bundle
+ #endif
+@@ -337,9 +337,9 @@
+  * of what is to be pushed next, coming either from mp->out or ncp->afq.
+  */
+ int
+-ncp_PushPacket(struct ncp *ncp __unused,
++ncp_PushPacket(struct ncp *ncp __attribute__((unused)),
+ #ifdef NOINET6
+-	       int *af __unused,
++	       int *af __attribute__((unused)),
+ #else
+ 	       int *af,
+ #endif
+--- a/usr.sbin/ppp/netgraph.c
++++ b/usr.sbin/ppp/netgraph.c
+@@ -279,7 +279,7 @@
+ 
+ static void
+ ng_device2iov(struct device *d, struct iovec *iov, int *niov,
+-              int maxiov __unused, int *auxfd, int *nauxfd)
++              int maxiov __attribute__((unused)), int *auxfd, int *nauxfd)
+ {
+   struct ngdevice *dev;
+   int sz = physical_MaxDeviceSize();
+@@ -320,7 +320,7 @@
+ 
+ struct device *
+ ng_iov2device(int type, struct physical *p, struct iovec *iov, int *niov,
+-              int maxiov __unused, int *auxfd, int *nauxfd)
++              int maxiov __attribute__((unused)), int *auxfd, int *nauxfd)
+ {
+   if (type == NG_DEVICE) {
+     struct ngdevice *dev = (struct ngdevice *)iov[(*niov)++].iov_base;
+--- a/usr.sbin/ppp/physical.c
++++ b/usr.sbin/ppp/physical.c
+@@ -397,8 +397,8 @@
+ }
+ 
+ static int
+-physical_DescriptorWrite(struct fdescriptor *d, struct bundle *bundle __unused,
+-                         const fd_set *fdset __unused)
++physical_DescriptorWrite(struct fdescriptor *d, struct bundle *bundle __attribute__((unused)),
++                         const fd_set *fdset __attribute__((unused)))
+ {
+   struct physical *p = descriptor2physical(d);
+   int nw, result = 0;
+@@ -530,7 +530,7 @@
+ 
+ void
+ physical_DescriptorRead(struct fdescriptor *d, struct bundle *bundle,
+-                     const fd_set *fdset __unused)
++                     const fd_set *fdset __attribute__((unused)))
+ {
+   struct physical *p = descriptor2physical(d);
+   u_char *rbuff;
+--- a/usr.sbin/ppp/pred.c
++++ b/usr.sbin/ppp/pred.c
+@@ -151,7 +151,7 @@
+ }
+ 
+ static void *
+-Pred1InitInput(struct bundle *bundle __unused, struct fsm_opt *o __unused)
++Pred1InitInput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o __attribute__((unused)))
+ {
+   struct pred1_state *state;
+   state = (struct pred1_state *)malloc(sizeof(struct pred1_state));
+@@ -161,7 +161,7 @@
+ }
+ 
+ static void *
+-Pred1InitOutput(struct bundle *bundle __unused, struct fsm_opt *o __unused)
++Pred1InitOutput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o __attribute__((unused)))
+ {
+   struct pred1_state *state;
+   state = (struct pred1_state *)malloc(sizeof(struct pred1_state));
+@@ -171,8 +171,8 @@
+ }
+ 
+ static struct mbuf *
+-Pred1Output(void *v, struct ccp *ccp, struct link *l __unused,
+-	    int pri __unused, u_short *proto, struct mbuf *bp)
++Pred1Output(void *v, struct ccp *ccp, struct link *l __attribute__((unused)),
++	    int pri __attribute__((unused)), u_short *proto, struct mbuf *bp)
+ {
+   struct pred1_state *state = (struct pred1_state *)v;
+   struct mbuf *mwp;
+@@ -289,28 +289,28 @@
+ }
+ 
+ static void
+-Pred1DictSetup(void *v __unused, struct ccp *ccp __unused,
+-	       u_short proto __unused, struct mbuf *bp __unused)
++Pred1DictSetup(void *v __attribute__((unused)), struct ccp *ccp __attribute__((unused)),
++	       u_short proto __attribute__((unused)), struct mbuf *bp __attribute__((unused)))
+ {
+   /* Nothing to see here */
+ }
+ 
+ static const char *
+-Pred1DispOpts(struct fsm_opt *o __unused)
++Pred1DispOpts(struct fsm_opt *o __attribute__((unused)))
+ {
+   return NULL;
+ }
+ 
+ static void
+-Pred1InitOptsOutput(struct bundle *bundle __unused, struct fsm_opt *o,
+-                    const struct ccp_config *cfg __unused)
++Pred1InitOptsOutput(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o,
++                    const struct ccp_config *cfg __attribute__((unused)))
+ {
+   o->hdr.len = 2;
+ }
+ 
+ static int
+-Pred1SetOpts(struct bundle *bundle __unused, struct fsm_opt *o,
+-             const struct ccp_config *cfg __unused)
++Pred1SetOpts(struct bundle *bundle __attribute__((unused)), struct fsm_opt *o,
++             const struct ccp_config *cfg __attribute__((unused)))
+ {
+   if (o->hdr.len != 2) {
+     o->hdr.len = 2;
+--- a/usr.sbin/ppp/prompt.c
++++ b/usr.sbin/ppp/prompt.c
+@@ -129,7 +129,7 @@
+ }
+ 
+ static int
+-prompt_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w __unused,
++prompt_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w __attribute__((unused)),
+ 		 fd_set *e, int *n)
+ {
+   struct prompt *p = descriptor2prompt(d);
+@@ -181,7 +181,7 @@
+ 
+ static void
+ prompt_Read(struct fdescriptor *d, struct bundle *bundle,
+-	    const fd_set *fdset __unused)
++	    const fd_set *fdset __attribute__((unused)))
+ {
+   struct prompt *p = descriptor2prompt(d);
+   struct prompt *op;
+@@ -302,8 +302,8 @@
+ }
+ 
+ static int
+-prompt_Write(struct fdescriptor *d __unused, struct bundle *bundle __unused,
+-	     const fd_set *fdset __unused)
++prompt_Write(struct fdescriptor *d __attribute__((unused)), struct bundle *bundle __attribute__((unused)),
++	     const fd_set *fdset __attribute__((unused)))
+ {
+   /* We never want to write here ! */
+   log_Printf(LogALERT, "prompt_Write: Internal error: Bad call !\n");
+--- a/usr.sbin/ppp/proto.c
++++ b/usr.sbin/ppp/proto.c
+@@ -69,8 +69,8 @@
+ }
+ 
+ static struct mbuf *
+-proto_LayerPush(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-                int pri __unused, u_short *proto)
++proto_LayerPush(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++                int pri __attribute__((unused)), u_short *proto)
+ {
+   log_Printf(LogDEBUG, "proto_LayerPush: Using 0x%04x\n", *proto);
+   bp = proto_Prepend(bp, *proto, l->lcp.his_protocomp,
+@@ -82,7 +82,7 @@
+ }
+ 
+ static struct mbuf *
+-proto_LayerPull(struct bundle *b __unused, struct link *l, struct mbuf *bp,
++proto_LayerPull(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
+                 u_short *proto)
+ {
+   u_char cp[2];
+--- a/usr.sbin/ppp/radius.c
++++ b/usr.sbin/ppp/radius.c
+@@ -682,8 +682,8 @@
+  * Time to call rad_continue_send_request() - something to read.
+  */
+ static void
+-radius_Read(struct fdescriptor *d, struct bundle *bundle __unused,
+-	    const fd_set *fdset __unused)
++radius_Read(struct fdescriptor *d, struct bundle *bundle __attribute__((unused)),
++	    const fd_set *fdset __attribute__((unused)))
+ {
+   radius_Continue(descriptor2radius(d), 1);
+ }
+@@ -711,8 +711,8 @@
+  * Behave as a struct fdescriptor (descriptor.h)
+  */
+ static int
+-radius_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w __unused,
+-		 fd_set *e __unused, int *n)
++radius_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w __attribute__((unused)),
++		 fd_set *e __attribute__((unused)), int *n)
+ {
+   struct radius *rad = descriptor2radius(d);
+ 
+@@ -742,8 +742,8 @@
+  * Behave as a struct fdescriptor (descriptor.h)
+  */
+ static int
+-radius_Write(struct fdescriptor *d __unused, struct bundle *bundle __unused,
+-	     const fd_set *fdset __unused)
++radius_Write(struct fdescriptor *d __attribute__((unused)), struct bundle *bundle __attribute__((unused)),
++	     const fd_set *fdset __attribute__((unused)))
+ {
+   /* We never want to write here ! */
+   log_Printf(LogALERT, "radius_Write: Internal error: Bad call !\n");
+--- a/usr.sbin/ppp/server.c
++++ b/usr.sbin/ppp/server.c
+@@ -192,8 +192,8 @@
+ }
+ 
+ static int
+-server_Write(struct fdescriptor *d __unused, struct bundle *bundle __unused,
+-	     const fd_set *fdset __unused)
++server_Write(struct fdescriptor *d __attribute__((unused)), struct bundle *bundle __attribute__((unused)),
++	     const fd_set *fdset __attribute__((unused)))
+ {
+   /* We never want to write here ! */
+   log_Printf(LogALERT, "server_Write: Internal error: Bad call !\n");
+@@ -384,7 +384,7 @@
+ }
+ 
+ int
+-server_Close(struct bundle *bundle __unused)
++server_Close(struct bundle *bundle __attribute__((unused)))
+ {
+   if (server.fd >= 0) {
+     if (*server.cfg.sockname != '\0') {
+--- a/usr.sbin/ppp/sync.c
++++ b/usr.sbin/ppp/sync.c
+@@ -49,8 +49,8 @@
+ #include "physical.h"
+ 
+ static struct mbuf *
+-sync_LayerPush(struct bundle *bundle __unused, struct link *l __unused,
+-	       struct mbuf *bp, int pri __unused, u_short *proto __unused)
++sync_LayerPush(struct bundle *bundle __attribute__((unused)), struct link *l __attribute__((unused)),
++	       struct mbuf *bp, int pri __attribute__((unused)), u_short *proto __attribute__((unused)))
+ {
+   log_DumpBp(LogSYNC, "Write", bp);
+   m_settype(bp, MB_SYNCOUT);
+@@ -59,8 +59,8 @@
+ }
+ 
+ static struct mbuf *
+-sync_LayerPull(struct bundle *b __unused, struct link *l, struct mbuf *bp,
+-               u_short *proto __unused)
++sync_LayerPull(struct bundle *b __attribute__((unused)), struct link *l, struct mbuf *bp,
++               u_short *proto __attribute__((unused)))
+ {
+   struct physical *p = link2physical(l);
+   int len;
+--- a/usr.sbin/ppp/tcp.c
++++ b/usr.sbin/ppp/tcp.c
+@@ -119,8 +119,8 @@
+ 
+ struct device *
+ tcp_iov2device(int type, struct physical *p, struct iovec *iov,
+-               int *niov, int maxiov __unused, int *auxfd __unused,
+-	       int *nauxfd __unused)
++               int *niov, int maxiov __attribute__((unused)), int *auxfd __attribute__((unused)),
++	       int *nauxfd __attribute__((unused)))
+ {
+   if (type == TCP_DEVICE) {
+     free(iov[(*niov)++].iov_base);
+--- a/usr.sbin/ppp/tcpmss.c
++++ b/usr.sbin/ppp/tcpmss.c
+@@ -168,15 +168,15 @@
+ }
+ 
+ static struct mbuf *
+-tcpmss_LayerPush(struct bundle *bundle, struct link *l __unused,
+-		 struct mbuf *bp, int pri __unused, u_short *proto __unused)
++tcpmss_LayerPush(struct bundle *bundle, struct link *l __attribute__((unused)),
++		 struct mbuf *bp, int pri __attribute__((unused)), u_short *proto __attribute__((unused)))
+ {
+ 	return tcpmss_Check(bundle, bp);
+ }
+ 
+ static struct mbuf *
+-tcpmss_LayerPull(struct bundle *bundle, struct link *l __unused,
+-		 struct mbuf *bp, u_short *proto __unused)
++tcpmss_LayerPull(struct bundle *bundle, struct link *l __attribute__((unused)),
++		 struct mbuf *bp, u_short *proto __attribute__((unused)))
+ {
+ 	return tcpmss_Check(bundle, bp);
+ }
+--- a/usr.sbin/ppp/tty.c
++++ b/usr.sbin/ppp/tty.c
+@@ -573,11 +573,11 @@
+ 
+ static void
+ tty_device2iov(struct device *d, struct iovec *iov, int *niov,
+-               int maxiov __unused,
++               int maxiov __attribute__((unused)),
+ #ifndef NONETGRAPH
+                int *auxfd, int *nauxfd
+ #else
+-               int *auxfd __unused, int *nauxfd __unused
++               int *auxfd __attribute__((unused)), int *nauxfd __attribute__((unused))
+ #endif
+                )
+ {
+@@ -630,11 +630,11 @@
+ 
+ struct device *
+ tty_iov2device(int type, struct physical *p, struct iovec *iov, int *niov,
+-               int maxiov __unused,
++               int maxiov __attribute__((unused)),
+ #ifndef NONETGRAPH
+                int *auxfd, int *nauxfd
+ #else
+-               int *auxfd __unused, int *nauxfd __unused
++               int *auxfd __attribute__((unused)), int *nauxfd __attribute__((unused))
+ #endif
+                )
+ {
+--- a/usr.sbin/ppp/udp.c
++++ b/usr.sbin/ppp/udp.c
+@@ -138,7 +138,7 @@
+ 
+ static void
+ udp_device2iov(struct device *d, struct iovec *iov, int *niov,
+-               int maxiov __unused, int *auxfd __unused, int *nauxfd __unused)
++               int maxiov __attribute__((unused)), int *auxfd __attribute__((unused)), int *nauxfd __attribute__((unused)))
+ {
+   int sz = physical_MaxDeviceSize();
+ 
+@@ -174,7 +174,7 @@
+ 
+ struct device *
+ udp_iov2device(int type, struct physical *p, struct iovec *iov, int *niov,
+-               int maxiov __unused, int *auxfd __unused, int *nauxfd __unused)
++               int maxiov __attribute__((unused)), int *auxfd __attribute__((unused)), int *nauxfd __attribute__((unused)))
+ {
+   if (type == UDP_DEVICE) {
+     struct udpdevice *dev = (struct udpdevice *)iov[(*niov)++].iov_base;
+--- a/usr.sbin/ppp/vjcomp.c
++++ b/usr.sbin/ppp/vjcomp.c
+@@ -70,8 +70,8 @@
+ #define MAX_VJHEADER 16		/* Maximum size of compressed header */
+ 
+ static struct mbuf *
+-vj_LayerPush(struct bundle *bundle, struct link *l __unused, struct mbuf *bp,
+-	     int pri __unused, u_short *proto)
++vj_LayerPush(struct bundle *bundle, struct link *l __attribute__((unused)), struct mbuf *bp,
++	     int pri __attribute__((unused)), u_short *proto)
+ {
+   int type;
+   struct ip *pip;
+@@ -162,7 +162,7 @@
+ }
+ 
+ static struct mbuf *
+-vj_LayerPull(struct bundle *bundle, struct link *l __unused, struct mbuf *bp,
++vj_LayerPull(struct bundle *bundle, struct link *l __attribute__((unused)), struct mbuf *bp,
+              u_short *proto)
+ {
+   u_char type;

Added: trunk/freebsd-utils/debian/patches/043_ppp.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/043_ppp.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/043_ppp.diff	2011-11-08 20:20:42 UTC (rev 3832)
@@ -0,0 +1,272 @@
+
+we don't link against libmd since it's not on debian
+http://martin.hinner.info/libmd/
+
+To run this, you need the if_tun module to be loaded:
+
+# kldload if_tun
+# ./ppp
+Working in interactive mode
+Warning: Add! route failed: ff02::/32: errno: Network is unreachable
+Using interface: tun0
+Warning: No default entry found in config file.
+ppp ON loony>
+
+--- a/usr.sbin/ppp/Makefile
++++ b/usr.sbin/ppp/Makefile
+@@ -38,11 +38,11 @@
+ BINMODE=4550
+ BINOWN=	root
+ .endif
+-BINGRP=	network
++BINGRP=	dialout
+ M4FLAGS=
+ 
+-LDADD= -lcrypt -lmd -lutil -lz
+-DPADD=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
++LDADD= -lcrypt -lbsd -lutil -lz
++DPADD=	${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+ 
+ .SUFFIXES: .8 .8.m4
+ 
+@@ -79,6 +79,7 @@
+ 
+ .if defined(PPP_NO_SUID)
+ CFLAGS+=-DNOSUID
++LDADD+= -llockdev
+ .else
+ SRCS+=	id.c
+ .endif
+--- a/usr.sbin/ppp/acf.c
++++ b/usr.sbin/ppp/acf.c
+@@ -26,7 +26,7 @@
+  * $FreeBSD$
+  */
+ 
+-#include <sys/types.h>
++#include <sys/_types.h>
+ 
+ #include <stdio.h>
+ #include <termios.h>
+--- a/usr.sbin/ppp/bundle.c
++++ b/usr.sbin/ppp/bundle.c
+@@ -26,6 +26,9 @@
+  * $FreeBSD$
+  */
+ 
++#include <sys/ioccom.h>
++#include <time.h>
++
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+@@ -51,6 +54,8 @@
+ #include <sys/uio.h>
+ #include <sys/wait.h>
+ #include <termios.h>
++// this is mislead about the getpgrp() declaration
++#undef __FAVOR_BSD
+ #include <unistd.h>
+ 
+ #include "layer.h"
+@@ -1629,7 +1634,11 @@
+         log_Printf(LogDEBUG, "Received confirmation from pid %ld\n",
+                    (long)newpid);
+         if (lock && (res = ID0uu_lock_txfr(lock, newpid)) != UU_LOCK_OK)
++#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
++            log_Printf(LogERROR, "lock transfer failed");
++#else
+             log_Printf(LogERROR, "uu_lock_txfr: %s\n", uu_lockerr(res));
++#endif
+ 
+         log_Printf(LogDEBUG, "Transmitting link (%d bytes)\n", expect);
+         if ((got = writev(reply[0], iov + 1, niov - 1)) != expect) {
+--- a/usr.sbin/ppp/cbcp.c
++++ b/usr.sbin/ppp/cbcp.c
+@@ -28,9 +28,7 @@
+ 
+ #include <sys/param.h>
+ 
+-#ifdef __FreeBSD__
+ #include <netinet/in.h>
+-#endif
+ #include <sys/un.h>
+ 
+ #include <string.h>
+--- a/usr.sbin/ppp/chap.c
++++ b/usr.sbin/ppp/chap.c
+@@ -38,10 +38,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#ifndef NODES
+-#include <md4.h>
+-#endif
+-#include <md5.h>
++#include <sys/md5.h>
+ #include <paths.h>
+ #include <signal.h>
+ #include <stdio.h>
+--- a/usr.sbin/ppp/command.c
++++ b/usr.sbin/ppp/command.c
+@@ -50,14 +50,6 @@
+ #include <termios.h>
+ #include <unistd.h>
+ 
+-#ifndef NONAT
+-#ifdef LOCALNAT
+-#include "alias.h"
+-#else
+-#include <alias.h>
+-#endif
+-#endif
+-
+ #include "layer.h"
+ #include "defs.h"
+ #include "command.h"
+--- a/usr.sbin/ppp/id.h
++++ b/usr.sbin/ppp/id.h
+@@ -61,9 +61,18 @@
+ #define ID0fopen fopen
+ #define ID0open open
+ #define ID0write write
++#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
++#include <lockdev.h>
++#define ID0uu_lock dev_lock
++#define ID0uu_lock_txfr dev_relock
++#define ID0uu_unlock dev_unlock
++#define UU_LOCK_OK 0
++#else /* on BSD */
+ #define ID0uu_lock uu_lock
+ #define ID0uu_lock_txfr uu_lock_txfr
+ #define ID0uu_unlock uu_unlock
++#endif
++
+ #define ID0login(u)			\
+   do {					\
+     if (logout((u)->ut_line))		\
+--- a/usr.sbin/ppp/physical.c
++++ b/usr.sbin/ppp/physical.c
+@@ -41,6 +41,8 @@
+ #include <sysexits.h>
+ #include <termios.h>
+ #include <time.h>
++// this is mislead about the getpgrp() declaration
++#undef __FAVOR_BSD
+ #include <unistd.h>
+ #include <utmp.h>
+ #if defined(__OpenBSD__) || defined(__NetBSD__)
+@@ -308,11 +310,15 @@
+ 
+   if (*p->name.full == '/' && p->type != PHYS_DIRECT &&
+       (res = ID0uu_lock(p->name.base)) != UU_LOCK_OK) {
++#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
++    log_Printf(LogPHASE, "%s: %s is in use\n", p->link.name, p->name.full);
++#else
+     if (res == UU_LOCK_INUSE)
+       log_Printf(LogPHASE, "%s: %s is in use\n", p->link.name, p->name.full);
+     else
+       log_Printf(LogPHASE, "%s: %s is in use: uu_lock: %s\n",
+                  p->link.name, p->name.full, uu_lockerr(res));
++#endif
+     return 0;
+   }
+ 
+@@ -323,7 +329,12 @@
+ physical_Unlock(struct physical *p)
+ {
+   if (*p->name.full == '/' && p->type != PHYS_DIRECT &&
+-      ID0uu_unlock(p->name.base) == -1)
++#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
++      ID0uu_unlock(p->name.base, 0) == -1
++#else
++      ID0uu_unlock(p->name.base) == -1
++#endif
++      )
+     log_Printf(LogALERT, "%s: Can't uu_unlock %s\n", p->link.name,
+                p->name.base);
+ }
+@@ -762,7 +773,11 @@
+     int res;
+ 
+     if ((res = ID0uu_lock_txfr(p->name.base, newpid)) != UU_LOCK_OK)
++#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
++      log_Printf(LogPHASE, "uu_lock_txfr");
++#else
+       log_Printf(LogPHASE, "uu_lock_txfr: %s\n", uu_lockerr(res));
++#endif
+   }
+ }
+ 
+--- a/usr.sbin/ppp/prompt.c
++++ b/usr.sbin/ppp/prompt.c
+@@ -40,6 +40,8 @@
+ #include <string.h>
+ #include <sys/fcntl.h>
+ #include <termios.h>
++// this is mislead about the getpgrp() declaration
++#undef __FAVOR_BSD
+ #include <unistd.h>
+ 
+ #include "layer.h"
+--- a/usr.sbin/ppp/tty.c
++++ b/usr.sbin/ppp/tty.c
+@@ -41,6 +41,7 @@
+ #include <sys/uio.h>
+ #include <termios.h>
+ #include <ttyent.h>
++#include <sys/ttycom.h>
+ #include <unistd.h>
+ #ifndef NONETGRAPH
+ #include <netgraph.h>
+--- a/usr.sbin/ppp/tun.c
++++ b/usr.sbin/ppp/tun.c
+@@ -42,7 +42,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
+-#if defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+ #include <sys/ioctl.h>
+ #endif
+ #include <stdio.h>
+--- a/usr.sbin/ppp/slcompress.c
++++ b/usr.sbin/ppp/slcompress.c
+@@ -42,7 +42,10 @@
+ #include <sys/param.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/in.h>
++// BSDish struct tcphdr
++#define __FAVOR_BSD 1
+ #include <netinet/tcp.h>
++#undef __FAVOR_BSD
+ #include <netinet/ip.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+--- a/usr.sbin/ppp/tcpmss.c
++++ b/usr.sbin/ppp/tcpmss.c
+@@ -33,7 +33,10 @@
+ #include <netinet/in_systm.h>
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
++// BSDish struct tcphdr
++#define __FAVOR_BSD 1
+ #include <netinet/tcp.h>
++#undef __FAVOR_BSD
+ #include <sys/un.h>
+ 
+ #include <termios.h>
+--- a/usr.sbin/ppp/ip.c
++++ b/usr.sbin/ppp/ip.c
+@@ -38,8 +38,11 @@
+ #include <netinet/ip6.h>
+ #endif
+ #include <netinet/ip_icmp.h>
++// BSDish struct tcphdr
++#define __FAVOR_BSD 1
+ #include <netinet/udp.h>
+ #include <netinet/tcp.h>
++#undef __FAVOR_BSD
+ #include <sys/un.h>
+ 
+ #include <errno.h>

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2011-11-08 20:10:01 UTC (rev 3831)
+++ trunk/freebsd-utils/debian/patches/series	2011-11-08 20:20:42 UTC (rev 3832)
@@ -38,3 +38,5 @@
 039_geom.diff
 040_kdump_multiarch.diff
 041_delete_key.diff
+042_ppp_unused.diff
+043_ppp.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2011-11-08 20:10:01 UTC (rev 3831)
+++ trunk/freebsd-utils/debian/rules	2011-11-08 20:20:42 UTC (rev 3832)
@@ -89,7 +89,7 @@
 	$(MAKE) -C lib
 	touch $@
 
-build-arch: freebsd-utils gbde geli kbdcontrol vidcontrol kldutils freebsd-net-tools freebsd-nfs-utils
+build-arch: freebsd-utils gbde geli kbdcontrol vidcontrol kldutils freebsd-net-tools freebsd-nfs-utils freebsd-ppp
 
 freebsd-utils: freebsd-utils-stamp
 freebsd-utils-stamp: $(RPCHDRS)
@@ -169,6 +169,11 @@
 	$(PMAKE) -C usr.bin/netstat
 	$(PMAKE) -C usr.sbin/arp
 	$(PMAKE) -C usr.sbin/authpf
+	touch $@
+
+freebsd-ppp: freebsd-ppp-stamp
+freebsd-ppp-stamp:
+	$(PMAKE) -C usr.sbin/ppp -DPPP_NO_PAM -DPPP_NO_NAT -DPPP_NO_DES -DPPP_NO_SUID -DPPP_NO_ATM -DPPP_NO_RADIUS
 	$(PMAKE) -C usr.sbin/pppctl
 	touch $@
 
@@ -252,6 +257,7 @@
 	$(PMAKE) -C usr.bin/netstat clean
 	$(PMAKE) -C usr.sbin/arp clean
 	$(PMAKE) -C usr.sbin/authpf clean
+	$(PMAKE) -C usr.sbin/ppp clean
 	$(PMAKE) -C usr.sbin/pppctl clean
 
 	$(PMAKE) -C sbin/nfsiod clean
@@ -301,6 +307,7 @@
 	dh_installinit -pfreebsd-utils --name=devd -- start 03 S . stop 01 0 1 6 .
 	dh_installinit -pkldutils --no-start -- start 12 S .
 	dh_installinit -pkbdcontrol -- start 20 S .
+	dh_installinit -pfreebsd-ppp -- start 20 2 3 4 5 . stop 80 0 1 6 .
 	dh_installinit -pfreebsd-nfs-common --name=rpc.statd -- start 20 2 3 4 5 S . stop 20 0 1 6 .
 	dh_installinit -pfreebsd-nfs-common --name=rpc.lockd -- start 20 2 3 4 5 S . stop 20 0 1 6 .
 	dh_installinit -pfreebsd-nfs-common --name=nfsiod -- start 20 2 3 4 5 S . stop 20 0 1 6 .




More information about the Glibc-bsd-commits mailing list