[Glibc-bsd-commits] r3896 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Wed Nov 23 20:51:45 UTC 2011
Author: rmh
Date: 2011-11-23 20:51:45 +0000 (Wed, 23 Nov 2011)
New Revision: 3896
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/008_verioned_freebsd_macro.diff
trunk/kfreebsd-10/debian/patches/107_mount_update.diff
trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
trunk/kfreebsd-10/debian/patches/999_config.diff
trunk/kfreebsd-10/debian/patches/999_firmware.diff
Log:
New upstream snapshot
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/changelog 2011-11-23 20:51:45 UTC (rev 3896)
@@ -1,5 +1,8 @@
-kfreebsd-10 (10.0~svn227111-3) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn227875-1) UNRELEASED; urgency=low
+ * New upstream snapshot.
+
+ [ Robert Millan ]
* Mark kfreebsd-headers- at version@- at abiname@ as kfreebsd-any.
* Depend on package providing devd.
* Fix installability problem on non-kfreebsd platforms.
@@ -8,7 +11,7 @@
(Closes: #646957)
* Add comment placeholder in kernel-wedge empty files.
- -- Robert Millan <rmh at debian.org> Mon, 21 Nov 2011 22:26:26 +0100
+ -- Robert Millan <rmh at debian.org> Wed, 23 Nov 2011 21:05:12 +0100
kfreebsd-10 (10.0~svn227111-2) experimental; urgency=low
Modified: trunk/kfreebsd-10/debian/patches/008_verioned_freebsd_macro.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/008_verioned_freebsd_macro.diff 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/patches/008_verioned_freebsd_macro.diff 2011-11-23 20:51:45 UTC (rev 3896)
@@ -24,81 +24,3 @@
# include <sys/queue.h>
#endif
#include <net/if.h>
---- a/sys/dev/bktr/bktr_reg.h
-+++ b/sys/dev/bktr/bktr_reg.h
-@@ -717,13 +717,13 @@
- /* ioctl_cmd_t int on old versions, u_long on new versions */
- /***********************************************************/
-
--#if (__FreeBSD__ == 2)
--typedef int ioctl_cmd_t;
--#endif
--
- #if defined(__FreeBSD__)
-+#if __FreeBSD_version >= 200000 && __FreeBSD_version < 300000
-+typedef int ioctl_cmd_t;
-+#else
- typedef u_long ioctl_cmd_t;
- #endif
-+#endif
-
- #if defined(__NetBSD__) || defined(__OpenBSD__)
- typedef u_long ioctl_cmd_t;
---- a/sys/kern/uipc_socket.c
-+++ b/sys/kern/uipc_socket.c
-@@ -2828,7 +2828,7 @@
- return (error);
- }
-
--/* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */
-+/* XXX; prepare mbuf for (__FreeBSD_version < 300000) routines. */
- int
- soopt_getm(struct sockopt *sopt, struct mbuf **mp)
- {
-@@ -2877,7 +2877,7 @@
- return (0);
- }
-
--/* XXX; copyin sopt data into mbuf chain for (__FreeBSD__ < 3) routines. */
-+/* XXX; copyin sopt data into mbuf chain for (__FreeBSD_version < 300000) routines. */
- int
- soopt_mcopyin(struct sockopt *sopt, struct mbuf *m)
- {
-@@ -2906,7 +2906,7 @@
- return (0);
- }
-
--/* XXX; copyout mbuf chain data into soopt for (__FreeBSD__ < 3) routines. */
-+/* XXX; copyout mbuf chain data into soopt for (__FreeBSD_version < 300000) routines. */
- int
- soopt_mcopyout(struct sockopt *sopt, struct mbuf *m)
- {
---- a/sys/net/if_spppfr.c
-+++ b/sys/net/if_spppfr.c
-@@ -25,7 +25,7 @@
-
- #include <sys/param.h>
-
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
- #include "opt_inet.h"
- #include "opt_inet6.h"
- #include "opt_ipx.h"
-@@ -45,7 +45,7 @@
- #include <sys/sockio.h>
- #include <sys/socket.h>
- #include <sys/syslog.h>
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
- #include <sys/random.h>
- #endif
- #include <sys/malloc.h>
-@@ -149,7 +149,7 @@
- unsigned short ptarget2;
- } __packed;
-
--#if defined(__FreeBSD__) && __FreeBSD__ >= 3 && __FreeBSD_version < 501113
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 300000 && __FreeBSD_version < 501113
- #define SPP_FMT "%s%d: "
- #define SPP_ARGS(ifp) (ifp)->if_name, (ifp)->if_unit
- #else
Modified: trunk/kfreebsd-10/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/107_mount_update.diff 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/patches/107_mount_update.diff 2011-11-23 20:51:45 UTC (rev 3896)
@@ -7,7 +7,7 @@
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
-@@ -639,6 +639,24 @@
+@@ -641,6 +641,24 @@
}
/*
Modified: trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2011-11-23 20:51:45 UTC (rev 3896)
@@ -81,7 +81,7 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -507,8 +504,6 @@
+@@ -509,8 +506,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -90,7 +90,7 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -524,7 +519,6 @@
+@@ -526,7 +521,6 @@
_ixgbe= ixgbe
_mly= mly
_nfe= nfe
@@ -98,7 +98,7 @@
_nvram= nvram
_nxge= nxge
_tpm= tpm
-@@ -580,8 +574,6 @@
+@@ -583,8 +577,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -107,7 +107,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -612,7 +604,6 @@
+@@ -615,7 +607,6 @@
.endif
_ndis= ndis
_nfe= nfe
Modified: trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff 2011-11-23 20:51:45 UTC (rev 3896)
@@ -5,7 +5,7 @@
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
-@@ -463,7 +463,12 @@
+@@ -464,7 +464,12 @@
KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
if (soun->sun_len > sizeof(struct sockaddr_un))
@@ -18,7 +18,7 @@
namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
if (namelen <= 0)
return (EINVAL);
-@@ -1255,7 +1260,12 @@
+@@ -1256,7 +1261,12 @@
KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
if (nam->sa_len > sizeof(struct sockaddr_un))
Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2011-11-23 20:51:45 UTC (rev 3896)
@@ -3,7 +3,7 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -361,12 +361,11 @@
+@@ -363,12 +363,11 @@
.endif
.endif
@@ -18,7 +18,7 @@
_if_carp= if_carp
.endif
-@@ -374,7 +373,7 @@
+@@ -376,7 +375,7 @@
_ipfilter= ipfilter
.endif
@@ -27,7 +27,7 @@
_ipfw= ipfw
.endif
-@@ -382,11 +381,10 @@
+@@ -384,11 +383,10 @@
_netgraph= netgraph
.endif
@@ -41,7 +41,7 @@
_pfsync= pfsync
.endif
.endif
-@@ -442,7 +440,7 @@
+@@ -444,7 +442,7 @@
_linsysfs= linsysfs
_linux= linux
_mse= mse
@@ -50,7 +50,7 @@
_mlx4= mlx4
_mlx4ib= mlx4ib
_mlxen= mlxen
-@@ -594,7 +592,7 @@
+@@ -597,7 +595,7 @@
_linsysfs= linsysfs
_linux= linux
_mly= mly
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2011-11-23 20:51:45 UTC (rev 3896)
@@ -166,7 +166,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -344,10 +294,10 @@
+@@ -344,15 +294,15 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -177,6 +177,12 @@
-device snd_ich # Intel, NVidia and other ICH AC'97 Audio
-device snd_uaudio # USB Audio
-device snd_via8233 # VIA VT8233x Audio
+-
+ # MMC/SD
+ device mmc # MMC/SD bus
+ device mmcsd # MMC/SD memory card
+ device sdhci # Generic PCI SD Host Controller
++
+# Alternate queueing
+options ALTQ
+options ALTQ_CBQ # Class Bases Queuing (CBQ)
@@ -365,7 +371,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -357,10 +309,10 @@
+@@ -357,15 +309,15 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -376,6 +382,12 @@
-device snd_ich # Intel, NVidia and other ICH AC'97 Audio
-device snd_uaudio # USB Audio
-device snd_via8233 # VIA VT8233x Audio
+-
+ # MMC/SD
+ device mmc # MMC/SD bus
+ device mmcsd # MMC/SD memory card
+ device sdhci # Generic PCI SD Host Controller
++
+# Alternate queueing
+options ALTQ
+options ALTQ_CBQ # Class Bases Queuing (CBQ)
Modified: trunk/kfreebsd-10/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_firmware.diff 2011-11-23 19:44:49 UTC (rev 3895)
+++ trunk/kfreebsd-10/debian/patches/999_firmware.diff 2011-11-23 20:51:45 UTC (rev 3896)
@@ -355,7 +355,7 @@
dev/mxge/if_mxge.c optional mxge pci
dev/mxge/mxge_lro.c optional mxge pci
dev/mxge/mxge_eth_z8e.c optional mxge pci
-@@ -1587,65 +1298,6 @@
+@@ -1588,65 +1299,6 @@
dev/puc/puc_pci.c optional puc pci
dev/puc/pucdata.c optional puc pci
dev/quicc/quicc_core.c optional quicc
@@ -421,11 +421,17 @@
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
-@@ -1670,14 +1322,7 @@
+@@ -1671,7 +1323,6 @@
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/sdhci/sdhci.c optional sdhci pci
-dev/sf/if_sf.c optional sf pci
+ dev/sfxge/common/efx_bootcfg.c optional sfxge inet pci
+ dev/sfxge/common/efx_ev.c optional sfxge inet pci
+ dev/sfxge/common/efx_filter.c optional sfxge inet pci
+@@ -1704,12 +1355,6 @@
+ dev/sfxge/sfxge_rx.c optional sfxge inet pci
+ dev/sfxge/sfxge_tx.c optional sfxge inet pci
dev/sge/if_sge.c optional sge pci
-dev/si/si.c optional si
-dev/si/si2_z280.c optional si
@@ -436,7 +442,7 @@
dev/siba/siba_bwn.c optional siba_bwn pci
dev/siba/siba_core.c optional siba_bwn pci
dev/siis/siis.c optional siis pci
-@@ -1688,9 +1333,6 @@
+@@ -1720,9 +1365,6 @@
dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
@@ -446,7 +452,7 @@
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
-@@ -1706,10 +1348,6 @@
+@@ -1738,10 +1380,6 @@
dev/sound/pci/atiixp.c optional snd_atiixp pci
dev/sound/pci/cmi.c optional snd_cmi pci
dev/sound/pci/cs4281.c optional snd_cs4281 pci
@@ -457,7 +463,7 @@
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \
dependency "emu10k1-alsa%diked.h" \
warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1732,8 +1370,6 @@
+@@ -1764,8 +1402,6 @@
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
dev/sound/pci/maestro.c optional snd_maestro pci
@@ -466,7 +472,7 @@
dev/sound/pci/neomagic.c optional snd_neomagic pci
dev/sound/pci/solo.c optional snd_solo pci
dev/sound/pci/spicds.c optional snd_spicds pci
-@@ -1813,7 +1449,6 @@
+@@ -1845,7 +1481,6 @@
dev/syscons/warp/warp_saver.c optional warp_saver
dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux
dev/tdfx/tdfx_pci.c optional tdfx pci
@@ -474,7 +480,7 @@
dev/tl/if_tl.c optional tl pci
dev/trm/trm.c optional trm
dev/twa/tw_cl_init.c optional twa \
-@@ -1836,7 +1471,6 @@
+@@ -1868,7 +1503,6 @@
dev/tws/tws_services.c optional tws
dev/tws/tws_user.c optional tws
dev/tx/if_tx.c optional tx
@@ -482,7 +488,7 @@
dev/uart/uart_bus_acpi.c optional uart acpi
#dev/uart/uart_bus_cbus.c optional uart cbus
dev/uart/uart_bus_ebus.c optional uart ebus
-@@ -1916,19 +1550,17 @@
+@@ -1948,19 +1582,17 @@
dev/usb/net/if_cdce.c optional cdce
dev/usb/net/if_cue.c optional cue
dev/usb/net/if_ipheth.c optional ipheth
@@ -503,7 +509,7 @@
dev/usb/wlan/if_run.c optional run
runfw.c optional runfw \
compile-with "${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}" \
-@@ -1944,11 +1576,9 @@
+@@ -1976,11 +1608,9 @@
compile-with "uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu" \
no-obj no-implicit-rule \
clean "runfw"
@@ -637,10 +643,10 @@
sem \
send \
- sf \
+ ${_sfxge} \
sge \
siba_bwn \
- siftr \
-@@ -277,7 +262,6 @@
+@@ -278,7 +263,6 @@
sis \
sk \
${_smbfs} \
@@ -648,7 +654,7 @@
${_snc} \
snp \
${_sound} \
-@@ -292,7 +276,6 @@
+@@ -293,7 +277,6 @@
${_sym} \
${_syscons} \
sysvipc \
@@ -656,7 +662,7 @@
tl \
tmpfs \
${_tpm} \
-@@ -301,7 +284,6 @@
+@@ -302,7 +285,6 @@
twe \
tws \
tx \
@@ -664,7 +670,7 @@
uart \
ubsec \
udf \
-@@ -329,7 +311,6 @@
+@@ -331,7 +313,6 @@
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -672,7 +678,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -405,9 +386,7 @@
+@@ -407,9 +388,7 @@
_bxe= bxe
_cardbus= cardbus
_cbb= cbb
@@ -682,7 +688,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -506,11 +485,8 @@
+@@ -508,11 +487,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -694,7 +700,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -519,7 +495,6 @@
+@@ -521,7 +497,6 @@
_nxge= nxge
_tpm= tpm
_wpi= wpi
@@ -702,7 +708,7 @@
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -580,11 +555,8 @@
+@@ -583,11 +558,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -714,7 +720,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -626,7 +598,6 @@
+@@ -631,7 +603,6 @@
_x86bios= x86bios
_wi= wi
_wpi= wpi
More information about the Glibc-bsd-commits
mailing list