Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed source package creation.

  • Loading branch information...
commit 634d704721f03ba388f654b76517aa96ef6d2c0d 1 parent f3b62e2
@varialus authored
Showing with 6 additions and 2,543 deletions.
  1. +6 −7 README
  2. +0 −39 kdragonflybsd-3/debian/patches/001_misc.diff
  3. +0 −52 kdragonflybsd-3/debian/patches/002_maxpathlen.diff
  4. +0 −65 kdragonflybsd-3/debian/patches/003_glibc_dev_aicasm.diff
  5. +0 −32 kdragonflybsd-3/debian/patches/004_xargs.diff
  6. +0 −14 kdragonflybsd-3/debian/patches/005_linux_cflags.diff
  7. +0 −66 kdragonflybsd-3/debian/patches/006_mips_i8259_alloc.diff
  8. +0 −57 kdragonflybsd-3/debian/patches/007_clone_signals.diff
  9. +0 −139 kdragonflybsd-3/debian/patches/009_disable_duped_modules.diff
  10. +0 −54 kdragonflybsd-3/debian/patches/101_nullfs_vsock.diff
  11. +0 −32 kdragonflybsd-3/debian/patches/107_mount_update.diff
  12. +0 −43 kdragonflybsd-3/debian/patches/108_teken_utf8_table.diff
  13. +0 −12 kdragonflybsd-3/debian/patches/109_linprocfs_non_x86.diff
  14. +0 −11 kdragonflybsd-3/debian/patches/110_disable_trampoline_flavour.diff
  15. +0 −29 kdragonflybsd-3/debian/patches/201_pseudofs.diff
  16. +0 −29 kdragonflybsd-3/debian/patches/901_disable_optimization_2.diff
  17. +0 −11 kdragonflybsd-3/debian/patches/902_version.diff
  18. +0 −180 kdragonflybsd-3/debian/patches/903_disable_non-free_drivers.diff
  19. +0 −75 kdragonflybsd-3/debian/patches/904_dev_full.diff
  20. +0 −51 kdragonflybsd-3/debian/patches/906_grow_sysv_ipc_limits.diff
  21. +0 −13 kdragonflybsd-3/debian/patches/908_linprocfs_is_not_proc.diff
  22. +0 −20 kdragonflybsd-3/debian/patches/910_GENERIC_hints.diff
  23. +0 −116 kdragonflybsd-3/debian/patches/913_uudecode.diff
  24. +0 −75 kdragonflybsd-3/debian/patches/914_psm.diff
  25. +0 −20 kdragonflybsd-3/debian/patches/915_ip6.v6only.diff
  26. +0 −16 kdragonflybsd-3/debian/patches/916_NKPT_amd64.diff
  27. +0 −11 kdragonflybsd-3/debian/patches/917_disable_kgssapi.diff
  28. +0 −33 kdragonflybsd-3/debian/patches/918_unix_socket_overflow.diff
  29. +0 −34 kdragonflybsd-3/debian/patches/919_delete_key.diff
  30. +0 −31 kdragonflybsd-3/debian/patches/950_no_stack_protector.diff
  31. +0 −337 kdragonflybsd-3/debian/patches/999_config.diff
  32. +0 −242 kdragonflybsd-3/debian/patches/999_firmware.diff
  33. +0 −128 kdragonflybsd-3/debian/patches/EN-12_02.ipv6refcount.patch
  34. +0 −32 kdragonflybsd-3/debian/patches/SA-12_04.sysret.patch
  35. +0 −21 kdragonflybsd-3/debian/patches/amd64_increase_DFLDSIZ.diff
  36. +0 −259 kdragonflybsd-3/debian/patches/fix_VOP_VPTOCNP_bypass_for_nullfs.diff
  37. +0 −21 kdragonflybsd-3/debian/patches/improve_tmpfs_mem_info.diff
  38. +0 −55 kdragonflybsd-3/debian/patches/pf_counter_initialization_SVN236364.diff
  39. +0 −15 kdragonflybsd-3/debian/patches/remove_tmpfs_warning.diff
  40. +0 −44 kdragonflybsd-3/debian/patches/series
  41. +0 −22 kdragonflybsd-3/debian/patches/svn239447_SCTP_DoS.patch
View
13 README
@@ -1,5 +1,4 @@
ToDo:
- - Make the kernel source package extract and apply debian patches automatically.
- Make the kernel compile.
- Make related packages compile, including the Hammer and Hammer2 file systems.
- Try to use the kernel with the Hammer or Hammer2 filesystem.
@@ -23,9 +22,9 @@ http://ftp.nl.debian.org/debian/dists/squeeze/main/installer-kfreebsd-amd64/curr
- Using aptitude is preferred over 'apt-get install' for binary package management but apt-get lends itself to written instructions.
- sudo apt-get build-dep kfreebsd-9
- Only do the following 'apt-get install' until 'apt-get build-dep' for kfreebsd-9 includes them, the fix for which is on my ToDo list above.
- - sudo apt-get install fakeroot subversion kernel_wedge
+ - sudo apt-get install fakeroot subversion kernel_wedge devscripts
- Only do the following 'apt-get install' until 'apt-get build-dep' for kdragonflybsd-3 includes them, the fix for which is on my ToDo list above.
- - sudo apt-get install fakeroot git kernel_wedge
+ - sudo apt-get install fakeroot git kernel_wedge devscripts
- mkdir ~/kbsd-build-comparison
- cd kbsd-build-comparison
- mkdir freebsd
@@ -38,7 +37,8 @@ In one of two console terminals:
- ./debian/rules get-orig-source
- touch ./debian/control
- fakeroot ./debian/rules control
- - Figure out what prerequisites need to be run before running dpkg-buildpackage.
+ - Copy contents of kfreebsd-9_9.0.orig.tar.gz into kfreebsd-9/debian/
+ - debuild -S -us -uc
- dpkg-buildpackage
- Fix errors.
- Commit to git and push to github.
@@ -52,9 +52,8 @@ In the other console terminal:
- cd DragonFlyBSD/kdragonflybsd-3/
- ./debian/rules get-orig-source
- fakeroot ./debian/rules control
- - Figure out what prerequisites need to be run before running dpkg-buildpackage.
- - Fix errors.
- - Commit to git and push to github.
+ - Copy contents of kdragonflybsd-3_3.0.3.orig.tar.gz into kdragonflybsd-9/debian/
+ - debuild -S -us -uc
- dpkg-buildpackage
- Fix errors.
- Commit to git and push to github.
View
39 kdragonflybsd-3/debian/patches/001_misc.diff
@@ -1,39 +0,0 @@
-
-Sent to dragonflybsd-hackers (2011-07-05)
-
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -1,12 +1,23 @@
- # $DragonFlyBSD$
-
-+.if !defined(OPSYS)
-+OPSYS!= uname -s
-+.endif
-+
- #
- # Warning flags for compiling the kernel and components of the kernel:
- #
-+.if ${OPSYS} == "DragonFlyBSD"
-+# DragonFlyBSD 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
-+
- #
- # The following flags are next up for working on:
- # -Wextra
-@@ -32,7 +43,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
- .else
- CFLAGS+= -mno-aes -mno-avx
- .endif
View
52 kdragonflybsd-3/debian/patches/002_maxpathlen.diff
@@ -1,52 +0,0 @@
---- a/usr.sbin/config/main.c
-+++ b/usr.sbin/config/main.c
-@@ -60,6 +60,10 @@
- #include "config.h"
- #include "configvers.h"
-
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 4096
-+#endif
-+
- #ifndef TRUE
- #define TRUE (1)
- #endif
---- a/usr.sbin/config/mkmakefile.c
-+++ b/usr.sbin/config/mkmakefile.c
-@@ -50,6 +50,10 @@
- #include "config.h"
- #include "configvers.h"
-
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 4096
-+#endif
-+
- #define next_word(fp, wd) \
- { char *word = get_word(fp); \
- if (word == (char *)EOF) \
---- a/usr.sbin/config/mkoptions.c
-+++ b/usr.sbin/config/mkoptions.c
-@@ -48,6 +48,10 @@
- #include "config.h"
- #include "y.tab.h"
-
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 4096
-+#endif
-+
- static struct users {
- int u_default;
- int u_min;
---- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-@@ -57,6 +57,10 @@
- #include "aicasm_symbol.h"
- #include "aicasm_gram.h"
-
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- /* This is used for macro body capture too, so err on the large size. */
- #define MAX_STR_CONST 4096
- static char string_buf[MAX_STR_CONST];
View
65 kdragonflybsd-3/debian/patches/003_glibc_dev_aicasm.diff
@@ -1,65 +0,0 @@
-
-Partially sent to dragonflybsd-hackers (2011-07-02)
-
---- a/sys/dev/aic7xxx/aicasm/Makefile
-+++ b/sys/dev/aic7xxx/aicasm/Makefile
-@@ -3,6 +3,10 @@
- #
- # $DragonFlyBSD$
-
-+.if !defined(OPSYS)
-+OPSYS!= uname -s
-+.endif
-+
- PROG= aicasm
-
- CSRCS= aicasm.c aicasm_symbol.c
-@@ -14,8 +18,9 @@
- SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD= ${LIBL}
--LDADD= -ll
-+LDADD= -ll -ldb -lbsd
- WARNS?= 5
-+NO_WERROR?= 1
-
- # Correct path for kernel builds
- # Don't rely on the kernel's .depend file
-@@ -24,8 +29,15 @@
- 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} == "DragonFlyBSD"
- NOSTDINC= -nostdinc
- CFLAGS+= ${NOSTDINC} -I/usr/include -I.
-+.endif
-+
- .ifdef MAKESRCPATH
- CFLAGS+= -I${MAKESRCPATH}
- .endif
---- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-@@ -1529,7 +1529,7 @@
- }
-
- static void
--add_macro_arg(const char *argtext, int argnum __unused)
-+add_macro_arg(const char *argtext, int argnum)
- {
- struct macro_arg *marg;
- int retval;
---- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-@@ -44,7 +44,7 @@
-
- #include <sys/types.h>
- #include <sys/param.h>
--#ifdef BSD
-+#if defined(BSD) && !defined(__GNU__)
- #include <db.h>
- #else
- #include <db_185.h>
View
32 kdragonflybsd-3/debian/patches/004_xargs.diff
@@ -1,32 +0,0 @@
-
-xargs -I works here, although it's not exactly the same.
--J option requested to findutils maintainers:
-
-http://savannah.gnu.org/patch/?4916
-
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -217,7 +217,7 @@
- grep -v '^#' < ${EXPORT_SYMS} > export_syms
- .endif
- awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
-- export_syms | xargs -J% ${OBJCOPY} % ${.TARGET}
-+ export_syms | xargs -I% ${OBJCOPY} % ${.TARGET}
- .endif
- .endif
- .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
---- a/sys/contrib/dev/acpica/acpica_prep.sh
-+++ b/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -60,10 +60,10 @@
- # copy files
- echo copying full dirs
- for i in ${fulldirs}; do
-- find ${wrk} -name ${i} -type d -print | xargs -J % mv % ${dst}
-+ find ${wrk} -name ${i} -type d -print | xargs -I % mv % ${dst}
- done
- echo copying remaining files
--find ${wrk} -type f -print | xargs -J % mv % ${dst}
-+find ${wrk} -type f -print | xargs -I % mv % ${dst}
-
- # canonify include paths
- for H in ${src_headers}; do
View
14 kdragonflybsd-3/debian/patches/005_linux_cflags.diff
@@ -1,14 +0,0 @@
-
-Submitted to dragonflybsd-hackers on 2011-07-04
-
---- a/sys/sys/cdefs.h
-+++ b/sys/sys/cdefs.h
-@@ -349,7 +349,7 @@
- #endif
-
- /* Compiler-dependent macros that rely on DragonFlyBSD-specific extensions. */
--#if __DragonFlyBSD_cc_version >= 300001 && defined(__GNUC__) && !defined(__INTEL_COMPILER)
-+#if defined(__DragonFlyBSD_cc_version) && __DragonFlyBSD_cc_version >= 300001 && defined(__GNUC__) && !defined(__INTEL_COMPILER)
- #define __printf0like(fmtarg, firstvararg) \
- __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
- #else
View
66 kdragonflybsd-3/debian/patches/006_mips_i8259_alloc.diff
@@ -1,66 +0,0 @@
---- a/sys/mips/malta/gt_pci.c
-+++ b/sys/mips/malta/gt_pci.c
-@@ -59,6 +59,7 @@
- #include <machine/bus.h>
- #include <machine/cpu.h>
- #include <machine/pmap.h>
-+#include <machine/timerreg.h>
-
- #include <mips/malta/maltareg.h>
-
-@@ -401,7 +402,42 @@
- }
-
- /* Initialize memory and i/o rmans. */
-- device_add_child(dev, "pci", busno);
-+ {
-+ device_t child;
-+ int rid;
-+ void *res;
-+
-+ child = device_add_child(dev, "pci", busno);
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_ICU1, IO_ICU1 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8259 controller #1\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_ICU2, IO_ICU2 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8259 controller #2\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_TIMER1, IO_TIMER1 + IO_TIMERSIZE, IO_TIMERSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8254 controllers\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_SMSC_KYBD_ADR, MALTA_SMSC_KYBD_ADR + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for keyboard controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_SMSC_KYBD_ADR + 4, MALTA_SMSC_KYBD_ADR + 4 + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for keyboard controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_RTCADR, MALTA_RTCADR + 2, 2, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for RTC controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, 0x81, 0x81 + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for DMA controller\n");
-+ }
-+
- return (bus_generic_attach(dev));
- }
-
---- a/sys/mips/include/timerreg.h
-+++ b/sys/mips/include/timerreg.h
-@@ -49,6 +49,9 @@
- #define TIMER_CNTR2 (IO_TIMER1 + TIMER_REG_CNTR2)
- #define TIMER_MODE (IO_TIMER1 + TIMER_REG_MODE)
-
-+/* 3 timers, 4 registers each. */
-+#define IO_TIMERSIZE 3 * 4
-+
- #define timer_spkr_acquire() \
- acquire_timer2(TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT)
- #define timer_spkr_release() \
View
57 kdragonflybsd-3/debian/patches/007_clone_signals.diff
@@ -1,57 +0,0 @@
-
-Starting with r223966 in 9-CURRENT, a new interface is available
-(RFTSIGZMB). It is supported in eglibc 2.13-11 or later. Use this
-patch if you need support for older eglibc.
-
---- a/sys/kern/kern_fork.c
-+++ b/sys/kern/kern_fork.c
-@@ -480,7 +480,13 @@
- if (flags & RFTSIGZMB)
- p2->p_sigparent = RFTSIGNUM(flags);
- else if (flags & RFLINUXTHPN)
-- p2->p_sigparent = SIGUSR1;
-+ {
-+ int sig;
-+ sig = RFTHPNSIGNUM(flags);
-+ if (sig == 0) sig = SIGUSR1;
-+ if (sig == SIGCHLD) sig = 0;
-+ p2->p_sigparent = sig;
-+ }
- else
- p2->p_sigparent = SIGCHLD;
-
-@@ -723,12 +729,16 @@
- static struct timeval lastfail;
-
- /* Check for the undefined or unimplemented flags. */
-- if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK))) != 0)
-+ if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK) | (RFTHPNMASK << RFTHPNSHIFT))) != 0)
- return (EINVAL);
-
-- /* Signal value requires RFTSIGZMB. */
-- if ((flags & RFTSIGFLAGS(RFTSIGMASK)) != 0 && (flags & RFTSIGZMB) == 0)
-- return (EINVAL);
-+ /* Signal value requires either RFTSIGZMB or RFLINUXTHPN. */
-+ if ((flags & RFTSIGZMB) == 0 && (flags & RFLINUXTHPN) == 0) {
-+ if ((flags & RFTSIGFLAGS(RFTSIGMASK)) != 0)
-+ return (EINVAL);
-+ if ((flags & (RFTHPNMASK << RFTHPNSHIFT)) != 0)
-+ return (EINVAL);
-+ }
-
- /* Can't copy and clear. */
- if ((flags & (RFFDG|RFCFDG)) == (RFFDG|RFCFDG))
---- a/sys/sys/unistd.h
-+++ b/sys/sys/unistd.h
-@@ -191,6 +191,11 @@
- RFTHREAD | RFSIGSHARE | RFLINUXTHPN | RFSTOPPED | RFHIGHPID | RFTSIGZMB | \
- RFPPWAIT)
-
-+#define RFTHPNSHIFT 24 /* reserve bits 24-30 */
-+#define RFTHPNMASK 0x7F /* for compatibility with linuxthreads/clone() */
-+ /* allow to specify "clone exit parent notification" signal */
-+#define RFTHPNSIGNUM(flags) (((flags) >> RFTHPNSHIFT) & RFTHPNMASK)
-+
- #endif /* __BSD_VISIBLE */
-
- #endif /* !_SYS_UNISTD_H_ */
View
139 kdragonflybsd-3/debian/patches/009_disable_duped_modules.diff
@@ -1,139 +0,0 @@
-
-Status: in upstream BTS
-
---- a/sys/conf/Makefile.amd64
-+++ b/sys/conf/Makefile.amd64
-@@ -48,6 +48,8 @@
- ASM_CFLAGS+= ${.IMPSRC:T:Mmpboot.S:C/^.+$/-no-integrated-as/}
- .endif
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/sys/conf/Makefile.arm
-+++ b/sys/conf/Makefile.arm
-@@ -124,6 +124,8 @@
-
- MKMODULESENV+= MACHINE=${MACHINE}
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/sys/conf/Makefile.i386
-+++ b/sys/conf/Makefile.i386
-@@ -40,6 +40,8 @@
- ASM_CFLAGS+= ${.IMPSRC:T:Mmpboot.s:C/^.+$/-no-integrated-as/}
- .endif
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/sys/conf/Makefile.ia64
-+++ b/sys/conf/Makefile.ia64
-@@ -36,6 +36,8 @@
-
- ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/sys/conf/Makefile.mips
-+++ b/sys/conf/Makefile.mips
-@@ -70,6 +70,8 @@
- ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
- ${KERNEL_KO}.tramp.bin \
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/sys/conf/Makefile.pc98
-+++ b/sys/conf/Makefile.pc98
-@@ -34,6 +34,8 @@
-
- MKMODULESENV+= MACHINE=${MACHINE}
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/sys/conf/Makefile.powerpc
-+++ b/sys/conf/Makefile.powerpc
-@@ -42,6 +42,8 @@
- CFLAGS+= -fno-omit-frame-pointer
- .endif
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/sys/conf/Makefile.sparc64
-+++ b/sys/conf/Makefile.sparc64
-@@ -32,6 +32,8 @@
-
- MDOBJS= exception.o interrupt.o
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
---- a/usr.sbin/config/mkmakefile.c
-+++ b/usr.sbin/config/mkmakefile.c
-@@ -70,6 +70,7 @@
- static void do_rules(FILE *);
- static void do_xxfiles(char *, FILE *);
- static void do_objs(FILE *);
-+static void do_without_modules(FILE *);
- static void do_before_depend(FILE *);
- static int opteq(const char *, const char *);
- static void read_files(void);
-@@ -161,6 +162,8 @@
- }
- if (eq(line, "%BEFORE_DEPEND\n"))
- do_before_depend(ofp);
-+ else if (eq(line, "%WITHOUT_MODULES\n"))
-+ do_without_modules(ofp);
- else if (eq(line, "%OBJS\n"))
- do_objs(ofp);
- else if (strncmp(line, "%FILES.", 7) == 0)
-@@ -647,6 +650,28 @@
- }
-
- static void
-+do_without_modules(FILE *fp)
-+{
-+ struct device *dp;
-+ int lpos, len;
-+ char *cp, *sp;
-+
-+ fprintf(fp, "MKMODULESENV+= WITHOUT_MODULES=\"");
-+ lpos = 34;
-+ STAILQ_FOREACH(dp, &dtab, d_next) {
-+ sp = dp->d_name;
-+ cp = sp + (len = strlen(sp)) - 1;
-+ if (len + lpos > 72) {
-+ lpos = 8;
-+ fprintf(fp, "\\\n\t");
-+ }
-+ fprintf(fp, "%s ", sp);
-+ lpos += len + 1;
-+ }
-+ fprintf(fp, "\"\n");
-+}
-+
-+static void
- do_xxfiles(char *tag, FILE *fp)
- {
- struct file_list *tp;
View
54 kdragonflybsd-3/debian/patches/101_nullfs_vsock.diff
@@ -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,
View
32 kdragonflybsd-3/debian/patches/107_mount_update.diff
@@ -1,32 +0,0 @@
-
-Revision 220937 in upstream removed a similar kludge, which had become
-unnecessary in some cases but not in the one that concerns us (see
-comment below).
-
---- a/sys/kern/vfs_mount.c
-+++ b/sys/kern/vfs_mount.c
-@@ -639,6 +639,24 @@
- }
-
- /*
-+ * If MNT_RDONLY was not specified as a mount option, and we
-+ * are trying to update a mount-point from "ro", it means
-+ * read-write mode is desired by userland even if "rw" or
-+ * "noro" weren't specified explicitly. Add "noro" here to
-+ * make that happen.
-+ */
-+ if (!(fsflags & MNT_RDONLY)) {
-+ struct vfsopt *noro_opt;
-+ noro_opt = malloc(sizeof(struct vfsopt), M_MOUNT, M_WAITOK);
-+ noro_opt->name = strdup("noro", M_MOUNT);
-+ noro_opt->value = NULL;
-+ noro_opt->len = 0;
-+ noro_opt->pos = -1;
-+ noro_opt->seen = 1;
-+ TAILQ_INSERT_TAIL(optlist, noro_opt, link);
-+ }
-+
-+ /*
- * Be ultra-paranoid about making sure the type and fspath
- * variables will fit in our mp buffers, including the
- * terminating NUL.
View
43 kdragonflybsd-3/debian/patches/108_teken_utf8_table.diff
@@ -1,43 +0,0 @@
---- a/sys/dev/syscons/scterm-teken.c
-+++ b/sys/dev/syscons/scterm-teken.c
-@@ -424,10 +424,18 @@
- { 0x00b6, 0x14, 0x00 }, { 0x00b7, 0xfa, 0x00 },
- { 0x00ba, 0xa7, 0x00 }, { 0x00bb, 0xaf, 0x00 },
- { 0x00bc, 0xac, 0x00 }, { 0x00bd, 0xab, 0x00 },
-- { 0x00bf, 0xa8, 0x00 }, { 0x00c4, 0x8e, 0x01 },
-- { 0x00c6, 0x92, 0x00 }, { 0x00c7, 0x80, 0x00 },
-- { 0x00c9, 0x90, 0x00 }, { 0x00d1, 0xa5, 0x00 },
-- { 0x00d6, 0x99, 0x00 }, { 0x00dc, 0x9a, 0x00 },
-+ { 0x00bf, 0xa8, 0x00 }, { 0x00c0, 0x41, 0x00 },
-+ { 0x00c1, 0x41, 0x00 }, { 0x00c2, 0x41, 0x00 },
-+ { 0x00c4, 0x8e, 0x01 }, { 0x00c6, 0x92, 0x00 },
-+ { 0x00c7, 0x80, 0x00 }, { 0x00c8, 0x45, 0x00 },
-+ { 0x00c9, 0x90, 0x00 }, { 0x00ca, 0x45, 0x00 },
-+ { 0x00cb, 0x45, 0x00 }, { 0x00cc, 0x49, 0x00 },
-+ { 0x00cd, 0x49, 0x00 }, { 0x00ce, 0x49, 0x00 },
-+ { 0x00cf, 0x49, 0x00 }, { 0x00d1, 0xa5, 0x00 },
-+ { 0x00d2, 0x4f, 0x00 }, { 0x00d3, 0x4f, 0x00 },
-+ { 0x00d4, 0x4f, 0x00 }, { 0x00d6, 0x99, 0x00 },
-+ { 0x00d9, 0x55, 0x00 }, { 0x00da, 0x55, 0x00 },
-+ { 0x00db, 0x55, 0x00 }, { 0x00dc, 0x9a, 0x00 },
- { 0x00df, 0xe1, 0x00 }, { 0x00e0, 0x85, 0x00 },
- { 0x00e1, 0xa0, 0x00 }, { 0x00e2, 0x83, 0x00 },
- { 0x00e4, 0x84, 0x00 }, { 0x00e5, 0x86, 0x00 },
-@@ -442,6 +450,7 @@
- { 0x00f8, 0xed, 0x00 }, { 0x00f9, 0x97, 0x00 },
- { 0x00fa, 0xa3, 0x00 }, { 0x00fb, 0x96, 0x00 },
- { 0x00fc, 0x81, 0x00 }, { 0x00ff, 0x98, 0x00 },
-+ { 0x013f, 0x4c, 0x00 }, { 0x0140, 0x6c, 0x00 },
- { 0x0192, 0x9f, 0x00 }, { 0x0393, 0xe2, 0x00 },
- { 0x0398, 0xe9, 0x00 }, { 0x03a3, 0xe4, 0x00 },
- { 0x03a6, 0xe8, 0x00 }, { 0x03a9, 0xea, 0x00 },
-@@ -490,7 +499,8 @@
- { 0x2584, 0xdc, 0x00 }, { 0x2588, 0xdb, 0x00 },
- { 0x258c, 0xdd, 0x00 }, { 0x2590, 0xde, 0x00 },
- { 0x2591, 0xb0, 0x02 }, { 0x25a0, 0xfe, 0x00 },
-- { 0x25ac, 0x16, 0x00 }, { 0x25b2, 0x1e, 0x00 },
-+ { 0x25ac, 0x16, 0x00 },
-+ { 0x25ae, 0xdb, 0x00 }, { 0x25b2, 0x1e, 0x00 },
- { 0x25ba, 0x10, 0x00 }, { 0x25bc, 0x1f, 0x00 },
- { 0x25c4, 0x11, 0x00 }, { 0x25cb, 0x09, 0x00 },
- { 0x25d8, 0x08, 0x00 }, { 0x25d9, 0x0a, 0x00 },
View
12 kdragonflybsd-3/debian/patches/109_linprocfs_non_x86.diff
@@ -1,12 +0,0 @@
---- a/sys/conf/options.mips
-+++ b/sys/conf/options.mips
-@@ -56,6 +56,9 @@
- TICK_USE_YAMON_FREQ opt_global.h
- TICK_USE_MALTA_RTC opt_global.h
-
-+LINPROCFS opt_dontuse.h
-+LINSYSFS opt_dontuse.h
-+
- #
- # The highest memory address that can be used by the kernel in units of KB.
- #
View
11 kdragonflybsd-3/debian/patches/110_disable_trampoline_flavour.diff
@@ -1,11 +0,0 @@
---- a/sys/conf/Makefile.mips
-+++ b/sys/conf/Makefile.mips
-@@ -61,7 +61,7 @@
- # XXX hardcoded kernel entry point
- ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
-
--KERNEL_EXTRA=trampoline
-+#KERNEL_EXTRA=trampoline
- trampoline: ${KERNEL_KO}.tramp.bin
- ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \
- $S/$M/$M/inckern.S
View
29 kdragonflybsd-3/debian/patches/201_pseudofs.diff
@@ -1,29 +0,0 @@
-
-dirty workaround for #650667
-http://www.dragonflybsd.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);
View
29 kdragonflybsd-3/debian/patches/901_disable_optimization_2.diff
@@ -1,29 +0,0 @@
-
-Regretably, with GCC 4.4 or later this is the only flag combination
-I could find that doesn't cause kernel panics CPU triple-faults or
-other kind of severe breakage.
-
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
-@@ -41,6 +41,9 @@
- .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
- .endif
-+.if !empty(COPTFLAGS:M-O[23s])
-+COPTFLAGS+= -O1
-+.endif
- .if !defined(NO_CPU_COPTFLAGS)
- COPTFLAGS+= ${_CPUCFLAGS}
- .endif
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -91,6 +91,9 @@
- .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+= -fno-strict-aliasing
- .endif
-+.if !empty(CFLAGS:M-O[23s])
-+CFLAGS+= -O1
-+.endif
- WERROR?= -Werror
- CFLAGS+= ${WERROR}
- CFLAGS+= -D_KERNEL
View
11 kdragonflybsd-3/debian/patches/902_version.diff
@@ -1,11 +0,0 @@
---- a/sys/conf/newvers.sh
-+++ b/sys/conf/newvers.sh
-@@ -132,7 +132,7 @@
- cat << EOF > vers.c
- $COPYRIGHT
- #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
--#define VERSTR "${VERSION} #${v}${svn}${git}: ${t}\\n ${u}@${h}:${d}\\n"
-+#define VERSTR "#${v} ${t}\\n"
- #define RELSTR "${RELEASE}"
-
- char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR;
View
180 kdragonflybsd-3/debian/patches/903_disable_non-free_drivers.diff
@@ -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
View
75 kdragonflybsd-3/debian/patches/904_dev_full.diff
@@ -1,75 +0,0 @@
-
-Status: FIONBIO/FIOASYNC is in http://www.dragonflybsd.org/cgi/query-pr.cgi?pr=138526
- /dev/full already rejected in upstream (kern/68961)
-
---- a/sys/dev/null/null.c
-+++ b/sys/dev/null/null.c
-@@ -45,9 +45,11 @@
-
- /* For use with destroy_dev(9). */
- static struct cdev *null_dev;
-+static struct cdev *full_dev;
- static struct cdev *zero_dev;
-
- static d_write_t null_write;
-+static d_write_t full_write;
- static d_ioctl_t null_ioctl;
- static d_read_t zero_read;
-
-@@ -59,6 +61,14 @@
- .d_name = "null",
- };
-
-+static struct cdevsw full_cdevsw = {
-+ .d_version = D_VERSION,
-+ .d_read = (d_read_t *)nullop,
-+ .d_write = full_write,
-+ .d_ioctl = null_ioctl,
-+ .d_name = "full",
-+};
-+
- static struct cdevsw zero_cdevsw = {
- .d_version = D_VERSION,
- .d_read = zero_read,
-@@ -78,11 +88,25 @@
-
- /* ARGSUSED */
- static int
-+full_write(struct cdev *dev __unused, struct uio *uio, int flags __unused)
-+{
-+ uio->uio_resid = 0;
-+
-+ 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 @@
- 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");
-+ full_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &full_cdevsw, 0,
-+ NULL, UID_ROOT, GID_WHEEL, 0666, "full");
- zero_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &zero_cdevsw, 0,
- NULL, UID_ROOT, GID_WHEEL, 0666, "zero");
- break;
-
- case MOD_UNLOAD:
- destroy_dev(null_dev);
-+ destroy_dev(full_dev);
- destroy_dev(zero_dev);
- break;
-
View
51 kdragonflybsd-3/debian/patches/906_grow_sysv_ipc_limits.diff
@@ -1,51 +0,0 @@
-Status: Rejected in upstream (kern/77353)
-
-postgresql documentation encourages to grow SysV IPC limits on *BSD systems
-(which obviously applies to GNU/k*BSD ones too):
-
-<quote>
- The options SYSVSHM and SYSVSEM need to be enabled when the kernel is compiled. (They are by default.) The maximum size of shared memory is determined by the option SHMMAXPGS (in pages). The following shows an example of how to set the various parameters:
-
-options SYSVSHM
-options SHMMAXPGS=4096
-options SHMSEG=256
-
-options SYSVSEM
-options SEMMNI=256
-options SEMMNS=512
-options SEMMNU=256
-options SEMMAP=256
-
- (On NetBSD and OpenBSD the key word is actually option singular.)
-
- You might also want to configure your kernel to lock shared memory into RAM and prevent it from being paged out to swap. Use the sysctl setting kern.ipc.shm_use_phys.
-</quote>
-
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -55,6 +55,11 @@
- options SYSVSHM # SYSV-style shared memory
- options SYSVMSG # SYSV-style message queues
- options SYSVSEM # SYSV-style semaphores
-+options SHMMAXPGS=4096
-+options SHMSEG=256
-+options SEMMNI=256
-+options SEMMNS=512
-+options SEMMNU=256
- options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
- options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
- options KBD_INSTALL_CDEV # install a CDEV entry in /dev
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
-@@ -56,6 +56,11 @@
- options SYSVSHM # SYSV-style shared memory
- options SYSVMSG # SYSV-style message queues
- options SYSVSEM # SYSV-style semaphores
-+options SHMMAXPGS=4096
-+options SHMSEG=256
-+options SEMMNI=256
-+options SEMMNS=512
-+options SEMMNU=256
- options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
- options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
- options KBD_INSTALL_CDEV # install a CDEV entry in /dev
View
13 kdragonflybsd-3/debian/patches/908_linprocfs_is_not_proc.diff
@@ -1,13 +0,0 @@
---- a/sys/compat/linprocfs/linprocfs.c
-+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -361,10 +361,6 @@
-
- /* determine fs type */
- fstype = mp->mnt_stat.f_fstypename;
-- if (strcmp(fstype, pn->pn_info->pi_name) == 0)
-- mntfrom = fstype = "proc";
-- else if (strcmp(fstype, "procfs") == 0)
-- continue;
-
- if (strcmp(fstype, "linsysfs") == 0) {
- sbuf_printf(sb, "/sys %s sysfs %s", mntto,
View
20 kdragonflybsd-3/debian/patches/910_GENERIC_hints.diff
@@ -1,20 +0,0 @@
---- a/sys/i386/conf/GENERIC.hints
-+++ b/sys/i386/conf/GENERIC.hints
-@@ -18,6 +18,7 @@
- hint.atkbd.0.at="atkbdc"
- hint.atkbd.0.irq="1"
- hint.psm.0.at="atkbdc"
-+hint.psm.0.flags="0x100"
- hint.psm.0.irq="12"
- hint.sc.0.at="isa"
- hint.sc.0.flags="0x100"
---- a/sys/amd64/conf/GENERIC.hints
-+++ b/sys/amd64/conf/GENERIC.hints
-@@ -12,6 +12,7 @@
- hint.atkbd.0.at="atkbdc"
- hint.atkbd.0.irq="1"
- hint.psm.0.at="atkbdc"
-+hint.psm.0.flags="0x100"
- hint.psm.0.irq="12"
- hint.sc.0.at="isa"
- hint.sc.0.flags="0x100"
View
116 kdragonflybsd-3/debian/patches/913_uudecode.diff
@@ -1,116 +0,0 @@
---- a/sys/modules/ralfw/Makefile.inc
-+++ b/sys/modules/ralfw/Makefile.inc
-@@ -12,4 +12,4 @@
- FIRMWS= ${_FIRM}:${KMOD}
-
- ${_FIRM}: ${.CURDIR}/../../../contrib/dev/ral/${_FIRM}.uu
-- uudecode -p $? > ${.TARGET}
-+ uudecode -o- $? > ${.TARGET}
---- a/sys/modules/mwlfw/Makefile
-+++ b/sys/modules/mwlfw/Makefile
-@@ -6,9 +6,9 @@
- CLEANFILES+= mw88W8363.fw mwlboot.fw
-
- mw88W8363.fw: ${.CURDIR}/../../contrib/dev/mwl/mw88W8363.fw.uu
-- uudecode -p $? > ${.TARGET}
-+ uudecode -o- $? > ${.TARGET}
-
- mwlboot.fw: ${.CURDIR}/../../contrib/dev/mwl/mwlboot.fw.uu
-- uudecode -p $? > ${.TARGET}
-+ uudecode -o- $? > ${.TARGET}
-
- .include <bsd.kmod.mk>
---- a/sys/modules/ipwfw/ipw_bss/Makefile
-+++ b/sys/modules/ipwfw/ipw_bss/Makefile
-@@ -9,7 +9,7 @@
- CLEANFILES= ipw_bss
-
- ipw_bss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu
-- uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
-
---- a/sys/modules/ipwfw/ipw_ibss/Makefile
-+++ b/sys/modules/ipwfw/ipw_ibss/Makefile
-@@ -9,7 +9,7 @@
- CLEANFILES= ipw_ibss
-
- ipw_ibss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu
-- uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
-
---- a/sys/modules/ipwfw/ipw_monitor/Makefile
-+++ b/sys/modules/ipwfw/ipw_monitor/Makefile
-@@ -9,7 +9,7 @@
- CLEANFILES= ipw_monitor
-
- ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
-- uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
-
---- a/sys/modules/iwifw/iwi_bss/Makefile
-+++ b/sys/modules/iwifw/iwi_bss/Makefile
-@@ -9,7 +9,7 @@
- CLEANFILES= iwi_bss
-
- iwi_bss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu
-- uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
-
---- a/sys/modules/iwifw/iwi_ibss/Makefile
-+++ b/sys/modules/iwifw/iwi_ibss/Makefile
-@@ -9,7 +9,7 @@
- CLEANFILES= iwi_fw
-
- iwi_ibss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu
-- uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
-
---- a/sys/modules/iwifw/iwi_monitor/Makefile
-+++ b/sys/modules/iwifw/iwi_monitor/Makefile
-@@ -9,7 +9,7 @@
- CLEANFILES= iwi_monitor
-
- iwi_monitor: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu
-- uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
-
---- a/sys/modules/wpifw/Makefile
-+++ b/sys/modules/wpifw/Makefile
-@@ -8,6 +8,6 @@
- CLEANFILES= iwlwifi-3945-15.32.2.9.fw
-
- iwlwifi-3945-15.32.2.9.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu
-- uudecode -p ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
---- a/sys/modules/iwnfw/Makefile.inc
-+++ b/sys/modules/iwnfw/Makefile.inc
-@@ -15,4 +15,4 @@
- #FIRMWARE_LICENSE=
-
- ${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu
-- uudecode -p $? > ${.TARGET}
-+ uudecode -o- $? > ${.TARGET}
---- a/sys/modules/runfw/Makefile
-+++ b/sys/modules/runfw/Makefile
-@@ -6,6 +6,6 @@
- CLEANFILES= runfw
-
- runfw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
-- uudecode -p ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu > ${.TARGET}
-
- .include <bsd.kmod.mk>
View
75 kdragonflybsd-3/debian/patches/914_psm.diff
@@ -1,75 +0,0 @@
-This patch fixes PS/2 mouse support with xserver-xorg-input-mouse 1.4.0.
-It is a revert of upstream commit r18970:
-
-| Teach psm about O_ASYNC
-|
-| This makes Xorg happy if you aren't using moused.
-
---- a/sys/dev/atkbdc/psm.c
-+++ b/sys/dev/atkbdc/psm.c
-@@ -70,10 +70,7 @@
- #include <sys/module.h>
- #include <sys/bus.h>
- #include <sys/conf.h>
--#include <sys/filio.h>
- #include <sys/poll.h>
--#include <sys/sigio.h>
--#include <sys/signalvar.h>
- #include <sys/syslog.h>
- #include <machine/bus.h>
- #include <sys/rman.h>
-@@ -297,7 +294,6 @@
- struct cdev *bdev;
- int lasterr;
- int cmdcount;
-- struct sigio *async; /* Processes waiting for SIGIO */
- };
- static devclass_t psm_devclass;
-
-@@ -1518,7 +1514,6 @@
- sc->mode.level = sc->dflt_mode.level;
- sc->mode.protocol = sc->dflt_mode.protocol;
- sc->watchdog = FALSE;
-- sc->async = NULL;
-
- /* flush the event queue */
- sc->queue.count = 0;
-@@ -1660,12 +1655,6 @@
- /* remove anything left in the output buffer */
- empty_aux_buffer(sc->kbdc, 10);
-
-- /* clean up and sigio requests */
-- if (sc->async != NULL) {
-- funsetown(&sc->async);
-- sc->async = NULL;
-- }
--
- /* close is almost always successful */
- sc->state &= ~PSM_OPEN;
- kbdc_lock(sc->kbdc, FALSE);
-@@ -2227,15 +2216,6 @@
- break;
- #endif /* MOUSE_GETHWID */
-
-- case FIONBIO:
-- case FIOASYNC:
-- break;
-- case FIOSETOWN:
-- error = fsetown(*(int *)addr, &sc->async);
-- break;
-- case FIOGETOWN:
-- *(int *) addr = fgetown(&sc->async);
-- break;
- default:
- return (ENOTTY);
- }
-@@ -3502,9 +3482,6 @@
- wakeup(sc);
- }
- selwakeuppri(&sc->rsel, PZERO);
-- if (sc->async != NULL) {
-- pgsigio(&sc->async, SIGIO, 0);
-- }
- sc->state &= ~PSM_SOFTARMED;
- splx(s);
- }
View
20 kdragonflybsd-3/debian/patches/915_ip6.v6only.diff
@@ -1,20 +0,0 @@
---- a/sys/netinet6/in6_proto.c
-+++ b/sys/netinet6/in6_proto.c
-@@ -396,7 +396,7 @@
- VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
- VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
- VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
--VNET_DEFINE(int, ip6_accept_rtadv) = 0;
-+VNET_DEFINE(int, ip6_accept_rtadv) = 1;
- VNET_DEFINE(int, ip6_no_radr) = 0;
- VNET_DEFINE(int, ip6_norbit_raif) = 0;
- VNET_DEFINE(int, ip6_rfc6204w3) = 0;
-@@ -412,7 +412,7 @@
- VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix
- * walk list every 5 sec. */
- VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */
--VNET_DEFINE(int, ip6_v6only) = 1;
-+VNET_DEFINE(int, ip6_v6only) = 0;
-
- VNET_DEFINE(int, ip6_keepfaith) = 0;
- VNET_DEFINE(time_t, ip6_log_time) = (time_t)0L;
View
16 kdragonflybsd-3/debian/patches/916_NKPT_amd64.diff
@@ -1,16 +0,0 @@
-
-Just to make sure NKPT is defined in config and not here.
-
-Also see #596577.
-
---- a/sys/amd64/include/pmap.h
-+++ b/sys/amd64/include/pmap.h
-@@ -115,7 +115,7 @@
-
- /* Initial number of kernel page tables. */
- #ifndef NKPT
--#define NKPT 32
-+#define NKPT eat shit and die
- #endif
-
- #define NKPML4E 1 /* number of kernel PML4 slots */
View
11 kdragonflybsd-3/debian/patches/917_disable_kgssapi.diff
@@ -1,11 +0,0 @@
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -154,8 +154,6 @@
- jme \
- joy \
- kbdmux \
-- kgssapi \
-- kgssapi_krb5 \
- khelp \
- krpc \
- ksyms \
View
33 kdragonflybsd-3/debian/patches/918_unix_socket_overflow.diff
@@ -1,33 +0,0 @@
-See #645527.
-
-Our former userspace allows 108 bytes in sun_path,
-but kernel restrict it to 104 bytes.
-
---- a/sys/kern/uipc_usrreq.c
-+++ b/sys/kern/uipc_usrreq.c
-@@ -463,7 +463,12 @@
- KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
-
- if (soun->sun_len > sizeof(struct sockaddr_un))
-+ {
-+ if (soun->sun_len <= (4 + sizeof(struct sockaddr_un)))
-+ soun->sun_len = sizeof(struct sockaddr_un); /* clip it */
-+ else
- return (EINVAL);
-+ };
- namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
- if (namelen <= 0)
- return (EINVAL);
-@@ -1255,7 +1260,12 @@
- KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
-
- if (nam->sa_len > sizeof(struct sockaddr_un))
-+ {
-+ if (nam->sa_len <= (4 + sizeof(struct sockaddr_un)))
-+ nam->sa_len = sizeof(struct sockaddr_un); /* clip it */
-+ else
- return (EINVAL);
-+ };
- len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
- if (len <= 0)
- return (EINVAL);
View
34 kdragonflybsd-3/debian/patches/919_delete_key.diff
@@ -1,34 +0,0 @@
-Debian Policy 9.8 Keyboard configuration
-
-The (Linux) console is configured to make <-- generate DEL, and Delete generate ESC [ 3 ~.
-
-
---- a/sys/dev/kbd/kbdtables.h
-+++ b/sys/dev/kbd/kbdtables.h
-@@ -56,7 +56,7 @@
- /*0b*/{{ '0', ')', NOP, NOP, '0', ')', NOP, NOP, }, 0x33,0x00 },
- /*0c*/{{ '-', '_', 0x1F, 0x1F, '-', '_', 0x1F, 0x1F, }, 0x00,0x00 },
- /*0d*/{{ '=', '+', NOP, NOP, '=', '+', NOP, NOP, }, 0x33,0x00 },
--/*0e*/{{ 0x08, 0x08, 0x7F, 0x7F, 0x08, 0x08, 0x7F, 0x7F, }, 0x00,0x00 },
-+/*0e*/{{ 0x7F, 0x7F, 0x7F, 0x7F, 0x08, 0x08, 0x7F, 0x7F, }, 0x00,0x00 },
- /*0f*/{{ 0x09, BTAB, NOP, NOP, 0x09, BTAB, NOP, NOP, }, 0x77,0x00 },
- /*10*/{{ 'q', 'Q', 0x11, 0x11, 'q', 'Q', 0x11, 0x11, }, 0x00,0x01 },
- /*11*/{{ 'w', 'W', 0x17, 0x17, 'w', 'W', 0x17, 0x17, }, 0x00,0x01 },
-@@ -125,7 +125,7 @@
- /*50*/{{ F(58), '2', '2', '2', '2', '2', '2', '2', }, 0x80,0x02 },
- /*51*/{{ F(59), '3', '3', '3', '3', '3', '3', '3', }, 0x80,0x02 },
- /*52*/{{ F(60), '0', '0', '0', '0', '0', '0', '0', }, 0x80,0x02 },
--/*53*/{{ 0x7F, '.', '.', '.', '.', '.', RBT, RBT, }, 0x03,0x02 },
-+/*53*/{{ F(61), '.', '.', '.', '.', '.', RBT, RBT, }, 0x83,0x02 },
- /*54*/{{ NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, }, 0xFF,0x00 },
- /*55*/{{ NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, }, 0xFF,0x00 },
- /*56*/{{ NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, }, 0xFF,0x00 },
-@@ -226,7 +226,7 @@
- /* 49-52 */ {"\033[H", 3}, {"\033[A", 3}, {"\033[I", 3}, {"-" , 1},
- /* 53-56 */ {"\033[D", 3}, {"\033[E", 3}, {"\033[C", 3}, {"+" , 1},
- /* 57-60 */ {"\033[F", 3}, {"\033[B", 3}, {"\033[G", 3}, {"\033[L", 3},
--/* 61-64 */ {"\177", 1}, {"\033[J", 3}, {"\033[~", 3}, {"\033[}", 3},
-+/* 61-64 */ {"\033[3~",4}, {"\033[J", 3}, {"\033[~", 3}, {"\033[}", 3},
- /* 65-68 */ {"", 0} , {"", 0} , {"", 0} , {"", 0} ,
- /* 69-72 */ {"", 0} , {"", 0} , {"", 0} , {"", 0} ,
- /* 73-76 */ {"", 0} , {"", 0} , {"", 0} , {"", 0} ,
View
31 kdragonflybsd-3/debian/patches/950_no_stack_protector.diff
@@ -1,31 +0,0 @@
-
- disable ssp for now ...
- at least under QEMU it panics, might be due to
- - QEMU
- - newer gcc compared to plain DragonFlyBSD
- - different init order
- - ...
-
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -133,6 +133,8 @@
- #
- # GCC SSP support
- #
-+# Disable stack protector as it causes kernel panic
-+MK_SSP= no
- .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
- CFLAGS+= -fstack-protector
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -144,6 +144,9 @@
- CTFFLAGS+= -g
- .endif
-
-+# Disable stack protector as it causes kernel panic
-+MK_SSP= no
-+
- .if defined(FIRMWS)
- .if !exists(@)
- ${KMOD:S/$/.c/}: @
View
337 kdragonflybsd-3/debian/patches/999_config.diff
@@ -1,337 +0,0 @@
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -18,10 +18,12 @@
- #
- # $DragonFlyBSD$
-
--cpu HAMMER
--ident GENERIC
-+#cpu HAMMER
-+#ident GENERIC
-
--makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-+hints "GENERIC.hints" # Default places to look for devices.
-+
-+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-
- options SCHED_ULE # ULE scheduler
- options PREEMPTION # Enable kernel thread preemption
-@@ -49,7 +51,7 @@
- options COMPAT_DRAGONFLYBSD5 # Compatible with DragonFlyBSD5
- options COMPAT_DRAGONFLYBSD6 # Compatible with DragonFlyBSD6
- options COMPAT_DRAGONFLYBSD7 # Compatible with DragonFlyBSD7
--options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
-+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
- options KTRACE # ktrace(1) support
- options STACK # stack(9) support
- options SYSVSHM # SYSV-style shared memory
-@@ -73,7 +75,7 @@
- options KDB_TRACE # Print a stack trace for a panic
-
- # Make an SMP-capable kernel by default
--options SMP # Symmetric MultiProcessor Kernel
-+#options SMP # Symmetric MultiProcessor Kernel
-
- # CPU frequency control
- device cpufreq
-@@ -82,9 +84,6 @@
- device acpi
- device pci
-
--# Floppy drives
--device fdc
--
- # ATA controllers
- device ahci # AHCI-compatible SATA controllers
- device ata # Legacy ATA/SATA controllers
-@@ -111,7 +110,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 @@
- # Parallel port
- device ppc
- device ppbus # Parallel port bus (required)
--device lpt # Printer
--device plip # TCP/IP over parallel
--device ppi # Parallel port interface device
--#device vpo # Requires scbus and da
-
- device puc # Multi I/O cards and multi-channel UARTs
-
-@@ -190,8 +184,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
--device ti # Alteon Networks Tigon I/II gigabit Ethernet
--device txp # 3Com 3cR990 (``Typhoon'')
- 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 @@
- device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
- device re # RealTek 8139C+/8169/8169S/8110S
- device rl # RealTek 8129/8139
--device sf # Adaptec AIC-6915 (``Starfire'')
- 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 @@
- device ex # Intel EtherExpress Pro/10 and Pro/10+
- device ep # Etherlink III based cards
- device fe # Fujitsu MB8696x based cards
--device sn # SMC's 9000 series of Ethernet chips
- device xe # Xircom pccard Ethernet
-
- # Wireless NIC cards
-@@ -256,12 +244,7 @@
- device ath_rate_sample # SampleRate tx rate control for ath
- #device bwi # Broadcom BCM430x/BCM431x wireless NICs.
- #device bwn # Broadcom BCM43xx wireless NICs.
--device ipw # Intel 2100 wireless NICs.
--device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs.
--device iwn # Intel 4965/1000/5000/6000 wireless NICs.
- device malo # Marvell Libertas wireless NICs.
--device mwl # Marvell 88W8363 802.11n wireless NICs.
--device ral # Ralink Technology RT2500 wireless NICs.
- device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
- device wpi # Intel 3945ABG wireless NICs.
-
-@@ -270,11 +253,8 @@
- device random # Entropy device
- device ether # Ethernet support
- device vlan # 802.1Q VLAN support
--device tun # Packet tunnel.
- device pty # BSD-style compatibility pseudo ttys
- device md # Memory "disks"
--device gif # IPv6 and IPv4 tunneling
--device faith # IPv6-to-IPv4 relaying (translation)
- device firmware # firmware assist module
-
- # The `bpf' device enables the Berkeley Packet Filter.
-@@ -290,12 +270,12 @@
- device xhci # XHCI PCI->USB interface (USB 3.0)
- device usb # USB Bus (required)
- #device udbp # USB Double Bulk Pipe devices (needs netgraph)
--device uhid # "Human Interface Devices"
-+#device uhid # "Human Interface Devices"
- device ukbd # Keyboard
--device ulpt # Printer
-+#device ulpt # Printer
- device umass # Disks/Mass storage - Requires scbus and da
- device ums # Mouse
--device urio # Diamond Rio 500 MP3 player
-+#device urio # Diamond Rio 500 MP3 player
- # 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
-+# 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 @@
- #
- # $DragonFlyBSD$
-
--cpu I486_CPU
--cpu I586_CPU
--cpu I686_CPU
--ident GENERIC
-+#cpu I486_CPU
-+#cpu I586_CPU
-+#cpu I686_CPU
-+#ident GENERIC
-
--makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-+hints "GENERIC.hints" # Default places to look for devices.
-+
-+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-
- options SCHED_ULE # ULE scheduler
- options PREEMPTION # Enable kernel thread preemption
-@@ -43,6 +45,8 @@
- options MSDOSFS # MSDOS Filesystem
- options CD9660 # ISO 9660 Filesystem
- options PROCFS # Process filesystem (requires PSEUDOFS)
-+options LINPROCFS
-+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 COMPAT_DRAGONFLYBSD5 # Compatible with DragonFlyBSD5
- options COMPAT_DRAGONFLYBSD6 # Compatible with DragonFlyBSD6
- options COMPAT_DRAGONFLYBSD7 # Compatible with DragonFlyBSD7
--options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
-+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
- options KTRACE # ktrace(1) support
- options STACK # stack(9) support
- options SYSVSHM # SYSV-style shared memory
-@@ -73,7 +77,7 @@
- options KDB_TRACE # Print a stack trace for a panic
-
- # To make an SMP kernel, the next two lines are needed
--options SMP # Symmetric MultiProcessor Kernel
-+#options SMP # Symmetric MultiProcessor Kernel
- device apic # I/O APIC
-
- # CPU frequency control
-@@ -84,9 +88,6 @@
- device eisa
- device pci
-
--# Floppy drives
--device fdc
--
- # ATA controllers
- device ahci # AHCI-compatible SATA controllers
- device ata # Legacy ATA/SATA controllers
-@@ -113,7 +114,6 @@
- device trm # Tekram DC395U/UW/F DC315U adapters
-
- device adv # Advansys SCSI adapters
--device adw # Advansys wide SCSI adapters
- 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 @@
- # Parallel port
- device ppc
- device ppbus # Parallel port bus (required)
--device lpt # Printer
--device plip # TCP/IP over parallel
--device ppi # Parallel port interface device
--#device vpo # Requires scbus and da
-
- device puc # Multi I/O cards and multi-channel UARTs
-
-@@ -200,8 +196,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
--device ti # Alteon Networks Tigon I/II gigabit Ethernet
--device txp # 3Com 3cR990 (``Typhoon'')
- 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 @@
- device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
- device re # RealTek 8139C+/8169/8169S/8110S
- device rl # RealTek 8129/8139
--device sf # Adaptec AIC-6915 (``Starfire'')
- 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 @@
- device ep # Etherlink III based cards
- device fe # Fujitsu MB8696x based cards
- device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
--device sn # SMC's 9000 series of Ethernet chips
- device xe # Xircom pccard Ethernet
-
- # Wireless NIC cards
-@@ -268,12 +258,7 @@
- device ath_rate_sample # SampleRate tx rate control for ath
- #device bwi # Broadcom BCM430x/BCM431x wireless NICs.
- #device bwn # Broadcom BCM43xx wireless NICs.
--device ipw # Intel 2100 wireless NICs.
--device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs.
--device iwn # Intel 4965/1000/5000/6000 wireless NICs.
- device malo # Marvell Libertas wireless NICs.
--device mwl # Marvell 88W8363 802.11n wireless NICs.
--device ral # Ralink Technology RT2500 wireless NICs.
- 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 @@
- device random # Entropy device
- device ether # Ethernet support
- device vlan # 802.1Q VLAN support
--device tun # Packet tunnel.
- device pty # BSD-style compatibility pseudo ttys
- device md # Memory "disks"
--device gif # IPv6 and IPv4 tunneling
--device faith # IPv6-to-IPv4 relaying (translation)
- device firmware # firmware assist module
-
- # The `bpf' device enables the Berkeley Packet Filter.
-@@ -303,12 +285,12 @@
- device xhci # XHCI PCI->USB interface (USB 3.0)
- device usb # USB Bus (required)
- #device udbp # USB Double Bulk Pipe devices (needs netgraph)
--device uhid # "Human Interface Devices"
-+#device uhid # "Human Interface Devices"
- device ukbd # Keyboard
--device ulpt # Printer
-+#device ulpt # Printer
- device umass # Disks/Mass storage - Requires scbus and da
- device ums # Mouse
--device urio # Diamond Rio 500 MP3 player
-+#device urio # Diamond Rio 500 MP3 player
- # 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
-+# 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)
View
242 kdragonflybsd-3/debian/patches/999_firmware.diff
@@ -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 @@
- # $DragonFlyBSD$
-
--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/kDragonFlyBSD 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.
-+#
-+# $DragonFlyBSD$
-+
-+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.
-+#
-+# $DragonFlyBSD$
-+
-+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.
-+#
-+# $DragonFlyBSD$
-+
-+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
View
128 kdragonflybsd-3/debian/patches/EN-12_02.ipv6refcount.patch
@@ -1,128 +0,0 @@
-Description:
- Fix reference count errors in IPv6 code. [EN-12:02]
-Origin: vendor, http://security.dragonflybsd.org/patches/EN-12:02/ipv6refcount.patch
-Bug: http://security.dragonflybsd.org/advisories/DragonFlyBSD-EN-12:02.ipv6refcount.asc
-Applied-Upstream: http://svnweb.dragonflybsd.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 */
- /*
View
32 kdragonflybsd-3/debian/patches/SA-12_04.sysret.patch
@@ -1,32 +0,0 @@
-Description:
- Correct a privilege escalation when returning from kernel if
- running DragonFlyBSD/amd64 on non-AMD processors. [12:04]
-Origin: vendor, http://security.dragonflybsd.org/patches/SA-12:04/sysret.patch
-Bug: http://security.dragonflybsd.org/advisories/DragonFlyBSD-SA-12:04.sysret.asc
-Bug-Debian: http://bugs.debian.org/677298
-Applied-Upstream: http://svnweb.dragonflybsd.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);
-+ }
- }
View
21 kdragonflybsd-3/debian/patches/amd64_increase_DFLDSIZ.diff
@@ -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 */
View
259 kdragonflybsd-3/debian/patches/fix_VOP_VPTOCNP_bypass_for_nullfs.diff
@@ -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);
View
21 kdragonflybsd-3/debian/patches/improve_tmpfs_mem_info.diff
@@ -1,21 +0,0 @@
-
-Cherry-pick from 9-STABLE (SVN rev 233769).
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666747
-http://www.dragonflybsd.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
View
55 kdragonflybsd-3/debian/patches/pf_counter_initialization_SVN236364.diff
@@ -1,55 +0,0 @@
-Index: kdragonflybsd-9-9.0/sys/contrib/pf/net/pf_ioctl.c
-===================================================================
---- kdragonflybsd-9-9.0.orig/sys/contrib/pf/net/pf_ioctl.c 2011-10-26 19:09:09.000000000 +0200
-+++ kdragonflybsd-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);