[Glibc-bsd-commits] r4314 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Jun 16 11:46:45 UTC 2012
Author: rmh
Date: 2012-06-16 11:46:44 +0000 (Sat, 16 Jun 2012)
New Revision: 4314
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/control.in
trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-10/debian/patches/004_xargs.diff
trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
* New upstream snapshot.
- Fix for FreeBSD SA-12:06, aka CVE-2012-0217. (Closes: #677299)
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/changelog 2012-06-16 11:46:44 UTC (rev 4314)
@@ -1,3 +1,10 @@
+kfreebsd-10 (10.0~svn237137-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ - Fix for FreeBSD SA-12:06, aka CVE-2012-0217. (Closes: #677299)
+
+ -- Robert Millan <rmh at debian.org> Fri, 15 Jun 2012 20:59:04 +0200
+
kfreebsd-10 (10.0~svn234760-1) experimental; urgency=low
* New upstream snapshot.
Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/control.in 2012-06-16 11:46:44 UTC (rev 4314)
@@ -6,7 +6,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
- freebsd-buildutils (>= 9.0-9~),
+ freebsd-buildutils (>= 10~svn237137-1~),
@kernel_cc@, libdb-dev,
libbsd-dev (>= 0.3.0), pkg-config,
libsbuf-dev (>= 9.0+ds1-2),
Modified: trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff 2012-06-16 11:46:44 UTC (rev 4314)
@@ -3,40 +3,13 @@
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
-@@ -3,6 +3,10 @@
- #
- # $FreeBSD$
-
-+.if !defined(OPSYS)
-+OPSYS!= uname -s
-+.endif
-+
- PROG= aicasm
-
- CSRCS= aicasm.c aicasm_symbol.c
-@@ -14,8 +18,9 @@
- SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
+@@ -16,6 +16,9 @@
DPADD= ${LIBL}
--LDADD= -ll
-+LDADD= -ll -ldb -lbsd
+ LDADD= -ll
WARNS?= 5
+NO_WERROR?= 1
++LDADD+= -ldb -lbsd
++CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
# Correct path for kernel builds
# Don't rely on the kernel's .depend file
-@@ -24,8 +29,14 @@
- DEPENDFILE= .depend_aicasm
- .endif
-
-+CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
-+
-+# This would discard implicit include flags in upstream GCC
-+.if ${OPSYS} == "FreeBSD"
- NOSTDINC= -nostdinc
- CFLAGS+= ${NOSTDINC} -I/usr/include -I.
-+.endif
-+
- .ifdef MAKESRCPATH
- CFLAGS+= -I${MAKESRCPATH}
- .endif
Modified: trunk/kfreebsd-10/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/004_xargs.diff 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/patches/004_xargs.diff 2012-06-16 11:46:44 UTC (rev 4314)
@@ -32,7 +32,7 @@
for H in ${src_headers}; do
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
-@@ -168,12 +168,9 @@
+@@ -189,12 +189,9 @@
rm -f .newdep
${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \
MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
Modified: trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff 2012-06-16 11:46:44 UTC (rev 4314)
@@ -23,7 +23,7 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -56,6 +56,11 @@
+@@ -57,6 +57,11 @@
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
@@ -37,7 +37,7 @@
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -57,6 +57,11 @@
+@@ -58,6 +58,11 @@
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2012-06-16 11:46:44 UTC (rev 4314)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -163,8 +163,6 @@
+@@ -166,8 +166,6 @@
jme \
joy \
kbdmux \
Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2012-06-16 11:46:44 UTC (rev 4314)
@@ -3,7 +3,7 @@
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
-@@ -94,7 +94,7 @@
+@@ -115,7 +115,7 @@
@rm -f ${.TARGET}
@echo linking ${.TARGET}
${SYSTEM_LD}
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2012-06-16 10:54:19 UTC (rev 4313)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2012-06-16 11:46:44 UTC (rev 4314)
@@ -16,7 +16,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -25,27 +25,20 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -69,8 +69,8 @@
+@@ -70,9 +70,9 @@
options CAPABILITY_MODE # Capsicum capability mode
options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
-options KDTRACE_FRAME # Ensure frames are compiled in
-options KDTRACE_HOOKS # Kernel DTrace hooks
+-options DDB_CTF # Kernel ELF linker loads CTF data
+#options KDTRACE_FRAME # Ensure frames are compiled in
+#options KDTRACE_HOOKS # Kernel DTrace hooks
++#options DDB_CTF # Kernel ELF linker loads CTF data
options INCLUDE_CONFIG_FILE # Include this file in kernel
# Debugging support. Always need this:
-@@ -80,7 +80,7 @@
- # For full debugger support use this instead:
- options DDB # Support DDB.
- options GDB # Support remote GDB.
--options DDB_CTF # kernel ELF linker loads CTF data
-+#options DDB_CTF # kernel ELF linker loads CTF data
- options DEADLKRES # Enable the deadlock resolver
- options INVARIANTS # Enable calls of extra sanity checking
- options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-@@ -98,9 +98,6 @@
+@@ -99,9 +99,6 @@
device acpi
device pci
@@ -55,7 +48,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -197,10 +194,6 @@
+@@ -198,10 +195,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -66,7 +59,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -294,10 +287,7 @@
+@@ -297,10 +290,7 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -107,8 +100,8 @@
+options COMPAT_LINUX # Needed by LINPROCFS
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
- options GEOM_LABEL # Provides labelization
-@@ -51,7 +53,7 @@
+ options GEOM_RAID # Soft RAID functionality.
+@@ -52,7 +54,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -117,25 +110,18 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -70,7 +72,7 @@
+@@ -71,8 +73,8 @@
options CAPABILITY_MODE # Capsicum capability mode
options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
-options KDTRACE_HOOKS # Kernel DTrace hooks
+-options DDB_CTF # Kernel ELF linker loads CTF data
+#options KDTRACE_HOOKS # Kernel DTrace hooks
++#options DDB_CTF # Kernel ELF linker loads CTF data
options INCLUDE_CONFIG_FILE # Include this file in kernel
# Debugging support. Always need this:
-@@ -80,7 +82,7 @@
- # For full debugger support use this instead:
- options DDB # Support DDB.
- options GDB # Support remote GDB.
--options DDB_CTF # kernel ELF linker loads CTF data
-+#options DDB_CTF # kernel ELF linker loads CTF data
- options DEADLKRES # Enable the deadlock resolver
- options INVARIANTS # Enable calls of extra sanity checking
- options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-@@ -100,9 +102,6 @@
+@@ -101,9 +103,6 @@
device eisa
device pci
@@ -145,7 +131,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -207,10 +206,6 @@
+@@ -208,10 +207,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -156,7 +142,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -307,10 +302,7 @@
+@@ -310,10 +305,7 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
More information about the Glibc-bsd-commits
mailing list