Update SELinux patch

4 files changed, 185 insertions, 17 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 07e028bf2c14..8133e3238e7c 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.48 2004/01/22 19:20:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.49 2004/01/23 19:51:06 pebenito Exp $
+
+  23 Jan 2004; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.4.1.ebuild,
+  files/shadow-4.0.4.1-selinux.diff:
+  Update SELinux patch.
 
 *shadow-4.0.4.1 (22 Jan 2004)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index b971dc97428a..7ec58078f0e5 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,24 +1,25 @@
-MD5 7452616f9e23975f06b648553542e190 shadow-4.0.3-r10.ebuild 5680
-MD5 0bfea38d38f50550c81a99bd920f8c6c ChangeLog 9640
+MD5 fc234ef3fbbff41342780dc7bfbf36b7 shadow-4.0.4.1.ebuild 5434
+MD5 1b469cef634fd32d10d8f58b2ee399a7 ChangeLog 9779
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 62cc9812d368c9201eb3bb993481a05a shadow-4.0.3-r9.ebuild 5425
-MD5 1aa1fb968ea9691590663522962a7430 shadow-4.0.4.1.ebuild 5430
-MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r9 65
-MD5 6dfd34cef0901f49a1899aa59219bc8f files/shadow-4.0.3-shared-needs-pam.patch 646
+MD5 7452616f9e23975f06b648553542e190 shadow-4.0.3-r10.ebuild 5680
+MD5 ab9789d22ebb1e74be504dcd71e23132 files/shadow-4.0.4.1-selinux.diff 3926
+MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
 MD5 94728414b91e556a211379f6acc9b52d files/shadow-4.0.3-selinux.diff 3940
-MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r10 65
-MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230
-MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882
 MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972
-MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
-MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1 67
+MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230
 MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
+MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r9 65
+MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1 67
 MD5 de1e23b4a7d38545475dffc3c9dc73a0 files/shadow-4.0.3-useradd-manpage-update.patch 804
-MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
+MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882
+MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r10 65
+MD5 6dfd34cef0901f49a1899aa59219bc8f files/shadow-4.0.3-shared-needs-pam.patch 646
 MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247
+MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
 MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
 MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
-MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
-MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
 MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
+MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
+MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
+MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
diff --git a/sys-apps/shadow/files/shadow-4.0.4.1-selinux.diff b/sys-apps/shadow/files/shadow-4.0.4.1-selinux.diff
new file mode 100644
index 000000000000..c2a15f80fd20
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.4.1-selinux.diff
@@ -0,0 +1,163 @@
+diff -urN shadow-4.0.3.orig/lib/Makefile.am shadow-4.0.3/lib/Makefile.am
+--- shadow-4.0.3.orig/lib/Makefile.am	2001-10-06 14:53:20.000000000 -0500
++++ shadow-4.0.3/lib/Makefile.am	2003-08-07 08:38:20.000000000 -0500
+@@ -1,7 +1,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.0 foreign
+ 
+-DEFS = 
++DEFS = -DWITH_SELINUX
+ INCLUDES =
+ 
+ lib_LTLIBRARIES = libshadow.la
+diff -urN shadow-4.0.3.orig/lib/commonio.c shadow-4.0.3/lib/commonio.c
+--- shadow-4.0.3.orig/lib/commonio.c	2001-11-17 07:15:52.000000000 -0600
++++ shadow-4.0.3/lib/commonio.c	2003-08-07 08:38:20.000000000 -0500
+@@ -15,7 +15,10 @@
+ #ifdef HAVE_SHADOW_H
+ #include <shadow.h>
+ #endif
+-
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++static security_context_t old_context=NULL;
++#endif
+ #include "commonio.h"
+ 
+ /* local function prototypes */
+@@ -437,6 +440,15 @@
+ 		return 0;
+ 	}
+ 
++#ifdef WITH_SELINUX
++	db->scontext=NULL;
++	if (is_selinux_enabled() &&  (! db->readonly)) {
++	  if (fgetfilecon(fileno(db->fp),&db->scontext) < 0) {
++		goto cleanup;
++	  }
++	}
++#endif
++
+ 	buflen = BUFLEN;
+ 	buf = (char *) malloc(buflen);
+ 	if (!buf)
+@@ -492,6 +504,12 @@
+ 	free(buf);
+ cleanup:
+ 	free_linked_list(db);
++#ifdef WITH_SELINUX
++	if (db->scontext!= NULL) {
++	  freecon(db->scontext);
++	  db->scontext=NULL;
++	}
++#endif
+ 	fclose(db->fp);
+ 	db->fp = NULL;
+ 	errno = ENOMEM;
+@@ -627,6 +645,19 @@
+ 			goto fail;
+ 		}
+ 
++#ifdef WITH_SELINUX
++		if (db->scontext != NULL) {
++		  int stat=getfscreatecon(&old_context);
++		  if (stat< 0) {
++		    errors++;
++		    goto fail;
++		  }
++		  if (setfscreatecon(db->scontext)<0) {
++		    errors++;
++		    goto fail;
++		  }
++		}
++#endif
+ 		/*
+ 		 * Create backup file.
+ 		 */
+@@ -683,14 +714,26 @@
+ 		goto fail;
+ 
+ 	nscd_need_reload = 1;
+-
++	goto success;
++fail:
++	errors++;
+ success:
+-	free_linked_list(db);
+-	return 1;
+ 
+-fail:
++#ifdef WITH_SELINUX
++	if (db->scontext != NULL) {
++	  if (setfscreatecon(old_context)<0) {
++	    errors++;
++	  }
++	  if (old_context != NULL) {		  
++	    freecon(old_context);
++	    old_context=NULL;
++	  }
++	  freecon(db->scontext);
++	  db->scontext=NULL;
++	}
++#endif
+ 	free_linked_list(db);
+-	return 0;
++	return errors==0;
+ }
+ 
+ 
+diff -urN shadow-4.0.3.orig/lib/commonio.h shadow-4.0.3/lib/commonio.h
+--- shadow-4.0.3.orig/lib/commonio.h	2001-08-14 16:09:54.000000000 -0500
++++ shadow-4.0.3/lib/commonio.h	2003-08-07 08:38:20.000000000 -0500
+@@ -1,5 +1,8 @@
+ /* $Id: shadow-4.0.4.1-selinux.diff,v 1.1 2004/01/23 19:51:06 pebenito Exp $ */
+ 
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#endif
+ /*
+  * Linked list entry.
+  */
+@@ -70,6 +73,9 @@
+ 	 */
+ 	FILE *fp;
+ 
++#ifdef WITH_SELINUX
++        security_context_t scontext;
++#endif
+ 	/*
+ 	 * Head, tail, current position in linked list.
+ 	 */
+diff -urN shadow-4.0.3.orig/src/Makefile.am shadow-4.0.3/src/Makefile.am
+--- shadow-4.0.3.orig/src/Makefile.am	2002-03-10 01:12:52.000000000 -0600
++++ shadow-4.0.3/src/Makefile.am	2003-08-07 08:38:20.000000000 -0500
+@@ -4,7 +4,7 @@
+ ubindir = ${prefix}/bin
+ usbindir = ${prefix}/sbin
+ 
+-DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\"
++DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" -DWITH_SELINUX
+ 
+ INCLUDES = -I${top_srcdir} \
+ 	-I${top_srcdir}/lib \
+@@ -35,7 +35,7 @@
+ suidubins = chage chfn chsh expiry gpasswd newgrp passwd
+ 
+ LDADD = $(top_builddir)/libmisc/libmisc.la \
+-	$(top_builddir)/lib/libshadow.la
++	$(top_builddir)/lib/libshadow.la -lselinux
+ 
+ chpasswd_LDADD = $(LDADD) $(LIBPAM)
+ chage_LDADD    = $(LDADD) $(LIBPAM)
+diff -urN shadow-4.0.3.orig/src/Makefile.in shadow-4.0.3/src/Makefile.in
+--- shadow-4.0.3.orig/src/Makefile.in	2002-03-13 13:04:10.000000000 -0600
++++ shadow-4.0.3/src/Makefile.in	2003-08-07 08:45:13.000000000 -0500
+@@ -145,7 +145,7 @@
+ suidubins = chage chfn chsh expiry gpasswd newgrp passwd
+ 
+ LDADD = $(top_builddir)/libmisc/libmisc.la \
+-	$(top_builddir)/lib/libshadow.la
++	$(top_builddir)/lib/libshadow.la -lselinux
+ 
+ 
+ chpasswd_LDADD = $(LDADD) $(LIBPAM)
diff --git a/sys-apps/shadow/shadow-4.0.4.1.ebuild b/sys-apps/shadow/shadow-4.0.4.1.ebuild
index 0e5ce81369c0..b35b368c1a24 100644
--- a/sys-apps/shadow/shadow-4.0.4.1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1.ebuild,v 1.1 2004/01/22 19:20:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1.ebuild,v 1.2 2004/01/23 19:51:06 pebenito Exp $
 
 IUSE="pam selinux"
 
@@ -8,7 +8,7 @@ inherit eutils libtool gnuconfig
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
-SELINUX_PATCH="shadow-4.0.3-selinux.diff"
+SELINUX_PATCH="shadow-4.0.4.1-selinux.diff"
 
 S="${WORKDIR}/${P}"
 HOMEPAGE="http://shadow.pld.org.pl/"