[arch-commits] Commit in nfs-utils/trunk (PKGBUILD kernel-3.0-segfault.patch)

Tobias Powalowski tpowa at archlinux.org
Thu Apr 12 11:51:13 EDT 2012


    Date: Thursday, April 12, 2012 @ 11:51:12
  Author: tpowa
Revision: 156060

remove not needed patch

Modified:
  nfs-utils/trunk/PKGBUILD
Deleted:
  nfs-utils/trunk/kernel-3.0-segfault.patch

---------------------------+
 PKGBUILD                  |   12 ---------
 kernel-3.0-segfault.patch |   53 --------------------------------------------
 2 files changed, 1 insertion(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-12 15:42:02 UTC (rev 156059)
+++ PKGBUILD	2012-04-12 15:51:12 UTC (rev 156060)
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -26,16 +26,6 @@
 	nfs-utils-1.1.4-mtab-sym.patch
 	nfs-utils-1.1.4-no-exec.patch)
 install=nfs-utils.install
-md5sums=('8395ac770720b83c5c469f88306d7765'
-         'dd0d65fc6e8f422fa12520813098264b'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
-         '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}

Deleted: kernel-3.0-segfault.patch
===================================================================
--- kernel-3.0-segfault.patch	2012-04-12 15:42:02 UTC (rev 156059)
+++ kernel-3.0-segfault.patch	2012-04-12 15:51:12 UTC (rev 156060)
@@ -1,53 +0,0 @@
-mount.nfs segfaults if kernel version number does not contain
-at least 3 components delimited with a dot.
-
-Avoid this by matching up to three unsigned integers inialised
-to zero, separated by dots.
-
-A version that does not start with an integer is probably a future
-version where the versioning evolved to another scheme.
-Return UINT_MAX which is guaranteed to be higher than existing
-versions. This would also make it possible to easily identify
-versions that do not start with an integer.
-
-Signed-off-by: Luk Claes <luk at ...>
----
- utils/mount/version.h |   16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/utils/mount/version.h b/utils/mount/version.h
-index af61a6f..531cf68 100644
---- a/utils/mount/version.h
-+++ b/utils/mount/version.h
-@@ -23,8 +23,8 @@
- #ifndef _NFS_UTILS_MOUNT_VERSION_H
- #define _NFS_UTILS_MOUNT_VERSION_H
-
--#include <stdlib.h>
--#include <string.h>
-+#include <stdio.h>
-+#include <limits.h>
-
- #include <sys/utsname.h>
-
-@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q,
- static inline unsigned int linux_version_code(void)
- {
- 	struct utsname my_utsname;
--	unsigned int p, q, r;
-+	unsigned int p, q = 0, r = 0;
-
-+	/* UINT_MAX as backward compatibility code should not be run */
- 	if (uname(&my_utsname))
--		return 0;
-+		return UINT_MAX;
-
--	p = (unsigned int)atoi(strtok(my_utsname.release, "."));
--	q = (unsigned int)atoi(strtok(NULL, "."));
--	r = (unsigned int)atoi(strtok(NULL, "."));
-+	/* UINT_MAX as future versions might not start with an integer */
-+	if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1)
-+		return UINT_MAX;
-+	
- 	return MAKE_VERSION(p, q, r);
- }



More information about the arch-commits mailing list