Bug#731412: pu: package am-utils/6.2+rc20110530-3.1~deb7u1

[Andreas Beckmann <anbe@debian.org>]

Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

according to #722145 crashes unless the kernel version has 2 dots.
While this is not a problem with the kernel in wheezy, it will prevent
using it with newer kernels (backports, custom, vanilla, ...)

I'm not a user of am-utils and don't know how to test this change
properly. Attached is a proposed debdiff that just rebuilds the fixed
package from sid for wheezy (therefore including also a trivial change
to the texinfo manual).


Andreas

diff -u am-utils-6.2+rc20110530/debian/changelog am-utils-6.2+rc20110530/debian/changelog
--- am-utils-6.2+rc20110530/debian/changelog
+++ am-utils-6.2+rc20110530/debian/changelog
@@ -1,3 +1,18 @@
+am-utils (6.2+rc20110530-3.1~deb7u1) wheezy; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild for wheezy.
+
+ -- Andreas Beckmann <anbe@debian.org>  Thu, 05 Dec 2013 10:00:57 +0100
+
+am-utils (6.2+rc20110530-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix @sp macro usage in the texinfo manual (Closes: #713285).
+  * Fix crashes on modern kernels (Closes: #722145).
+
+ -- Andrew Shadura <andrewsh@debian.org>  Wed, 06 Nov 2013 00:32:42 +0100
+
 am-utils (6.2+rc20110530-3) unstable; urgency=low
 
   * Fixed missing build dependency on dpkg-dev
diff -u am-utils-6.2+rc20110530/debian/patches/series am-utils-6.2+rc20110530/debian/patches/series
--- am-utils-6.2+rc20110530/debian/patches/series
+++ am-utils-6.2+rc20110530/debian/patches/series
@@ -9,0 +10,2 @@
+kernel-version.patch
+fix-texi.patch
only in patch2:
unchanged:
--- am-utils-6.2+rc20110530.orig/debian/patches/kernel-version.patch
+++ am-utils-6.2+rc20110530/debian/patches/kernel-version.patch
@@ -0,0 +1,35 @@
+From: Yoram Bar-Haim <bhyoram@zahav.net.il>
+Date: Sun, 22 Sep 2013 13:06:33 +0000 (+0300)
+Subject: fix flaw when kernel version is 3.x
+X-Git-Url: http://git.fsl.cs.sunysb.edu/?p=am-utils-6.2.git;a=commitdiff_plain;h=3a382320e8d0b52a250efd8907f8429497de2335
+
+fix flaw when kernel version is 3.x
+---
+
+--- a/conf/mount/mount_linux.c
++++ b/conf/mount/mount_linux.c
+@@ -239,14 +239,20 @@
+ int
+ linux_version_code(void)
+ {
++  char *token;
++  int shift = 16;
+   struct utsname my_utsname;
+   static int release = 0;
+ 
+-  if ( 0 == release && 0 == uname(&my_utsname)) {
+-    release = 65536 * atoi(strtok(my_utsname.release, "."))
+-      + 256 * atoi(strtok(NULL, "."))
+-      + atoi(strtok(NULL, "."));
++  if ( release || uname(&my_utsname))
++    return release;
++
++  for (token = strtok(my_utsname.release, "."); token && (shift > -1); token = strtok(NULL, "."))
++  {
++     release |= (atoi(token) << shift);
++     shift -= 8;
+   }
++
+   return release;
+ }
+ 
only in patch2:
unchanged:
--- am-utils-6.2+rc20110530.orig/debian/patches/fix-texi.patch
+++ am-utils-6.2+rc20110530/debian/patches/fix-texi.patch
@@ -0,0 +1,11 @@
+--- a/doc/am-utils.texi
++++ b/doc/am-utils.texi
+@@ -67,7 +67,7 @@
+ Copyright @copyright{} 1989 Imperial College of Science, Technology & Medicine
+ @*
+ Copyright @copyright{} 1989 The Regents of the University of California.
+-@sp
++@sp 1
+ All Rights Reserved.
+ @vskip 1ex
+ Permission to copy this document, or any portion of it, as