r3715 - in people/waldi/kernel/source/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/i386 arch/ia64 arch/powerpc patches-debian patches-debian/series templates

Bastian Blank waldi at costa.debian.org
Sun Aug 7 15:28:27 UTC 2005


Author: waldi
Date: 2005-08-07 15:28:24 +0000 (Sun, 07 Aug 2005)
New Revision: 3715

Added:
   people/waldi/kernel/source/linux-2.6/debian/patches-debian/patch-2.6.12.4
   people/waldi/kernel/source/linux-2.6/debian/patches-debian/series/2.6.12-2
Modified:
   people/waldi/kernel/source/linux-2.6/debian/
   people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-generic
   people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-smp
   people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config
   people/waldi/kernel/source/linux-2.6/debian/arch/config
   people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.386
   people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686
   people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686-smp
   people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7
   people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7-smp
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.itanium
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.mckinley
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines
   people/waldi/kernel/source/linux-2.6/debian/changelog
   people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in
Log:
Merge /trunk/kernel/source/linux-2.6.



Property changes on: people/waldi/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3701
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3714

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-generic
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-generic	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-generic	2005-08-07 15:28:24 UTC (rev 3715)
@@ -5,7 +5,6 @@
 CONFIG_CM206=m
 CONFIG_CDU31A=m
 CONFIG_MKISS=m
-CONFIG_6PACK=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 CONFIG_DONGLE_OLD=y

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-smp	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config.alpha-smp	2005-08-07 15:28:24 UTC (rev 3715)
@@ -6,4 +6,3 @@
 CONFIG_NR_CPUS=64
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_MATHEMU=y
-# CONFIG_6PACK is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config	2005-08-07 15:28:24 UTC (rev 3715)
@@ -608,7 +608,6 @@
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
 CONFIG_ROSE=m
-CONFIG_6PACK=m
 CONFIG_BPQETHER=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/config	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/config	2005-08-07 15:28:24 UTC (rev 3715)
@@ -177,3 +177,4 @@
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
+CONFIG_6PACK=m

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.386
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.386	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.386	2005-08-07 15:28:24 UTC (rev 3715)
@@ -46,7 +46,6 @@
 CONFIG_CM206=m
 CONFIG_CDU31A=m
 CONFIG_MKISS=m
-CONFIG_6PACK=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686	2005-08-07 15:28:24 UTC (rev 3715)
@@ -35,7 +35,6 @@
 CONFIG_CM206=m
 CONFIG_CDU31A=m
 CONFIG_MKISS=m
-CONFIG_6PACK=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686-smp	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.686-smp	2005-08-07 15:28:24 UTC (rev 3715)
@@ -39,7 +39,6 @@
 # CONFIG_CM206 is not set
 # CONFIG_CDU31A is not set
 # CONFIG_MKISS is not set
-# CONFIG_6PACK is not set
 # CONFIG_DMASCC is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_NI5010 is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7	2005-08-07 15:28:24 UTC (rev 3715)
@@ -36,7 +36,6 @@
 CONFIG_CM206=m
 CONFIG_CDU31A=m
 CONFIG_MKISS=m
-CONFIG_6PACK=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7-smp	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/config.k7-smp	2005-08-07 15:28:24 UTC (rev 3715)
@@ -40,7 +40,6 @@
 # CONFIG_CM206 is not set
 # CONFIG_CDU31A is not set
 # CONFIG_MKISS is not set
-# CONFIG_6PACK is not set
 # CONFIG_DMASCC is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_NI5010 is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config	2005-08-07 15:28:24 UTC (rev 3715)
@@ -1500,4 +1500,3 @@
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_6PACK=m

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.itanium
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.itanium	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.itanium	2005-08-07 15:28:24 UTC (rev 3715)
@@ -6,7 +6,6 @@
 # CONFIG_SMP is not set
 # CONFIG_MTD_XIP is not set
 # CONFIG_MKISS is not set
-# CONFIG_6PACK is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_PCMCIA_XIRTULIP is not set
 # CONFIG_COMPUTONE is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.mckinley
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.mckinley	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config.mckinley	2005-08-07 15:28:24 UTC (rev 3715)
@@ -5,7 +5,6 @@
 # CONFIG_SMP is not set
 # CONFIG_MTD_XIP is not set
 # CONFIG_MKISS is not set
-# CONFIG_6PACK is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_PCMCIA_XIRTULIP is not set
 # CONFIG_COMPUTONE is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config	2005-08-07 15:28:24 UTC (rev 3715)
@@ -1460,4 +1460,3 @@
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_6PACK=m

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines	2005-08-07 15:28:24 UTC (rev 3715)
@@ -1,3 +1,3 @@
 [DEFAULT]
-depends: mkvmlinuz
+depends: mkvmlinuz (>= 13)
 suggests: fdutils

Modified: people/waldi/kernel/source/linux-2.6/debian/changelog
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-07 15:28:24 UTC (rev 3715)
@@ -1,5 +1,11 @@
 linux-2.6 (2.6.12-2) UNRELEASED; urgency=low
 
+  The kernel team dedicates this release to Jens Schmalzig (jensen), who died
+  saturday, July 30, 2005 in a tragic accident in Munich. Jens was a member
+  of the kernel team, and was instrumental in taking the powerpc kernel
+  package to 2.6, as well as maintained MOL and its kernel modules. We offer
+  condoleance to his surviving family and miss him dearly.
+
   * Add @longclass@ variable to control file autogeneration. (Andres Salomon)
 
   * Bump build-depends on kernel-package to a fixed version (>= 9.004).
@@ -14,12 +20,37 @@
   * Add ARM support. (Vincent Sanders)
 
   * Add desc.* files for ia64. (dann frazier)
-  
+
   * Strip down the scripts dir in the headers packages. (Bastian Blank)
 
-  * Add m68k support. (Christian T. Steigies) 
+  * Add m68k support. (Christian T. Steigies)
 
- -- Christian T. Steigies <cts at debian.org>  Sat,  6 Aug 2005 10:21:14 +0200
+  * Added 2.6.12.4 (Frederik Schüler)
+    - Fix powernow oops on dual-core athlon
+    - Fix early vlan adding leads to not functional device
+    - sys_get_thread_area does not clear the returned argument
+    - bio_clone fix
+    - Fix possible overflow of sock->sk_policy (CAN-2005-2456)
+      (closes: #321401)
+    - Wait until all references to ip_conntrack_untracked are dropped on
+      unload
+    - Fix potential memory corruption in NAT code (aka memory NAT)
+    - Fix deadlock in ip6_queue
+    - Fix signedness issues in net/core/filter.c
+    - x86_64 memleak from malicious 32bit elf program
+    - rocket.c: Fix ldisc ref count handling
+    - kbuild: build TAGS problem with O=
+
+  * Enable CONFIG_6PACK=m for all archs (Andres Salomon)
+    (closes: #319646)
+
+  * [powerpc] Fixed minor problems with the powerpc image :
+    - mkvmlinuz support was missing, should be fixed building with
+      kernel-package 9.005. (Closes: #321625)
+    - typo made the ams-ppc and asm-ppc64 headers not being included.
+    - re-added dependency on mkvmlinuz for powerpc.
+
+ -- Sven Luther <luther at debian.org>  Sun,  7 Aug 2005 09:12:51 +0200
  
 linux-2.6 (2.6.12-1) unstable; urgency=low
 

Added: people/waldi/kernel/source/linux-2.6/debian/patches-debian/patch-2.6.12.4
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/patches-debian/patch-2.6.12.4	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/patches-debian/patch-2.6.12.4	2005-08-07 15:28:24 UTC (rev 3715)
@@ -0,0 +1,194 @@
+diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
++++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+@@ -44,7 +44,7 @@
+ 
+ #define PFX "powernow-k8: "
+ #define BFX PFX "BIOS error: "
+-#define VERSION "version 1.40.2"
++#define VERSION "version 1.40.4"
+ #include "powernow-k8.h"
+ 
+ /* serialize freq changes  */
+@@ -978,7 +978,7 @@ static int __init powernowk8_cpu_init(st
+ {
+ 	struct powernow_k8_data *data;
+ 	cpumask_t oldmask = CPU_MASK_ALL;
+-	int rc;
++	int rc, i;
+ 
+ 	if (!check_supported_cpu(pol->cpu))
+ 		return -ENODEV;
+@@ -1064,7 +1064,9 @@ static int __init powernowk8_cpu_init(st
+ 	printk("cpu_init done, current fid 0x%x, vid 0x%x\n",
+ 	       data->currfid, data->currvid);
+ 
+-	powernow_data[pol->cpu] = data;
++	for_each_cpu_mask(i, cpu_core_map[pol->cpu]) {
++		powernow_data[i] = data;
++	}
+ 
+ 	return 0;
+ 
+diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
+--- a/arch/i386/kernel/process.c
++++ b/arch/i386/kernel/process.c
+@@ -827,6 +827,8 @@ asmlinkage int sys_get_thread_area(struc
+ 	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
+ 		return -EINVAL;
+ 
++	memset(&info, 0, sizeof(info));
++
+ 	desc = current->thread.tls_array + idx - GDT_ENTRY_TLS_MIN;
+ 
+ 	info.entry_number = idx;
+diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86_64/ia32/syscall32.c
+--- a/arch/x86_64/ia32/syscall32.c
++++ b/arch/x86_64/ia32/syscall32.c
+@@ -57,6 +57,7 @@ int syscall32_setup_pages(struct linux_b
+ 	int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
+ 	struct vm_area_struct *vma;
+ 	struct mm_struct *mm = current->mm;
++	int ret;
+ 
+ 	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+ 	if (!vma)
+@@ -78,7 +79,11 @@ int syscall32_setup_pages(struct linux_b
+ 	vma->vm_mm = mm;
+ 
+ 	down_write(&mm->mmap_sem);
+-	insert_vm_struct(mm, vma);
++	if ((ret = insert_vm_struct(mm, vma))) {
++		up_write(&mm->mmap_sem);
++		kmem_cache_free(vm_area_cachep, vma);
++		return ret;
++	}
+ 	mm->total_vm += npages;
+ 	up_write(&mm->mmap_sem);
+ 	return 0;
+diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
+--- a/drivers/char/rocket.c
++++ b/drivers/char/rocket.c
+@@ -277,7 +277,7 @@ static void rp_do_receive(struct r_port 
+ 		ToRecv = space;
+ 
+ 	if (ToRecv <= 0)
+-		return;
++		goto done;
+ 
+ 	/*
+ 	 * if status indicates there are errored characters in the
+@@ -359,6 +359,7 @@ static void rp_do_receive(struct r_port 
+ 	}
+ 	/*  Push the data up to the tty layer */
+ 	ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count);
++done:
+ 	tty_ldisc_deref(ld);
+ }
+ 
+diff --git a/fs/bio.c b/fs/bio.c
+--- a/fs/bio.c
++++ b/fs/bio.c
+@@ -261,6 +261,7 @@ inline void __bio_clone(struct bio *bio,
+ 	 */
+ 	bio->bi_vcnt = bio_src->bi_vcnt;
+ 	bio->bi_size = bio_src->bi_size;
++	bio->bi_idx = bio_src->bi_idx;
+ 	bio_phys_segments(q, bio);
+ 	bio_hw_segments(q, bio);
+ }
+diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1192,7 +1192,7 @@ static inline void *skb_header_pointer(c
+ {
+ 	int hlen = skb_headlen(skb);
+ 
+-	if (offset + len <= hlen)
++	if (hlen - offset >= len)
+ 		return skb->data + offset;
+ 
+ 	if (skb_copy_bits(skb, offset, buffer, len) < 0)
+diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
+--- a/net/8021q/vlan.c
++++ b/net/8021q/vlan.c
+@@ -578,6 +578,14 @@ static int vlan_device_event(struct noti
+ 			if (!vlandev)
+ 				continue;
+ 
++			if (netif_carrier_ok(dev)) {
++				if (!netif_carrier_ok(vlandev))
++					netif_carrier_on(vlandev);
++			} else {
++				if (netif_carrier_ok(vlandev))
++					netif_carrier_off(vlandev);
++			}
++
+ 			if ((vlandev->state & VLAN_LINK_STATE_MASK) != flgs) {
+ 				vlandev->state = (vlandev->state &~ VLAN_LINK_STATE_MASK) 
+ 					| flgs;
+diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
+@@ -1124,6 +1124,9 @@ void ip_conntrack_cleanup(void)
+ 		schedule();
+ 		goto i_see_dead_people;
+ 	}
++	/* wait until all references to ip_conntrack_untracked are dropped */
++	while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1)
++		schedule();
+ 
+ 	kmem_cache_destroy(ip_conntrack_cachep);
+ 	kmem_cache_destroy(ip_conntrack_expect_cachep);
+diff --git a/net/ipv4/netfilter/ip_nat_proto_tcp.c b/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- a/net/ipv4/netfilter/ip_nat_proto_tcp.c
++++ b/net/ipv4/netfilter/ip_nat_proto_tcp.c
+@@ -40,7 +40,8 @@ tcp_unique_tuple(struct ip_conntrack_tup
+ 		 enum ip_nat_manip_type maniptype,
+ 		 const struct ip_conntrack *conntrack)
+ {
+-	static u_int16_t port, *portptr;
++	static u_int16_t port;
++	u_int16_t *portptr;
+ 	unsigned int range_size, min, i;
+ 
+ 	if (maniptype == IP_NAT_MANIP_SRC)
+diff --git a/net/ipv4/netfilter/ip_nat_proto_udp.c b/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- a/net/ipv4/netfilter/ip_nat_proto_udp.c
++++ b/net/ipv4/netfilter/ip_nat_proto_udp.c
+@@ -41,7 +41,8 @@ udp_unique_tuple(struct ip_conntrack_tup
+ 		 enum ip_nat_manip_type maniptype,
+ 		 const struct ip_conntrack *conntrack)
+ {
+-	static u_int16_t port, *portptr;
++	static u_int16_t port;
++	u_int16_t *portptr;
+ 	unsigned int range_size, min, i;
+ 
+ 	if (maniptype == IP_NAT_MANIP_SRC)
+diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
+--- a/net/ipv6/netfilter/ip6_queue.c
++++ b/net/ipv6/netfilter/ip6_queue.c
+@@ -76,7 +76,9 @@ static DECLARE_MUTEX(ipqnl_sem);
+ static void
+ ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
+ {
++	local_bh_disable();
+ 	nf_reinject(entry->skb, entry->info, verdict);
++	local_bh_enable();
+ 	kfree(entry);
+ }
+ 
+diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
+--- a/net/xfrm/xfrm_user.c
++++ b/net/xfrm/xfrm_user.c
+@@ -1180,6 +1180,9 @@ static struct xfrm_policy *xfrm_compile_
+ 	if (nr > XFRM_MAX_DEPTH)
+ 		return NULL;
+ 
++	if (p->dir > XFRM_POLICY_OUT)
++		return NULL;
++
+ 	xp = xfrm_policy_alloc(GFP_KERNEL);
+ 	if (xp == NULL) {
+ 		*dir = -ENOBUFS;

Added: people/waldi/kernel/source/linux-2.6/debian/patches-debian/series/2.6.12-2
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/patches-debian/series/2.6.12-2	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/patches-debian/series/2.6.12-2	2005-08-07 15:28:24 UTC (rev 3715)
@@ -0,0 +1 @@
++ patch-2.6.12.4

Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in	2005-08-07 13:13:42 UTC (rev 3714)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in	2005-08-07 15:28:24 UTC (rev 3715)
@@ -4,5 +4,5 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Andres Salomon <dilinger at debian.org>
 Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!sparc !alpha], gcc-3.3 [sparc alpha], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.004)
+Build-Depends: gcc (>= 4:4.0) [!sparc !alpha], gcc-3.3 [sparc alpha], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.004), kernel-package (>= 9.005) [powerpc]
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)




More information about the Kernel-svn-changes mailing list