i'm tired of typing "etchnhalf"

git-svn-id: svn+ssh://svn.debian.org/svn/kernel-sec@1213 e094ebfe-e918-0410-adfb-c712417f3574

46 files changed, 46 insertions, 46 deletions

diff --git a/active/00boilerplate b/active/00boilerplate
index 49945318..77a7a288 100644
--- a/active/00boilerplate
+++ b/active/00boilerplate
@@ -7,7 +7,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: 
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security:
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2006-6921 b/active/CVE-2006-6921
index fcd2ec7c..6d16314f 100644
--- a/active/CVE-2006-6921
+++ b/active/CVE-2006-6921
@@ -15,7 +15,7 @@ Bugs:
 upstream: 
 linux-2.6: needed
 2.6.18-etch-security: ignored (2.6.18.dfsg.1-13etch6) "no upstream fix"
-2.6.24-etchnhalf-security: ignored "no upstream fix"
+2.6.24-etch-security: ignored "no upstream fix"
 2.6.26-lenny-security: ignored
 2.6.8-sarge-security: ignored (2.6.8-16sarge7)
 2.4.27-sarge-security: N/A
diff --git a/active/CVE-2006-7051 b/active/CVE-2006-7051
index c8880c65..f23857b8 100644
--- a/active/CVE-2006-7051
+++ b/active/CVE-2006-7051
@@ -24,7 +24,7 @@ Bugs:
 upstream: released (2.6.23-rc4)
 linux-2.6: released (2.6.23-1)
 2.6.18-etch-security: ignored (2.6.18.dfsg.1-13etch6) "no upstream patch"
-2.6.24-etchnhalf-security: ignored "no upstream patch"
+2.6.24-etch-security: ignored "no upstream patch"
 2.6.26-lenny-security: ignored "no upstream patch"
 2.6.8-sarge-security: ignored (2.6.8-17sarge1) "no upstream patch"
 2.4.27-sarge-security: N/A "No posix-timers.c"
diff --git a/active/CVE-2007-2480 b/active/CVE-2007-2480
index b26570e6..408b7f6f 100644
--- a/active/CVE-2007-2480
+++ b/active/CVE-2007-2480
@@ -14,7 +14,7 @@ Bugs:
 upstream: released (2.6.22)
 linux-2.6: released (2.6.22-1)
 2.6.18-etch-security: ignored (2.6.18.dfsg.1-13etch6) "needs backport"
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: N/A
 2.6.8-sarge-security: ignored (2.6.8-17sarge1) "needs backport"
 2.4.27-sarge-security: ignored (2.4.27-10sarge6) "needs backport if affected"
diff --git a/active/CVE-2007-3719 b/active/CVE-2007-3719
index d11ec145..19d09fac 100644
--- a/active/CVE-2007-3719
+++ b/active/CVE-2007-3719
@@ -12,7 +12,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: ignored (2.6.18.dfsg.1-13etch6) "no upstream fix"
-2.6.24-etchnhalf-security: ignored "low priority/no upstream fix"
+2.6.24-etch-security: ignored "low priority/no upstream fix"
 2.6.26-lenny-security: ignored "low priority/no upstream fix"
 2.6.8-sarge-security: ignored (2.6.8-17sarge1) "no upstream fix"
 2.4.27-sarge-security: ignored (2.4.27-10sarge6) "no upstream fix"
diff --git a/active/CVE-2007-3843 b/active/CVE-2007-3843
index 44cd0f1b..b86726fc 100644
--- a/active/CVE-2007-3843
+++ b/active/CVE-2007-3843
@@ -15,7 +15,7 @@ Bugs:
 upstream: released (2.6.23-rc1)
 linux-2.6: released (2.6.23-1)
 2.6.18-etch-security: released (2.6.18.dfsg.1-13etch2) [bugfix/cifs-fix-sign-settings.patch]
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: N/A
 2.6.8-sarge-security: ignore (2.6.8-17sarge1) "code looks substantially different"
 2.4.27-sarge-security: N/A "No cifs in 2.4.27"
diff --git a/active/CVE-2007-6282 b/active/CVE-2007-6282
index 406fb4a9..9bae0a05 100644
--- a/active/CVE-2007-6282
+++ b/active/CVE-2007-6282
@@ -11,7 +11,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch1) [bugfix/esp-iv-in-linear-part-of-skb.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.4) [bugfix/esp-iv-in-linear-part-of-skb.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.4) [bugfix/esp-iv-in-linear-part-of-skb.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: pending
 2.6.20-feisty-security: pending
diff --git a/active/CVE-2007-6514 b/active/CVE-2007-6514
index 9e47e85c..b0677296 100644
--- a/active/CVE-2007-6514
+++ b/active/CVE-2007-6514
@@ -8,7 +8,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: ignored "no upstream fix"
-2.6.24-etchnhalf-security: ignored "no upstream fix"
+2.6.24-etch-security: ignored "no upstream fix"
 2.6.26-lenny-security: ignored "no upstream fix"
 2.6.15-dapper-security: 
 2.6.17-edgy-security: ignored (EOL)
diff --git a/active/CVE-2007-6716 b/active/CVE-2007-6716
index 9c2a6933..551f92bf 100644
--- a/active/CVE-2007-6716
+++ b/active/CVE-2007-6716
@@ -16,7 +16,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: 
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security:
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-0598 b/active/CVE-2008-0598
index 5596480b..4f45a214 100644
--- a/active/CVE-2008-0598
+++ b/active/CVE-2008-0598
@@ -10,7 +10,7 @@ Bugs: 490910
 upstream: pending (2.6.27-rc1)
 linux-2.6: released (2.6.26-4) [bugfix/x86-add-copy_user_handle_tail.patch, bugfix/x86-fix-copy_user.patch]
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch2) [bugfix/x86-add-copy_user_handle_tail.patch, bugfix/x86-fix-copy_user.patch, bugfix/x86-wrong-register-was-used-in-align-macro.patch]
-2.6.24-etchnhalf-security: pending (2.6.24-6~etchnhalf.5) [bugfix/x86-add-copy_user_handle_tail.patch, bugfix/x86-fix-copy_user.patch, bugfix/x86-wrong-register-was-used-in-align-macro.patch]
+2.6.24-etch-security: pending (2.6.24-6~etchnhalf.5) [bugfix/x86-add-copy_user_handle_tail.patch, bugfix/x86-fix-copy_user.patch, bugfix/x86-wrong-register-was-used-in-align-macro.patch]
 2.6.26-lenny-security: released (2.6.26-4) [bugfix/x86-add-copy_user_handle_tail.patch, bugfix/x86-fix-copy_user.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-1673 b/active/CVE-2008-1673
index 198836d5..6fed0d36 100644
--- a/active/CVE-2008-1673
+++ b/active/CVE-2008-1673
@@ -16,7 +16,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch2) [bugfix/asn1-ber-decoding-checks.patch, bugfix/cifs-fix-compiler-warning.patch, bugfix/netfilter-nf_nat_snmp_basic-fix-range-check.patch]
-2.6.24-etchnhalf-security: needed (2.6.24-6~etchnhalf.5) [bugfix/asn1-ber-decoding-checks.patch, bugfix/cifs-fix-compiler-warning.patch, bugfix/netfilter-nf_nat_snmp_basic-fix-range-check.patch]
+2.6.24-etch-security: needed (2.6.24-6~etchnhalf.5) [bugfix/asn1-ber-decoding-checks.patch, bugfix/cifs-fix-compiler-warning.patch, bugfix/netfilter-nf_nat_snmp_basic-fix-range-check.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: pending
 2.6.20-feisty-security: pending
diff --git a/active/CVE-2008-2136 b/active/CVE-2008-2136
index 36a6960a..51946f10 100644
--- a/active/CVE-2008-2136
+++ b/active/CVE-2008-2136
@@ -8,7 +8,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch5) [bugfix/sit-missing-kfree_skb-on-pskb_may_pull.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.3) [bugfix/sit-missing-kfree_skb-on-pskb_may_pull.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.3) [bugfix/sit-missing-kfree_skb-on-pskb_may_pull.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: pending
 2.6.20-feisty-security: pending
diff --git a/active/CVE-2008-2137 b/active/CVE-2008-2137
index 0b7f788f..efda341b 100644
--- a/active/CVE-2008-2137
+++ b/active/CVE-2008-2137
@@ -7,7 +7,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch5) [bugfix/sparc-fix-mmap-va-span-checking.patch, bugfix/sparc-fix-mremap-addr-range-validation.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.3) [bugfix/sparc-fix-mmap-va-span-checking.patch, bugfix/sparc-fix-mremap-addr-range-validation.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.3) [bugfix/sparc-fix-mmap-va-span-checking.patch, bugfix/sparc-fix-mremap-addr-range-validation.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: pending
 2.6.20-feisty-security: pending
diff --git a/active/CVE-2008-2148 b/active/CVE-2008-2148
index 5eb43cc7..0e1b2294 100644
--- a/active/CVE-2008-2148
+++ b/active/CVE-2008-2148
@@ -8,7 +8,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.3) [bugfix/vfs-fix-permission-checking-in-sys_utimensat.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.3) [bugfix/vfs-fix-permission-checking-in-sys_utimensat.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: N/A
 2.6.20-feisty-security: N/A
diff --git a/active/CVE-2008-2358 b/active/CVE-2008-2358
index 067a35ea..8c040569 100644
--- a/active/CVE-2008-2358
+++ b/active/CVE-2008-2358
@@ -12,7 +12,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch6) [bugfix/dccp-feature-length-check.patch]
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: N/A
 2.6.20-feisty-security: pending
diff --git a/active/CVE-2008-2365 b/active/CVE-2008-2365
index 684dd3cc..832175c9 100644
--- a/active/CVE-2008-2365
+++ b/active/CVE-2008-2365
@@ -12,7 +12,7 @@ Bugs:
 upstream: released (2.6.17)
 linux-2.6: N/A
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-2372 b/active/CVE-2008-2372
index e8e3256c..001e1e0b 100644
--- a/active/CVE-2008-2372
+++ b/active/CVE-2008-2372
@@ -8,7 +8,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: needed "Maybe... 2.6.18 is before zero page was removed"
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.4) [bugfix/reinstate-zero_page-optimization-in-get_user_pages-and-fix-xip.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.4) [bugfix/reinstate-zero_page-optimization-in-get_user_pages-and-fix-xip.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-2729 b/active/CVE-2008-2729
index 7ada7cf2..27280ac5 100644
--- a/active/CVE-2008-2729
+++ b/active/CVE-2008-2729
@@ -8,7 +8,7 @@ Bugs:
 upstream: released
 linux-2.6: N/A
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch1) [bugfix/amd64-fix-zeroing-on-exception-in-copy_user.patch]
-2.6.24-etchnhalf-security: N/A "Fixed upstream before 2.6.24"
+2.6.24-etch-security: N/A "Fixed upstream before 2.6.24"
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-2750 b/active/CVE-2008-2750
index 26856081..7e4febb5 100644
--- a/active/CVE-2008-2750
+++ b/active/CVE-2008-2750
@@ -13,7 +13,7 @@ Bugs:
 upstream: released (2.6.26-rc6)
 linux-2.6: released (2.6.26-1)
 2.6.18-etch-security: N/A "code added after 2.6.18"
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.4) "bugfix/l2tp-pppol2tp_recvmsg-corruption.patch"
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.4) "bugfix/l2tp-pppol2tp_recvmsg-corruption.patch"
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: N/A
 2.6.20-feisty-security: N/A
diff --git a/active/CVE-2008-2812 b/active/CVE-2008-2812
index 7ffe8c20..f1f91464 100644
--- a/active/CVE-2008-2812
+++ b/active/CVE-2008-2812
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.25.10)
 linux-2.6: released (2.6.25-7) [bugfix/all/stable/2.6.25.10.patch]
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch1) [bugfix/tty-fix-for-tty-operations-bugs.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.4) [bugfix/tty-fix-for-tty-operations-bugs.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.4) [bugfix/tty-fix-for-tty-operations-bugs.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-2826 b/active/CVE-2008-2826
index 25633fd4..1f054922 100644
--- a/active/CVE-2008-2826
+++ b/active/CVE-2008-2826
@@ -8,7 +8,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch1) [bugfix/sctp-make-sure-n-sizeof-does-not-overflow.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.4) [bugfix/sctp-make-sure-n-sizeof-does-not-overflow.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.4) [bugfix/sctp-make-sure-n-sizeof-does-not-overflow.patch]
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-2931 b/active/CVE-2008-2931
index 2d7d8e8f..2514148c 100644
--- a/active/CVE-2008-2931
+++ b/active/CVE-2008-2931
@@ -9,7 +9,7 @@ Bugs:
 upstream: released (2.6.21)
 linux-2.6: N/A
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch1) [bugfix/check-privileges-before-setting-mount-propagation.patch]
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-2944 b/active/CVE-2008-2944
index ea70337a..2474cd7b 100644
--- a/active/CVE-2008-2944
+++ b/active/CVE-2008-2944
@@ -7,7 +7,7 @@ Bugs:
 upstream: 
 linux-2.6:
 2.6.18-etch-security:
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security:
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3077 b/active/CVE-2008-3077
index e8630ad7..499c2d0a 100644
--- a/active/CVE-2008-3077
+++ b/active/CVE-2008-3077
@@ -9,7 +9,7 @@ Bugs:
 upstream: released (2.6.25.10, 2.6.26)
 linux-2.6: N/A
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3247 b/active/CVE-2008-3247
index e50a19f1..e40be3bf 100644
--- a/active/CVE-2008-3247
+++ b/active/CVE-2008-3247
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.25.11, 2.6.26)
 linux-2.6: released (2.6.25-7)
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: N/A
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3272 b/active/CVE-2008-3272
index 10d901cc..f5f1ab29 100644
--- a/active/CVE-2008-3272
+++ b/active/CVE-2008-3272
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.25.15, 2.6.26.2, 2.6.27-rc2)
 linux-2.6: released (2.6.26-2) [bugfix/all/stable/2.6.26.2.patch]
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch2) [bugfix/sound-ensure-device-number-is-valid-in-snd_seq_oss_synth_make_info.patch]
-2.6.24-etchnhalf-security: pending (2.6.24-6~etchnhalf.5) [bugfix/sound-ensure-device-number-is-valid-in-snd_seq_oss_synth_make_info.patch]
+2.6.24-etch-security: pending (2.6.24-6~etchnhalf.5) [bugfix/sound-ensure-device-number-is-valid-in-snd_seq_oss_synth_make_info.patch]
 2.6.26-lenny-security: released (2.6.26-2) [bugfix/all/stable/2.6.26.2.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3275 b/active/CVE-2008-3275
index e7e0cb6b..709e64fa 100644
--- a/active/CVE-2008-3275
+++ b/active/CVE-2008-3275
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.25.15, 2.6.26.2)
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-22etch2) [bugfix/vfs-fix-lookup-on-deleted-directory.patch]
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security: released (2.6.26-2) [bugfix/all/stable/2.6.26.2.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3276 b/active/CVE-2008-3276
index 1588f1e8..a4ce863d 100644
--- a/active/CVE-2008-3276
+++ b/active/CVE-2008-3276
@@ -8,7 +8,7 @@ Bugs:
 upstream: released (2.6.26.3)
 linux-2.6: released (2.6.26-4)
 2.6.18-etch-security: pending (2.6.18.dfsg.1-22etch3) [bugfix/dccp-change-l-r-must-have-at-least-one-byte-in-the-dccpsf_val-field.patch]
-2.6.24-etchnhalf-security: pending (2.6.24-6~etchnhalf.5) [bugfix/dccp-change-l-r-must-have-at-least-one-byte-in-the-dccpsf_val-field.patch]
+2.6.24-etch-security: pending (2.6.24-6~etchnhalf.5) [bugfix/dccp-change-l-r-must-have-at-least-one-byte-in-the-dccpsf_val-field.patch]
 2.6.26-lenny-security: released (2.6.26-4) [bugfix/all/stable/2.6.26.3.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3496 b/active/CVE-2008-3496
index 7f9aec84..204ba922 100644
--- a/active/CVE-2008-3496
+++ b/active/CVE-2008-3496
@@ -7,7 +7,7 @@ Bugs:
 upstream: 
 linux-2.6: released (2.6.26.1)
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.26-lenny-security: released (2.6.26-2)
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3526 b/active/CVE-2008-3526
index f49d1ee3..d5ec6229 100644
--- a/active/CVE-2008-3526
+++ b/active/CVE-2008-3526
@@ -8,7 +8,7 @@ Bugs:
 upstream: pending
 linux-2.6: released (2.6.26-4) [bugfix/sctp-auth-key-length-check.patch]
 2.6.18-etch-security: N/A "code not present"
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security: released (2.6.26-4) [bugfix/sctp-auth-key-length-check.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3534 b/active/CVE-2008-3534
index 38f49516..98362883 100644
--- a/active/CVE-2008-3534
+++ b/active/CVE-2008-3534
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.25.14, 2.6.26.1)
 linux-2.6: released (2.6.26-2)
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: needed
+2.6.24-etch-security: needed
 2.6.26-lenny-security: released (2.6.26-2) [bugfix/all/stable/2.6.26.2.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3535 b/active/CVE-2008-3535
index 247ad376..648e0655 100644
--- a/active/CVE-2008-3535
+++ b/active/CVE-2008-3535
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.25.14, 2.6.26.1)
 linux-2.6: released (2.6.26-2) [bugfix/all/stable/2.6.26.1.patch]
 2.6.18-etch-security: N/A "code not present"
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security: released (2.6.26-2) [bugfix/all/stable/2.6.26.1.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3792 b/active/CVE-2008-3792
index c97949f7..18282705 100644
--- a/active/CVE-2008-3792
+++ b/active/CVE-2008-3792
@@ -8,7 +8,7 @@ Bugs:
 upstream: pending
 linux-2.6: released (2.6.26-4) [bugfix/sctp-auth-panics.patch]
 2.6.18-etch-security:
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security: released (2.6.26-4) [bugfix/sctp-auth-panics.patch]
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3911 b/active/CVE-2008-3911
index 248352e6..41710b8f 100644
--- a/active/CVE-2008-3911
+++ b/active/CVE-2008-3911
@@ -16,7 +16,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: 
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security:
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/active/CVE-2008-3915 b/active/CVE-2008-3915
index 74447bd4..606a7190 100644
--- a/active/CVE-2008-3915
+++ b/active/CVE-2008-3915
@@ -8,7 +8,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: 
-2.6.24-etchnhalf-security:
+2.6.24-etch-security:
 2.6.26-lenny-security:
 2.6.15-dapper-security: 
 2.6.20-feisty-security: 
diff --git a/retired/CVE-2007-6712 b/retired/CVE-2007-6712
index c07bae11..7a3ca7b9 100644
--- a/retired/CVE-2007-6712
+++ b/retired/CVE-2007-6712
@@ -12,7 +12,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch5) [bugfix/hrtimer-prevent-overrun.patch, bugfix/ktime-fix-MTIME_SEC_MAX-on-32-bit.patch]
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.15-dapper-security: N/A
 2.6.20-feisty-security: released (2.6.20-17.36)
 2.6.22-gutsy-security: released (2.6.22-15.54)
diff --git a/retired/CVE-2008-0007 b/retired/CVE-2008-0007
index 3f588fa9..cf6c0557 100644
--- a/retired/CVE-2008-0007
+++ b/retired/CVE-2008-0007
@@ -13,7 +13,7 @@ Bugs:
 upstream: released (2.6.24.1)
 linux-2.6: released (2.6.24-4)
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch2) [bugfix/mmap-VM_DONTEXPAND.patch]
-2.6.24-etchnhalf-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.1.patch]
+2.6.24-etch-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.1.patch]
 2.6.8-sarge-security: released (2.6.8-17sarge1) [mmap-VM_DONTEXPAND.dpatch]
 2.4.27-sarge-security: released (2.4.27-10sarge6) [264_mmap-VM_DONTEXPAND.diff]
 2.6.15-dapper-security: released (2.6.15-52.67)
diff --git a/retired/CVE-2008-0009 b/retired/CVE-2008-0009
index 054dc29f..aa89fe72 100644
--- a/retired/CVE-2008-0009
+++ b/retired/CVE-2008-0009
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.24.1)
 linux-2.6: released (2.6.24-4)
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.1.patch]
+2.6.24-etch-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.1.patch]
 2.6.8-sarge-security: N/A
 2.4.27-sarge-security: N/A
 2.6.15-dapper-security: N/A
diff --git a/retired/CVE-2008-0010 b/retired/CVE-2008-0010
index 5384b024..ad95adf7 100644
--- a/retired/CVE-2008-0010
+++ b/retired/CVE-2008-0010
@@ -7,7 +7,7 @@ Bugs:
 upstream: released (2.6.24.1)
 linux-2.6: released (2.6.24-4)
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch1)
-2.6.24-etchnhalf-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.1.patch]
+2.6.24-etch-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.1.patch]
 2.6.8-sarge-security: N/A
 2.4.27-sarge-security: N/A
 2.6.15-dapper-security: N/A
diff --git a/retired/CVE-2008-0163 b/retired/CVE-2008-0163
index 77eddcc3..5dc822a3 100644
--- a/retired/CVE-2008-0163
+++ b/retired/CVE-2008-0163
@@ -7,7 +7,7 @@ Bugs:
 upstream: N/A
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch1)
-2.6.24-etchnhalf-security: N/A "no vserver support"
+2.6.24-etch-security: N/A "no vserver support"
 2.6.8-sarge-security: N/A
 2.4.27-sarge-security: N/A
 2.6.15-dapper-security: N/A
diff --git a/retired/CVE-2008-0600 b/retired/CVE-2008-0600
index 23a12e99..766aae87 100644
--- a/retired/CVE-2008-0600
+++ b/retired/CVE-2008-0600
@@ -12,7 +12,7 @@ Bugs:
 upstream: released (2.6.24.2)
 linux-2.6: released (2.6.24-4)
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch1)
-2.6.24-etchnhalf-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.2.patch]
+2.6.24-etch-security: released (2.6.24-4) [bugfix/all/stable/2.6.24.2.patch]
 2.6.8-sarge-security: N/A
 2.4.27-sarge-security: N/A
 2.6.15-dapper-security: N/A
diff --git a/retired/CVE-2008-1294 b/retired/CVE-2008-1294
index 9f6ac748..884b1fac 100644
--- a/retired/CVE-2008-1294
+++ b/retired/CVE-2008-1294
@@ -19,7 +19,7 @@ Bugs:
 upstream: 
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch2) [bugfix/RLIMIT_CPU-earlier-checking.patch]
-2.6.24-etchnhalf-security: N/A
+2.6.24-etch-security: N/A
 2.6.15-dapper-security: released (2.6.15-52.67)
 2.6.17-edgy-security: ignored (EOL)
 2.6.20-feisty-security: released (2.6.20-17.36)
diff --git a/retired/CVE-2008-1375 b/retired/CVE-2008-1375
index 27075c84..d20fc9aa 100644
--- a/retired/CVE-2008-1375
+++ b/retired/CVE-2008-1375
@@ -15,7 +15,7 @@ Bugs:
 upstream: released (2.6.26-rc1)
 linux-2.6: released (2.6.25-2)
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch2) [bugfix/dnotify-race.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.2) [bugfix/all/stable/2.6.24.6.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.2) [bugfix/all/stable/2.6.24.6.patch]
 2.6.15-dapper-security: released (2.6.15-52.67)
 2.6.17-edgy-security: ignored (EOL)
 2.6.20-feisty-security: released (2.6.20-17.36)
diff --git a/retired/CVE-2008-1615 b/retired/CVE-2008-1615
index 9c297dd3..06699cd7 100644
--- a/retired/CVE-2008-1615
+++ b/retired/CVE-2008-1615
@@ -11,7 +11,7 @@ Bugs:
 upstream:
 linux-2.6: 
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch5) [bugfix/amd64-cs-corruption.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.3) [bugfix/amd64-cs-corruption.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.3) [bugfix/amd64-cs-corruption.patch]
 2.6.15-dapper-security: pending
 2.6.20-feisty-security: pending
 2.6.22-gutsy-security: pending
diff --git a/retired/CVE-2008-1669 b/retired/CVE-2008-1669
index 900a997a..e3f5cac9 100644
--- a/retired/CVE-2008-1669
+++ b/retired/CVE-2008-1669
@@ -13,7 +13,7 @@ Bugs:
 upstream: released (2.6.24.7, 2.6.25.2)
 linux-2.6: released (2.6.25-2)
 2.6.18-etch-security: released (2.6.18.dfsg.1-18etch4) [bugfix/fcntl_setlk-close-race.patch]
-2.6.24-etchnhalf-security: released (2.6.24-6~etchnhalf.2) [bugfix/all/stable/2.6.24.7.patch]
+2.6.24-etch-security: released (2.6.24-6~etchnhalf.2) [bugfix/all/stable/2.6.24.7.patch]
 2.6.15-dapper-security: released (2.6.15-52.67)
 2.6.20-feisty-security: released (2.6.20-17.36)
 2.6.22-gutsy-security: released (2.6.22-15.54)
diff --git a/retired/CVE-2008-1675 b/retired/CVE-2008-1675
index 0e3f1637..ff9d2e0b 100644
--- a/retired/CVE-2008-1675
+++ b/retired/CVE-2008-1675
@@ -13,7 +13,7 @@ Bugs:
 upstream: released (2.6.24.6)
 linux-2.6: released (2.6.24-7)
 2.6.18-etch-security: N/A
-2.6.24-etchnhalf-security: released (linux-2.6.24 2.6.24-6~etchnhalf.2) [bugfix/all/stable/2.6.24.6.patch]
+2.6.24-etch-security: released (linux-2.6.24 2.6.24-6~etchnhalf.2) [bugfix/all/stable/2.6.24.6.patch]
 2.6.15-dapper-security: N/A
 2.6.20-feisty-security: N/A
 2.6.22-gutsy-security: N/A