r1976 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian

[Sven Luther]

Author: luther
Date: 2004-12-05 18:23:23 -0700 (Sun, 05 Dec 2004)
New Revision: 1976

Added:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-official.m4
Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Added changelog entry for the kernel-source 2.6.8-9 and -10 releases.
Added metapackage selection logic in the same way as the 2.6.9 packages.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-12-06 01:11:33 UTC (rev 1975)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-12-06 01:23:23 UTC (rev 1976)
@@ -1,13 +1,33 @@
 kernel-patch-powerpc-2.6.8 (2.6.8-7) unstable; urgency=high
 
   * Rebuilt against kernel-source 2.6.8-10.
+    - [SECURITY] Fix problems in binfmt_elf and binfmt_aout loaders; see
+      http://isec.pl/vulnerabilities/isec-0017-binfmt_elf.txt for more
+      details (Andres Salomon).
+    - Adding drivers-serial-8250-ioremap-fix.dpatch: a patch from Alex
+      Williamson that prevents setserial from crashing the kernel.
+      See: http://marc.theaimsgroup.com/?l=linux-kernel&m=109913237604338&w=2
+      (Dann Frazier)
+    - Split out aic7xxx-update patch into separate changesets, and drop
+      the pci-id-table and hostraid changesets; people are still reporting
+      problems having the driver detect their controller (Andres Salomon).
+    -  VLAN updates (Potential fix for: Bug#280743) (Simon Horman)
+    - copy_to_user checking in select.c
+      (Potential fix for: Bug#278183) (Simon Horman)
+    - Remove bogus DMA blacklist for RICOH CD-R/RW MP7083A (Maximilian Attems)
+    - tmpfs inode accounting leak fix (Maximilian Attems)
+    - Fix disconnected dentries on NFS exports (Maximilian Attems)
+    - [SECURITY] Further smbfs overflow fixes, stolen from -ac tree
+      (Andres Salomon).
+
   * Enabled the USB IrDA FIR Dongle device driver (CONFIG_USB_IRDA), which
     was apparently forgotten in the transition from 2.4.
-  * Removed the metapackages, as they conflict with the upload of 2.6.9 also
-    containing them.
 
- -- Sven Luther <luther@debian.org>  Thu,  2 Dec 2004 15:58:12 +0100
+  * Modified debian/rules to easily create or not the kernel-image packages.
+    (Sven Luther)
 
+ -- Sven Luther <luther@debian.org>  Mon,  6 Dec 2004 02:19:20 +0100
+
 kernel-patch-powerpc-2.6.8 (2.6.8-6) unstable; urgency=medium
 
   * Built support for the - now fixed - VGA console into the kernel, and

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4	2004-12-06 01:11:33 UTC (rev 1975)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4	2004-12-06 01:23:23 UTC (rev 1976)
@@ -1,13 +1,4 @@
 
-Package: kernel-image-M4FLAVOUR
-Section: base
-Architecture: powerpc
-Depends: kernel-image-M4KERNEL-M4FLAVOUR
-Description: Linux kernel image for M4FLAVOUR
- .
- This is a dummy package that will always depend on the latest release
- of the kernel-image package for M4FLAVOUR.
-
 Package: kernel-build-M4KERNEL-M4FLAVOUR
 Architecture: powerpc
 Depends: kernel-headers-M4KERNEL

Copied: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-official.m4 (from rev 1970, trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4)
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4	2004-12-03 18:38:00 UTC (rev 1970)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-official.m4	2004-12-06 01:23:23 UTC (rev 1976)
@@ -0,0 +1,10 @@
+
+Package: kernel-image-M4FLAVOUR
+Section: base
+Architecture: powerpc
+Depends: kernel-image-M4KERNEL-M4FLAVOUR
+Description: Linux kernel image for M4FLAVOUR
+ .
+ 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.8-2.6.8/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-12-06 01:11:33 UTC (rev 1975)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-12-06 01:23:23 UTC (rev 1976)
@@ -7,6 +7,9 @@
 # debhelper compatibility version
 export DH_COMPAT=4
 
+# Set to Yes if we are going to generate the metapackages.
+OFFICIAL_VERSION = Yes
+
 # set the build architecture if necessary
 DEB_HOST_ARCH ?= $(shell dpkg --print-architecture)
 
@@ -368,11 +371,14 @@
 debian/control: \
 debian/changelog debian/flavours \
 $(foreach flavour,$(flavours), debian/flavour-$(flavour)) \
-debian/control.stub debian/control-image.m4
+debian/control.stub debian/control-image.m4 debian/control-official.m4
 
 	$(M4CONTROL) debian/control.stub > $@
 
 	for flavour in $(flavours); do \
-	$(M4CONTROL) debian/control-image.m4 >> $@; \
-	cat debian/flavour-$$flavour >> $@; \
+		$(M4CONTROL) debian/control-image.m4 >> $@; \
+		if [ "$(OFFICIAL_VERSION)" = "Yes" ]; then \
+			$(M4CONTROL) debian/control-official.m4 >> $@; \
+		fi; \
+		cat debian/flavour-$$flavour >> $@; \
 	done