[Glibc-bsd-commits] r2210 - in trunk/kfreebsd-7/debian: . patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Mon Jul 7 17:00:49 UTC 2008
Author: ps-guest
Date: 2008-07-07 17:00:49 +0000 (Mon, 07 Jul 2008)
New Revision: 2210
Modified:
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
trunk/kfreebsd-7/debian/patches/008_config.diff
trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
trunk/kfreebsd-7/debian/patches/999_config.diff
Log:
* refresh patches
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/changelog 2008-07-07 17:00:49 UTC (rev 2210)
@@ -1,8 +1,9 @@
-kfreebsd-7 (7.1~cvs20080630-1) EXPERIMENTAL; urgency=low
+kfreebsd-7 (7.1~cvs20080707-1) EXPERIMENTAL; urgency=low
[ Petr Salinger ]
* New upstream snapshot of RELENG_7
- update of some patches
+ - refresh remaining patches
- 030_abi_cld.diff and 000_tcp.diff applied upstream
[ Aurelien Jarno ]
Modified: trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2008-07-07 17:00:49 UTC (rev 2210)
@@ -2,7 +2,7 @@
===================================================================
--- sys/kern/kern_fork.c.orig
+++ sys/kern/kern_fork.c
-@@ -485,7 +485,11 @@
+@@ -511,7 +511,11 @@
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff 2008-07-07 17:00:49 UTC (rev 2210)
@@ -27,7 +27,7 @@
--- usr.sbin/config/main.c.orig
+++ usr.sbin/config/main.c
@@ -41,12 +41,18 @@
- "$FreeBSD: src/usr.sbin/config/main.c,v 1.76 2007/05/17 04:53:52 imp Exp $";
+ "$FreeBSD: src/usr.sbin/config/main.c,v 1.76.2.1 2008/06/27 15:20:18 emaste Exp $";
#endif /* not lint */
+#include <stdarg.h>
@@ -46,7 +46,7 @@
#include <assert.h>
#include <ctype.h>
-@@ -588,7 +594,11 @@
+@@ -606,7 +612,11 @@
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
Modified: trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2008-07-07 17:00:49 UTC (rev 2210)
@@ -42,7 +42,7 @@
interp = brand_info->interp_newpath;
/*
-@@ -706,7 +724,7 @@
+@@ -708,7 +726,7 @@
if ((error = __elfN(load_section)(vmspace,
imgp->object, phdr[i].p_offset,
@@ -51,7 +51,7 @@
phdr[i].p_memsz, phdr[i].p_filesz, prot,
sv->sv_pagesize)) != 0)
return (error);
-@@ -720,11 +738,12 @@
+@@ -722,11 +740,12 @@
if (phdr[i].p_offset == 0 &&
hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize
<= phdr[i].p_filesz)
@@ -65,7 +65,7 @@
/*
* Is this .text or .data? We can't use
-@@ -746,7 +765,7 @@
+@@ -748,7 +767,7 @@
phdr[i].p_memsz)) {
text_size = seg_size;
text_addr = seg_addr;
@@ -74,7 +74,7 @@
} else {
data_size = seg_size;
data_addr = seg_addr;
-@@ -754,7 +773,7 @@
+@@ -756,7 +775,7 @@
total_size += seg_size;
break;
case PT_PHDR: /* Program header table info */
Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2008-07-07 17:00:49 UTC (rev 2210)
@@ -134,7 +134,7 @@
aue \
${_auxio} \
${_awi} \
-@@ -96,8 +91,6 @@
+@@ -97,8 +92,6 @@
hifn \
hme \
${_hptiop} \
@@ -143,7 +143,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -195,10 +188,8 @@
+@@ -197,10 +190,8 @@
ntfs_iconv \
${_nxge} \
nullfs \
@@ -154,7 +154,7 @@
${_padlock} \
patm \
${_pccard} \
-@@ -320,7 +311,6 @@
+@@ -322,7 +313,6 @@
${_xe} \
xfs \
xl \
@@ -162,7 +162,7 @@
zlib \
zyd
-@@ -370,11 +360,6 @@
+@@ -372,11 +362,6 @@
_apm= apm
_ar= ar
_arcnet= arcnet
@@ -174,7 +174,7 @@
_awi= awi
_bktr= bktr
_cardbus= cardbus
-@@ -414,7 +399,6 @@
+@@ -417,7 +402,6 @@
.if ${MK_NCP} != "no"
_nwfs= nwfs
.endif
@@ -182,7 +182,7 @@
_pccard= pccard
_pcfclock= pcfclock
_pecoff= pecoff
-@@ -435,9 +419,6 @@
+@@ -438,9 +422,6 @@
_tmpfs= tmpfs
_wi= wi
_xe= xe
@@ -192,7 +192,7 @@
.if ${MACHINE} == "i386"
_aac= aac
_acpi= acpi
-@@ -455,8 +436,6 @@
+@@ -458,8 +439,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -201,7 +201,7 @@
_ichwd= ichwd
_ida= ida
# Disabled due to non-MPSAFEty in 7.0
-@@ -471,7 +450,6 @@
+@@ -474,7 +453,6 @@
_ixgb= ixgb
_mly= mly
_nfe= nfe
@@ -209,7 +209,7 @@
_nvram= nvram
_nxge= nxge
_wpi= wpi
-@@ -498,11 +476,6 @@
+@@ -501,11 +479,6 @@
_agp= agp
_an= an
_arcmsr= arcmsr
@@ -221,7 +221,7 @@
_cardbus= cardbus
_cbb= cbb
_cmx= cmx
-@@ -516,8 +489,6 @@
+@@ -520,8 +493,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -230,7 +230,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -536,7 +507,6 @@
+@@ -541,7 +512,6 @@
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -238,7 +238,7 @@
_nvram= nvram
_nxge= nxge
_pccard= pccard
-@@ -551,9 +521,6 @@
+@@ -556,9 +526,6 @@
_wi= wi
_wpi= wpi
_wpifw= wpifw
@@ -248,7 +248,7 @@
.endif
.if ${MACHINE_ARCH} == "ia64"
-@@ -596,21 +563,11 @@
+@@ -601,21 +568,11 @@
.if ${MACHINE_ARCH} == "powerpc"
_an= an
@@ -325,7 +325,7 @@
#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -176,21 +145,12 @@
+@@ -176,14 +145,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -340,6 +340,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
+@@ -191,7 +152,6 @@
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
Modified: trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2008-07-07 17:00:49 UTC (rev 2210)
@@ -26,9 +26,9 @@
===================================================================
--- sys/i386/conf/GENERIC.orig
+++ sys/i386/conf/GENERIC
-@@ -55,8 +55,14 @@
- options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+@@ -57,8 +57,14 @@
options KTRACE # ktrace(1) support
+ options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
+options SHMMAXPGS=4096
+options SHMSEG=256
@@ -45,9 +45,9 @@
===================================================================
--- sys/amd64/conf/GENERIC.orig
+++ sys/amd64/conf/GENERIC
-@@ -55,8 +55,14 @@
- options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+@@ -57,8 +57,14 @@
options KTRACE # ktrace(1) support
+ options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
+options SHMMAXPGS=4096
+options SHMSEG=256
Modified: trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2008-07-07 17:00:49 UTC (rev 2210)
@@ -5,7 +5,7 @@
===================================================================
--- sys/i386/i386/identcpu.c.orig
+++ sys/i386/i386/identcpu.c
-@@ -643,6 +643,7 @@
+@@ -626,6 +626,7 @@
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -13,7 +13,7 @@
bzero_vector = i486_bzero;
break;
#endif
-@@ -653,6 +654,7 @@
+@@ -636,6 +637,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("586");
@@ -21,7 +21,7 @@
break;
#endif
#if defined(I686_CPU)
-@@ -662,6 +664,7 @@
+@@ -645,6 +647,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("686");
Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff 2008-07-06 14:39:46 UTC (rev 2209)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2008-07-07 17:00:49 UTC (rev 2210)
@@ -4,7 +4,7 @@
+++ sys/amd64/conf/GENERIC
@@ -18,13 +18,8 @@
#
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.7 2008/04/10 22:09:21 rwatson Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.8 2008/07/04 01:29:12 delphij Exp $
-cpu HAMMER
-ident GENERIC
@@ -65,7 +65,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -238,9 +230,6 @@
+@@ -239,9 +231,6 @@
device wlan_scan_ap # 802.11 AP mode scanning
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -75,7 +75,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -249,13 +238,8 @@
+@@ -250,13 +239,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -89,7 +89,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -272,12 +256,8 @@
+@@ -273,12 +257,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -102,7 +102,7 @@
# USB Serial devices
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
-@@ -304,3 +284,11 @@
+@@ -305,3 +285,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -120,7 +120,7 @@
+++ sys/i386/conf/GENERIC
@@ -18,15 +18,8 @@
#
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.7 2008/04/10 22:09:22 rwatson Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.8 2008/07/04 01:29:12 delphij Exp $
-cpu I486_CPU
-cpu I586_CPU
@@ -183,7 +183,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -251,9 +241,6 @@
+@@ -252,9 +242,6 @@
device wlan_scan_ap # 802.11 AP mode scanning
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -193,7 +193,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -263,13 +250,8 @@
+@@ -264,13 +251,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -207,7 +207,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -286,13 +268,9 @@
+@@ -287,13 +269,9 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -221,7 +221,7 @@
# USB Serial devices
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
-@@ -319,3 +297,11 @@
+@@ -320,3 +298,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
More information about the Glibc-bsd-commits
mailing list