[Glibc-bsd-commits] r3821 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Nov 5 23:38:42 UTC 2011
Author: rmh
Date: 2011-11-05 23:38:42 +0000 (Sat, 05 Nov 2011)
New Revision: 3821
Removed:
trunk/kfreebsd-10/debian/patches/005_linux_cflags.diff
trunk/kfreebsd-10/debian/patches/108_teken_utf8_table.diff
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
trunk/kfreebsd-10/debian/patches/999_firmware.diff
trunk/kfreebsd-10/debian/patches/series
Log:
* New upstream snapshot.
- 005_linux_cflags.diff: Remove (merged).
- 108_teken_utf8_table.diff: Remove (merged).
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/changelog 2011-11-05 23:38:42 UTC (rev 3821)
@@ -1,5 +1,10 @@
-kfreebsd-10 (10.0~svn226872-3) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn227111-1) UNRELEASED; urgency=low
+ * New upstream snapshot.
+ - 005_linux_cflags.diff: Remove (merged).
+ - 108_teken_utf8_table.diff: Remove (merged).
+
+ [ Robert Millan ]
* Replace sed kludge with a pair of patches (920_linux_cflags.diff and
008_verioned_freebsd_macro.diff).
* Remove gen-ld-u-options / 020_linker.diff kludge, not needed since
Deleted: trunk/kfreebsd-10/debian/patches/005_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/005_linux_cflags.diff 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/005_linux_cflags.diff 2011-11-05 23:38:42 UTC (rev 3821)
@@ -1,14 +0,0 @@
-
-Submitted to freebsd-hackers on 2011-07-04
-
---- a/sys/sys/cdefs.h
-+++ b/sys/sys/cdefs.h
-@@ -349,7 +349,7 @@
- #endif
-
- /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
--#if __FreeBSD_cc_version >= 300001 && defined(__GNUC__) && !defined(__INTEL_COMPILER)
-+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && defined(__GNUC__) && !defined(__INTEL_COMPILER)
- #define __printf0like(fmtarg, firstvararg) \
- __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
- #else
Deleted: trunk/kfreebsd-10/debian/patches/108_teken_utf8_table.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/108_teken_utf8_table.diff 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/108_teken_utf8_table.diff 2011-11-05 23:38:42 UTC (rev 3821)
@@ -1,43 +0,0 @@
---- a/sys/dev/syscons/scterm-teken.c
-+++ b/sys/dev/syscons/scterm-teken.c
-@@ -424,10 +424,18 @@
- { 0x00b6, 0x14, 0x00 }, { 0x00b7, 0xfa, 0x00 },
- { 0x00ba, 0xa7, 0x00 }, { 0x00bb, 0xaf, 0x00 },
- { 0x00bc, 0xac, 0x00 }, { 0x00bd, 0xab, 0x00 },
-- { 0x00bf, 0xa8, 0x00 }, { 0x00c4, 0x8e, 0x01 },
-- { 0x00c6, 0x92, 0x00 }, { 0x00c7, 0x80, 0x00 },
-- { 0x00c9, 0x90, 0x00 }, { 0x00d1, 0xa5, 0x00 },
-- { 0x00d6, 0x99, 0x00 }, { 0x00dc, 0x9a, 0x00 },
-+ { 0x00bf, 0xa8, 0x00 }, { 0x00c0, 0x41, 0x00 },
-+ { 0x00c1, 0x41, 0x00 }, { 0x00c2, 0x41, 0x00 },
-+ { 0x00c4, 0x8e, 0x01 }, { 0x00c6, 0x92, 0x00 },
-+ { 0x00c7, 0x80, 0x00 }, { 0x00c8, 0x45, 0x00 },
-+ { 0x00c9, 0x90, 0x00 }, { 0x00ca, 0x45, 0x00 },
-+ { 0x00cb, 0x45, 0x00 }, { 0x00cc, 0x49, 0x00 },
-+ { 0x00cd, 0x49, 0x00 }, { 0x00ce, 0x49, 0x00 },
-+ { 0x00cf, 0x49, 0x00 }, { 0x00d1, 0xa5, 0x00 },
-+ { 0x00d2, 0x4f, 0x00 }, { 0x00d3, 0x4f, 0x00 },
-+ { 0x00d4, 0x4f, 0x00 }, { 0x00d6, 0x99, 0x00 },
-+ { 0x00d9, 0x55, 0x00 }, { 0x00da, 0x55, 0x00 },
-+ { 0x00db, 0x55, 0x00 }, { 0x00dc, 0x9a, 0x00 },
- { 0x00df, 0xe1, 0x00 }, { 0x00e0, 0x85, 0x00 },
- { 0x00e1, 0xa0, 0x00 }, { 0x00e2, 0x83, 0x00 },
- { 0x00e4, 0x84, 0x00 }, { 0x00e5, 0x86, 0x00 },
-@@ -442,6 +450,7 @@
- { 0x00f8, 0xed, 0x00 }, { 0x00f9, 0x97, 0x00 },
- { 0x00fa, 0xa3, 0x00 }, { 0x00fb, 0x96, 0x00 },
- { 0x00fc, 0x81, 0x00 }, { 0x00ff, 0x98, 0x00 },
-+ { 0x013f, 0x4c, 0x00 }, { 0x0140, 0x6c, 0x00 },
- { 0x0192, 0x9f, 0x00 }, { 0x0393, 0xe2, 0x00 },
- { 0x0398, 0xe9, 0x00 }, { 0x03a3, 0xe4, 0x00 },
- { 0x03a6, 0xe8, 0x00 }, { 0x03a9, 0xea, 0x00 },
-@@ -490,7 +499,8 @@
- { 0x2584, 0xdc, 0x00 }, { 0x2588, 0xdb, 0x00 },
- { 0x258c, 0xdd, 0x00 }, { 0x2590, 0xde, 0x00 },
- { 0x2591, 0xb0, 0x02 }, { 0x25a0, 0xfe, 0x00 },
-- { 0x25ac, 0x16, 0x00 }, { 0x25b2, 0x1e, 0x00 },
-+ { 0x25ac, 0x16, 0x00 },
-+ { 0x25ae, 0xdb, 0x00 }, { 0x25b2, 0x1e, 0x00 },
- { 0x25ba, 0x10, 0x00 }, { 0x25bc, 0x1f, 0x00 },
- { 0x25c4, 0x11, 0x00 }, { 0x25cb, 0x09, 0x00 },
- { 0x25d8, 0x08, 0x00 }, { 0x25d9, 0x0a, 0x00 },
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-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2011-11-05 23:38:42 UTC (rev 3821)
@@ -64,7 +64,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -108,8 +108,6 @@
+@@ -109,8 +109,6 @@
hifn \
hme \
${_hptiop} \
@@ -73,7 +73,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -229,7 +227,6 @@
+@@ -230,7 +228,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -81,7 +81,7 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -501,8 +498,6 @@
+@@ -507,8 +504,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -90,7 +90,7 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -518,7 +513,6 @@
+@@ -524,7 +519,6 @@
_ixgbe= ixgbe
_mly= mly
_nfe= nfe
@@ -98,7 +98,7 @@
_nvram= nvram
_nxge= nxge
_tpm= tpm
-@@ -574,8 +568,6 @@
+@@ -580,8 +574,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -107,7 +107,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -606,7 +598,6 @@
+@@ -612,7 +604,6 @@
.endif
_ndis= ndis
_nfe= nfe
@@ -176,5 +176,5 @@
dev/nfe/if_nfe.c optional nfe pci
-dev/nve/if_nve.c optional nve pci
dev/nvram/nvram.c optional nvram isa
- dev/sio/sio.c optional sio
- dev/sio/sio_isa.c optional sio isa
+ dev/qlxgb/qla_dbg.c optional qlxgb pci
+ dev/qlxgb/qla_hw.c optional qlxgb pci
Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2011-11-05 23:38:42 UTC (rev 3821)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -153,8 +153,6 @@
+@@ -154,8 +154,6 @@
jme \
joy \
kbdmux \
Modified: trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff 2011-11-05 23:38:42 UTC (rev 3821)
@@ -19,7 +19,7 @@
CFLAGS+= -fstack-protector
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -144,6 +144,9 @@
+@@ -146,6 +146,9 @@
CTFFLAGS+= -g
.endif
Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2011-11-05 23:38:42 UTC (rev 3821)
@@ -3,7 +3,7 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -359,12 +359,11 @@
+@@ -361,12 +361,11 @@
.endif
.endif
@@ -18,7 +18,7 @@
_if_carp= if_carp
.endif
-@@ -376,8 +375,7 @@
+@@ -382,8 +381,7 @@
_netgraph= netgraph
.endif
@@ -28,7 +28,7 @@
_pf= pf
_pflog= pflog
.if ${MK_INET_SUPPORT} != "no"
-@@ -436,7 +434,7 @@
+@@ -442,7 +440,7 @@
_linsysfs= linsysfs
_linux= linux
_mse= mse
@@ -37,7 +37,7 @@
_mlx4= mlx4
_mlx4ib= mlx4ib
_mlxen= mlxen
-@@ -588,7 +586,7 @@
+@@ -594,7 +592,7 @@
_linsysfs= linsysfs
_linux= linux
_mly= mly
Modified: trunk/kfreebsd-10/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_firmware.diff 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/999_firmware.diff 2011-11-05 23:38:42 UTC (rev 3821)
@@ -98,7 +98,7 @@
dev/drm/savage_bci.c optional savagedrm
dev/drm/savage_drv.c optional savagedrm
dev/drm/savage_state.c optional savagedrm
-@@ -1091,8 +1031,6 @@
+@@ -1092,8 +1032,6 @@
dev/firewire/sbp_targ.c optional sbp_targ
dev/flash/at45d.c optional at45d
dev/flash/mx25l.c optional mx25l
@@ -107,7 +107,7 @@
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
dev/gem/if_gem_sbus.c optional gem sbus
-@@ -1149,49 +1087,6 @@
+@@ -1150,49 +1088,6 @@
dev/ips/ips_disk.c optional ips
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
@@ -157,7 +157,7 @@
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
-@@ -1204,163 +1099,6 @@
+@@ -1205,163 +1100,6 @@
dev/isp/isp_pci.c optional isp pci
dev/isp/isp_sbus.c optional isp sbus
dev/isp/isp_target.c optional isp
@@ -321,7 +321,7 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
-@@ -1469,33 +1207,6 @@
+@@ -1471,33 +1209,6 @@
dev/mvs/mvs.c optional mvs
dev/mvs/mvs_if.m optional mvs
dev/mvs/mvs_pci.c optional mvs pci
@@ -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
-@@ -1585,65 +1296,6 @@
+@@ -1587,65 +1298,6 @@
dev/puc/puc_pci.c optional puc pci
dev/puc/pucdata.c optional puc pci
dev/quicc/quicc_core.c optional quicc
@@ -421,7 +421,7 @@
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
-@@ -1668,14 +1320,7 @@
+@@ -1670,14 +1322,7 @@
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/sdhci/sdhci.c optional sdhci pci
@@ -436,7 +436,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
-@@ -1686,9 +1331,6 @@
+@@ -1688,9 +1333,6 @@
dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
@@ -446,7 +446,7 @@
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
-@@ -1704,10 +1346,6 @@
+@@ -1706,10 +1348,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 +457,7 @@
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \
dependency "emu10k1-alsa%diked.h" \
warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1730,8 +1368,6 @@
+@@ -1732,8 +1370,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 +466,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
-@@ -1811,7 +1447,6 @@
+@@ -1813,7 +1449,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 +474,7 @@
dev/tl/if_tl.c optional tl pci
dev/trm/trm.c optional trm
dev/twa/tw_cl_init.c optional twa \
-@@ -1834,7 +1469,6 @@
+@@ -1836,7 +1471,6 @@
dev/tws/tws_services.c optional tws
dev/tws/tws_user.c optional tws
dev/tx/if_tx.c optional tx
@@ -482,7 +482,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
-@@ -1914,19 +1548,17 @@
+@@ -1916,19 +1550,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 +503,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}" \
-@@ -1942,11 +1574,9 @@
+@@ -1944,11 +1576,9 @@
compile-with "uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu" \
no-obj no-implicit-rule \
clean "runfw"
@@ -580,7 +580,7 @@
cxgbe \
${_cyclic} \
dc \
-@@ -93,13 +88,11 @@
+@@ -94,13 +89,11 @@
${_ex} \
${_exca} \
${_ext2fs} \
@@ -594,7 +594,7 @@
gem \
geom \
${_glxiic} \
-@@ -140,14 +133,10 @@
+@@ -141,14 +134,10 @@
ip_mroute_mod \
${_ips} \
${_ipw} \
@@ -609,7 +609,7 @@
${_ixgb} \
${_ixgbe} \
jme \
-@@ -202,7 +191,6 @@
+@@ -203,7 +192,6 @@
${_mthca} \
mvs \
mwl \
@@ -617,9 +617,9 @@
mxge \
my \
${_ncp} \
-@@ -250,14 +238,12 @@
- pty \
+@@ -252,14 +240,12 @@
puc \
+ ${_qlxgb} \
ral \
- ralfw \
${_random} \
@@ -632,7 +632,7 @@
${_s3} \
${_safe} \
${_sbni} \
-@@ -267,7 +253,6 @@
+@@ -269,7 +255,6 @@
sdhci \
sem \
send \
@@ -640,7 +640,7 @@
sge \
siba_bwn \
siftr \
-@@ -275,7 +260,6 @@
+@@ -277,7 +262,6 @@
sis \
sk \
${_smbfs} \
@@ -648,7 +648,7 @@
${_snc} \
snp \
${_sound} \
-@@ -290,7 +274,6 @@
+@@ -292,7 +276,6 @@
${_sym} \
${_syscons} \
sysvipc \
@@ -656,7 +656,7 @@
tl \
tmpfs \
${_tpm} \
-@@ -299,7 +282,6 @@
+@@ -301,7 +284,6 @@
twe \
tws \
tx \
@@ -664,7 +664,7 @@
uart \
ubsec \
udf \
-@@ -327,7 +309,6 @@
+@@ -329,7 +311,6 @@
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -672,7 +672,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -399,9 +380,7 @@
+@@ -405,9 +386,7 @@
_bxe= bxe
_cardbus= cardbus
_cbb= cbb
@@ -682,7 +682,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -500,11 +479,8 @@
+@@ -506,11 +485,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -694,7 +694,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -513,7 +489,6 @@
+@@ -519,7 +495,6 @@
_nxge= nxge
_tpm= tpm
_wpi= wpi
@@ -702,7 +702,7 @@
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -574,11 +549,8 @@
+@@ -580,11 +555,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -714,7 +714,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -619,7 +591,6 @@
+@@ -626,7 +598,6 @@
_x86bios= x86bios
_wi= wi
_wpi= wpi
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2011-11-05 23:11:48 UTC (rev 3820)
+++ trunk/kfreebsd-10/debian/patches/series 2011-11-05 23:38:42 UTC (rev 3821)
@@ -2,13 +2,11 @@
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
-005_linux_cflags.diff
006_mips_i8259_alloc.diff
#007_clone_signals.diff
008_verioned_freebsd_macro.diff
#009_disable_duped_modules.diff
#107_mount_update.diff
-108_teken_utf8_table.diff
109_linprocfs_non_x86.diff
110_disable_trampoline_flavour.diff
901_disable_optimization_2.diff
More information about the Glibc-bsd-commits
mailing list