[Glibc-bsd-commits] r3993 - in trunk/kfreebsd-8/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Jan 21 00:19:21 UTC 2012
Author: rmh
Date: 2012-01-21 00:19:20 +0000 (Sat, 21 Jan 2012)
New Revision: 3993
Removed:
trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
Modified:
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/000_syscons_backport.diff
trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-8/debian/patches/904_dev_full.diff
trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff
trunk/kfreebsd-8/debian/patches/999_firmware.diff
trunk/kfreebsd-8/debian/patches/series
Log:
New upstream snapshot
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/changelog 2012-01-21 00:19:20 UTC (rev 3993)
@@ -1,5 +1,8 @@
-kfreebsd-8 (8.3~svn229760-2) UNRELEASED; urgency=low
+kfreebsd-8 (8.3~svn230343-1) experimental; urgency=low
+ * New upstream snapshot.
+
+ [ Robert Millan ]
* 904_dev_full.diff: Small bugfix affecting destruction of /dev/full.
* Built by GCC 4.6. (Closes: #654738)
Modified: trunk/kfreebsd-8/debian/patches/000_syscons_backport.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_syscons_backport.diff 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/patches/000_syscons_backport.diff 2012-01-21 00:19:20 UTC (rev 3993)
@@ -2176,9 +2176,9 @@
+static void scsuspend(void *);
+static void scresume(void *);
static u_int scgetc(sc_softc_t *sc, u_int flags);
+ static void sc_puts(scr_stat *scp, u_char *buf, int len, int kernel);
#define SCGETC_CN 1
- #define SCGETC_NONBLOCK 2
-@@ -348,7 +361,9 @@
+@@ -349,7 +362,9 @@
sc_set_vesa_mode(scr_stat *scp, sc_softc_t *sc, int unit)
{
video_info_t info;
@@ -2188,7 +2188,7 @@
int i;
int vmode;
-@@ -377,9 +392,37 @@
+@@ -378,9 +393,37 @@
vidd_get_info(sc->adp, vmode, &info);
}
@@ -2228,7 +2228,7 @@
#endif
#ifdef DEV_SPLASH
if ((sc->flags & SC_SPLASH_SCRN) != 0)
-@@ -398,16 +441,12 @@
+@@ -399,16 +442,12 @@
scp->xpixel = info.vi_width;
scp->ypixel = info.vi_height;
scp->xsize = scp->xpixel / 8;
@@ -2248,7 +2248,7 @@
scp->font_width = 8;
scp->start = scp->xsize * scp->ysize - 1;
scp->end = 0;
-@@ -475,7 +514,7 @@
+@@ -476,7 +515,7 @@
scrn_timer(sc);
/* set up the keyboard */
@@ -2257,7 +2257,7 @@
update_kbd_state(scp, scp->status, LOCK_MASK);
printf("%s%d: %s <%d virtual consoles, flags=0x%x>\n",
-@@ -492,10 +531,15 @@
+@@ -493,10 +532,15 @@
printf("\n");
}
@@ -2277,7 +2277,7 @@
for (vc = 0; vc < sc->vtys; vc++) {
if (sc->dev[vc] == NULL) {
-@@ -584,7 +628,7 @@
+@@ -585,7 +629,7 @@
#ifndef __sparc64__
if (sc->kbd != NULL) {
key.keynum = KEYCODE_BS;
@@ -2286,7 +2286,7 @@
tp->t_termios.c_cc[VERASE] = key.key.map[0];
}
#endif
-@@ -643,7 +687,7 @@
+@@ -644,7 +688,7 @@
#endif
scp->kbd_mode = K_XLATE;
if (scp == scp->sc->cur_scp)
@@ -2295,7 +2295,7 @@
DPRINTF(5, ("done.\n"));
}
}
-@@ -665,7 +709,7 @@
+@@ -666,7 +710,7 @@
struct tty *cur_tty;
int c, error = 0;
size_t len;
@@ -2304,7 +2304,7 @@
sc = (sc_softc_t *)arg;
/* assert(thiskbd == sc->kbd) */
-@@ -704,24 +748,21 @@
+@@ -705,24 +749,21 @@
ttydisc_rint(cur_tty, KEYCHAR(c), 0);
break;
case FKEY: /* function key, return string */
@@ -2336,7 +2336,7 @@
break;
}
-@@ -1225,7 +1266,7 @@
+@@ -1226,7 +1267,7 @@
case K_CODE: /* switch to CODE mode */
scp->kbd_mode = *(int *)data;
if (scp == sc->cur_scp)
@@ -2345,7 +2345,7 @@
return 0;
default:
return EINVAL;
-@@ -1339,7 +1380,7 @@
+@@ -1340,7 +1381,7 @@
}
sc->kbd = kbd_get_keyboard(i); /* sc->kbd == newkbd */
sc->keyboard = i;
@@ -2354,7 +2354,7 @@
(caddr_t)&sc->cur_scp->kbd_mode);
update_kbd_state(sc->cur_scp, sc->cur_scp->status,
LOCK_MASK);
-@@ -1618,7 +1659,7 @@
+@@ -1619,7 +1660,7 @@
static struct fkeytab fkey;
static int fkeycp;
scr_stat *scp;
@@ -2363,7 +2363,7 @@
int cur_mode;
int s = spltty(); /* block sckbdevent and scrn_timer while we poll */
int c;
-@@ -1652,14 +1693,14 @@
+@@ -1653,14 +1694,14 @@
/* we shall always use the keyboard in the XLATE mode here */
cur_mode = scp->kbd_mode;
scp->kbd_mode = K_XLATE;
@@ -2380,7 +2380,7 @@
kbdd_disable(scp->sc->kbd);
splx(s);
-@@ -1667,6 +1708,13 @@
+@@ -1668,6 +1709,13 @@
case 0: /* normal char */
return KEYCHAR(c);
case FKEY: /* function key */
@@ -2394,7 +2394,7 @@
p = kbdd_get_fkeystr(scp->sc->kbd, KEYCHAR(c), (size_t *)&fkeycp);
fkey.len = fkeycp;
if ((p != NULL) && (fkey.len > 0)) {
-@@ -1688,7 +1736,7 @@
+@@ -1689,7 +1737,7 @@
{
/* this is a cut-down version of scrn_timer()... */
@@ -2403,7 +2403,7 @@
return;
if (debugger > 0 || panicstr || shutdown_in_progress) {
-@@ -1738,7 +1786,7 @@
+@@ -1739,7 +1787,7 @@
return;
/* don't do anything when we are performing some I/O operations */
@@ -2412,7 +2412,7 @@
if (again)
timeout(scrn_timer, sc, hz / 10);
return;
-@@ -1752,7 +1800,7 @@
+@@ -1753,7 +1801,7 @@
sc->keyboard = sc_allocate_keyboard(sc, -1);
if (sc->keyboard >= 0) {
sc->kbd = kbd_get_keyboard(sc->keyboard);
@@ -2421,7 +2421,7 @@
(caddr_t)&sc->cur_scp->kbd_mode);
update_kbd_state(sc->cur_scp, sc->cur_scp->status,
LOCK_MASK);
-@@ -2547,7 +2595,7 @@
+@@ -2548,7 +2596,7 @@
/* set up the keyboard for the new screen */
if (sc->old_scp->kbd_mode != scp->kbd_mode)
@@ -2430,7 +2430,7 @@
update_kbd_state(scp, scp->status, LOCK_MASK);
mark_all(scp);
-@@ -2977,16 +3025,64 @@
+@@ -2978,16 +3026,64 @@
}
static void
@@ -2503,7 +2503,7 @@
}
int
-@@ -3089,27 +3185,18 @@
+@@ -3090,27 +3186,18 @@
scp->ypixel = scp->ysize*info.vi_cheight;
}
@@ -2540,7 +2540,7 @@
sc_vtb_init(&scp->vtb, VTB_MEMORY, 0, 0, NULL, FALSE);
#ifndef __sparc64__
-@@ -3330,7 +3417,7 @@
+@@ -3331,7 +3418,7 @@
case NLK: case CLK: case ALK:
break;
case SLK:
@@ -2549,7 +2549,7 @@
if (f & SLKED) {
scp->status |= SLKED;
} else {
-@@ -3473,6 +3560,10 @@
+@@ -3474,6 +3561,10 @@
/* goto next_code */
} else {
/* regular keys (maybe MKEY is set) */
@@ -2560,7 +2560,7 @@
if (!(sc->flags & SC_SCRN_BLANKED))
return c;
}
-@@ -3482,7 +3573,8 @@
+@@ -3483,7 +3574,8 @@
}
static int
@@ -2570,7 +2570,7 @@
{
scr_stat *scp;
-@@ -3653,19 +3745,18 @@
+@@ -3654,19 +3746,18 @@
}
void
@@ -2596,7 +2596,7 @@
}
void
-@@ -3760,7 +3851,7 @@
+@@ -3761,7 +3852,7 @@
strcpy(ki.kb_name, k->kb_name);
ki.kb_unit = k->kb_unit;
@@ -2649,7 +2649,7 @@
} sc_term_sw_t;
#define SCTERM_MODULE(name, sw) \
-@@ -568,7 +573,8 @@
+@@ -567,7 +572,8 @@
void sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard);
int sc_init_emulator(scr_stat *scp, char *name);
void sc_paste(scr_stat *scp, const u_char *p, int count);
Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2012-01-21 00:19:20 UTC (rev 3993)
@@ -1,64 +1,3 @@
----
- sys/amd64/conf/GENERIC | 2 --
- sys/conf/files.amd64 | 29 -----------------------------
- sys/conf/files.i386 | 30 ------------------------------
- sys/i386/conf/GENERIC | 2 --
- sys/modules/Makefile | 9 ---------
- 5 files changed, 72 deletions(-)
-
---- 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
-@@ -173,14 +152,6 @@
- dev/fe/if_fe_isa.c optional fe isa
- 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
-@@ -213,7 +184,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
@@ -145,8 +145,6 @@
@@ -72,16 +11,16 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -106,8 +106,6 @@
- hifn \
+@@ -107,8 +107,6 @@
hme \
+ ${_hpt27xx} \
${_hptiop} \
- ${_hptmv} \
- ${_hptrr} \
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -223,7 +221,6 @@
+@@ -224,7 +222,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -89,16 +28,18 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -482,8 +479,6 @@
+@@ -483,10 +480,7 @@
+ _ctau= ctau
_dpt= dpt
_ex= ex
+-_hpt27xx= hpt27xx
_hptiop= hptiop
-_hptmv= hptmv
-_hptrr= hptrr
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -499,7 +494,6 @@
+@@ -502,7 +496,6 @@
_ixgbe= ixgbe
_mly= mly
_nfe= nfe
@@ -106,16 +47,18 @@
_nvram= nvram
_nxge= nxge
_tpm= tpm
-@@ -553,8 +547,6 @@
+@@ -556,10 +549,7 @@
+ _em= em
_exca= exca
_ext2fs= ext2fs
+-_hpt27xx= hpt27xx
_hptiop= hptiop
-_hptmv= hptmv
-_hptrr= hptrr
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -579,7 +571,6 @@
+@@ -584,7 +574,6 @@
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -136,7 +79,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
-@@ -47,26 +47,6 @@
+@@ -47,30 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -151,6 +94,10 @@
- no-implicit-rule no-obj before-depend \
- clean "os+%DIKED-nve.h"
-#
+-hpt27xx_lib.o optional hpt27xx \
+- dependency "$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
+- compile-with "uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
+- no-implicit-rule
-hptmvraid.o optional hptmv \
- dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \
- compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
@@ -163,10 +110,13 @@
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
amd64/acpica/acpi_switch.S optional acpi
-@@ -194,14 +174,6 @@
+@@ -198,17 +174,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/hpt27xx/os_bsd.c optional hpt27xx
+-dev/hpt27xx/osm_bsd.c optional hpt27xx
+-dev/hpt27xx/hpt27xx_config.c optional hpt27xx
-dev/hptmv/entry.c optional hptmv
-dev/hptmv/mv.c optional hptmv
-dev/hptmv/gui_lib.c optional hptmv
@@ -178,7 +128,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -213,7 +185,6 @@
+@@ -220,7 +185,6 @@
dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
@@ -186,3 +136,81 @@
dev/nvram/nvram.c optional nvram isa
dev/sio/sio.c optional sio
dev/sio/sio_isa.c optional sio isa
+--- a/sys/conf/files.i386
++++ b/sys/conf/files.i386
+@@ -46,31 +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"
+-#
+-hpt27xx_lib.o optional hpt27xx \
+- dependency "$S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
+- compile-with "uudecode < $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
+- no-implicit-rule
+-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
+@@ -146,17 +121,9 @@
+ dev/atkbdc/atkbdc_isa.c optional atkbdc isa
+ dev/atkbdc/atkbdc_subr.c optional atkbdc
+ dev/atkbdc/psm.c optional psm atkbdc
+-dev/ce/ceddk.c optional ce
+-dev/ce/if_ce.c optional ce
+-dev/ce/tau32-ddk.c optional ce
+ dev/cm/if_cm_isa.c optional cm isa
+ dev/coretemp/coretemp.c optional coretemp
+-dev/cp/cpddk.c optional cp
+-dev/cp/if_cp.c optional cp
+ dev/cpuctl/cpuctl.c optional cpuctl
+-dev/ctau/ctau.c optional ctau
+-dev/ctau/ctddk.c optional ctau
+-dev/ctau/if_ct.c optional ctau
+ dev/cx/csigma.c optional cx
+ dev/cx/cxddk.c optional cx
+ dev/cx/if_cx.c optional cx
+@@ -177,17 +144,6 @@
+ dev/fe/if_fe_isa.c optional fe isa
+ dev/glxsb/glxsb.c optional glxsb
+ dev/glxsb/glxsb_hash.c optional glxsb
+-dev/hpt27xx/os_bsd.c optional hpt27xx
+-dev/hpt27xx/osm_bsd.c optional hpt27xx
+-dev/hpt27xx/hpt27xx_config.c optional hpt27xx
+-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
+@@ -220,7 +176,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
Modified: trunk/kfreebsd-8/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2012-01-21 00:19:20 UTC (rev 3993)
@@ -1,14 +1,9 @@
-Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
- /dev/full already rejected in upstream (kern/68961)
+/dev/full already rejected in upstream (kern/68961)
----
- sys/dev/null/null.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
-@@ -43,9 +43,11 @@
+@@ -45,9 +45,11 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -18,9 +13,9 @@
static d_write_t null_write;
+static d_write_t full_write;
static d_ioctl_t null_ioctl;
+ static d_ioctl_t zero_ioctl;
static d_read_t zero_read;
-
-@@ -57,6 +59,14 @@
+@@ -60,6 +62,14 @@
.d_name = "null",
};
@@ -35,7 +30,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -78,11 +88,25 @@
+@@ -82,6 +92,15 @@
/* ARGSUSED */
static int
@@ -46,22 +41,12 @@
+ return (ENOSPC);
+}
+
-+#include <sys/filio.h>
+/* ARGSUSED */
+static int
null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
int flags __unused, struct thread *td)
{
- int error;
-
-+ if (cmd == FIONBIO)
-+ return 0;
-+ if ((cmd == FIOASYNC) && ((*(int *)data) == 0))
-+ return 0;
- if (cmd != DIOCSKERNELDUMP)
- return (ENOIOCTL);
- error = priv_check(td, PRIV_SETDUMPER);
-@@ -114,12 +138,15 @@
+@@ -151,12 +170,15 @@
zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "null");
Modified: trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff 2012-01-21 00:19:20 UTC (rev 3993)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -151,8 +151,6 @@
+@@ -152,8 +152,6 @@
jme \
joy \
kbdmux \
Deleted: trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/917_track_alignment.diff 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/patches/917_track_alignment.diff 2012-01-21 00:19:20 UTC (rev 3993)
@@ -1,20 +0,0 @@
----
- sys/geom/part/g_part_mbr.c | 7 -------
- 1 file changed, 7 deletions(-)
-
---- a/sys/geom/part/g_part_mbr.c
-+++ b/sys/geom/part/g_part_mbr.c
-@@ -461,13 +461,6 @@
- basetable->gpt_heads = heads;
- }
- }
-- if ((ent.dp_start % basetable->gpt_sectors) != 0)
-- printf("GEOM: %s: partition %d does not start on a "
-- "track boundary.\n", pp->name, index + 1);
-- if ((ent.dp_size % basetable->gpt_sectors) != 0)
-- printf("GEOM: %s: partition %d does not end on a "
-- "track boundary.\n", pp->name, index + 1);
--
- entry = (struct g_part_mbr_entry *)g_part_new_entry(basetable,
- index + 1, ent.dp_start, ent.dp_start + ent.dp_size - 1);
- entry->ent = ent;
Modified: trunk/kfreebsd-8/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_firmware.diff 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/patches/999_firmware.diff 2012-01-21 00:19:20 UTC (rev 3993)
@@ -513,26 +513,6 @@
#
# USB serial and parallel port drivers
#
---- a/sys/conf/files.i386
-+++ b/sys/conf/files.i386
-@@ -121,17 +121,9 @@
- dev/atkbdc/atkbdc_isa.c optional atkbdc isa
- dev/atkbdc/atkbdc_subr.c optional atkbdc
- dev/atkbdc/psm.c optional psm atkbdc
--dev/ce/ceddk.c optional ce
--dev/ce/if_ce.c optional ce
--dev/ce/tau32-ddk.c optional ce
- dev/cm/if_cm_isa.c optional cm isa
- dev/coretemp/coretemp.c optional coretemp
--dev/cp/cpddk.c optional cp
--dev/cp/if_cp.c optional cp
- dev/cpuctl/cpuctl.c optional cpuctl
--dev/ctau/ctau.c optional ctau
--dev/ctau/ctddk.c optional ctau
--dev/ctau/if_ct.c optional ctau
- dev/cx/csigma.c optional cx
- dev/cx/cxddk.c optional cx
- dev/cx/if_cx.c optional cx
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -4,9 +4,6 @@
@@ -592,7 +572,7 @@
gem \
geom \
${_glxsb} \
-@@ -138,14 +131,10 @@
+@@ -139,14 +132,10 @@
ip_mroute_mod \
${_ips} \
${_ipw} \
@@ -607,7 +587,7 @@
${_ixgb} \
${_ixgbe} \
jme \
-@@ -196,7 +185,6 @@
+@@ -197,7 +186,6 @@
msk \
mvs \
mwl \
@@ -615,7 +595,7 @@
mxge \
my \
${_ncp} \
-@@ -242,14 +230,12 @@
+@@ -243,14 +231,12 @@
${_pst} \
puc \
ral \
@@ -630,7 +610,7 @@
${_s3} \
${_safe} \
${_sbni} \
-@@ -258,7 +244,6 @@
+@@ -259,7 +245,6 @@
${_scsi_low} \
sdhci \
sem \
@@ -638,7 +618,7 @@
sge \
${_siba_bwn} \
siftr \
-@@ -266,7 +251,6 @@
+@@ -267,7 +252,6 @@
sis \
sk \
${_smbfs} \
@@ -646,7 +626,7 @@
${_snc} \
snp \
${_sound} \
-@@ -281,7 +265,6 @@
+@@ -282,7 +266,6 @@
${_sym} \
${_syscons} \
sysvipc \
@@ -654,7 +634,7 @@
tl \
${_tmpfs} \
${_tpm} \
-@@ -290,7 +273,6 @@
+@@ -291,7 +274,6 @@
twe \
tws \
tx \
@@ -662,7 +642,7 @@
${_uart} \
ubsec \
udf \
-@@ -317,7 +299,6 @@
+@@ -319,7 +301,6 @@
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -670,7 +650,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -389,9 +370,7 @@
+@@ -391,9 +372,7 @@
_bktr= bktr
_cardbus= cardbus
_cbb= cbb
@@ -680,7 +660,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -483,11 +462,8 @@
+@@ -486,11 +465,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -692,15 +672,15 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -496,7 +472,6 @@
- _nxge= nxge
+@@ -500,7 +476,6 @@
_tpm= tpm
+ _viawd= viawd
_wpi= wpi
-_wpifw= wpifw
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -555,11 +530,8 @@
+@@ -560,11 +535,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -712,7 +692,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -594,7 +566,6 @@
+@@ -600,7 +572,6 @@
_x86bios= x86bios
_wi= wi
_wpi= wpi
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2012-01-21 00:00:53 UTC (rev 3992)
+++ trunk/kfreebsd-8/debian/patches/series 2012-01-21 00:19:20 UTC (rev 3993)
@@ -34,7 +34,6 @@
914_psm.diff
915_ip6.v6only.diff
916_NKPT_amd64.diff
-917_track_alignment.diff
917_disable_kgssapi.diff
918_unix_socket_overflow.diff
919_delete_key.diff
More information about the Glibc-bsd-commits
mailing list