[Glibc-bsd-commits] r5455 - in trunk/freebsd-utils/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Sat Mar 22 22:33:11 UTC 2014
Author: rmh
Date: 2014-03-22 22:33:11 +0000 (Sat, 22 Mar 2014)
New Revision: 5455
Removed:
trunk/freebsd-utils/debian/patches/svn_HEAD_syscons.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/patches/017_sysctl.diff
trunk/freebsd-utils/debian/patches/series
Log:
Rebuild tarball and document Mats' changes
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2014-03-22 21:28:50 UTC (rev 5454)
+++ trunk/freebsd-utils/debian/changelog 2014-03-22 22:33:11 UTC (rev 5455)
@@ -1,3 +1,10 @@
+freebsd-utils (10.0+ds1-1) UNRELEASED; urgency=low
+
+ [ Mats Erik Andersson ]
+ * Fetch pf.conf(5) and pf.os(5) from new location.
+
+ -- Robert Millan <rmh at debian.org> Sat, 22 Mar 2014 23:09:57 +0100
+
freebsd-utils (10.0-3) experimental; urgency=low
* Add 'sysctl -p' support. Replace /sbin/sysctl wrapper script with
Modified: trunk/freebsd-utils/debian/patches/017_sysctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/017_sysctl.diff 2014-03-22 21:28:50 UTC (rev 5454)
+++ trunk/freebsd-utils/debian/patches/017_sysctl.diff 2014-03-22 22:33:11 UTC (rev 5455)
@@ -12,7 +12,7 @@
static const char *conffile;
-@@ -471,6 +472,7 @@
+@@ -473,6 +474,7 @@
static int
S_loadavg(int l2, void *p)
{
@@ -20,7 +20,7 @@
struct loadavg *tv = (struct loadavg*)p;
if (l2 != sizeof(*tv)) {
-@@ -481,6 +483,7 @@
+@@ -483,6 +485,7 @@
(double)tv->ldavg[0]/(double)tv->fscale,
(double)tv->ldavg[1]/(double)tv->fscale,
(double)tv->ldavg[2]/(double)tv->fscale);
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2014-03-22 21:28:50 UTC (rev 5454)
+++ trunk/freebsd-utils/debian/patches/series 2014-03-22 22:33:11 UTC (rev 5455)
@@ -1,5 +1,4 @@
# Patches from (or merged in) upstream
-svn_HEAD_syscons.diff
syscons.diff
savecore_signal.diff
Deleted: trunk/freebsd-utils/debian/patches/svn_HEAD_syscons.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/svn_HEAD_syscons.diff 2014-03-22 21:28:50 UTC (rev 5454)
+++ trunk/freebsd-utils/debian/patches/svn_HEAD_syscons.diff 2014-03-22 22:33:11 UTC (rev 5455)
@@ -1,266 +0,0 @@
---- /dev/null
-+++ b/src/etc/rc.d/syscons
-@@ -0,0 +1,263 @@
-+#!/bin/sh -
-+#
-+# Copyright (c) 2000 The FreeBSD Project
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+# notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+# SUCH DAMAGE.
-+#
-+# $FreeBSD$
-+#
-+
-+# PROVIDE: syscons
-+# REQUIRE: LOGIN
-+# KEYWORD: nojail
-+
-+. /etc/rc.subr
-+
-+name="syscons"
-+extra_commands="setkeyboard"
-+setkeyboard_cmd="syscons_setkeyboard"
-+start_precmd="syscons_precmd"
-+start_cmd="syscons_start"
-+stop_cmd=":"
-+
-+# stdin must be redirected because it might be for a serial console
-+#
-+kbddev=/dev/ttyv0
-+viddev=/dev/ttyv0
-+
-+_sc_config="syscons"
-+_sc_initdone=
-+sc_init()
-+{
-+ if [ -z "${_sc_initdone}" ]; then
-+ echo -n "Configuring ${_sc_config}:"
-+ _sc_initdone=yes
-+ fi
-+}
-+
-+# helper
-+syscons_configure_keyboard()
-+{
-+ # keymap
-+ #
-+ case ${keymap} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' keymap'; kbdcontrol < ${kbddev} -l ${keymap}
-+ ;;
-+ esac
-+
-+ # keyrate
-+ #
-+ case ${keyrate} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' keyrate'; kbdcontrol < ${kbddev} -r ${keyrate}
-+ ;;
-+ esac
-+
-+ # keybell
-+ #
-+ case ${keybell} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' keybell'; kbdcontrol < ${kbddev} -b ${keybell}
-+ ;;
-+ esac
-+
-+ # change function keys
-+ #
-+ case ${keychange} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' keychange'
-+ set -- ${keychange}
-+ while [ $# -gt 0 ]; do
-+ kbdcontrol <${kbddev} -f "$1" "$2"
-+ shift; shift
-+ done
-+ ;;
-+ esac
-+
-+ # set this keyboard mode for all virtual terminals
-+ #
-+ if [ -n "${allscreens_kbdflags}" ]; then
-+ sc_init
-+ echo -n ' allscreens_kbd'
-+ for ttyv in /dev/ttyv*; do
-+ kbdcontrol ${allscreens_kbdflags} < ${ttyv} > ${ttyv} 2>&1
-+ done
-+ fi
-+}
-+
-+syscons_setkeyboard()
-+{
-+ kbd=$1
-+
-+ if [ -z "${kbd}" ]; then
-+ return 1
-+ fi
-+
-+ # Check if the kbdmux(4) is the current active keyboard
-+ kbdcontrol -i < ${kbddev} | grep kbdmux > /dev/null 2>&1
-+ if [ $? -ne 0 ]; then
-+ kbdcontrol -k ${kbd} < ${kbddev} > /dev/null 2>&1
-+ fi
-+
-+ _sc_config="keyboard"
-+ syscons_configure_keyboard
-+
-+ # Terminate keyboard configuration line and reset global variables.
-+ #
-+ if [ -n "${_sc_initdone}" ]; then
-+ echo '.'
-+ _sc_config="syscons"
-+ _sc_initdone=
-+ fi
-+
-+}
-+
-+syscons_precmd()
-+{
-+ if [ ! -c $kbddev ]
-+ then
-+ return 1
-+ fi
-+ return 0
-+}
-+
-+syscons_start()
-+{
-+ # keyboard
-+ #
-+ if [ -n "${keyboard}" ]; then
-+ syscons_setkeyboard ${keyboard}
-+ fi
-+
-+ syscons_configure_keyboard
-+
-+ # cursor type
-+ #
-+ case ${cursor} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' cursor'; vidcontrol < ${viddev} -c ${cursor}
-+ ;;
-+ esac
-+
-+ # screen mapping
-+ #
-+ case ${scrnmap} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' scrnmap'; vidcontrol < ${viddev} -l ${scrnmap}
-+ ;;
-+ esac
-+
-+ # font 8x16
-+ #
-+ case ${font8x16} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' font8x16'; vidcontrol < ${viddev} -f 8x16 ${font8x16}
-+ ;;
-+ esac
-+
-+ # font 8x14
-+ #
-+ case ${font8x14} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' font8x14'; vidcontrol < ${viddev} -f 8x14 ${font8x14}
-+ ;;
-+ esac
-+
-+ # font 8x8
-+ #
-+ case ${font8x8} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' font8x8'; vidcontrol < ${viddev} -f 8x8 ${font8x8}
-+ ;;
-+ esac
-+
-+ # blank time
-+ #
-+ case ${blanktime} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' blanktime'; vidcontrol < ${viddev} -t ${blanktime}
-+ ;;
-+ esac
-+
-+ # screen saver
-+ #
-+ case ${saver} in
-+ [Nn][Oo] | '')
-+ ;;
-+ *)
-+ sc_init
-+ echo -n ' screensaver'
-+ for i in `kldstat | awk '$5 ~ "_saver\.ko$" { print $5 }'`; do
-+ kldunload ${i}
-+ done
-+ load_kld -e _saver ${saver}_saver
-+ ;;
-+ esac
-+
-+ # set this mode for all virtual screens
-+ #
-+ if [ -n "${allscreens_flags}" ]; then
-+ sc_init
-+ echo -n ' allscreens'
-+ for ttyv in /dev/ttyv*; do
-+ vidcontrol ${allscreens_flags} < ${ttyv} > ${ttyv} 2>&1
-+ done
-+ fi
-+
-+ [ -n "${_sc_initdone}" ] && echo '.'
-+}
-+
-+load_rc_config $name
-+run_rc_command $*
-+
More information about the Glibc-bsd-commits
mailing list