diff --git a/shadow-4.1.4.2-gshadow.patch b/shadow-4.1.4.2-gshadow.patch index 6e4e911..1cf5ba6 100644 --- a/shadow-4.1.4.2-gshadow.patch +++ b/shadow-4.1.4.2-gshadow.patch @@ -1,29 +1,3 @@ -diff -up shadow-4.1.4.2/configure.gshadow shadow-4.1.4.2/configure ---- shadow-4.1.4.2/configure.gshadow 2011-01-05 16:29:33.355695459 +0100 -+++ shadow-4.1.4.2/configure 2011-01-05 16:29:58.322687480 +0100 -@@ -18220,7 +18220,7 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -- #include -+ #include - main() - { - struct sgrp *sg = sgetsgent("test:x::"); -diff -up shadow-4.1.4.2/lib/defines.h.gshadow shadow-4.1.4.2/lib/defines.h ---- shadow-4.1.4.2/lib/defines.h.gshadow 2011-01-05 16:29:21.914687787 +0100 -+++ shadow-4.1.4.2/lib/defines.h 2011-01-05 16:29:58.323739225 +0100 -@@ -134,6 +134,10 @@ char *strchr (), *strrchr (), *strtok () - * - /usr/include/shadow.h exists, but we use our own gshadow.h. - */ - #include -+#if defined(HAVE_SHADOWGRP) -+#include -+#define sg_name sg_namp -+#endif - #if defined(SHADOWGRP) && !defined(GSHADOW) - #include "gshadow_.h" - #endif diff -up shadow-4.1.4.2/lib/gshadow.c.gshadow shadow-4.1.4.2/lib/gshadow.c --- shadow-4.1.4.2/lib/gshadow.c.gshadow 2009-06-12 19:50:23.000000000 +0200 +++ shadow-4.1.4.2/lib/gshadow.c 2011-01-05 16:28:55.207685148 +0100 diff --git a/shadow-utils.spec b/shadow-utils.spec index 1afc5c5..bc9b61f 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.4.2 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -194,6 +194,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/vigr.8* %changelog +* Tue Feb 01 2011 Peter Vrabec - 2:4.1.4.2-10 +- do not use gshadow functions from glibc, there is a bug + in glibc sgetsgent(#674361) + Resolves: #674234 + * Wed Jan 05 2011 Peter Vrabec - 2:4.1.4.2-9 - fix gshadow functions from shadow utils - make shadow utils use gshadow functions from glibc