[Glibc-bsd-commits] r4794 - in trunk/kfreebsd-9/debian: . patches
Robert Millan
rmh at alioth.debian.org
Mon Jul 22 22:10:01 UTC 2013
Author: rmh
Date: 2013-07-22 22:10:01 +0000 (Mon, 22 Jul 2013)
New Revision: 4794
Added:
trunk/kfreebsd-9/debian/patches/922_cc_version.diff
trunk/kfreebsd-9/debian/patches/cxgbe.diff
Removed:
trunk/kfreebsd-9/debian/patches/000_cpuclockid2_zombie.diff
trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch
trunk/kfreebsd-9/debian/patches/disable_ctf.diff
Modified:
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/000_cpuclockid2_compat32.diff
trunk/kfreebsd-9/debian/patches/000_cpuclockid2_syscall.diff
trunk/kfreebsd-9/debian/patches/001_misc.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/111_ldd_load_address.diff
trunk/kfreebsd-9/debian/patches/902_version.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/918_unix_socket_overflow.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_06.mmap.patch
trunk/kfreebsd-9/debian/patches/series
trunk/kfreebsd-9/debian/rules
Log:
* New upstream release (svn253470 == 9.2-BETA1).
- Refresh all patches.
- Cherry-pick cxgbe.diff and 922_cc_version.diff from kfreebsd-10.
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/changelog 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,3 +1,11 @@
+kfreebsd-9 (9.2~svn253470-1) experimental; urgency=low
+
+ * New upstream release (svn253470 == 9.2-BETA1).
+ - Refresh all patches.
+ - Cherry-pick cxgbe.diff and 922_cc_version.diff from kfreebsd-10.
+
+ -- Robert Millan <rmh at debian.org> Mon, 22 Jul 2013 23:25:07 +0200
+
kfreebsd-9 (9.1-3) unstable; urgency=low
* Reupload.
Modified: trunk/kfreebsd-9/debian/patches/000_cpuclockid2_compat32.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/000_cpuclockid2_compat32.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/000_cpuclockid2_compat32.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -5,7 +5,7 @@
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
-@@ -2332,6 +2332,20 @@ freebsd32_clock_getres(struct thread *td,
+@@ -2319,6 +2319,20 @@
}
int
@@ -28,7 +28,7 @@
{
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
-@@ -457,8 +457,9 @@
+@@ -455,8 +455,9 @@
244 AUE_NULL UNIMPL nosys
245 AUE_NULL UNIMPL nosys
246 AUE_NULL UNIMPL nosys
@@ -42,7 +42,7 @@
; syscall numbers initially used in OpenBSD
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
-@@ -183,38 +183,46 @@ int
+@@ -182,38 +182,46 @@
sys_clock_getcpuclockid2(struct thread *td, struct clock_getcpuclockid2_args *uap)
{
clockid_t clk_id;
@@ -105,7 +105,7 @@
#ifndef _SYS_SYSPROTO_H_
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
-@@ -76,6 +76,8 @@ int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg,
+@@ -74,6 +74,8 @@
int mode);
int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid,
int gid);
@@ -129,7 +129,7 @@
struct freebsd32_aio_read_args {
char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)];
};
-@@ -625,6 +631,7 @@
+@@ -664,6 +670,7 @@
int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *);
int freebsd32_clock_getres(struct thread *, struct freebsd32_clock_getres_args *);
int freebsd32_nanosleep(struct thread *, struct freebsd32_nanosleep_args *);
@@ -137,7 +137,7 @@
int freebsd32_aio_read(struct thread *, struct freebsd32_aio_read_args *);
int freebsd32_aio_write(struct thread *, struct freebsd32_aio_write_args *);
int freebsd32_lio_listio(struct thread *, struct freebsd32_lio_listio_args *);
-@@ -1003,6 +1010,7 @@
+@@ -1061,6 +1068,7 @@
#define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME
#define FREEBSD32_SYS_AUE_freebsd32_clock_getres AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_nanosleep AUE_NULL
@@ -145,8 +145,8 @@
#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_NULL
---- a/sys/compat/freebsd32/freebsd32_syscall.h 2013-07-19 20:16:58.000000000 +0200
-+++ b/sys/compat/freebsd32/freebsd32_syscall.h 2013-07-19 20:18:38.000000000 +0200
+--- a/sys/compat/freebsd32/freebsd32_syscall.h
++++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -207,7 +207,7 @@
#define FREEBSD32_SYS_freebsd32_clock_settime 233
#define FREEBSD32_SYS_freebsd32_clock_getres 234
@@ -201,7 +201,7 @@
break;
}
/* minherit */
-@@ -4949,16 +4950,19 @@
+@@ -5004,16 +5005,19 @@
break;
};
break;
Modified: trunk/kfreebsd-9/debian/patches/000_cpuclockid2_syscall.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/000_cpuclockid2_syscall.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/000_cpuclockid2_syscall.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -14,7 +14,7 @@
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
-@@ -453,7 +453,8 @@
+@@ -455,7 +455,8 @@
244 AUE_NULL UNIMPL nosys
245 AUE_NULL UNIMPL nosys
246 AUE_NULL UNIMPL nosys
@@ -42,7 +42,7 @@
/* minherit */
case 250: {
struct minherit_args *p = params;
-@@ -4938,6 +4947,22 @@
+@@ -4993,6 +5002,22 @@
break;
default:
break;
@@ -161,7 +161,7 @@
struct ntp_gettime_args {
char ntvp_l_[PADL_(struct ntptimeval *)]; struct ntptimeval * ntvp; char ntvp_r_[PADR_(struct ntptimeval *)];
};
-@@ -1894,6 +1899,7 @@
+@@ -1902,6 +1907,7 @@
int sys_ktimer_gettime(struct thread *, struct ktimer_gettime_args *);
int sys_ktimer_getoverrun(struct thread *, struct ktimer_getoverrun_args *);
int sys_nanosleep(struct thread *, struct nanosleep_args *);
@@ -169,7 +169,7 @@
int sys_ntp_gettime(struct thread *, struct ntp_gettime_args *);
int sys_minherit(struct thread *, struct minherit_args *);
int sys_rfork(struct thread *, struct rfork_args *);
-@@ -2581,6 +2587,7 @@
+@@ -2590,6 +2596,7 @@
#define SYS_AUE_ktimer_gettime AUE_NULL
#define SYS_AUE_ktimer_getoverrun AUE_NULL
#define SYS_AUE_nanosleep AUE_NULL
@@ -406,7 +406,7 @@
{ AS(minherit_args), (sy_call_t *)sys_minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 250 = minherit */
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
-@@ -462,7 +462,8 @@
+@@ -461,7 +461,8 @@
244 AUE_NULL UNIMPL nosys
245 AUE_NULL UNIMPL nosys
246 AUE_NULL UNIMPL nosys
@@ -434,7 +434,7 @@
/* ntp_gettime */
case 248: {
struct ntp_gettime_args *p = params;
-@@ -5379,6 +5388,22 @@
+@@ -5391,6 +5400,22 @@
break;
default:
break;
Deleted: trunk/kfreebsd-9/debian/patches/000_cpuclockid2_zombie.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/000_cpuclockid2_zombie.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/000_cpuclockid2_zombie.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,200 +0,0 @@
-apply patch from STABLE-9 branch
-enhances clock_getcpuclockid2 patch
-
-------------------------------------------------------------------------
-r243962 | kib | 2012-12-07 02:13:07 +0100 (Fri, 07 Dec 2012) | 11 lines
-
-MFC r243142:
-In pget(9), if PGET_NOTWEXIT flag is not specified, also search the
-zombie list for the pid. This allows several kern.proc sysctls to
-report useful information for zombies.
-
-Hold the allproc_lock around all searches instead of relocking it.
-Remove private pfind_locked() from the new nfs client code.
-
-MFC r243528 (by pjd):
-Look for zombie process only if we were given process id.
-
---- a/sys/fs/nfsclient/nfs_clport.c (revision 243961)
-+++ b/sys/fs/nfsclient/nfs_clport.c (revision 243962)
-@@ -1150,31 +1150,6 @@
- }
-
- /*
-- * Locate a process by number; return only "live" processes -- i.e., neither
-- * zombies nor newly born but incompletely initialized processes. By not
-- * returning processes in the PRS_NEW state, we allow callers to avoid
-- * testing for that condition to avoid dereferencing p_ucred, et al.
-- * Identical to pfind() in kern_proc.c, except it assume the list is
-- * already locked.
-- */
--static struct proc *
--pfind_locked(pid_t pid)
--{
-- struct proc *p;
--
-- LIST_FOREACH(p, PIDHASH(pid), p_hash)
-- if (p->p_pid == pid) {
-- PROC_LOCK(p);
-- if (p->p_state == PRS_NEW) {
-- PROC_UNLOCK(p);
-- p = NULL;
-- }
-- break;
-- }
-- return (p);
--}
--
--/*
- * Check to see if the process for this owner exists. Return 1 if it doesn't
- * and 0 otherwise.
- */
-
---- a/sys/sys/proc.h (revision 243961)
-+++ b/sys/sys/proc.h (revision 243962)
-@@ -835,6 +835,7 @@
- extern struct uma_zone *proc_zone;
-
- struct proc *pfind(pid_t); /* Find process by id. */
-+struct proc *pfind_locked(pid_t pid);
- struct pgrp *pgfind(pid_t); /* Find process group by id. */
- struct proc *zpfind(pid_t); /* Find zombie process by id. */
-
---- a/sys/kern/kern_proc.c (revision 243961)
-+++ b/sys/kern/kern_proc.c (revision 243962)
-@@ -137,6 +137,7 @@
- static int proc_init(void *mem, int size, int flags);
- static void proc_fini(void *mem, int size);
- static void pargs_free(struct pargs *pa);
-+static struct proc *zpfind_locked(pid_t pid);
-
- /*
- * Other process lists
-@@ -284,20 +285,13 @@
- return (1);
- }
-
--/*
-- * Locate a process by number; return only "live" processes -- i.e., neither
-- * zombies nor newly born but incompletely initialized processes. By not
-- * returning processes in the PRS_NEW state, we allow callers to avoid
-- * testing for that condition to avoid dereferencing p_ucred, et al.
-- */
- struct proc *
--pfind(pid)
-- register pid_t pid;
-+pfind_locked(pid_t pid)
- {
-- register struct proc *p;
-+ struct proc *p;
-
-- sx_slock(&allproc_lock);
-- LIST_FOREACH(p, PIDHASH(pid), p_hash)
-+ sx_assert(&allproc_lock, SX_LOCKED);
-+ LIST_FOREACH(p, PIDHASH(pid), p_hash) {
- if (p->p_pid == pid) {
- PROC_LOCK(p);
- if (p->p_state == PRS_NEW) {
-@@ -306,17 +300,34 @@
- }
- break;
- }
-+ }
-+ return (p);
-+}
-+
-+/*
-+ * Locate a process by number; return only "live" processes -- i.e., neither
-+ * zombies nor newly born but incompletely initialized processes. By not
-+ * returning processes in the PRS_NEW state, we allow callers to avoid
-+ * testing for that condition to avoid dereferencing p_ucred, et al.
-+ */
-+struct proc *
-+pfind(pid_t pid)
-+{
-+ struct proc *p;
-+
-+ sx_slock(&allproc_lock);
-+ p = pfind_locked(pid);
- sx_sunlock(&allproc_lock);
- return (p);
- }
-
- static struct proc *
--pfind_tid(pid_t tid)
-+pfind_tid_locked(pid_t tid)
- {
- struct proc *p;
- struct thread *td;
-
-- sx_slock(&allproc_lock);
-+ sx_assert(&allproc_lock, SX_LOCKED);
- FOREACH_PROC_IN_SYSTEM(p) {
- PROC_LOCK(p);
- if (p->p_state == PRS_NEW) {
-@@ -330,7 +341,6 @@
- PROC_UNLOCK(p);
- }
- found:
-- sx_sunlock(&allproc_lock);
- return (p);
- }
-
-@@ -364,12 +374,17 @@
- struct proc *p;
- int error;
-
-- if (pid <= PID_MAX)
-- p = pfind(pid);
-- else if ((flags & PGET_NOTID) == 0)
-- p = pfind_tid(pid);
-- else
-+ sx_slock(&allproc_lock);
-+ if (pid <= PID_MAX) {
-+ p = pfind_locked(pid);
-+ if (p == NULL && (flags & PGET_NOTWEXIT) == 0)
-+ p = zpfind_locked(pid);
-+ } else if ((flags & PGET_NOTID) == 0) {
-+ p = pfind_tid_locked(pid);
-+ } else {
- p = NULL;
-+ }
-+ sx_sunlock(&allproc_lock);
- if (p == NULL)
- return (ESRCH);
- if ((flags & PGET_CANSEE) != 0) {
-@@ -1046,6 +1061,21 @@
- free(ps, M_SUBPROC);
- }
-
-+static struct proc *
-+zpfind_locked(pid_t pid)
-+{
-+ struct proc *p;
-+
-+ sx_assert(&allproc_lock, SX_LOCKED);
-+ LIST_FOREACH(p, &zombproc, p_list) {
-+ if (p->p_pid == pid) {
-+ PROC_LOCK(p);
-+ break;
-+ }
-+ }
-+ return (p);
-+}
-+
- /*
- * Locate a zombie process by number
- */
-@@ -1055,11 +1085,7 @@
- struct proc *p;
-
- sx_slock(&allproc_lock);
-- LIST_FOREACH(p, &zombproc, p_list)
-- if (p->p_pid == pid) {
-- PROC_LOCK(p);
-- break;
-- }
-+ p = zpfind_locked(pid);
- sx_sunlock(&allproc_lock);
- return (p);
- }
Modified: trunk/kfreebsd-9/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/001_misc.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/001_misc.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -12,10 +12,10 @@
-Wmissing-include-dirs -fdiagnostics-show-option \
${CWARNEXTRA}
#
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
- .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
+ .if ${COMPILER_TYPE} != "clang"
-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
+CFLAGS+= -mpreferred-stack-boundary=2
.else
Modified: trunk/kfreebsd-9/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/004_xargs.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/004_xargs.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -6,7 +6,7 @@
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -219,7 +219,7 @@
+@@ -215,7 +215,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-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/005_linux_cflags.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -3,7 +3,7 @@
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
-@@ -428,7 +428,7 @@
+@@ -444,7 +444,7 @@
#endif
/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
Modified: trunk/kfreebsd-9/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/107_mount_update.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/107_mount_update.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -5,7 +5,7 @@
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
-@@ -650,6 +650,24 @@
+@@ -652,6 +652,24 @@
}
/*
Modified: trunk/kfreebsd-9/debian/patches/111_ldd_load_address.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/111_ldd_load_address.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/111_ldd_load_address.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -3,7 +3,7 @@
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
-@@ -795,7 +795,14 @@
+@@ -798,7 +798,14 @@
* non-zero for some reason.
*/
if (baddr == 0)
Modified: trunk/kfreebsd-9/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/902_version.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/902_version.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,6 +1,6 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -136,7 +136,7 @@
+@@ -137,7 +137,7 @@
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
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-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -23,7 +23,7 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -56,6 +56,11 @@
+@@ -59,6 +59,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 @@
+@@ -60,6 +60,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-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/914_psm.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -18,7 +18,7 @@
#include <sys/syslog.h>
#include <machine/bus.h>
#include <sys/rman.h>
-@@ -297,7 +294,6 @@
+@@ -335,7 +332,6 @@
struct cdev *bdev;
int lasterr;
int cmdcount;
@@ -26,7 +26,7 @@
};
static devclass_t psm_devclass;
-@@ -1515,7 +1511,6 @@
+@@ -1562,7 +1558,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;
-@@ -1657,12 +1652,6 @@
+@@ -1704,12 +1699,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);
-@@ -2224,15 +2213,6 @@
+@@ -2271,15 +2260,6 @@
break;
#endif /* MOUSE_GETHWID */
@@ -63,7 +63,7 @@
default:
return (ENOTTY);
}
-@@ -3499,9 +3479,6 @@
+@@ -3547,9 +3527,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-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -164,8 +164,6 @@
+@@ -166,8 +166,6 @@
jme \
joy \
kbdmux \
Modified: trunk/kfreebsd-9/debian/patches/918_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/918_unix_socket_overflow.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/918_unix_socket_overflow.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -5,7 +5,7 @@
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
-@@ -463,7 +463,12 @@
+@@ -465,7 +465,12 @@
KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
if (soun->sun_len > sizeof(struct sockaddr_un))
@@ -18,7 +18,7 @@
namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
if (namelen <= 0)
return (EINVAL);
-@@ -1255,7 +1260,12 @@
+@@ -1257,7 +1262,12 @@
KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
if (nam->sa_len > sizeof(struct sockaddr_un))
Added: trunk/kfreebsd-9/debian/patches/922_cc_version.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/922_cc_version.diff (rev 0)
+++ trunk/kfreebsd-9/debian/patches/922_cc_version.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -0,0 +1,14 @@
+Ensure we don't accidentally match lines with 'version' as a substring in
+some other term (such as a compiler flag) when grepping for the compiler
+version.
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -86,7 +86,7 @@
+ touch version
+ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
+ i=`${MAKE:-make} -V KERN_IDENT`
+-compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
++compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
+
+ for dir in /bin /usr/bin /usr/local/bin; do
+ if [ -x "${dir}/svnversion" ] ; then
Modified: trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -8,7 +8,7 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -141,6 +141,8 @@
+@@ -142,6 +142,8 @@
#
# GCC SSP support
#
@@ -19,7 +19,7 @@
CFLAGS+= -fstack-protector
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -141,6 +141,9 @@
+@@ -137,6 +137,9 @@
CTFFLAGS+= -g
.endif
Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,6 +1,6 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -18,10 +18,12 @@
+@@ -18,11 +18,11 @@
#
# $FreeBSD$
@@ -10,13 +10,13 @@
+#ident GENERIC
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-+hints "GENERIC.hints" # Default places to look for devices.
-+
+-makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -50,7 +52,7 @@
+@@ -53,7 +53,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -25,8 +25,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -74,7 +76,7 @@
- options KDB_TRACE # Print a stack trace for a panic
+@@ -78,7 +78,7 @@
+ options DDB_CTF # kernel ELF linker loads CTF data
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -34,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -83,9 +85,6 @@
+@@ -87,9 +87,6 @@
device acpi
device pci
@@ -44,7 +44,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -112,7 +111,6 @@
+@@ -116,7 +113,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -52,7 +52,7 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
device isci # Intel C600 SAS controller
-@@ -182,10 +180,6 @@
+@@ -189,10 +185,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
-@@ -196,8 +190,6 @@
+@@ -203,8 +195,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,7 +72,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -225,7 +217,6 @@
+@@ -232,7 +222,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -80,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
-@@ -245,7 +236,6 @@
+@@ -252,7 +241,6 @@
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
@@ -88,7 +88,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -265,12 +255,7 @@
+@@ -272,12 +260,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -101,8 +101,8 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device wpi # Intel 3945ABG wireless NICs.
-@@ -279,11 +264,8 @@
- device random # Entropy device
+@@ -288,11 +271,8 @@
+ options RDRAND_RNG # Intel Bull Mountain RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
-device tun # Packet tunnel.
@@ -113,7 +113,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -299,12 +281,12 @@
+@@ -308,12 +288,12 @@
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices (needs netgraph)
@@ -129,21 +129,9 @@
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -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)
-+options ALTQ_RED # Random Early Detection (RED)
-+options ALTQ_RIO # RED In/Out
-+options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
-+options ALTQ_PRIQ # Priority Queuing (PRIQ)
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -18,12 +18,14 @@
+@@ -18,13 +18,13 @@
#
# $FreeBSD$
@@ -157,13 +145,13 @@
+#ident GENERIC
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-+hints "GENERIC.hints" # Default places to look for devices.
-+
+-makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -43,6 +45,8 @@
+@@ -46,6 +46,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -172,7 +160,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_RAID # Soft RAID functionality.
-@@ -51,7 +55,7 @@
+@@ -54,7 +56,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -181,8 +169,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -74,7 +78,7 @@
- options KDB_TRACE # Print a stack trace for a panic
+@@ -78,7 +80,7 @@
+ options DDB_CTF # kernel ELF linker loads CTF data
# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
@@ -190,7 +178,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -85,9 +89,6 @@
+@@ -89,9 +91,6 @@
device eisa
device pci
@@ -200,7 +188,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -114,7 +115,6 @@
+@@ -118,7 +117,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -208,7 +196,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
-@@ -192,10 +192,6 @@
+@@ -199,10 +197,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -219,7 +207,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -206,8 +202,6 @@
+@@ -213,8 +207,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
@@ -228,7 +216,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -235,7 +229,6 @@
+@@ -242,7 +234,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -236,7 +224,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
-@@ -257,7 +250,6 @@
+@@ -264,7 +255,6 @@
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -244,7 +232,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -277,12 +269,7 @@
+@@ -284,12 +274,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -257,8 +245,8 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
device wpi # Intel 3945ABG wireless NICs.
-@@ -292,11 +279,8 @@
- device random # Entropy device
+@@ -301,11 +286,8 @@
+ options RDRAND_RNG # Intel Bull Mountain RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
-device tun # Packet tunnel.
@@ -269,7 +257,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -312,12 +296,12 @@
+@@ -321,12 +303,12 @@
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices (needs netgraph)
@@ -285,11 +273,17 @@
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -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
+--- /dev/null
++++ b/sys/conf/DEBIAN
+@@ -0,0 +1,15 @@
+
++# Not available yet
++nomakeoptions WITH_CTF
++
++include WITHOUT_SOURCELESS
++
++hints "GENERIC.hints" # Default places to look for devices.
++
+# Alternate queueing
+options ALTQ
+options ALTQ_CBQ # Class Bases Queuing (CBQ)
@@ -297,11 +291,3 @@
+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/SA-13_05.nfsserver.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,19 +0,0 @@
-Description:
- Fix a bug that allows NFS clients to issue READDIR on files. [13:05]
- (CVE-2013-3266)
-Origin: vendor, http://security.freebsd.org/patches/SA-13:05/nfsserver.patch
-Bug: http://security.freebsd.org/advisories/FreeBSD-SA-13:05.nfsserver.asc
-Bug-Debian: http://bugs.debian.org/706414
-Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=250060
-
---- 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
- }
-+ if (!nd->nd_repstat && vp->v_type != VDIR)
-+ nd->nd_repstat = NFSERR_NOTDIR;
- if (nd->nd_repstat == 0 && cnt == 0) {
- if (nd->nd_flag & ND_NFSV2)
- /* NFSv2 does not have NFSERR_TOOSMALL */
Modified: trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch 2013-07-22 22:10:01 UTC (rev 4794)
@@ -11,7 +11,7 @@
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
-@@ -3761,6 +3761,12 @@
+@@ -3805,6 +3805,12 @@
vm_map_unlock_read(map);
return (KERN_PROTECTION_FAILURE);
}
Added: trunk/kfreebsd-9/debian/patches/cxgbe.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/cxgbe.diff (rev 0)
+++ trunk/kfreebsd-9/debian/patches/cxgbe.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -0,0 +1,13 @@
+
+Simplified version, equivalent to the one from HEAD.
+
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -77,7 +77,6 @@
+ ${_cs} \
+ ${_ctau} \
+ ${_cxgb} \
+- cxgbe \
+ ${_cyclic} \
+ dc \
+ dcons \
Deleted: trunk/kfreebsd-9/debian/patches/disable_ctf.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/disable_ctf.diff 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/disable_ctf.diff 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,52 +0,0 @@
---- 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}
-
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/patches/series 2013-07-22 22:10:01 UTC (rev 4794)
@@ -1,13 +1,11 @@
# Patches from (or merged in) upstream
-SA-13_05.nfsserver.patch
SA-13_06.mmap.patch
-000_cpuclockid2_zombie.diff
000_cpuclockid2_syscall.diff
000_cpuclockid2_compat32.diff
# Other patches that might or might not be mergeable
-disable_ctf.diff
+cxgbe.diff
001_misc.diff
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
@@ -36,5 +34,6 @@
917_disable_kgssapi.diff
918_unix_socket_overflow.diff
919_delete_key.diff
+922_cc_version.diff
950_no_stack_protector.diff
999_config.diff
Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules 2013-07-22 21:21:56 UTC (rev 4793)
+++ trunk/kfreebsd-9/debian/rules 2013-07-22 22:10:01 UTC (rev 4794)
@@ -30,9 +30,9 @@
kfreebsd_cpu := $(cpu)
endif
-SVN := http://svn.freebsd.org/base/release/$(version).0
+#SVN := http://svn.freebsd.org/base/release/$(version).0
#SVN := http://svn.freebsd.org/base/releng/$(version)
-#SVN := http://svn.freebsd.org/base/stable/$(major)
+SVN := http://svn.freebsd.org/base/stable/$(major)
#SVN := http://svn.freebsd.org/base/head
SOURCE_PACKAGE := $(CURDIR)/debian/kfreebsd-source-$(version)
IMAGE_PACKAGE := $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
@@ -59,7 +59,7 @@
get-orig-source:
rm -rf $(ORIG_DIR)
for i in sys usr.sbin/config ; do \
- svn export $(SVN)/$$i $(ORIG_DIR)/$$i ; \
+ svn export -r $(svn_revision) $(SVN)/$$i $(ORIG_DIR)/$$i ; \
done
cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
tar --numeric-owner --owner 0 --group 0 -cJf ../$(ORIG_TAR) $(ORIG_DIR)
More information about the Glibc-bsd-commits
mailing list