[Glibc-bsd-commits] r4176 - in trunk/freebsd-utils/debian: . local/scripts/sbin
Robert Millan
rmh at alioth.debian.org
Sat Apr 7 11:29:01 UTC 2012
Author: rmh
Date: 2012-04-07 11:29:00 +0000 (Sat, 07 Apr 2012)
New Revision: 4176
Added:
trunk/freebsd-utils/debian/local/scripts/sbin/route
Removed:
trunk/freebsd-utils/debian/local/scripts/sbin/route
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install
trunk/freebsd-utils/debian/freebsd-net-tools.install
Log:
Drop route wrapper and replace /sbin/route with upstream version.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2012-04-04 23:08:55 UTC (rev 4175)
+++ trunk/freebsd-utils/debian/changelog 2012-04-07 11:29:00 UTC (rev 4176)
@@ -1,8 +1,9 @@
-freebsd-utils (9.0+ds1-2) UNRELEASED; urgency=low
+freebsd-utils (9.0+ds1-2) unstable; urgency=low
* Set freebsd-geom Priority to "standard" to fix override disparity.
+ * Drop route wrapper and replace /sbin/route with upstream version.
- -- Robert Millan <rmh at debian.org> Sun, 18 Mar 2012 13:26:13 +0100
+ -- Robert Millan <rmh at debian.org> Sat, 07 Apr 2012 13:20:23 +0200
freebsd-utils (9.0+ds1-1) unstable; urgency=low
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2012-04-04 23:08:55 UTC (rev 4175)
+++ trunk/freebsd-utils/debian/control 2012-04-07 11:29:00 UTC (rev 4176)
@@ -147,6 +147,7 @@
pf,
Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<< 7), net-tools
Provides: net-tools
+Breaks: ifupdown (<< 0.7~alpha5+really0.6.16~), isc-dhcp-client (<< 4.2.2-2~)
Description: FreeBSD networking tools
This package provides the FreeBSD tools needed to manage networking on
GNU/kFreeBSD.
@@ -157,6 +158,7 @@
Priority: important
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: isc-dhcp-client-udeb (<< 4.2.2-2~)
Description: FreeBSD networking tools
This package provides the FreeBSD tools needed to manage networking on
GNU/kFreeBSD.
Modified: trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install 2012-04-04 23:08:55 UTC (rev 4175)
+++ trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install 2012-04-07 11:29:00 UTC (rev 4176)
@@ -1,3 +1,3 @@
sbin/ifconfig/ifconfig /sbin
-sbin/route/route /lib/freebsd
-debian/local/scripts/sbin/route /sbin
+sbin/route/route /sbin
+debian/local/scripts/sbin/route /lib/freebsd
Modified: trunk/freebsd-utils/debian/freebsd-net-tools.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.install 2012-04-04 23:08:55 UTC (rev 4175)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.install 2012-04-07 11:29:00 UTC (rev 4176)
@@ -1,5 +1,5 @@
etc/regdomain.xml /etc
sbin/ifconfig/ifconfig /sbin
-sbin/route/route /lib/freebsd
-debian/local/scripts/sbin/route /sbin
+sbin/route/route /sbin
+debian/local/scripts/sbin/route /lib/freebsd
usr.sbin/arp/arp /usr/sbin/
Deleted: trunk/freebsd-utils/debian/local/scripts/sbin/route
===================================================================
--- trunk/freebsd-utils/debian/local/scripts/sbin/route 2012-04-04 23:08:55 UTC (rev 4175)
+++ trunk/freebsd-utils/debian/local/scripts/sbin/route 2012-04-07 11:29:00 UTC (rev 4176)
@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# /sbin/route
-#
-# Wrapper script around /lib/freebsd/route
-# crafted to catch the routing commands issued
-# by /sbin/ifup and /sbin/ifdown, translating
-# them into valid FreeBSD commands, at the same
-# time preserving all BSD native routing input.
-#
-# Authors: Axel Beckert, Mats Erik Andersson
-
-set -e
-
-if [ $# = 0 ] ; then
- # Issue usage info
- netstat -r
-fi
-
-args=""
-
-# Capture all options first. Save them for later.
-# One Debian endemic addition: -A family.
-# Typically: -A inet6
-#
-opts=""
-af=""
-
-while [ $# -gt 0 ]; do
- case "$1" in
- -*)
- # One Debian addition.
- if [ "$1" = "-A" ] ; then
- shift
- if [ -n "$1" ] ; then
- af="-$1"
- shift
- continue
- fi
- # Incorrect usage, call for help
- /lib/freebsd/route
- fi
- # A native option remains
- opts="${opts} $1"
- shift
- ;;
- *)
- # Must be the beginning of a command mode line.
- break ;;
- esac
-done
-
-cmd="$1"
-test $# -gt 0 && shift
-
-# Commands originating from ifupdown can only be
-# stated either for "add" or for "del".
-#
-# The commands from "ifupdown" are acceptable
-# as long as they do not contain the keyword "gw".
-# In case the command does so, then the very last
-# command line argument is the name of the interface.
-# We ignore it for now, since an interface specification
-# do not carry the same connotation in FreeBSD as it
-# does in GNU/Linux.
-#
-# The keyword "metric" seems unknown for FreeBSD,
-# so it is filtered off.
-
-if [ "$cmd" = "add" -o "$cmd" = "del" ] ; then
- # Our simple state machine
- HAVE_SEEN_GW=""
-
- while [ $# -gt 0 ]; do
- if [ -n "$HAVE_SEEN_GW" ] ; then
- if [ $# -eq 1 ] ; then
- # We have reached the end. An interface name
- # appears as last argument, since we are in
- # a state caused by a call from ifupdown.
- # We simply discard the interface name.
- break
- fi
- if [ "$1" = "metric" ] ; then
- # Ignored, together with its argument
- shift
- else
- args="${args} $1"
- fi
- else
- # Ifup and ifdown use "gw" only in two forms.
- if [ "$1" = "gw" -a \( $# -eq 3 -o \( $# -eq 5 -a "$3" = "metric" \) \) ]
- then
- # Change state and discard "gw",
- # hoping that no administrator ever
- # names a host or a network as "gw".
- HAVE_SEEN_GW="YES"
- else
- # This ingredient is important. Add it.
- args="${args} $1"
- fi
- fi
- test $# -gt 0 && shift
- done
-else
- # Must have a native command, whatever the content.
- args="$@"
-fi
-
-exec /lib/freebsd/route ${opts} ${cmd} ${af} ${args}
Added: trunk/freebsd-utils/debian/local/scripts/sbin/route
===================================================================
--- trunk/freebsd-utils/debian/local/scripts/sbin/route (rev 0)
+++ trunk/freebsd-utils/debian/local/scripts/sbin/route 2012-04-07 11:29:00 UTC (rev 4176)
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "$0: deprecated, use /sbin/route instead" >&2
+exec /sbin/route $@
Property changes on: trunk/freebsd-utils/debian/local/scripts/sbin/route
___________________________________________________________________
Added: svn:executable
+ *
More information about the Glibc-bsd-commits
mailing list