r970 - in trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian: . patches
Jens Schmalzing
jensen@haydn.debian.org
Wed, 04 Aug 2004 05:18:43 -0600
Author: jensen
Date: 2004-08-04 05:18:26 -0600 (Wed, 04 Aug 2004)
New Revision: 970
Added:
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-5
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/README.Debian
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/control
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-3
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe
Log:
Cleaned up 2.4.26-4.
Added a dummy patch for the build and upload of revision 2.4.26-5.
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/README.Debian
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/README.Debian 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/README.Debian 2004-08-04 11:18:26 UTC (rev 970)
@@ -1,4 +1,4 @@
-kernel-source for DEBIAN
+kernel-source for Debian
------------------------
IPsec and FreeSWAN
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog 2004-08-04 11:18:26 UTC (rev 970)
@@ -1,10 +1,17 @@
-kernel-source-2.4.26 (2.4.26-5) UNRELEASED; urgency=low
+kernel-source-2.4.26 (2.4.26-5) unstable; urgency=high
- * Added myself (Simon Horman <horms@debian.org>) to the list of uploaders,
- as I seem to have missed it the first time around.
+ * Cleaned up after the previous upload. In particular, patch-2.4.26-3
+ is now part of the kernel-source tarball again. Urgency set to high
+ since this patch fixes a couple of security issues.
- -- Simon Horman <horms@debian.org> Fri, 23 Jul 2004 10:55:06 +0900
+ * Added a conflict to kernel-tree to make sure that unsuspecting package
+ builders (both human and non-human) do not use the previous upload of
+ kernel-source for their kernel-image packages.
+ * Added an almost empty patch to handle the revision bump.
+
+ -- Jens Schmalzing <jensen@debian.org> Tue, 3 Aug 2004 15:10:31 +0200
+
kernel-source-2.4.26 (2.4.26-4) unstable; urgency=low
* Fix stack allocation in crypt(). Patch by Herbert Xu
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/control
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/control 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/control 2004-08-04 11:18:26 UTC (rev 970)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: William Irwin <wli@debian.org>, Martin Michlmayr <tbm@debian.org>, Sven Luther <luther@debian.org>, Jens Schmalzing <jensen@debian.org>, Jeff Bailey <jbailey@debian.org>, Dann Frazier <danf@debian.org>, Simon Horman <horms@debian.org>
+Uploaders: William Irwin <wli@debian.org>, Martin Michlmayr <tbm@debian.org>, Sven Luther <luther@debian.org>, Jens Schmalzing <jensen@debian.org>, Jeff Bailey <jbailey@debian.org>, Dann Frazier <danf@debian.org>
Standards-Version: 3.6.1
Build-Depends: bzip2, debhelper, docbook-utils, gs, kernel-package (>= 7.48), transfig
@@ -61,6 +61,7 @@
Section: devel
Priority: optional
Depends: kernel-patch-debian-2.4.26 (= ${Source-Version}), ${kt-depends}
+Conflicts: kernel-source-2.4.26 (= 2.4.26-4)
Provides: ${kt-provides}
Description: Linux kernel tree for building prepackaged Debian kernel images
This meta package is used as a build-time dependency of prepackaged
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list 2004-08-04 11:18:26 UTC (rev 970)
@@ -5,3 +5,4 @@
patch-2.4.26-2 2.4.26-1 2.4.26-2
patch-2.4.26-3 2.4.26-2 2.4.26-3
patch-2.4.26-4 2.4.26-3 2.4.26-4
+patch-2.4.26-5 2.4.26-4 2.4.26-5
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-3
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-3 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-3 2004-08-04 11:18:26 UTC (rev 970)
@@ -3,8 +3,8 @@
--- ./kernel/panic.c.orig 2002-11-29 08:53:15.000000000 +0900
+++ ./kernel/panic.c 2004-06-11 14:46:27.000000000 +0900
-@@ -51,7 +51,7 @@
-
+@@ -59,7 +59,7 @@
+
bust_spinlocks(1);
va_start(args, fmt);
- vsprintf(buf, fmt, args);
@@ -109,7 +109,7 @@
} \
--- 1/drivers/net/wireless/airo.c 2004-06-16 01:32:40.000000000 -0400
+++ 2/drivers/net/wireless/airo.c-fix 2004-06-16 01:34:27.000000000 -0400
-@@ -4363,19 +4363,22 @@
+@@ -3666,19 +3666,22 @@
size_t len,
loff_t *offset )
{
@@ -142,7 +142,7 @@
}
/*
-@@ -4387,24 +4390,24 @@
+@@ -3690,24 +3693,24 @@
size_t len,
loff_t *offset )
{
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4 2004-08-04 11:18:26 UTC (rev 970)
@@ -41,7 +41,7 @@
/* On PYXIS we have the monster window, selected by bit 40, so
there is no need for window3 to be enabled.
-@@ -797,6 +810,7 @@
+@@ -810,6 +797,7 @@
if (is_pyxis) {
*(vip)CIA_IOC_PCI_W3_BASE = 0;
} else if (cia_rev == 1) {
Added: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-5
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-5 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-5 2004-08-04 11:18:26 UTC (rev 970)
@@ -0,0 +1,8 @@
+--- kernel-source-2.4.26-4/README.Debian 2004-08-03 15:18:12.023638000 +0200
++++ kernel-source-2.4.26-5/README.Debian 2004-08-03 15:42:54.327681860 +0200
+@@ -1,4 +1,4 @@
+-kernel-source for DEBIAN
++kernel-source for Debian
+ ------------------------
+
+ IPsec and FreeSWAN
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars 2004-08-04 11:18:26 UTC (rev 970)
@@ -1,2 +1,2 @@
-kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3) | kernel-source-2.4.26 (= 2.4.26-4)
-kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3, kernel-tree-2.4.26-4
+kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3) | kernel-source-2.4.26 (= 2.4.26-4) | kernel-source-2.4.26 (= 2.4.26-5)
+kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3, kernel-tree-2.4.26-4, kernel-tree-2.4.26-5
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe 2004-08-04 08:59:17 UTC (rev 969)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe 2004-08-04 11:18:26 UTC (rev 970)
@@ -1,2 +1,2 @@
-kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3) | kernel-source-2.4.26 (= 2.4.26-4)
-kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3, kernel-tree-2.4.26-4
+kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3) | kernel-source-2.4.26 (= 2.4.26-4) | kernel-source-2.4.26 (= 2.4.26-5)
+kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3, kernel-tree-2.4.26-4, kernel-tree-2.4.26-5