[Glibc-bsd-commits] r4673 - in trunk/kfreebsd-9/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Mon Jul 8 12:48:51 UTC 2013
Author: rmh
Date: 2013-07-02 22:52:00 +0000 (Tue, 02 Jul 2013)
New Revision: 4673
Added:
trunk/kfreebsd-9/debian/patches/disable_ctf.diff
Removed:
trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff
trunk/kfreebsd-9/debian/patches/201_pseudofs.diff
trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-9/debian/patches/999_firmware.diff
trunk/kfreebsd-9/debian/patches/EN-12_02.ipv6refcount.patch
trunk/kfreebsd-9/debian/patches/SA-12_04.sysret.patch
trunk/kfreebsd-9/debian/patches/SA-12_08.linux.patch
trunk/kfreebsd-9/debian/patches/amd64_increase_DFLDSIZ.diff
trunk/kfreebsd-9/debian/patches/fix_VOP_VPTOCNP_bypass_for_nullfs.diff
trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff
trunk/kfreebsd-9/debian/patches/pf_counter_initialization_SVN236364.diff
trunk/kfreebsd-9/debian/patches/remove_tmpfs_warning.diff
trunk/kfreebsd-9/debian/patches/svn239447_SCTP_DoS.patch
Modified:
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/control.flavor.in
trunk/kfreebsd-9/debian/patches/001_misc.diff
trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-9/debian/patches/004_xargs.diff
trunk/kfreebsd-9/debian/patches/005_linux_cflags.diff
trunk/kfreebsd-9/debian/patches/107_mount_update.diff
trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff
trunk/kfreebsd-9/debian/patches/902_version.diff
trunk/kfreebsd-9/debian/patches/904_dev_full.diff
trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-9/debian/patches/914_psm.diff
trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff
trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-9/debian/patches/999_config.diff
trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch
trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch
trunk/kfreebsd-9/debian/patches/series
trunk/kfreebsd-9/debian/rules
Log:
* New upstream release.
- Refresh all patches.
- rules: Disable binary blobs using WITHOUT_SOURCELESS knob.
- rules: Disable Clang (for now) using WITHOUT_CLANG_IS_CC knob.
- rules: Disable CTF using WITHOUT_CTF knob.
- disable_ctf.diff: Fix non-CTF (WITHOUT_CTF) builds.
- control.flavour.in: Breaks grub-common << 1.99-27+deb7u2.
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/changelog 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,3 +1,15 @@
+kfreebsd-9 (9.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Refresh all patches.
+ - rules: Disable binary blobs using WITHOUT_SOURCELESS knob.
+ - rules: Disable Clang (for now) using WITHOUT_CLANG_IS_CC knob.
+ - rules: Disable CTF using WITHOUT_CTF knob.
+ - disable_ctf.diff: Fix non-CTF (WITHOUT_CTF) builds.
+ - control.flavour.in: Breaks grub-common << 1.99-27+deb7u2.
+
+ -- Robert Millan <rmh at debian.org> Wed, 03 Jul 2013 00:46:57 +0200
+
kfreebsd-9 (9.0-12) unstable; urgency=high
* Team upload.
Modified: trunk/kfreebsd-9/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-9/debian/control.flavor.in 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/control.flavor.in 2013-07-02 22:52:00 UTC (rev 4673)
@@ -6,8 +6,9 @@
# Policy-conformant keyboard mappings (see #605777)
kbdcontrol (>= 8.2+ds2-6) [kfreebsd-any],
Conflicts: kfreebsd-loader (<< 5.4-1.3)
-# grub-probe versions prior to ada(4) support break postinst
-Breaks: grub-common (<< 1.98+20100804-14+squeeze1) [kfreebsd-any],
+Breaks:
+# Prior versions can't boot kFreeBSD >= 9.1 (see #699002)
+ grub-common (<< 1.99-27+deb7u2) [kfreebsd-any],
# AT_* macros break LD_PRELOAD (see #630695)
# Missing support for RFTSIGZMB (see 007_clone_signals.diff)
libc0.1 (<< 2.13-11) [kfreebsd-any],
Modified: trunk/kfreebsd-9/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/001_misc.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/001_misc.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -3,37 +3,21 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -1,12 +1,23 @@
- # $FreeBSD$
-
-+.if !defined(OPSYS)
-+OPSYS!= uname -s
-+.endif
-+
+@@ -5,7 +5,7 @@
#
- # Warning flags for compiling the kernel and components of the kernel:
- #
-+.if ${OPSYS} == "FreeBSD"
-+# FreeBSD extension, not available in upstream GCC
-+format_extensions= -fformat-extensions
-+no_align_long_strings= -mno-align-long-strings
-+.endif
-+
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
- -Wundef -Wno-pointer-sign -fformat-extensions \
-+ -Wundef -Wno-pointer-sign ${format_extensions} \
- -Wmissing-include-dirs -fdiagnostics-show-option
-+
++ -Wundef -Wno-pointer-sign \
+ -Wmissing-include-dirs -fdiagnostics-show-option \
+ ${CWARNEXTRA}
#
- # The following flags are next up for working on:
- # -Wextra
-@@ -32,7 +43,7 @@
+@@ -52,7 +52,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
- .if ${CC:T:Mclang} != "clang"
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
-+CFLAGS+= ${no_align_long_strings} -mpreferred-stack-boundary=2 -mno-sse
+ .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
+-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
++CFLAGS+= -mpreferred-stack-boundary=2
.else
CFLAGS+= -mno-aes -mno-avx
.endif
Modified: trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -14,7 +14,7 @@
PROG= aicasm
CSRCS= aicasm.c aicasm_symbol.c
-@@ -14,8 +18,9 @@
+@@ -14,8 +18,10 @@
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
DPADD= ${LIBL}
@@ -22,22 +22,15 @@
+LDADD= -ll -ldb -lbsd
WARNS?= 5
+NO_WERROR?= 1
++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,15 @@
+@@ -24,7 +30,6 @@
DEPENDFILE= .depend_aicasm
.endif
-+LIBBSD_CFLAGS!= pkg-config --cflags libbsd-overlay
-+CFLAGS+= ${LIBBSD_CFLAGS}
-+
-+# This would discard implicit include flags in upstream GCC
-+.if ${OPSYS} == "FreeBSD"
- NOSTDINC= -nostdinc
- CFLAGS+= ${NOSTDINC} -I/usr/include -I.
-+.endif
-+
+-CFLAGS+= -I.
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
.endif
Modified: trunk/kfreebsd-9/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/004_xargs.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/004_xargs.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -6,7 +6,7 @@
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -217,7 +217,7 @@
+@@ -219,7 +219,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
Modified: trunk/kfreebsd-9/debian/patches/005_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/005_linux_cflags.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/005_linux_cflags.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -3,7 +3,7 @@
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
-@@ -349,7 +349,7 @@
+@@ -428,7 +428,7 @@
#endif
/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
Deleted: trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,54 +0,0 @@
-
-Obtained from kern/159663
-
---- a/sys/fs/nullfs/null_vnops.c
-+++ b/sys/fs/nullfs/null_vnops.c
-@@ -365,16 +365,38 @@
- vrele(lvp);
- } else {
- error = null_nodeget(dvp->v_mount, lvp, &vp);
-- if (error)
-+ if (error) {
- vput(lvp);
-- else
-+ } else if (vp->v_type == VSOCK) {
-+ vref(lvp);
-+ vrele(vp);
-+ *ap->a_vpp = lvp;
-+ } else {
- *ap->a_vpp = vp;
-+ }
- }
- }
- return (error);
- }
-
- static int
-+null_create(struct vop_create_args *ap)
-+{
-+ struct vnode *vp, *lvp;
-+ int retval;
-+
-+ retval = null_bypass(&ap->a_gen);
-+ vp = *ap->a_vpp;
-+ if (retval == 0 && vp->v_type == VSOCK) {
-+ lvp = NULLVPTOLOWERVP(vp);
-+ vref(lvp);
-+ vrele(vp);
-+ *ap->a_vpp = lvp;
-+ }
-+ return (retval);
-+}
-+
-+static int
- null_open(struct vop_open_args *ap)
- {
- int retval;
-@@ -826,6 +848,7 @@
- .vop_accessx = null_accessx,
- .vop_advlockpurge = vop_stdadvlockpurge,
- .vop_bmap = VOP_EOPNOTSUPP,
-+ .vop_create = null_create,
- .vop_getattr = null_getattr,
- .vop_getwritemount = null_getwritemount,
- .vop_inactive = null_inactive,
Modified: trunk/kfreebsd-9/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/107_mount_update.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/107_mount_update.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -5,7 +5,7 @@
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
-@@ -639,6 +639,24 @@
+@@ -650,6 +650,24 @@
}
/*
Deleted: trunk/kfreebsd-9/debian/patches/201_pseudofs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/201_pseudofs.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/201_pseudofs.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,29 +0,0 @@
-
-dirty workaround for #650667
-http://www.freebsd.org/cgi/query-pr.cgi?pr=163076
-
---- a/sys/fs/pseudofs/pseudofs_vnops.c
-+++ b/sys/fs/pseudofs/pseudofs_vnops.c
-@@ -640,7 +640,7 @@
- if (buflen > MAXPHYS + 1)
- buflen = MAXPHYS + 1;
-
-- sb = sbuf_new(sb, NULL, buflen, 0);
-+ sb = sbuf_new(sb, NULL, MAXPHYS + 1, 0);
- if (sb == NULL) {
- error = EIO;
- goto ret;
-@@ -654,7 +654,12 @@
- }
-
- sbuf_finish(sb);
-- error = uiomove_frombuf(sbuf_data(sb), sbuf_len(sb), uio);
-+
-+ if (buflen > sbuf_len(sb))
-+ buflen = sbuf_len(sb);
-+ else
-+ buflen--;
-+ error = uiomove_frombuf(sbuf_data(sb), buflen, uio);
- sbuf_delete(sb);
- ret:
- vn_lock(vn, locked | LK_RETRY);
Modified: trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -5,7 +5,7 @@
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -41,6 +41,9 @@
+@@ -45,6 +45,9 @@
.if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
COPTFLAGS+= -fno-strict-aliasing
.endif
Modified: trunk/kfreebsd-9/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/902_version.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/902_version.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,6 +1,6 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -132,7 +132,7 @@
+@@ -136,7 +136,7 @@
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
Deleted: trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,180 +0,0 @@
---- a/sys/conf/files.i386
-+++ b/sys/conf/files.i386
-@@ -46,27 +46,6 @@
- no-obj no-implicit-rule before-depend \
- clean "ukbdmap.h"
- #
--nvenetlib.o optional nve pci \
-- dependency "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu" \
-- compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
-- no-implicit-rule
--#
--os+%DIKED-nve.h optional nve pci \
-- dependency "$S/contrib/dev/nve/os.h" \
-- compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
-- no-implicit-rule no-obj before-depend \
-- clean "os+%DIKED-nve.h"
--#
--hptmvraid.o optional hptmv \
-- dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
-- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
-- no-implicit-rule
--#
--hptrr_lib.o optional hptrr \
-- dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
-- compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
-- no-implicit-rule
--#
- compat/linprocfs/linprocfs.c optional linprocfs
- compat/linsysfs/linsysfs.c optional linsysfs
- compat/linux/linux_emul.c optional compat_linux
-@@ -174,14 +153,6 @@
- dev/glxiic/glxiic.c optional glxiic
- dev/glxsb/glxsb.c optional glxsb
- dev/glxsb/glxsb_hash.c optional glxsb
--dev/hptmv/entry.c optional hptmv
--dev/hptmv/mv.c optional hptmv
--dev/hptmv/gui_lib.c optional hptmv
--dev/hptmv/hptproc.c optional hptmv
--dev/hptmv/ioctl.c optional hptmv
--dev/hptrr/hptrr_os_bsd.c optional hptrr
--dev/hptrr/hptrr_osm_bsd.c optional hptrr
--dev/hptrr/hptrr_config.c optional hptrr
- dev/hwpmc/hwpmc_amd.c optional hwpmc
- dev/hwpmc/hwpmc_intel.c optional hwpmc
- dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -214,7 +185,6 @@
- dev/mse/mse.c optional mse
- dev/mse/mse_isa.c optional mse isa
- dev/nfe/if_nfe.c optional nfe pci
--dev/nve/if_nve.c optional nve pci
- dev/nvram/nvram.c optional nvram isa
- dev/pcf/pcf_isa.c optional pcf
- dev/random/nehemiah.c optional random
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
-@@ -132,8 +132,6 @@
- device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
- device ciss # Compaq Smart RAID 5*
- device dpt # DPT Smartcache III, IV - See NOTES for options
--device hptmv # Highpoint RocketRAID 182x
--device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
- device iir # Intel Integrated RAID
- device ips # IBM (Adaptec) ServeRAID
- device mly # Mylex AcceleRAID/eXtremeRAID
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -109,8 +109,6 @@
- hifn \
- hme \
- ${_hptiop} \
-- ${_hptmv} \
-- ${_hptrr} \
- hwpmc \
- ${_i2c} \
- ${_ibcs2} \
-@@ -230,7 +228,6 @@
- ntfs \
- ntfs_iconv \
- nullfs \
-- ${_nve} \
- ${_nvram} \
- ${_nwfs} \
- ${_nxge} \
-@@ -508,8 +505,6 @@
- _dpt= dpt
- _ex= ex
- _hptiop= hptiop
--_hptmv= hptmv
--_hptrr= hptrr
- _ichwd= ichwd
- _ida= ida
- _iir= iir
-@@ -525,7 +520,6 @@
- _ixgbe= ixgbe
- _mly= mly
- _nfe= nfe
--_nve= nve
- _nvram= nvram
- _nxge= nxge
- _tpm= tpm
-@@ -581,8 +575,6 @@
- _exca= exca
- _ext2fs= ext2fs
- _hptiop= hptiop
--_hptmv= hptmv
--_hptrr= hptrr
- _i2c= i2c
- _ichwd= ichwd
- _ida= ida
-@@ -613,7 +605,6 @@
- .endif
- _ndis= ndis
- _nfe= nfe
--_nve= nve
- _nvram= nvram
- _nxge= nxge
- .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -126,8 +126,6 @@
- #device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
- device ciss # Compaq Smart RAID 5*
- device dpt # DPT Smartcache III, IV - See NOTES for options
--device hptmv # Highpoint RocketRAID 182x
--device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
- device iir # Intel Integrated RAID
- device ips # IBM (Adaptec) ServeRAID
- device mly # Mylex AcceleRAID/eXtremeRAID
---- a/sys/conf/files.amd64
-+++ b/sys/conf/files.amd64
-@@ -47,26 +47,6 @@
- no-obj no-implicit-rule before-depend \
- clean "ukbdmap.h"
- #
--nvenetlib.o optional nve pci \
-- dependency "$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu" \
-- compile-with "uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
-- no-implicit-rule
--#
--os+%DIKED-nve.h optional nve pci \
-- dependency "$S/contrib/dev/nve/os.h" \
-- compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
-- no-implicit-rule no-obj before-depend \
-- clean "os+%DIKED-nve.h"
--#
--hptmvraid.o optional hptmv \
-- dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \
-- compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
-- no-implicit-rule
--hptrr_lib.o optional hptrr \
-- dependency "$S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
-- compile-with "uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
-- no-implicit-rule
--#
- amd64/acpica/acpi_machdep.c optional acpi
- amd64/acpica/acpi_switch.S optional acpi
- acpi_wakecode.o optional acpi \
-@@ -187,14 +167,6 @@
- dev/fdc/fdc_acpi.c optional fdc
- dev/fdc/fdc_isa.c optional fdc isa
- dev/fdc/fdc_pccard.c optional fdc pccard
--dev/hptmv/entry.c optional hptmv
--dev/hptmv/mv.c optional hptmv
--dev/hptmv/gui_lib.c optional hptmv
--dev/hptmv/hptproc.c optional hptmv
--dev/hptmv/ioctl.c optional hptmv
--dev/hptrr/hptrr_os_bsd.c optional hptrr
--dev/hptrr/hptrr_osm_bsd.c optional hptrr
--dev/hptrr/hptrr_config.c optional hptrr
- dev/hwpmc/hwpmc_amd.c optional hwpmc
- dev/hwpmc/hwpmc_intel.c optional hwpmc
- dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -206,7 +178,6 @@
- dev/lindev/full.c optional lindev
- dev/lindev/lindev.c optional lindev
- dev/nfe/if_nfe.c optional nfe pci
--dev/nve/if_nve.c optional nve pci
- dev/nvram/nvram.c optional nvram isa
- dev/qlxgb/qla_dbg.c optional qlxgb pci
- dev/qlxgb/qla_hw.c optional qlxgb pci
Modified: trunk/kfreebsd-9/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/904_dev_full.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/904_dev_full.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,10 +1,9 @@
-Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
- /dev/full already rejected in upstream (kern/68961)
+Status: rejected in upstream (kern/68961)
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
-@@ -45,9 +45,11 @@
+@@ -46,9 +46,11 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -14,9 +13,9 @@
static d_write_t null_write;
+static d_write_t full_write;
static d_ioctl_t null_ioctl;
+ static d_ioctl_t zero_ioctl;
static d_read_t zero_read;
-
-@@ -59,6 +61,14 @@
+@@ -61,6 +63,14 @@
.d_name = "null",
};
@@ -31,7 +30,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -78,11 +88,25 @@
+@@ -81,6 +91,15 @@
/* ARGSUSED */
static int
@@ -42,22 +41,12 @@
+ return (ENOSPC);
+}
+
-+#include <sys/filio.h>
+/* ARGSUSED */
+static int
null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
int flags __unused, struct thread *td)
{
- int error;
-
-+ if (cmd == FIONBIO)
-+ return 0;
-+ if ((cmd == FIOASYNC) && ((*(int *)data) == 0))
-+ return 0;
- if (cmd != DIOCSKERNELDUMP)
- return (ENOIOCTL);
- error = priv_check(td, PRIV_SETDUMPER);
-@@ -122,12 +146,15 @@
+@@ -158,12 +177,15 @@
printf("null: <null device, zero device>\n");
null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "null");
Modified: trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -23,7 +23,7 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -55,6 +55,11 @@
+@@ -56,6 +56,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
-@@ -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
Modified: trunk/kfreebsd-9/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/914_psm.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/914_psm.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -26,7 +26,7 @@
};
static devclass_t psm_devclass;
-@@ -1518,7 +1514,6 @@
+@@ -1515,7 +1511,6 @@
sc->mode.level = sc->dflt_mode.level;
sc->mode.protocol = sc->dflt_mode.protocol;
sc->watchdog = FALSE;
@@ -34,7 +34,7 @@
/* flush the event queue */
sc->queue.count = 0;
-@@ -1660,12 +1655,6 @@
+@@ -1657,12 +1652,6 @@
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -47,7 +47,7 @@
/* close is almost always successful */
sc->state &= ~PSM_OPEN;
kbdc_lock(sc->kbdc, FALSE);
-@@ -2227,15 +2216,6 @@
+@@ -2224,15 +2213,6 @@
break;
#endif /* MOUSE_GETHWID */
@@ -63,7 +63,7 @@
default:
return (ENOTTY);
}
-@@ -3502,9 +3482,6 @@
+@@ -3499,9 +3479,6 @@
wakeup(sc);
}
selwakeuppri(&sc->rsel, PZERO);
Modified: trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -154,8 +154,6 @@
+@@ -164,8 +164,6 @@
jme \
joy \
kbdmux \
Modified: trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -8,7 +8,7 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -133,6 +133,8 @@
+@@ -141,6 +141,8 @@
#
# GCC SSP support
#
Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -16,7 +16,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -49,7 +51,7 @@
+@@ -50,7 +52,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -25,7 +25,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -73,7 +75,7 @@
+@@ -74,7 +76,7 @@
options KDB_TRACE # Print a stack trace for a panic
# Make an SMP-capable kernel by default
@@ -34,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -82,9 +84,6 @@
+@@ -83,9 +85,6 @@
device acpi
device pci
@@ -44,15 +44,15 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -111,7 +110,6 @@
+@@ -112,7 +111,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
-device adw # Advansys wide SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-
-@@ -176,10 +174,6 @@
+ device isci # Intel C600 SAS controller
+@@ -182,10 +180,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -63,7 +63,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -190,8 +184,6 @@
+@@ -196,8 +190,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgbe # Intel PRO/10GbE PCIE Ethernet Family
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -72,20 +72,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -201,12 +193,10 @@
- device age # Attansic/Atheros L1 Gigabit Ethernet
- device alc # Atheros AR8131/AR8132 Ethernet
- device ale # Atheros AR8121/AR8113/AR8114 Ethernet
--device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
- device bfe # Broadcom BCM440x 10/100 Ethernet
- device bge # Broadcom BCM570xx Gigabit Ethernet
- device dc # DEC/Intel 21143 and various workalikes
- device et # Agere ET1310 10/100/Gigabit Ethernet
--device fxp # Intel EtherExpress PRO/100B (82557, 82558)
- device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
- device lge # Level 1 LXT1001 gigabit Ethernet
- device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -216,7 +206,6 @@
+@@ -225,7 +217,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -93,7 +80,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -236,7 +225,6 @@
+@@ -245,7 +236,6 @@
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
@@ -101,7 +88,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -256,12 +244,7 @@
+@@ -265,12 +255,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -114,7 +101,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device wpi # Intel 3945ABG wireless NICs.
-@@ -270,11 +253,8 @@
+@@ -279,11 +264,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -126,7 +113,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -290,12 +270,12 @@
+@@ -299,12 +281,12 @@
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices (needs netgraph)
@@ -142,17 +129,11 @@
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -332,10 +312,10 @@
- device dcons # Dumb console driver
- device dcons_crom # Configuration ROM for dcons
-
--# Sound support
--device sound # Generic sound driver (required)
--device snd_es137x # Ensoniq AudioPCI ES137x
--device snd_hda # Intel High Definition Audio
--device snd_ich # Intel, NVidia and other ICH AC'97 Audio
--device snd_uaudio # USB Audio
--device snd_via8233 # VIA VT8233x Audio
+@@ -351,3 +333,11 @@
+ device snd_ich # Intel, NVidia and other ICH AC'97 Audio
+ device snd_uaudio # USB Audio
+ device snd_via8233 # VIA VT8233x Audio
++
+# Alternate queueing
+options ALTQ
+options ALTQ_CBQ # Class Bases Queuing (CBQ)
@@ -190,8 +171,8 @@
+options COMPAT_LINUX # Needed by LINPROCFS
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
- options GEOM_LABEL # Provides labelization
-@@ -50,7 +54,7 @@
+ options GEOM_RAID # Soft RAID functionality.
+@@ -51,7 +55,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -200,7 +181,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -73,7 +77,7 @@
+@@ -74,7 +78,7 @@
options KDB_TRACE # Print a stack trace for a panic
# To make an SMP kernel, the next two lines are needed
@@ -209,7 +190,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -84,9 +88,6 @@
+@@ -85,9 +89,6 @@
device eisa
device pci
@@ -219,7 +200,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -113,7 +114,6 @@
+@@ -114,7 +115,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -227,7 +208,7 @@
device aha # Adaptec 154x SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -186,10 +186,6 @@
+@@ -192,10 +192,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -238,7 +219,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -200,8 +196,6 @@
+@@ -206,8 +202,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -247,20 +228,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -211,12 +205,10 @@
- device age # Attansic/Atheros L1 Gigabit Ethernet
- device alc # Atheros AR8131/AR8132 Ethernet
- device ale # Atheros AR8121/AR8113/AR8114 Ethernet
--device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
- device bfe # Broadcom BCM440x 10/100 Ethernet
- device bge # Broadcom BCM570xx Gigabit Ethernet
- device dc # DEC/Intel 21143 and various workalikes
- device et # Agere ET1310 10/100/Gigabit Ethernet
--device fxp # Intel EtherExpress PRO/100B (82557, 82558)
- device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
- device lge # Level 1 LXT1001 gigabit Ethernet
- device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -226,7 +218,6 @@
+@@ -235,7 +229,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -268,7 +236,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -248,7 +239,6 @@
+@@ -257,7 +250,6 @@
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -276,7 +244,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -268,12 +258,7 @@
+@@ -277,12 +269,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -289,7 +257,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
device wpi # Intel 3945ABG wireless NICs.
-@@ -283,11 +268,8 @@
+@@ -292,11 +279,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -301,7 +269,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -303,12 +285,12 @@
+@@ -312,12 +296,12 @@
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices (needs netgraph)
@@ -317,17 +285,11 @@
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -345,10 +327,10 @@
- device dcons # Dumb console driver
- device dcons_crom # Configuration ROM for dcons
-
--# Sound support
--device sound # Generic sound driver (required)
--device snd_es137x # Ensoniq AudioPCI ES137x
--device snd_hda # Intel High Definition Audio
--device snd_ich # Intel, NVidia and other ICH AC'97 Audio
--device snd_uaudio # USB Audio
--device snd_via8233 # VIA VT8233x Audio
+@@ -364,3 +348,11 @@
+ device snd_ich # Intel, NVidia and other ICH AC'97 Audio
+ device snd_uaudio # USB Audio
+ device snd_via8233 # VIA VT8233x Audio
++
+# Alternate queueing
+options ALTQ
+options ALTQ_CBQ # Class Bases Queuing (CBQ)
@@ -335,3 +297,11 @@
+options ALTQ_RIO # RED In/Out
+options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
+--- /dev/null
++++ b/sys/conf/DEBIAN
+@@ -0,0 +1,5 @@
++
++# Not available yet
++nomakeoptions WITH_CTF
++
++include WITHOUT_SOURCELESS
Deleted: trunk/kfreebsd-9/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_firmware.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/999_firmware.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,242 +0,0 @@
-
-See #594940
-
---- a/sys/modules/drm/Makefile
-+++ b/sys/modules/drm/Makefile
-@@ -4,9 +4,6 @@
- drm \
- i915 \
- mach64 \
-- mga \
-- r128 \
-- radeon \
- savage \
- sis \
- tdfx \
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -37,7 +37,6 @@
- ath \
- ath_pci \
- ${_auxio} \
-- bce \
- bfe \
- bge \
- ${_bxe} \
-@@ -56,7 +55,6 @@
- cc \
- cd9660 \
- cd9660_iconv \
-- ${_ce} \
- ${_ciss} \
- ${_cm} \
- ${_cmx} \
-@@ -64,14 +62,11 @@
- coda5 \
- ${_coff} \
- ${_coretemp} \
-- ${_cp} \
- ${_cpuctl} \
- ${_cpufreq} \
- ${_crypto} \
- ${_cryptodev} \
- ${_cs} \
-- ${_ctau} \
-- ${_cxgb} \
- cxgbe \
- ${_cyclic} \
- dc \
-@@ -94,13 +89,11 @@
- ${_ex} \
- ${_exca} \
- ${_ext2fs} \
-- fatm \
- fdc \
- fdescfs \
- ${_fe} \
- firewire \
- firmware \
-- fxp \
- gem \
- geom \
- ${_glxiic} \
-@@ -141,14 +134,10 @@
- ip_mroute_mod \
- ${_ips} \
- ${_ipw} \
-- ${_ipwfw} \
- iscsi \
- isp \
-- ispfw \
- ${_iwi} \
-- ${_iwifw} \
- ${_iwn} \
-- ${_iwnfw} \
- ${_ixgb} \
- ${_ixgbe} \
- jme \
-@@ -203,7 +192,6 @@
- ${_mthca} \
- mvs \
- mwl \
-- mwlfw \
- mxge \
- my \
- ${_ncp} \
-@@ -252,14 +240,12 @@
- puc \
- ${_qlxgb} \
- ral \
-- ralfw \
- ${_random} \
- rc4 \
- ${_rdma} \
- re \
- reiserfs \
- rl \
-- runfw \
- ${_s3} \
- ${_safe} \
- ${_sbni} \
-@@ -269,7 +255,6 @@
- sdhci \
- sem \
- send \
-- sf \
- ${_sfxge} \
- sge \
- siba_bwn \
-@@ -278,7 +263,6 @@
- sis \
- sk \
- ${_smbfs} \
-- sn \
- ${_snc} \
- snp \
- ${_sound} \
-@@ -293,7 +277,6 @@
- ${_sym} \
- ${_syscons} \
- sysvipc \
-- ti \
- tl \
- tmpfs \
- ${_tpm} \
-@@ -302,7 +285,6 @@
- twe \
- tws \
- tx \
-- txp \
- uart \
- ubsec \
- udf \
-@@ -330,7 +312,6 @@
- wlan_wep \
- wlan_xauth \
- ${_wpi} \
-- ${_wpifw} \
- ${_x86bios} \
- ${_xe} \
- xfs \
---- a/sys/modules/sound/driver/Makefile
-+++ b/sys/modules/sound/driver/Makefile
-@@ -1,7 +1,7 @@
- # $FreeBSD$
-
--SUBDIR= ad1816 als4000 atiixp cs4281 csa ds1 emu10k1 emu10kx
--SUBDIR+= envy24 envy24ht es137x ess fm801 hda ich maestro maestro3
-+SUBDIR= ad1816 als4000 atiixp cs4281 emu10k1 emu10kx
-+SUBDIR+= envy24 envy24ht es137x ess fm801 hda ich maestro
- SUBDIR+= neomagic sb16 sb8 sbc solo spicds t4dwave via8233
- SUBDIR+= via82c686 vibes driver uaudio
-
---- a/sys/modules/usb/Makefile
-+++ b/sys/modules/usb/Makefile
-@@ -27,11 +27,11 @@
-
- SUBDIR = usb
- SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
--SUBDIR += rum run uath upgt usie ural zyd ${_urtw}
-+SUBDIR += run upgt usie ural ${_urtw}
- SUBDIR += atp uhid ukbd ums udbp ufm uep
- SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
- umct umcs umodem umoscom uplcom uslcom uvisor uvscom
--SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth
-+SUBDIR += uether aue axe cdce cue mos rue udav uhso ipheth
- SUBDIR += usfs umass urio
- SUBDIR += quirk template
-
---- /dev/null
-+++ b/sys/conf/DEBIAN
-@@ -0,0 +1,4 @@
-+# Common options to all Debian GNU/kFreeBSD kernels
-+
-+# Disable binary blobs
-+include WITHOUT_SOURCELESS
---- /dev/null
-+++ b/sys/conf/WITHOUT_SOURCELESS
-@@ -0,0 +1,7 @@
-+#
-+# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
-+#
-+# $FreeBSD$
-+
-+include WITHOUT_SOURCELESS_HOST
-+include WITHOUT_SOURCELESS_UCODE
---- /dev/null
-+++ b/sys/conf/WITHOUT_SOURCELESS_HOST
-@@ -0,0 +1,10 @@
-+#
-+# WITHOUT_SOURCELESS_HOST -- Disable drivers that include sourceless
-+# native code for host CPU.
-+#
-+# $FreeBSD$
-+
-+nodevice hpt27xx
-+nodevice hptmv
-+nodevice hptrr
-+nodevice nve
---- /dev/null
-+++ b/sys/conf/WITHOUT_SOURCELESS_UCODE
-@@ -0,0 +1,41 @@
-+#
-+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
-+# microcode.
-+#
-+# $FreeBSD$
-+
-+nodevice adw
-+nodevice bce
-+nodevice fatm
-+nodevice fxp
-+nodevice ispfw
-+nodevice mwlfw
-+nodevice ralfw
-+nodevice runfw
-+nodevice sf
-+nodevice sn
-+nodevice ti
-+nodevice txp
-+nodevice ce
-+nodevice cp
-+nodevice ctau
-+nodevice ipwfw
-+nodevice iwifw
-+nodevice iwnfw
-+nodevice wpifw
-+
-+# drm
-+nodevice mga
-+nodevice r128
-+nodevice radeon
-+
-+# sound
-+nodevice csa
-+nodevice ds1
-+nodevice maestro3
-+
-+# usb
-+nodevice rum
-+nodevice uath
-+nodevice zyd
-+nodevice kue
Deleted: trunk/kfreebsd-9/debian/patches/EN-12_02.ipv6refcount.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/EN-12_02.ipv6refcount.patch 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/EN-12_02.ipv6refcount.patch 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,128 +0,0 @@
-Description:
- Fix reference count errors in IPv6 code. [EN-12:02]
-Origin: vendor, http://security.freebsd.org/patches/EN-12:02/ipv6refcount.patch
-Bug: http://security.freebsd.org/advisories/FreeBSD-EN-12:02.ipv6refcount.asc
-Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=236953
-
---- a/sys/netinet6/in6.c.orig
-+++ b/sys/netinet6/in6.c
-@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa)
- }
-
- cleanup:
-+ if (ifa0 != NULL)
-+ ifa_free(ifa0);
-
- plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
- if ((ia->ia_flags & IFA_ROUTE) && plen == 128) {
-@@ -1393,8 +1395,6 @@ cleanup:
- return;
- ia->ia_flags &= ~IFA_ROUTE;
- }
-- if (ifa0 != NULL)
-- ifa_free(ifa0);
-
- in6_unlink_ifa(ia, ifp);
- }
-@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c
- hostid = IFA_IN6(ifa);
-
- /* prefixlen must be <= 64. */
-- if (64 < iflr->prefixlen)
-+ if (64 < iflr->prefixlen) {
-+ if (ifa != NULL)
-+ ifa_free(ifa);
- return EINVAL;
-+ }
- prefixlen = iflr->prefixlen;
-
- /* hostid part must be zero. */
- sin6 = (struct sockaddr_in6 *)&iflr->addr;
- if (sin6->sin6_addr.s6_addr32[2] != 0 ||
- sin6->sin6_addr.s6_addr32[3] != 0) {
-+ if (ifa != NULL)
-+ ifa_free(ifa);
- return EINVAL;
- }
- } else
-@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr
- IN6_IFADDR_RUNLOCK();
- return (struct in6_ifaddr *)ifa;
- }
-- IN6_IFADDR_RUNLOCK();
-
- /* use the last-resort values, that are, deprecated addresses */
-- if (dep[0])
-+ if (dep[0]) {
-+ ifa_ref((struct ifaddr *)dep[0]);
-+ IN6_IFADDR_RUNLOCK();
- return dep[0];
-- if (dep[1])
-+ }
-+ if (dep[1]) {
-+ ifa_ref((struct ifaddr *)dep[1]);
-+ IN6_IFADDR_RUNLOCK();
- return dep[1];
-+ }
-
-+ IN6_IFADDR_RUNLOCK();
- return NULL;
- }
-
---- a/sys/netinet6/ip6_input.c.orig
-+++ b/sys/netinet6/ip6_input.c
-@@ -879,19 +879,23 @@ passin:
- * as our interface address (e.g. multicast addresses, addresses
- * within FAITH prefixes and such).
- */
-- if (deliverifp && !ip6_getdstifaddr(m)) {
-+ if (deliverifp) {
- struct in6_ifaddr *ia6;
-
-- ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
-- if (ia6) {
-- if (!ip6_setdstifaddr(m, ia6)) {
-- /*
-- * XXX maybe we should drop the packet here,
-- * as we could not provide enough information
-- * to the upper layers.
-- */
-+ if ((ia6 = ip6_getdstifaddr(m)) != NULL) {
-+ ifa_free(&ia6->ia_ifa);
-+ } else {
-+ ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
-+ if (ia6) {
-+ if (!ip6_setdstifaddr(m, ia6)) {
-+ /*
-+ * XXX maybe we should drop the packet here,
-+ * as we could not provide enough information
-+ * to the upper layers.
-+ */
-+ }
-+ ifa_free(&ia6->ia_ifa);
- }
-- ifa_free(&ia6->ia_ifa);
- }
- }
-
---- a/sys/netinet/tcp_input.c.orig
-+++ b/sys/netinet/tcp_input.c
-@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
- (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
- return IPPROTO_DONE;
- }
-+ if (ia6)
-+ ifa_free(&ia6->ia_ifa);
-
- tcp_input(m, *offp);
- return IPPROTO_DONE;
-@@ -1240,7 +1242,8 @@ relocked:
- rstreason = BANDLIM_RST_OPENPORT;
- goto dropwithreset;
- }
-- ifa_free(&ia6->ia_ifa);
-+ if (ia6)
-+ ifa_free(&ia6->ia_ifa);
- }
- #endif /* INET6 */
- /*
Deleted: trunk/kfreebsd-9/debian/patches/SA-12_04.sysret.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-12_04.sysret.patch 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/SA-12_04.sysret.patch 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,32 +0,0 @@
-Description:
- Correct a privilege escalation when returning from kernel if
- running FreeBSD/amd64 on non-AMD processors. [12:04]
-Origin: vendor, http://security.freebsd.org/patches/SA-12:04/sysret.patch
-Bug: http://security.freebsd.org/advisories/FreeBSD-SA-12:04.sysret.asc
-Bug-Debian: http://bugs.debian.org/677298
-Applied-Upstream: http://svnweb.freebsd.org/base/stable/9/sys/amd64/amd64/trap.c?revision=236953&view=markup
-
---- a/sys/amd64/amd64/trap.c.orig
-+++ b/sys/amd64/amd64/trap.c (working copy)
-@@ -972,4 +972,21 @@
- syscallname(td->td_proc, sa.code)));
-
- syscallret(td, error, &sa);
-+
-+ /*
-+ * If the user-supplied value of %rip is not a canonical
-+ * address, then some CPUs will trigger a ring 0 #GP during
-+ * the sysret instruction. However, the fault handler would
-+ * execute with the user's %gs and %rsp in ring 0 which would
-+ * not be safe. Instead, preemptively kill the thread with a
-+ * SIGBUS.
-+ */
-+ if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
-+ ksiginfo_init_trap(&ksi);
-+ ksi.ksi_signo = SIGBUS;
-+ ksi.ksi_code = BUS_OBJERR;
-+ ksi.ksi_trapno = T_PROTFLT;
-+ ksi.ksi_addr = (void *)td->td_frame->tf_rip;
-+ trapsignal(td, &ksi);
-+ }
- }
Deleted: trunk/kfreebsd-9/debian/patches/SA-12_08.linux.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-12_08.linux.patch 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/SA-12_08.linux.patch 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,16 +0,0 @@
-Index: sys/compat/linux/linux_ioctl.c
-===================================================================
---- a/sys/compat/linux/linux_ioctl.c (revision 242578)
-+++ b/sys/compat/linux/linux_ioctl.c (working copy)
-@@ -2260,8 +2260,9 @@ again:
-
- ifc.ifc_len = valid_len;
- sbuf_finish(sb);
-- memcpy(PTRIN(ifc.ifc_buf), sbuf_data(sb), ifc.ifc_len);
-- error = copyout(&ifc, uifc, sizeof(ifc));
-+ error = copyout(sbuf_data(sb), PTRIN(ifc.ifc_buf), ifc.ifc_len);
-+ if (error == 0)
-+ error = copyout(&ifc, uifc, sizeof(ifc));
- sbuf_delete(sb);
- CURVNET_RESTORE();
-
Modified: trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch 2013-07-02 22:52:00 UTC (rev 4673)
@@ -6,11 +6,9 @@
Bug-Debian: http://bugs.debian.org/706414
Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=250060
-Index: kfreebsd-9-9.0/sys/fs/nfsserver/nfs_nfsdport.c
-===================================================================
---- kfreebsd-9-9.0.orig/sys/fs/nfsserver/nfs_nfsdport.c 2013-04-29 22:53:42.000000000 +0100
-+++ kfreebsd-9-9.0/sys/fs/nfsserver/nfs_nfsdport.c 2013-04-29 22:54:00.428787262 +0100
-@@ -1550,6 +1550,8 @@
+--- a/sys/fs/nfsserver/nfs_nfsdport.c
++++ b/sys/fs/nfsserver/nfs_nfsdport.c
+@@ -1574,6 +1574,8 @@
nd->nd_repstat = NFSERR_BAD_COOKIE;
#endif
}
Modified: trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch 2013-07-02 22:52:00 UTC (rev 4673)
@@ -9,11 +9,9 @@
Bug-Debian: http://bugs.debian.org/712664
Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=251902
-Index: kfreebsd-9-9.0/sys/vm/vm_map.c
-===================================================================
---- kfreebsd-9-9.0.orig/sys/vm/vm_map.c 2011-07-06 21:06:44.000000000 +0100
-+++ kfreebsd-9-9.0/sys/vm/vm_map.c 2013-06-18 13:39:13.104790989 +0100
-@@ -3704,6 +3704,12 @@
+--- a/sys/vm/vm_map.c
++++ b/sys/vm/vm_map.c
+@@ -3761,6 +3761,12 @@
vm_map_unlock_read(map);
return (KERN_PROTECTION_FAILURE);
}
Deleted: trunk/kfreebsd-9/debian/patches/amd64_increase_DFLDSIZ.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/amd64_increase_DFLDSIZ.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/amd64_increase_DFLDSIZ.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,21 +0,0 @@
-------------------------------------------------------------------------
-r234743 | rmh | 2012-04-28 00:27:21 +0200 (ds, 28 abr 2012) | 5 lines
-
-Increase DFLDSIZ from 128 MiB to 32 GiB. On amd64 there's plenty of virtual
-memory available, so there is no need to be so conservative about it.
-
-Reviewed by: arch
-
-------------------------------------------------------------------------
-
---- a/sys/amd64/include/vmparam.h
-+++ b/sys/amd64/include/vmparam.h
-@@ -54,7 +54,7 @@
- */
- #define MAXTSIZ (128UL*1024*1024) /* max text size */
- #ifndef DFLDSIZ
--#define DFLDSIZ (128UL*1024*1024) /* initial data size limit */
-+#define DFLDSIZ (32768UL*1024*1024) /* initial data size limit */
- #endif
- #ifndef MAXDSIZ
- #define MAXDSIZ (32768UL*1024*1024) /* max data size */
Added: trunk/kfreebsd-9/debian/patches/disable_ctf.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/disable_ctf.diff (rev 0)
+++ trunk/kfreebsd-9/debian/patches/disable_ctf.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -0,0 +1,52 @@
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -125,7 +125,9 @@
+ @rm -f ${.TARGET}
+ @echo linking ${.TARGET}
+ ${SYSTEM_LD}
++.if ${MK_CTF} != "no"
+ @${SYSTEM_CTFMERGE}
++.endif
+ .if !defined(DEBUG)
+ ${OBJCOPY} --strip-debug ${.TARGET}
+ .endif
+@@ -278,7 +280,9 @@
+
+ config.o env.o hints.o vers.o vnode_if.o:
+ ${NORMAL_C}
++.if ${MK_CTF} != "no"
+ @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
++.endif
+
+ config.ln env.ln hints.ln vers.ln vnode_if.ln:
+ ${NORMAL_LINT}
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -206,7 +206,9 @@
+ ${FULLPROG}: ${OBJS}
+ .endif
+ ${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
++.if ${MK_CTF} != "no"
+ @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
++.endif
+ .if defined(EXPORT_SYMS)
+ .if ${EXPORT_SYMS} != YES
+ .if ${EXPORT_SYMS} == NO
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -131,8 +131,13 @@
+ NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
+ ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
+
+-NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
+- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
++.if ${MK_CTF} != "no"
++NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
++.elif ${MAKE_VERSION} >= 5201111300
++NORMAL_CTFCONVERT=
++.else
++NORMAL_CTFCONVERT= @:
++.endif
+
+ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
+
Deleted: trunk/kfreebsd-9/debian/patches/fix_VOP_VPTOCNP_bypass_for_nullfs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/fix_VOP_VPTOCNP_bypass_for_nullfs.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/fix_VOP_VPTOCNP_bypass_for_nullfs.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,259 +0,0 @@
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
-@@ -1592,7 +1592,7 @@
- *ap->a_buflen -= len;
- bcopy(sep->se_name, ap->a_buf + *ap->a_buflen, len);
- mutex_exit(&sdp->sd_lock);
-- vhold(dvp);
-+ vref(dvp);
- *ap->a_vpp = dvp;
- }
- VN_RELE(dvp);
---- a/sys/fs/devfs/devfs_vnops.c
-+++ b/sys/fs/devfs/devfs_vnops.c
-@@ -261,7 +261,7 @@
- } else if (vp->v_type == VDIR) {
- if (dd == dmp->dm_rootdir) {
- *dvp = vp;
-- vhold(*dvp);
-+ vref(*dvp);
- goto finished;
- }
- i -= dd->de_dirent->d_namlen;
-@@ -289,6 +289,8 @@
- mtx_unlock(&devfs_de_interlock);
- vholdl(*dvp);
- VI_UNLOCK(*dvp);
-+ vref(*dvp);
-+ vdrop(*dvp);
- } else {
- mtx_unlock(&devfs_de_interlock);
- error = ENOENT;
---- a/sys/fs/nullfs/null_vnops.c
-+++ b/sys/fs/nullfs/null_vnops.c
-@@ -784,6 +784,7 @@
- vhold(lvp);
- VOP_UNLOCK(vp, 0); /* vp is held by vn_vptocnp_locked that called us */
- ldvp = lvp;
-+ vref(lvp);
- error = vn_vptocnp(&ldvp, cred, ap->a_buf, ap->a_buflen);
- vdrop(lvp);
- if (error != 0) {
-@@ -797,19 +798,17 @@
- */
- error = vn_lock(ldvp, LK_EXCLUSIVE);
- if (error != 0) {
-+ vrele(ldvp);
- vn_lock(vp, locked | LK_RETRY);
-- vdrop(ldvp);
- return (ENOENT);
- }
- vref(ldvp);
-- vdrop(ldvp);
- error = null_nodeget(vp->v_mount, ldvp, dvp);
- if (error == 0) {
- #ifdef DIAGNOSTIC
- NULLVPTOLOWERVP(*dvp);
- #endif
-- vhold(*dvp);
-- vput(*dvp);
-+ VOP_UNLOCK(*dvp, 0); /* keep reference on *dvp */
- } else
- vput(ldvp);
-
---- a/sys/fs/pseudofs/pseudofs_vnops.c
-+++ b/sys/fs/pseudofs/pseudofs_vnops.c
-@@ -410,8 +410,7 @@
- }
-
- *buflen = i;
-- vhold(*dvp);
-- vput(*dvp);
-+ VOP_UNLOCK(*dvp, 0);
- vn_lock(vp, locked | LK_RETRY);
- vfs_unbusy(mp);
-
---- a/sys/kern/vfs_cache.c
-+++ b/sys/kern/vfs_cache.c
-@@ -1067,16 +1067,8 @@
-
- CACHE_RLOCK();
- error = vn_vptocnp_locked(vp, cred, buf, buflen);
-- if (error == 0) {
-- /*
-- * vn_vptocnp_locked() dropped hold acquired by
-- * VOP_VPTOCNP immediately after locking the
-- * cache. Since we are going to drop the cache rlock,
-- * re-hold the result.
-- */
-- vhold(*vp);
-+ if (error == 0)
- CACHE_RUNLOCK();
-- }
- return (error);
- }
-
-@@ -1095,6 +1087,9 @@
- if (ncp != NULL) {
- if (*buflen < ncp->nc_nlen) {
- CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT((*vp)->v_mount);
-+ vrele(*vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
- numfullpathfail4++;
- error = ENOMEM;
- SDT_PROBE(vfs, namecache, fullpath, return, error,
-@@ -1105,18 +1100,23 @@
- memcpy(buf + *buflen, ncp->nc_name, ncp->nc_nlen);
- SDT_PROBE(vfs, namecache, fullpath, hit, ncp->nc_dvp,
- ncp->nc_name, vp, 0, 0);
-+ dvp = *vp;
- *vp = ncp->nc_dvp;
-+ vref(*vp);
-+ CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(dvp->v_mount);
-+ vrele(dvp);
-+ VFS_UNLOCK_GIANT(vfslocked);
-+ CACHE_RLOCK();
- return (0);
- }
- SDT_PROBE(vfs, namecache, fullpath, miss, vp, 0, 0, 0, 0);
-
-- vhold(*vp);
- CACHE_RUNLOCK();
- vfslocked = VFS_LOCK_GIANT((*vp)->v_mount);
- vn_lock(*vp, LK_SHARED | LK_RETRY);
- error = VOP_VPTOCNP(*vp, &dvp, cred, buf, buflen);
-- VOP_UNLOCK(*vp, 0);
-- vdrop(*vp);
-+ vput(*vp);
- VFS_UNLOCK_GIANT(vfslocked);
- if (error) {
- numfullpathfail2++;
-@@ -1127,16 +1127,20 @@
-
- *vp = dvp;
- CACHE_RLOCK();
-- if ((*vp)->v_iflag & VI_DOOMED) {
-+ if (dvp->v_iflag & VI_DOOMED) {
- /* forced unmount */
- CACHE_RUNLOCK();
-- vdrop(*vp);
-+ vfslocked = VFS_LOCK_GIANT(dvp->v_mount);
-+ vrele(dvp);
-+ VFS_UNLOCK_GIANT(vfslocked);
- error = ENOENT;
- SDT_PROBE(vfs, namecache, fullpath, return, error, vp,
- NULL, 0, 0);
- return (error);
- }
-- vdrop(*vp);
-+ /*
-+ * *vp has its use count incremented still.
-+ */
-
- return (0);
- }
-@@ -1148,10 +1152,11 @@
- vn_fullpath1(struct thread *td, struct vnode *vp, struct vnode *rdir,
- char *buf, char **retbuf, u_int buflen)
- {
-- int error, slash_prefixed;
-+ int error, slash_prefixed, vfslocked;
- #ifdef KDTRACE_HOOKS
- struct vnode *startvp = vp;
- #endif
-+ struct vnode *vp1;
-
- buflen--;
- buf[buflen] = '\0';
-@@ -1160,6 +1165,7 @@
-
- SDT_PROBE(vfs, namecache, fullpath, entry, vp, 0, 0, 0, 0);
- numfullpathcalls++;
-+ vref(vp);
- CACHE_RLOCK();
- if (vp->v_type != VDIR) {
- error = vn_vptocnp_locked(&vp, td->td_ucred, buf, &buflen);
-@@ -1167,6 +1173,9 @@
- return (error);
- if (buflen == 0) {
- CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+ vrele(vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
- return (ENOMEM);
- }
- buf[--buflen] = '/';
-@@ -1176,16 +1185,29 @@
- if (vp->v_vflag & VV_ROOT) {
- if (vp->v_iflag & VI_DOOMED) { /* forced unmount */
- CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+ vrele(vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
- error = ENOENT;
- SDT_PROBE(vfs, namecache, fullpath, return,
- error, vp, NULL, 0, 0);
- break;
- }
-- vp = vp->v_mount->mnt_vnodecovered;
-+ vp1 = vp->v_mount->mnt_vnodecovered;
-+ vref(vp1);
-+ CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+ vrele(vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
-+ vp = vp1;
-+ CACHE_RLOCK();
- continue;
- }
- if (vp->v_type != VDIR) {
- CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+ vrele(vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
- numfullpathfail1++;
- error = ENOTDIR;
- SDT_PROBE(vfs, namecache, fullpath, return,
-@@ -1197,6 +1219,9 @@
- break;
- if (buflen == 0) {
- CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+ vrele(vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
- error = ENOMEM;
- SDT_PROBE(vfs, namecache, fullpath, return, error,
- startvp, NULL, 0, 0);
-@@ -1210,6 +1235,9 @@
- if (!slash_prefixed) {
- if (buflen == 0) {
- CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+ vrele(vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
- numfullpathfail4++;
- SDT_PROBE(vfs, namecache, fullpath, return, ENOMEM,
- startvp, NULL, 0, 0);
-@@ -1219,6 +1247,9 @@
- }
- numfullpathfound++;
- CACHE_RUNLOCK();
-+ vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-+ vrele(vp);
-+ VFS_UNLOCK_GIANT(vfslocked);
-
- SDT_PROBE(vfs, namecache, fullpath, return, 0, startvp, buf + buflen,
- 0, 0);
---- a/sys/kern/vfs_default.c
-+++ b/sys/kern/vfs_default.c
-@@ -843,7 +843,7 @@
- free(dirbuf, M_TEMP);
- if (!error) {
- *buflen = i;
-- vhold(*dvp);
-+ vref(*dvp);
- }
- if (covered) {
- vput(*dvp);
Deleted: trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,21 +0,0 @@
-
-Cherry-pick from 9-STABLE (SVN rev 233769).
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666747
-http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/155411
-
---- a/sys/fs/tmpfs/tmpfs.h
-+++ b/sys/fs/tmpfs/tmpfs.h
-@@ -502,11 +502,8 @@
- static __inline size_t
- tmpfs_mem_info(void)
- {
-- size_t size;
-
-- size = swap_pager_avail + cnt.v_free_count + cnt.v_inactive_count;
-- size -= size > cnt.v_wire_count ? cnt.v_wire_count : size;
-- return size;
-+ return (swap_pager_avail + cnt.v_free_count + cnt.v_cache_count);
- }
-
- /* Returns the maximum size allowed for a tmpfs file system. This macro
Deleted: trunk/kfreebsd-9/debian/patches/pf_counter_initialization_SVN236364.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/pf_counter_initialization_SVN236364.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/pf_counter_initialization_SVN236364.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,55 +0,0 @@
-Index: kfreebsd-9-9.0/sys/contrib/pf/net/pf_ioctl.c
-===================================================================
---- kfreebsd-9-9.0.orig/sys/contrib/pf/net/pf_ioctl.c 2011-10-26 19:09:09.000000000 +0200
-+++ kfreebsd-9-9.0/sys/contrib/pf/net/pf_ioctl.c 2012-09-19 01:17:56.000000000 +0200
-@@ -308,7 +308,7 @@
- V_pf_altq_pl = V_pf_pooladdr_pl = NULL;
- V_pf_frent_pl = V_pf_frag_pl = V_pf_cache_pl = V_pf_cent_pl = NULL;
- V_pf_state_scrub_pl = NULL;
-- V_pfr_ktable_pl = V_pfr_kentry_pl = NULL;
-+ V_pfr_ktable_pl = V_pfr_kentry_pl = V_pfr_kcounters_pl = NULL;
- }
-
- void
-@@ -327,6 +327,7 @@
- UMA_DESTROY(V_pf_cent_pl);
- UMA_DESTROY(V_pfr_ktable_pl);
- UMA_DESTROY(V_pfr_kentry_pl);
-+ UMA_DESTROY(V_pfr_kcounters_pl);
- UMA_DESTROY(V_pf_state_scrub_pl);
- UMA_DESTROY(V_pfi_addr_pl);
- }
-@@ -347,6 +348,7 @@
- UMA_CREATE(V_pf_pooladdr_pl, struct pf_pooladdr, "pfpooladdrpl");
- UMA_CREATE(V_pfr_ktable_pl, struct pfr_ktable, "pfrktable");
- UMA_CREATE(V_pfr_kentry_pl, struct pfr_kentry, "pfrkentry");
-+ UMA_CREATE(V_pfr_kcounters_pl, struct pfr_kcounters, "pfrkcounters");
- UMA_CREATE(V_pf_frent_pl, struct pf_frent, "pffrent");
- UMA_CREATE(V_pf_frag_pl, struct pf_fragment, "pffrag");
- UMA_CREATE(V_pf_cache_pl, struct pf_fragment, "pffrcache");
-Index: kfreebsd-9-9.0/sys/contrib/pf/net/pfvar.h
-===================================================================
---- kfreebsd-9-9.0.orig/sys/contrib/pf/net/pfvar.h 2011-10-26 19:09:09.000000000 +0200
-+++ kfreebsd-9-9.0/sys/contrib/pf/net/pfvar.h 2012-09-19 01:17:56.000000000 +0200
-@@ -1871,6 +1871,8 @@
- #define V_pfr_ktable_pl VNET(pfr_ktable_pl)
- VNET_DECLARE(uma_zone_t, pfr_kentry_pl);
- #define V_pfr_kentry_pl VNET(pfr_kentry_pl)
-+VNET_DECLARE(uma_zone_t, pfr_kcounters_pl);
-+#define V_pfr_kcounters_pl VNET(pfr_kcounters_pl)
- VNET_DECLARE(uma_zone_t, pf_cache_pl);
- #define V_pf_cache_pl VNET(pf_cache_pl)
- VNET_DECLARE(uma_zone_t, pf_cent_pl);
-Index: kfreebsd-9-9.0/sys/contrib/pf/net/pf_table.c
-===================================================================
---- kfreebsd-9-9.0.orig/sys/contrib/pf/net/pf_table.c 2011-10-26 19:09:09.000000000 +0200
-+++ kfreebsd-9-9.0/sys/contrib/pf/net/pf_table.c 2012-09-19 01:17:56.000000000 +0200
-@@ -179,7 +179,6 @@
- VNET_DEFINE(uma_zone_t, pfr_ktable_pl);
- VNET_DEFINE(uma_zone_t, pfr_kentry_pl);
- VNET_DEFINE(uma_zone_t, pfr_kcounters_pl);
--#define V_pfr_kcounters_pl VNET(pfr_kcounters_pl)
- VNET_DEFINE(struct sockaddr_in, pfr_sin);
- #define V_pfr_sin VNET(pfr_sin)
- VNET_DEFINE(struct sockaddr_in6, pfr_sin6);
-
Deleted: trunk/kfreebsd-9/debian/patches/remove_tmpfs_warning.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/remove_tmpfs_warning.diff 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/remove_tmpfs_warning.diff 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,15 +0,0 @@
-
-From upstream HEAD (SVN rev 227310).
-
---- a/sys/fs/tmpfs/tmpfs_vfsops.c
-+++ b/sys/fs/tmpfs/tmpfs_vfsops.c
-@@ -156,9 +156,6 @@
- return EOPNOTSUPP;
- }
-
-- printf("WARNING: TMPFS is considered to be a highly experimental "
-- "feature in FreeBSD.\n");
--
- vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY);
- error = VOP_GETATTR(mp->mnt_vnodecovered, &va, mp->mnt_cred);
- VOP_UNLOCK(mp->mnt_vnodecovered, 0);
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/series 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,17 +1,9 @@
# Patches from (or merged in) upstream
-improve_tmpfs_mem_info.diff
-remove_tmpfs_warning.diff
-amd64_increase_DFLDSIZ.diff
-SA-12_04.sysret.patch
-EN-12_02.ipv6refcount.patch
-fix_VOP_VPTOCNP_bypass_for_nullfs.diff
-pf_counter_initialization_SVN236364.diff
-svn239447_SCTP_DoS.patch
-SA-12_08.linux.patch
SA-13_05.nfsserver.patch
SA-13_06.mmap.patch
# Other patches that might or might not be mergeable
+disable_ctf.diff
001_misc.diff
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
@@ -20,17 +12,14 @@
006_mips_i8259_alloc.diff
#007_clone_signals.diff
#009_disable_duped_modules.diff
-101_nullfs_vsock.diff
107_mount_update.diff
108_teken_utf8_table.diff
109_linprocfs_non_x86.diff
110_disable_trampoline_flavour.diff
-201_pseudofs.diff
# Patches that are likely to be Debian-specific
901_disable_optimization_2.diff
902_version.diff
-903_disable_non-free_drivers.diff
904_dev_full.diff
906_grow_sysv_ipc_limits.diff
908_linprocfs_is_not_proc.diff
@@ -44,4 +33,3 @@
919_delete_key.diff
950_no_stack_protector.diff
999_config.diff
-999_firmware.diff
Deleted: trunk/kfreebsd-9/debian/patches/svn239447_SCTP_DoS.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/svn239447_SCTP_DoS.patch 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/patches/svn239447_SCTP_DoS.patch 2013-07-02 22:52:00 UTC (rev 4673)
@@ -1,22 +0,0 @@
-Description:
- Fix a bug reported by Simon L. B. Nielsen:
- .
- If an SCTP endpoint receives an ASCONF with a wildcard
- lookup address and incorrect verification tag, the system
- crashes.
- .
- This bug was found by Shaun Colley.
-Origin: upstream, http://svnweb.freebsd.org/base?view=revision&revision=239447
-Bug-Debian: http://bugs.debian.org/686962
-
---- kfreebsd-9-9.0.orig/sys/netinet/sctp_pcb.c 2011-11-24 17:58:14.000000000 +0000
-+++ kfreebsd-9-9.0/sys/netinet/sctp_pcb.c 2012-09-30 17:13:51.837771919 +0100
-@@ -2073,8 +2073,6 @@
- struct sctp_nets *net;
- struct sctp_tcb *stcb;
-
-- *netp = NULL;
-- *inp_p = NULL;
- SCTP_INP_INFO_RLOCK();
- head = &SCTP_BASE_INFO(sctp_asochash)[SCTP_PCBHASH_ASOC(vtag,
- SCTP_BASE_INFO(hashasocmark))];
Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules 2013-07-02 15:05:38 UTC (rev 4672)
+++ trunk/kfreebsd-9/debian/rules 2013-07-02 22:52:00 UTC (rev 4673)
@@ -20,7 +20,7 @@
config_files := $(wildcard debian/arch/$(cpu)/*.config)
flavours := $(config_files:debian/arch/$(cpu)/%.config=%)
configfile := DEBCUSTOM
-abiname := 2
+abiname := 1
ld_target := $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
gcc_version := 4.6
@@ -46,6 +46,12 @@
MAKE := make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-$(gcc_version) WERROR=
PATH := $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
+MAKE += -DWITHOUT_SOURCELESS
+
+MAKE += -DWITHOUT_CLANG_IS_CC
+
+MAKE += -DWITHOUT_CTF
+
# Disable install of *.ko.symbols files (their presence would trigger an
# "unstripped-binary-or-object" lintian error).
MAKE += -DWITHOUT_KERNEL_SYMBOLS
More information about the Glibc-bsd-commits
mailing list