packages: pwdutils/pwdutils.spec, pwdutils/pwdutils-selinux.patch (NEW)=?UTF-8?Q?=20?=- u...

[qboosh]

Author: qboosh                       Date: Sat May 26 05:40:34 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.2.19 (passwd -S fix)
- added selinux patch to fix function name conflict with current libselinux

---- Files affected:
packages/pwdutils:
   pwdutils.spec (1.104 -> 1.105) , pwdutils-selinux.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pwdutils/pwdutils.spec
diff -u packages/pwdutils/pwdutils.spec:1.104 packages/pwdutils/pwdutils.spec:1.105
--- packages/pwdutils/pwdutils.spec:1.104	Tue Mar 27 16:32:49 2012
+++ packages/pwdutils/pwdutils.spec	Sat May 26 07:40:29 2012
@@ -10,13 +10,13 @@
 Summary:	Utilities to manage the passwd and shadow user information
 Summary(pl.UTF-8):	Narzędzia do zarządzania informacjami o użytkownikach z passwd i shadow
 Name:		pwdutils
-Version:	3.2.18
+Version:	3.2.19
 Release:	1
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
 Source0:	http://www.linux-nis.org/download/pwdutils/%{name}-%{version}.tar.bz2
-# Source0-md5:	7bdf1a93505a3f4e02cf6c06ee889610
+# Source0-md5:	25a77a0ab376eacf24ad5eab7af4cdce
 Source1:	%{name}.useradd
 Source2:	%{name}.rpasswdd.init
 Source3:	%{name}.login.defs
@@ -31,6 +31,7 @@
 Patch1:		%{name}-no_bash.patch
 Patch2:		%{name}-silent_crontab.patch
 Patch3:		%{name}-pl.po-update.patch
+Patch4:		%{name}-selinux.patch
 URL:		http://www.thkukuk.de/pam/pwdutils/
 %{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
@@ -158,6 +159,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} po/stamp-po
 
@@ -330,6 +332,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2012/05/26 05:40:29  qboosh
+- updated to 3.2.19 (passwd -S fix)
+- added selinux patch to fix function name conflict with current libselinux
+
 Revision 1.104  2012/03/27 14:32:49  qboosh
 - updated pl.po-update patch (one more message)
 - use __rm macro

================================================================
Index: packages/pwdutils/pwdutils-selinux.patch
diff -u /dev/null packages/pwdutils/pwdutils-selinux.patch:1.1
--- /dev/null	Sat May 26 07:40:34 2012
+++ packages/pwdutils/pwdutils-selinux.patch	Sat May 26 07:40:29 2012
@@ -0,0 +1,55 @@
+--- pwdutils-3.2.19.orig/lib/public.h	2005-06-22 11:05:53.000000000 +0200
++++ pwdutils-3.2.19/lib/public.h	2012-05-26 07:35:09.397451177 +0200
+@@ -115,7 +115,7 @@
+ 
+ 
+ #ifdef WITH_SELINUX
+-extern int selinux_check_access (const char *__chuser,
++extern int pwdu_selinux_check_access (const char *__chuser,
+ 				 unsigned int __selaccess) __attribute_warn_unused_result__;
+ extern int set_default_context (const char *filename,
+ 				char **prev_context) __attribute_warn_unused_result__;
+--- pwdutils-3.2.19.orig/lib/selinux_utils.c	2006-11-29 14:19:06.000000000 +0100
++++ pwdutils-3.2.19/lib/selinux_utils.c	2012-05-26 07:35:09.397451177 +0200
+@@ -33,7 +33,7 @@
+ #include "public.h"
+ 
+ int
+-selinux_check_access (const char *chuser, unsigned int selaccess)
++pwdu_selinux_check_access (const char *chuser, unsigned int selaccess)
+ {
+   int status = -1;
+   security_context_t user_context;
+--- pwdutils-3.2.19.orig/src/chfn.c	2006-11-29 14:19:39.000000000 +0100
++++ pwdutils-3.2.19/src/chfn.c	2012-05-26 07:35:09.394117844 +0200
+@@ -578,7 +578,7 @@
+   if (is_selinux_enabled () > 0)
+     {
+       if ((uid == 0) &&
+-          (selinux_check_access (pw_data->pw.pw_name, PASSWD__CHFN) != 0))
++          (pwdu_selinux_check_access (pw_data->pw.pw_name, PASSWD__CHFN) != 0))
+         {
+           security_context_t user_context;
+           if (getprevcon (&user_context) < 0)
+--- pwdutils-3.2.19.orig/src/chsh.c	2006-11-29 14:19:43.000000000 +0100
++++ pwdutils-3.2.19/src/chsh.c	2012-05-26 07:35:09.397451177 +0200
+@@ -443,7 +443,7 @@
+   if (is_selinux_enabled () > 0)
+     {
+       if ((uid == 0) &&
+-          (selinux_check_access (pw_data->pw.pw_name, PASSWD__CHSH) != 0))
++          (pwdu_selinux_check_access (pw_data->pw.pw_name, PASSWD__CHSH) != 0))
+         {
+           security_context_t user_context;
+           if (getprevcon (&user_context) < 0)
+--- pwdutils-3.2.19.orig/src/passwd.c	2012-05-08 14:12:35.000000000 +0200
++++ pwdutils-3.2.19/src/passwd.c	2012-05-26 07:35:09.390784511 +0200
+@@ -704,7 +704,7 @@
+   if (is_selinux_enabled () > 0)
+     {
+       if ((uid == 0) &&
+-	  (selinux_check_access (pw->pw_name, PASSWD__PASSWD) != 0))
++	  (pwdu_selinux_check_access (pw->pw_name, PASSWD__PASSWD) != 0))
+ 	{
+ 	  security_context_t user_context;
+ 	  if (getprevcon (&user_context) < 0)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/pwdutils/pwdutils.spec?r1=1.104&r2=1.105