r2220 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9: . debian
Sven Luther
luther@costa.debian.org
Sun, 09 Jan 2005 15:29:24 +0100
Author: luther
Date: 2005-01-09 15:29:24 +0100 (Sun, 09 Jan 2005)
New Revision: 2220
Removed:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/apply.m4
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/unpatch
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/patches/
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-official.m4
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control.stub
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules
Log:
Preparing 2.6.9-4
Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/apply.m4
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/apply.m4 2005-01-09 14:18:09 UTC (rev 2219)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/apply.m4 2005-01-09 14:29:24 UTC (rev 2220)
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# common apply/unpatch script for the Debian PowerPC patch
-
-if ! test -d Documentation -a -d kernel; then
- echo >&2 "This does not look like a kernel top level directory, exiting."
- exit 1
-fi
-
-version=M4VERSION
-upstream=M4KERNEL
-dir=/usr/src/kernel-patches/powerpc/$upstream/patches
-
-patch="patch -s -l -p1"
-if test "$1" = "unpatch"; then
- patch="$patch -R"
- doing="Backing out"
-else
- doing="Applying"
-fi
-
-# list the patch parts and loop over them
-for file in $($dir/list $dir $1); do
-
- name=${file%.diff}
-
- # test the patch part first.
-
- echo >&2 "Checking PowerPC patch part $name for $version..."
- if bzcat $dir/$file.bz2 | $patch --force --dry-run > /dev/null; then
-
- # if the test succeeds, apply the patch. After the test above,
- # it should apply cleanly, or something went wrong.
-
- echo >&2 "$doing PowerPC patch part $name for $version..."
- if ! bzcat $dir/$file.bz2 | $patch; then
- echo >&2 "Something went horribly wrong, PowerPC patch part $name for $version failed."
- exit 1
- fi
-
- else
-
- # if the test fails, try to determine what is happening and
- # act accordingly.
-
- echo -n >&2 "Skipping PowerPC patch part $name for $version, "
- if test "$1" != "unpatch" -a -f debian/APPLIED_${file%.diff}; then
- echo >&2 "it looks like it has already been applied."
- elif test "$1" = "unpatch" -a ! -f debian/APPLIED_${file%.diff}; then
- echo >&2 "it looks like it has already been backed out."
- else
- echo >&2 "it does not apply cleanly."
- exit 1
- fi
-
- fi
-
- # set or clear the mark.
-
- if test "$1" = "unpatch"; then
- rm -f debian/APPLIED_$name
- rmdir debian 2> /dev/null || true
- else
- test -d debian || mkdir debian
- echo "PATCHFILE=$dir/$file.bz2" > debian/APPLIED_$name
- fi
-
-done
-
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog 2005-01-09 14:18:09 UTC (rev 2219)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog 2005-01-09 14:29:24 UTC (rev 2220)
@@ -1,3 +1,48 @@
+kernel-patch-powerpc-2.6.9 (2.6.9-4) unstable; urgency=high
+
+ * Rebuilt against kernel-source-2.6.9-5 (Sven Luther) :
+ - [powerpc] Added a couple of powermac patches from Benjamin Herrenschmidt :
+ - 970FX cpu support
+ - G5 thermal management update
+ - Misc powermac fixes backports
+ (Bug #287030) (Sven Luther)
+ - [powerpc] Moved from powerpc kernel-patch package :
+ - powermac legacy serial fix.
+ - pegasos via-ide dual interrupt fix.
+ (Sven Luther)
+ - [powerpc] Added _chrp_type support though pegasos patch (Sven Luther)
+ - [powerpc - prep] Fix bad irq assignement for pci devices on motorola
+ powerstack boxes. (Sven Luther)
+ - add dh_fixperms to the build targets to kernel-patch-debian-2.6.9
+ to ensure that the permissions of the files in this package are
+ sensible. (See: Bug#288279) (Simon Horman)
+ - [SECURITY] Fix vulnerability in the ELF loader code allowing
+ local attacker to execute code as root; CAN-2004-1235.
+ (Maximilian Attems)
+ - [SECURITY] 028-do_brk_security_fixes.dpatch
+ Drop Marcelo's fix, use Linus' instead.
+ Fix local root vulnerability for various do_brk() calls;
+ ensure an exclusive lock on memory while modifying it; CAN-2004-1235
+ (Andres Salomon) (closes: #289155).
+ - [SECURITY] 029-random_poolsize_overflow.dpatch
+ drivers/char/random allows you to set the poolsize; its sanity checking
+ on that input isn's very good. We fix that here.
+ See http://seclists.org/lists/fulldisclosure/2005/Jan/0270.html for
+ more details. This fixes #3 on that list (Andres Salomon).
+ - [SECURITY] 030-moxa_user_copy_checking.dpatch
+ The moxa driver does some ugly things w/ signed integers. This fixes
+ #4 on Brad Spengler's advisory (Andres Salomon).
+ - [SECURITY] 031-sg_scsi_ioctl_int_overflows.dpatch
+ SG ioctl stuff doesn't actually check whether the scsi command length
+ is positive. #5 on the above advisory (Andres Salomon).
+
+ * Removed kernel-patch-powerpc package, since all the powerpc patches are
+ now part of kernel-source. Next version of kernel-source-2.6.9 should
+ have a conflict/replace/provides, but for now please remove it by hand.
+ (Sven Luther)
+
+ -- Sven Luther <luther@debian.org> Sun, 9 Jan 2005 15:31:57 +0100
+
kernel-patch-powerpc-2.6.9 (2.6.9-3) unstable; urgency=low
* Sven Luther :
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control 2005-01-09 14:18:09 UTC (rev 2219)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control 2005-01-09 14:29:24 UTC (rev 2220)
@@ -1,21 +1,11 @@
Source: kernel-patch-powerpc-2.6.9
Section: devel
Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.9, m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.9 (>= 2.6.9-5), m4
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
Standards-Version: 3.6.1
-Package: kernel-patch-powerpc-2.6.9
-Architecture: all
-Suggests: kernel-tree-2.6.9
-Description: improved PowerPC support for the Linux kernel
- .
- This package collects a number of patches that improve the Linux
- kernel's support for the PowerPC architecture in general. It is
- mainly used to build the official Debian kernel packages, but you
- can also use it as a starting point for custom-built kernels.
-
Package: kernel-headers-2.6.9
Architecture: powerpc
Description: header files for the Linux kernel version 2.6.9
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-official.m4
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-official.m4 2005-01-09 14:18:09 UTC (rev 2219)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-official.m4 2005-01-09 14:29:24 UTC (rev 2220)
@@ -7,3 +7,4 @@
.
This is a dummy package that will always depend on the latest release
of the kernel-image package for M4FLAVOUR.
+
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control.stub 2005-01-09 14:18:09 UTC (rev 2219)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control.stub 2005-01-09 14:29:24 UTC (rev 2220)
@@ -6,16 +6,6 @@
Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
Standards-Version: 3.6.1
-Package: kernel-patch-powerpc-M4KERNEL
-Architecture: all
-Suggests: kernel-tree-M4KERNEL
-Description: improved PowerPC support for the Linux kernel
- .
- This package collects a number of patches that improve the Linux
- kernel's support for the PowerPC architecture in general. It is
- mainly used to build the official Debian kernel packages, but you
- can also use it as a starting point for custom-built kernels.
-
Package: kernel-headers-M4KERNEL
Architecture: powerpc
Description: header files for the Linux kernel version M4KERNEL
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules 2005-01-09 14:18:09 UTC (rev 2219)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules 2005-01-09 14:29:24 UTC (rev 2220)
@@ -38,7 +38,6 @@
KHEADERS = $(TMP)/kernel-headers-$(kernel)_$(version)_powerpc.deb
# install locations
-KPATCH = $(CURDIR)/debian/kernel-patch-powerpc-$(kernel)/usr/src/kernel-patches/powerpc/$(kernel)
KBUILD = $(CURDIR)/debian/kernel-build-$(kernel)-$(flavour)
KBUILDDOC = $(KBUILD)/usr/share/doc/kernel-build-$(kernel)-$(flavour)
KSRC = $(KBUILD)/usr/src/kernel-build-$(kernel)-$(flavour)
@@ -54,8 +53,8 @@
export KPKG_SUBARCH=pmac
# the configure target is responsible for setting up the build arena,
-# i.e. unpacking the Debian kernel source, applying the PowerPC patch,
-# and preparing a separate build tree for each flavour.
+# i.e. unpacking the Debian kernel source and preparing a separate
+# build tree for each flavour.
configure: stamp-configure
@@ -75,15 +74,15 @@
touch $@
-# unpack the Debian kernel source, apply the PowerPC patch, add a
-# default .config file and the necessary Debian files (changelog,
-# control, copyright, post-install, and official)
+# unpack the Debian kernel source, add a default .config file and the
+# necessary Debian files (changelog, control, copyright, post-install,
+# and official)
stamp-configure-prepare:
test -d $(dir $(KSOURCE)) || mkdir -p $(dir $(KSOURCE))
tar jxCf $(dir $(KSOURCE)) /usr/src/kernel-source-$(kernel).tar.bz2
- cd $(KSOURCE); /usr/src/kernel-patches/all/$(kernel)/apply/debian
- for file in $(shell debian/list patches); do patch -d $(KSOURCE) -p1 < patches/$$file; done
+ #cd $(KSOURCE); /usr/src/kernel-patches/all/$(kernel)/apply/debian
+ #for file in $(shell debian/list patches); do patch -d $(KSOURCE) -p1 < patches/$$file; done
-$(MAKE) -s -C config default > $(KSOURCE)/.config
@@ -168,15 +167,14 @@
# and modules to the right kernel-image and kernel-modules packages.
# The main work is done through the kernel-image target of make-kpkg.
# The resulting intermediate package is immediately unpacked again and
-# its contents re-arranged slightly. The whole process results in one
-# kernel-image directory per flavour. Also, the install target puts
-# together the patch package itself and the build infrastructure for
-# modules.
+# its contents re-arranged slightly. The whole process results in one
+# kernel-image directory per flavour. Also, the install target puts
+# together the build infrastructure for modules.
install: stamp-install
stamp-install: \
-stamp-build stamp-install-patch
+stamp-build
$(MAKE) -f debian/rules $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-install-flavour-$(flavour))
touch $@
@@ -188,18 +186,6 @@
touch $@
-# install the patch itself and the accompanying scripts
-stamp-install-patch: stamp-install-prepare debian/dirs debian/apply
- dh_installdirs
-
- $(INSTALL_EXEC) debian/apply $(KPATCH)/apply/powerpc
- $(INSTALL_EXEC) debian/unpatch $(KPATCH)/unpatch/powerpc
- $(INSTALL_EXEC) debian/list $(KPATCH)/patches
- $(INSTALL_DATA) patches/* $(KPATCH)/patches
- bzip2 $(KPATCH)/patches/*.diff
-
- touch $@
-
ifeq (0,$(MAKELEVEL))
stamp-install-flavour-%:
@@ -255,14 +241,12 @@
ifeq ($(DEB_HOST_ARCH),powerpc)
binary: \
-binary-kernel-patch-powerpc-$(kernel) \
binary-kernel-headers-$(kernel) \
$(foreach flavour,$(flavours),binary-flavour-$(flavour))
else
binary: binary-arch binary-indep
binary-arch:
-binary-indep: \
-binary-kernel-patch-powerpc-$(kernel)
+binary-indep:
endif
ifeq (0,$(MAKELEVEL))
@@ -292,7 +276,7 @@
# The kernel-headers package is special since it can be created with a
# simple call to make-kpkg.
-binary-kernel-headers-$(kernel):
+binary-kernel-headers-$(kernel): stamp-install-prepare
cd $(KSOURCE); APPEND_TO_VERSION='' make-kpkg kernel-headers
mv $(KHEADERS) ..
dpkg-distaddfile $(notdir $(KHEADERS)) devel optional
@@ -324,8 +308,6 @@
dh_md5sums
dh_builddeb
-binary-kernel-patch-%: stamp-install-patch
- $(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-patch-$*
binary-kernel-%: stamp-install-flavour-$(flavour)
$(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-$*
binary-package: binary-common-package
Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/unpatch
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/unpatch 2005-01-09 14:18:09 UTC (rev 2219)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/unpatch 2005-01-09 14:29:24 UTC (rev 2220)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-home=$(dirname $(dirname $0))
-
-$home/apply/powerpc unpatch