shadow: backport a patch to make newgrp work

Backport a Debian patch to fix the reading of the
gshadow file in order to make newgrp work correctly.

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
[sgw - tweaked commit message]
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
new file mode 100644 (file)
index 0000000..80ebdc2
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
@@ -0,0 +1,36 @@
+shadow: Fix parsing of gshadow entries
+
+Upstream-Status: Backport [http://anonscm.debian.org/viewvc/pkg-shadow?view=revision&revision=3096]
+
+newgrp command does not function properly.
+Even with the valid password, it outputs: "'Invalid password'"
+
+Signed-off-by: Roy.Li <rongqing.li@windriver.com>
+
+2010-02-14  Michael Bunk  <mb@computer-leipzig.com>
+
+       * NEWS, lib/gshadow.c: Fix parsing of gshadow entries.
+
+diff -urpN a/lib/gshadow.c b/lib/gshadow.c
+--- a/lib/gshadow.c    2013-07-11 10:18:15.745450428 +0800
++++ b/lib/gshadow.c    2013-07-11 10:17:30.465450280 +0800
+@@ -222,6 +222,7 @@ void endsgent (void)
+               if (NULL == buf) {
+                       return NULL;
+               }
++              buflen = BUFSIZ;
+       }
+ 
+       if (NULL == fp) {
+@@ -229,9 +230,9 @@ void endsgent (void)
+       }
+ 
+ #ifdef        USE_NIS
+-      while (fgetsx (buf, (int) sizeof buf, fp) == buf)
++      while (fgetsx (buf, (int) buflen, fp) == buf)
+ #else
+-      if (fgetsx (buf, (int) sizeof buf, fp) == buf)
++      if (fgetsx (buf, (int) buflen, fp) == buf)
+ #endif
+       {
+               while (   ((cp = strrchr (buf, '\n')) == NULL)

diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index af67339d992b82eb8c3d4ebc91e102bb7b0a34b8..31cef20a1520977c0ad0698351b870ccf8c6690b 100644 (file)
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -24,6 +24,7 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://shadow-update-pam-conf.patch \
            file://shadow_fix_for_automake-1.12.patch \
            file://slackware_fix_for_glib-2.17_crypt.patch \
+           file://fix-etc-gshadow-reading.patch \
            "
 
 SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"