sys-cluster/torque-6.0.3: fix an empty-string comparison error

Bug: http://bugs.gentoo.org/638346
Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch
new file mode 100644 (file)
index 0000000..0666eda
--- /dev/null
+++ b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch
@@ -0,0 +1,21 @@
+--- a/src/lib/Libattr/req.cpp  2017-01-24 18:35:27.000000000 -0500
++++ b/src/lib/Libattr/req.cpp  2017-11-21 13:40:27.201964749 -0500
+@@ -1037,17 +1037,17 @@
+     error = "Bad tasks value: '";
+     error += submission_str;
+     error += "'";
+     return(PBSE_BAD_PARAMETER);
+     }
+ 
+   if (*current == ':')
+     current++;
+-  else if (current != '\0')
++  else if (*current != '\0')
+     {
+     error = "Invalid task specification";
+     return(PBSE_BAD_PARAMETER);
+     }
+ 
+   while ((current != NULL) && 
+          (*current != '\0'))
+     {

diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.3.ebuild
index 74409b48eef8dcb0261135620bb4e21ce979922f..ec9563e95bfacc755ef40fb37eea7942be073d85 100644 (file)
--- a/sys-cluster/torque/torque-6.0.3.ebuild
+++ b/sys-cluster/torque/torque-6.0.3.ebuild
@@ -81,6 +81,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-fix-emptystring-comparison.patch
        # We install to a valid location, no need to muck with ld.so.conf
        # --without-loadlibfile is supposed to do this for us...
        sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die