[linux-signed] 04/04: Validate version suffiix to ensure it sorts lowe than stable security updates

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux-signed.

commit 28b373537047a8cca645431b530ef42b450496a6
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Sep 15 16:47:55 2016 +0100

    Validate version suffiix to ensure it sorts lowe than stable security updates
    
    When we have signed packages in stable, we need to make sure that any
    upload of linux-signed that adds a suffix will have a version number
    lower than a following security update.  The current '+s1' sorts after
    '+deb' so could prevent automatic upgrades.  Make sure we don't make
    this mistake when it matters.
---
 debian/changelog  | 7 +++++++
 debian/rules      | 1 +
 debian/rules.defs | 1 +
 3 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3019ce8..ce31988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-signed (2.4) UNRELEASED; urgency=medium
+
+  * Validate version suffiix to ensure it sorts lowe than stable security
+    updates
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 15 Sep 2016 16:54:17 +0100
+
 linux-signed (2.3) unstable; urgency=medium
 
   * Add +s1 to binary package version
diff --git a/debian/rules b/debian/rules
index bd988dc..1ed0de9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ else
 endif
 
 debian/control-real: $(GENCONTROL) $(CONTROL_FILES)
+	dpkg --compare-versions '$(KERNEL_IMAGE_VERSION)$(SIGNED_VERSION_SUFFIX)' lt '$(KERNEL_IMAGE_VERSION)+deb'
 	$(GENCONTROL) /usr/src/linux-support-$(KERNEL_ABINAME) $(KERNEL_IMAGE_VERSION) '$(SIGNED_VERSION_SUFFIX)'
 	md5sum $^ > debian/control.md5sum
 	@echo
diff --git a/debian/rules.defs b/debian/rules.defs
index fb49e9a..6fe997f 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -3,6 +3,7 @@ STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates
 KERNEL_ABINAME := 4.7.0-1
 KERNEL_IMAGE_VERSION := 4.7.2-1
+# Note: any version suffix must sort *lower* than +deb
 SIGNED_VERSION_SUFFIX := +s1
 
 MIRROR_URL = http://deb.debian.org/debian/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-signed.git