[Glibc-bsd-commits] r2336 - in trunk/freebsd-utils: . debian debian/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Mon Jan 5 11:00:08 UTC 2009
Author: ps-guest
Date: 2009-01-05 11:00:08 +0000 (Mon, 05 Jan 2009)
New Revision: 2336
Added:
trunk/freebsd-utils/debian/patches/018_strnstr.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/kbdcontrol.config
trunk/freebsd-utils/debian/patches/012_net-tools.diff
trunk/freebsd-utils/debian/patches/series
trunk/freebsd-utils/fetch
Log:
* freebsd-utils based on FreeBSD 7.1
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2009-01-05 10:58:57 UTC (rev 2335)
+++ trunk/freebsd-utils/debian/changelog 2009-01-05 11:00:08 UTC (rev 2336)
@@ -1,3 +1,10 @@
+freebsd-utils (7.1-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 7.1
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 05 Jan 2009 10:58:46 +0100
+
freebsd-utils (7.0-3) unreleased; urgency=low
[ Petr Salinger ]
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2009-01-05 10:58:57 UTC (rev 2335)
+++ trunk/freebsd-utils/debian/control 2009-01-05 11:00:08 UTC (rev 2336)
@@ -3,7 +3,7 @@
Priority: important
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, po-debconf, freebsd-buildutils, libkvm-dev (>=7.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.7-13), flex | flex-old, kfreebsd-kernel-headers (>= 0.29), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, po-debconf, freebsd-buildutils, libkvm-dev (>=7.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.7-13), flex | flex-old, kfreebsd-kernel-headers (>= 0.31), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev
# libkvm-dev: dmesg
# libgeom-dev : ccdconfig
# libfreebsd (>= 0.0-5): ifconfig
Modified: trunk/freebsd-utils/debian/kbdcontrol.config
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.config 2009-01-05 10:58:57 UTC (rev 2335)
+++ trunk/freebsd-utils/debian/kbdcontrol.config 2009-01-05 11:00:08 UTC (rev 2336)
@@ -2,7 +2,7 @@
set -e
-choices="be.iso.acc.kbd, be.iso.kbd, bg.bds.ctrlcaps.kbd, bg.phonetic.ctrlcaps.kbd, br275.cp850.kbd, br275.iso.acc.kbd, br275.iso.kbd, by.cp1131.kbd, by.cp1251.kbd, by.iso5.kbd, ce.iso2.kbd, cs.latin2.qwertz.kbd, cz.iso2.kbd, danish.cp865.kbd, danish.iso.kbd, dutch.iso.acc.kbd, el.iso07.kbd, estonian.cp850.kbd, estonian.iso15.kbd, estonian.iso.kbd, finnish.cp850.kbd, finnish.iso.kbd, fr_CA.iso.acc.kbd, fr.dvorak.acc.kbd, fr.dvorak.kbd, fr.iso.acc.kbd, fr.iso.kbd, fr.macbook.acc.kbd, german.cp850.kbd, german.iso.acc.kbd, german.iso.kbd, gr.elot.acc.kbd, gr.us101.acc.kbd, hr.iso.kbd, hu.iso2.101keys.kbd, hu.iso2.102keys.kbd, hy.armscii-8.kbd, icelandic.iso.acc.kbd, icelandic.iso.kbd, it.iso.kbd, iw.iso8.kbd, jp.106.kbd, jp.106x.kbd, jp.pc98.iso.kbd, jp.pc98.kbd, kk.pt154.io.kbd, kk.pt154.kst.kbd, latinamerican.iso.acc.kbd, latinamerican.kbd, lt.iso4.kbd, norwegian.dvorak.kbd, norwegian.iso.kbd, pl_PL.ISO8859-2.kbd, pt.iso.acc.kbd, pt.iso.kbd, ru.cp866.kbd, ru.iso5.kbd, ru.koi8-r.kbd, ru.koi8-r.shift.kbd, ru.koi8-r.win.kbd, si.iso.kbd, sk.iso2.kbd, spanish.iso15.acc.kbd, spanish.iso.acc.kbd, spanish.iso.kbd, swedish.cp850.kbd, swedish.iso.kbd, swissfrench.cp850.kbd, swissfrench.iso.acc.kbd, swissfrench.iso.kbd, swissgerman.cp850.kbd, swissgerman.iso.acc.kbd, swissgerman.iso.kbd, tr.iso9.q.kbd, ua.iso5.kbd, ua.koi8-u.kbd, ua.koi8-u.shift.alt.kbd, uk.cp850-ctrl.kbd, uk.cp850.kbd, uk.iso-ctrl.kbd, uk.iso.kbd, us.dvorak.kbd, us.dvorakl.kbd, us.dvorakr.kbd, us.dvorakx.kbd, us.emacs.kbd, us.iso.acc.kbd, us.iso.kbd, us.pc-ctrl.kbd, us.unix.kbd"
+choices="be.iso.acc.kbd, be.iso.kbd, bg.bds.ctrlcaps.kbd, bg.phonetic.ctrlcaps.kbd, br275.cp850.kbd, br275.iso.acc.kbd, br275.iso.kbd, by.cp1131.kbd, by.cp1251.kbd, by.iso5.kbd, ce.iso2.kbd, colemak.iso15.acc.kbd, cs.latin2.qwertz.kbd, cz.iso2.kbd, danish.cp865.kbd, danish.iso.kbd, dutch.iso.acc.kbd, el.iso07.kbd, estonian.cp850.kbd, estonian.iso.kbd, estonian.iso15.kbd, finnish.cp850.kbd, finnish.iso.kbd, fr.dvorak.acc.kbd, fr.dvorak.kbd, fr.iso.acc.kbd, fr.iso.kbd, fr.macbook.acc.kbd, fr_CA.iso.acc.kbd, german.cp850.kbd, german.iso.acc.kbd, german.iso.kbd, gr.elot.acc.kbd, gr.us101.acc.kbd, hr.iso.kbd, hu.iso2.101keys.kbd, hu.iso2.102keys.kbd, hy.armscii-8.kbd, icelandic.iso.acc.kbd, icelandic.iso.kbd, it.iso.kbd, iw.iso8.kbd, jp.106.kbd, jp.106x.kbd, jp.pc98.iso.kbd, jp.pc98.kbd, kk.pt154.io.kbd, kk.pt154.kst.kbd, latinamerican.iso.acc.kbd, latinamerican.kbd, lt.iso4.kbd, norwegian.dvorak.kbd, norwegian.iso.kbd, pl_PL.ISO8859-2.kbd, pt.iso.acc.kbd, pt.iso.kbd, ru.cp866.kbd, ru.iso5.kbd, ru.koi8-r.kbd, ru.koi8-r.shift.kbd, ru.koi8-r.win.kbd, si.iso.kbd, sk.iso2.kbd, spanish.iso.acc.kbd, spanish.iso.kbd, spanish.iso15.acc.kbd, swedish.cp850.kbd, swedish.iso.kbd, swissfrench.cp850.kbd, swissfrench.iso.acc.kbd, swissfrench.iso.kbd, swissgerman.cp850.kbd, swissgerman.iso.acc.kbd, swissgerman.iso.kbd, tr.iso9.q.kbd, ua.iso5.kbd, ua.koi8-u.kbd, ua.koi8-u.shift.alt.kbd, uk.cp850-ctrl.kbd, uk.cp850.kbd, uk.iso-ctrl.kbd, uk.iso.kbd, us.dvorak.kbd, us.dvorakl.kbd, us.dvorakr.kbd, us.dvorakx.kbd, us.emacs.kbd, us.iso.acc.kbd, us.iso.kbd, us.pc-ctrl.kbd, us.unix.kbd"
. /usr/share/debconf/confmodule
Modified: trunk/freebsd-utils/debian/patches/012_net-tools.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_net-tools.diff 2009-01-05 10:58:57 UTC (rev 2335)
+++ trunk/freebsd-utils/debian/patches/012_net-tools.diff 2009-01-05 11:00:08 UTC (rev 2336)
@@ -2,7 +2,7 @@
===================================================================
--- src.orig/sbin/ifconfig/Makefile
+++ src/sbin/ifconfig/Makefile
-@@ -20,17 +20,17 @@
+@@ -20,18 +20,18 @@
SRCS+= af_atalk.c # AppleTalk support
SRCS+= ifclone.c # clone device support
@@ -11,6 +11,8 @@
SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support
SRCS+= ifvlan.c # SIOC[GS]ETVLAN support
SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support
+-SRCS+= ifgre.c # GRE keys etc
++#SRCS+= ifgre.c # GRE keys etc
-SRCS+= ifcarp.c # SIOC[GS]VH support
-SRCS+= ifgroup.c # ...
@@ -57,6 +59,20 @@
#include <net/ethernet.h>
#include <net/if.h>
+@@ -78,6 +78,13 @@
+
+ #include "ifconfig.h"
+
++#ifndef IFCAP_WOL
++#define IFCAP_WOL_UCAST 0x00800 /* wake on any unicast frame */
++#define IFCAP_WOL_MCAST 0x01000 /* wake on any multicast frame */
++#define IFCAP_WOL_MAGIC 0x02000 /* wake on any Magic Packet */
++#define IFCAP_WOL (IFCAP_WOL_UCAST | IFCAP_WOL_MCAST | IFCAP_WOL_MAGIC)
++#endif
++
+ /*
+ * Since "struct ifreq" is composed of various union members, callers
+ * should pay special attention to interprete the value.
Index: src/sbin/ifconfig/af_inet6.c
===================================================================
--- src.orig/sbin/ifconfig/af_inet6.c
@@ -142,3 +158,12 @@
switch(ch) {
case 'n':
nflag = 1;
+@@ -821,7 +821,7 @@
+ else if (IN_CLASSC(addr))
+ mask = IN_CLASSC_NET;
+ else if (IN_MULTICAST(addr))
+- mask = IN_CLASSD_NET;
++ mask = 0xf0000000;
+ else
+ mask = 0xffffffff;
+ }
Added: trunk/freebsd-utils/debian/patches/018_strnstr.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/018_strnstr.diff (rev 0)
+++ trunk/freebsd-utils/debian/patches/018_strnstr.diff 2009-01-05 11:00:08 UTC (rev 2336)
@@ -0,0 +1,11 @@
+--- src/sbin/mount/mount.c~
++++ src/sbin/mount/mount.c
+@@ -816,7 +816,7 @@
+
+ if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
+ strncmp(ent->f_mntfromname, "<above>", 7) == 0) {
+- strcpy(ent->f_mntfromname, (strnstr(ent->f_mntfromname, ":", 8)
++ strcpy(ent->f_mntfromname, (memchr(ent->f_mntfromname, ':', 8)
+ +1));
+ }
+
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2009-01-05 10:58:57 UTC (rev 2335)
+++ trunk/freebsd-utils/debian/patches/series 2009-01-05 11:00:08 UTC (rev 2336)
@@ -15,3 +15,4 @@
015_pf.diff
016_mdconfig.diff
017_kbsd7.diff
+018_strnstr.diff
Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch 2009-01-05 10:58:57 UTC (rev 2335)
+++ trunk/freebsd-utils/fetch 2009-01-05 11:00:08 UTC (rev 2336)
@@ -2,7 +2,7 @@
set -ex
ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_0_0_RELEASE
+RELENG=RELENG_7_1_0_RELEASE
rm -rf src
More information about the Glibc-bsd-commits
mailing list