[Glibc-bsd-commits] r2086 - in trunk: kfreebsd-6/debian kfreebsd-6/debian/patches kfreebsd-7/debian kfreebsd-7/debian/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Fri Dec 21 08:52:15 UTC 2007
Author: ps-guest
Date: 2007-12-21 08:52:14 +0000 (Fri, 21 Dec 2007)
New Revision: 2086
Modified:
trunk/kfreebsd-6/debian/changelog
trunk/kfreebsd-6/debian/copyright
trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/copyright
trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
Log:
* New upstream kernel snapshots
* Disable non-free "hptrr" driver - another Highpoint RocketRAID
Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog 2007-12-18 16:07:37 UTC (rev 2085)
+++ trunk/kfreebsd-6/debian/changelog 2007-12-21 08:52:14 UTC (rev 2086)
@@ -1,18 +1,21 @@
-kfreebsd-6 (6.3~cvs20071209-2) UNRELEASED; urgency=low
+kfreebsd-6 (6.3~cvs200712xx-1) UNRELEASED; urgency=low
+ [ Petr Salinger ]
+ * New upstream snapshot (RELENG_6_3)
+ * Disable non-free "hptrr" driver - another Highpoint RocketRAID
+
[ Aurelien Jarno ]
* Refresh all patches.
- -- Aurelien Jarno <aurel32 at debian.org> Sun, 09 Dec 2007 13:46:22 +0100
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 21 Dec 2007 10:29:00 +0100
kfreebsd-6 (6.3~cvs20071209-1) experimental; urgency=low
[ Petr Salinger ]
- * New upstream snapshot (RELENG_6_3)
- fix random value disclosure (FreeBSD-SA-07:09.random / CVE-2007-6150).
- drop obsolete 018_genassym_MAXCPU.diff
- add 913_uudecode.diff
- - refresh of some remaining patches
+ - update of some remaining patches
* Backport packaging changes from kfreebsd-7
* Changed building rules to be correctly buildable with current binutils
- add 020_linker.diff and gen-ld-u-options
Modified: trunk/kfreebsd-6/debian/copyright
===================================================================
--- trunk/kfreebsd-6/debian/copyright 2007-12-18 16:07:37 UTC (rev 2085)
+++ trunk/kfreebsd-6/debian/copyright 2007-12-21 08:52:14 UTC (rev 2086)
@@ -40,6 +40,7 @@
src/sys/contrib/dev/nve
src/sys/contrib/dev/oltr
src/sys/dev/hptmv
+src/sys/dev/hptrr
src/sys/dev/rr232x
The following directories contained code that is itself free, but depends
@@ -47,6 +48,7 @@
src/sys/modules/ath
src/sys/modules/hptmv
+src/sys/modules/hptrr
src/sys/modules/rr232x
src/sys/modules/nve
src/sys/modules/oltr
Modified: trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2007-12-18 16:07:37 UTC (rev 2085)
+++ trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2007-12-21 08:52:14 UTC (rev 2086)
@@ -25,7 +25,7 @@
===================================================================
--- sys/conf/files.i386.orig
+++ sys/conf/files.i386
-@@ -46,42 +46,6 @@
+@@ -46,47 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -60,6 +60,11 @@
- 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
+-#
-rr232x_lib.o optional rr232x \
- dependency "$S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \
- compile-with "uudecode < $S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \
@@ -68,7 +73,7 @@
#
compat/linux/linux_file.c optional compat_linux
compat/linux/linux_getcwd.c optional compat_linux
-@@ -185,11 +149,6 @@
+@@ -190,14 +149,6 @@
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
dev/fe/if_fe_isa.c optional fe isa
@@ -77,10 +82,13 @@
-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_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
-@@ -224,13 +183,9 @@
+@@ -232,13 +183,9 @@
dev/mxge/mxge_eth_z8e.c optional mxge pci
dev/mxge/mxge_ethp_z8e.c optional mxge pci
net/zlib.c optional mxge
@@ -112,16 +120,17 @@
===================================================================
--- sys/i386/conf/GENERIC.orig
+++ sys/i386/conf/GENERIC
-@@ -117,8 +117,6 @@
+@@ -117,9 +117,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 rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -200,7 +198,6 @@
+@@ -201,7 +198,6 @@
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
device nfe # nVidia nForce MCP on-board Ethernet Networking
device nge # NatSemi DP83820 gigabit Ethernet
@@ -145,15 +154,16 @@
aue \
${_auxio} \
${_awi} \
-@@ -96,7 +91,6 @@
+@@ -96,8 +91,6 @@
${_hfa} \
hifn \
hme \
- ${_hptmv} \
+- ${_hptrr} \
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -185,9 +179,7 @@
+@@ -186,9 +179,7 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -163,7 +173,7 @@
${_osf1} \
${_padlock} \
patm \
-@@ -343,7 +335,6 @@
+@@ -344,7 +335,6 @@
_apm= apm
_ar= ar
_arcnet= arcnet
@@ -171,7 +181,7 @@
_awi= awi
_bktr= bktr
_cardbus= cardbus
-@@ -377,7 +368,6 @@
+@@ -378,7 +368,6 @@
_ndis= ndis
_nsp= nsp
_nwfs= nwfs
@@ -179,15 +189,15 @@
_pccard= pccard
_pcfclock= pcfclock
_pecoff= pecoff
-@@ -415,7 +405,6 @@
+@@ -416,7 +405,6 @@
_dpt= dpt
_el= el
_ex= ex
--_hptmv= hptmv
+-_hptrr= hptrr
_ichwd= ichwd
_ida= ida
_idt= idt
-@@ -427,14 +416,12 @@
+@@ -428,14 +416,12 @@
_ixgb= ixgb
_mly= mly
_mxge= mxge
@@ -202,7 +212,7 @@
_s3= s3
_twa= twa
_vesa= vesa
-@@ -461,7 +448,6 @@
+@@ -462,7 +448,6 @@
#_acpi= acpi # doesn't work on amd64 yet
_agp= agp
_arcmsr= arcmsr
@@ -210,15 +220,16 @@
_ciss= ciss
_coretemp= coretemp
_cpufreq= cpufreq
-@@ -469,7 +455,6 @@
+@@ -470,8 +455,6 @@
_drm= drm
_em= em
_ext2fs= ext2fs
-_hptmv= hptmv
+-_hptrr= hptrr
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -486,7 +471,6 @@
+@@ -488,7 +471,6 @@
_ndis= ndis
_nve= nve
_ppc= ppc
@@ -230,16 +241,17 @@
===================================================================
--- sys/amd64/conf/GENERIC.orig
+++ sys/amd64/conf/GENERIC
-@@ -116,8 +116,6 @@
+@@ -116,9 +116,6 @@
device arcmsr # Areca SATA II 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 rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -191,7 +189,6 @@
+@@ -192,7 +189,6 @@
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
device nfe # nVidia nForce MCP on-board Ethernet Networking
device nge # NatSemi DP83820 gigabit Ethernet
@@ -251,7 +263,7 @@
===================================================================
--- sys/conf/files.amd64.orig
+++ sys/conf/files.amd64
-@@ -47,35 +47,6 @@
+@@ -47,41 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -280,6 +292,12 @@
- 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
+-#
-rr232x_lib.o optional rr232x \
- dependency "$S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
- compile-with "uudecode < $S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
@@ -287,7 +305,7 @@
#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -172,11 +143,6 @@
+@@ -178,14 +143,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -296,10 +314,13 @@
-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_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
-@@ -189,10 +155,6 @@
+@@ -198,10 +155,6 @@
dev/mxge/mxge_eth_z8e.c optional mxge pci
dev/mxge/mxge_ethp_z8e.c optional mxge pci
net/zlib.c optional mxge
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2007-12-18 16:07:37 UTC (rev 2085)
+++ trunk/kfreebsd-7/debian/changelog 2007-12-21 08:52:14 UTC (rev 2086)
@@ -1,15 +1,19 @@
-kfreebsd-7 (7.0~cvs20071209-2) UNRELEASED; urgency=low
+kfreebsd-7 (7.0~cvs200712xx-1) UNRELEASED; urgency=low
+ [ Petr Salinger ]
+ * New upstream snapshot (RELENG_7)
+ * Disable non-free "hptrr" driver - another Highpoint RocketRAID
+
[ Aurelien Jarno ]
* Refresh all patches.
- -- Aurelien Jarno <aurel32 at debian.org> Sun, 09 Dec 2007 13:43:21 +0100
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 21 Dec 2007 10:29:00 +0100
kfreebsd-7 (7.0~cvs20071209-1) experimental; urgency=low
[ Petr Salinger ]
* New upstream snapshot of RELENG_7
- - refresh of some patches
+ - update of some patches
* Reorder freebsd6-buildutils and freebsd7-buildutils in Build-Depends
* Add build-dependency on quilt, and use quilt in debian/rules
* arch/i386/586.config and arch/i386/586-smp.config: also support i686 CPU.
Modified: trunk/kfreebsd-7/debian/copyright
===================================================================
--- trunk/kfreebsd-7/debian/copyright 2007-12-18 16:07:37 UTC (rev 2085)
+++ trunk/kfreebsd-7/debian/copyright 2007-12-21 08:52:14 UTC (rev 2086)
@@ -42,6 +42,7 @@
src/sys/contrib/dev/oltr
src/sys/contrib/opensolaris
src/sys/dev/hptmv
+src/sys/dev/hptrr
src/sys/dev/rr232x
The following directories contained code that is itself free, but depends
@@ -52,6 +53,7 @@
src/sys/modules/ath
src/sys/modules/ath_hal
src/sys/modules/hptmv
+src/sys/modules/hptrr
src/sys/modules/nve
src/sys/modules/oltr
src/sys/modules/rr232x
Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2007-12-18 16:07:37 UTC (rev 2085)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2007-12-21 08:52:14 UTC (rev 2086)
@@ -24,7 +24,7 @@
===================================================================
--- sys/conf/files.i386.orig
+++ sys/conf/files.i386
-@@ -46,42 +46,6 @@
+@@ -46,47 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -54,6 +54,11 @@
- no-implicit-rule no-obj before-depend \
- clean "os+%DIKED-nve.h"
-#
+-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
+-#
-hptmvraid.o optional hptmv \
- dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
@@ -67,7 +72,7 @@
#
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
-@@ -179,11 +143,6 @@
+@@ -184,14 +143,6 @@
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
dev/fe/if_fe_isa.c optional fe isa
@@ -76,10 +81,13 @@
-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_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
-@@ -210,13 +169,9 @@
+@@ -218,13 +169,9 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
@@ -111,11 +119,12 @@
===================================================================
--- sys/i386/conf/GENERIC.orig
+++ sys/i386/conf/GENERIC
-@@ -128,8 +128,6 @@
+@@ -128,9 +128,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 rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
@@ -136,15 +145,16 @@
aue \
${_auxio} \
${_awi} \
-@@ -95,7 +90,6 @@
+@@ -95,8 +90,6 @@
hifn \
hme \
${_hptiop} \
- ${_hptmv} \
+- ${_hptrr} \
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -188,10 +182,8 @@
+@@ -189,10 +182,8 @@
ntfs_iconv \
${_nxge} \
nullfs \
@@ -155,7 +165,7 @@
${_padlock} \
patm \
${_pccard} \
-@@ -220,7 +212,6 @@
+@@ -221,7 +212,6 @@
reiserfs \
rl \
rp \
@@ -163,7 +173,7 @@
rue \
rum \
${_s3} \
-@@ -313,7 +304,6 @@
+@@ -314,7 +304,6 @@
${_xe} \
xfs \
xl \
@@ -171,7 +181,7 @@
zlib \
zyd
-@@ -363,11 +353,6 @@
+@@ -364,11 +353,6 @@
_apm= apm
_ar= ar
_arcnet= arcnet
@@ -183,7 +193,7 @@
_awi= awi
_bktr= bktr
_cardbus= cardbus
-@@ -406,7 +391,6 @@
+@@ -407,7 +391,6 @@
.if ${MK_NCP} != "no"
_nwfs= nwfs
.endif
@@ -191,7 +201,7 @@
_pccard= pccard
_pcfclock= pcfclock
_pecoff= pecoff
-@@ -427,9 +411,6 @@
+@@ -428,9 +411,6 @@
_tmpfs= tmpfs
_wi= wi
_xe= xe
@@ -201,15 +211,16 @@
.if ${MACHINE} == "i386"
_aac= aac
_acpi= acpi
-@@ -446,7 +427,6 @@
+@@ -447,8 +427,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
-_hptmv= hptmv
+-_hptrr= hptrr
_ichwd= ichwd
_ida= ida
# Disabled due to non-MPSAFEty in 7.0
-@@ -461,7 +441,6 @@
+@@ -463,7 +441,6 @@
_ixgb= ixgb
_mly= mly
_nfe= nfe
@@ -217,7 +228,7 @@
_nvram= nvram
_nxge= nxge
_wpi= wpi
-@@ -471,7 +450,6 @@
+@@ -473,7 +450,6 @@
_padlock= padlock
.endif
.endif
@@ -225,7 +236,7 @@
_s3= s3
_twa= twa
_vesa= vesa
-@@ -489,11 +467,6 @@
+@@ -491,11 +467,6 @@
_agp= agp
_an= an
_arcmsr= arcmsr
@@ -237,15 +248,16 @@
_cardbus= cardbus
_cbb= cbb
_ciss= ciss
-@@ -506,7 +479,6 @@
+@@ -508,8 +479,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
-_hptmv= hptmv
+-_hptrr= hptrr
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -524,11 +496,9 @@
+@@ -527,11 +496,9 @@
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -257,7 +269,7 @@
_safe= safe
_scsi_low= scsi_low
_smbfs= smbfs
-@@ -540,9 +510,6 @@
+@@ -543,9 +510,6 @@
_wi= wi
_wpi= wpi
_wpifw= wpifw
@@ -267,7 +279,7 @@
.endif
.if ${MACHINE_ARCH} == "ia64"
-@@ -583,21 +550,11 @@
+@@ -586,21 +550,11 @@
.if ${MACHINE_ARCH} == "powerpc"
_an= an
@@ -293,11 +305,12 @@
===================================================================
--- sys/amd64/conf/GENERIC.orig
+++ sys/amd64/conf/GENERIC
-@@ -121,8 +121,6 @@
+@@ -121,9 +121,6 @@
device arcmsr # Areca SATA II 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 rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
@@ -306,7 +319,7 @@
===================================================================
--- sys/conf/files.amd64.orig
+++ sys/conf/files.amd64
-@@ -47,35 +47,6 @@
+@@ -47,41 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -335,6 +348,12 @@
- 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
+-#
-rr232x_lib.o optional rr232x \
- dependency "$S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
- compile-with "uudecode < $S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
@@ -342,7 +361,7 @@
#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -173,22 +144,13 @@
+@@ -179,25 +144,13 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -351,6 +370,9 @@
-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_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
More information about the Glibc-bsd-commits
mailing list