summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2003-10-20 00:55:08 +0000
committerChris PeBenito <pebenito@gentoo.org>2003-10-20 00:55:08 +0000
commit17d64567e018f6ab6ffc1da8a79640d8ddb44d56 (patch)
treee7a058a649309ef164969805419aae0ab229ff4a /sys-apps/pam-login
parentAdd nVidia XvMC flag for mythtv/frontend. (diff)
downloadhistorical-17d64567e018f6ab6ffc1da8a79640d8ddb44d56.tar.gz
historical-17d64567e018f6ab6ffc1da8a79640d8ddb44d56.tar.bz2
historical-17d64567e018f6ab6ffc1da8a79640d8ddb44d56.zip
re-enable query_user_context SELinux code
Diffstat (limited to 'sys-apps/pam-login')
-rw-r--r--sys-apps/pam-login/ChangeLog6
-rw-r--r--sys-apps/pam-login/Manifest31
-rw-r--r--sys-apps/pam-login/files/pam-login-3.14-query_user_context.diff22
-rw-r--r--sys-apps/pam-login/pam-login-3.14.ebuild5
4 files changed, 47 insertions, 17 deletions
diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 8c6929132c41..a31e8275ba5a 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/pam-login
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.27 2003/10/19 00:03:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.28 2003/10/20 00:55:03 pebenito Exp $
+
+ 19 Oct 2003; Chris PeBenito <pebenito@gentoo.org> pam-login-3.14.ebuild,
+ files/pam-login-3.14-query_user_context.diff:
+ Patch to re-enable query_user_context SELinux code.
*pam-login-3.14 (19 Oct 2003)
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index b953f88ee105..23b66aed5f6b 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,25 +1,26 @@
-MD5 bee9afe35fafcb837c6cbcfd2ca4b443 pam-login-3.12.ebuild 2610
-MD5 3ef7667cab81c44fe7f8e4d933686c23 pam-login-3.14.ebuild 2487
+MD5 439c8582c80ed0ba9e741616885da587 ChangeLog 4221
+MD5 363daa32525ee949f2294e752e55709c pam-login-3.10.ebuild 1988
+MD5 ecd4297984744a8212898a88025c2945 pam-login-3.11-r1.ebuild 2530
MD5 4e8328615b4be73c2edead03f8e03a9a pam-login-3.11.ebuild 2286
MD5 13075ff52d9b0a7e91d424096286c570 pam-login-3.6-r1.ebuild 1833
-MD5 a105723f181995a30162630bbf4d4610 ChangeLog 4041
-MD5 ef65801f8ddff5ab3d3414df10191093 pam-login-3.7.ebuild 1983
MD5 4277c8c7e9488f7d4b83945c2dc9f916 pam-login-3.6-r2.ebuild 1935
-MD5 ecd4297984744a8212898a88025c2945 pam-login-3.11-r1.ebuild 2530
-MD5 363daa32525ee949f2294e752e55709c pam-login-3.10.ebuild 1988
+MD5 ef65801f8ddff5ab3d3414df10191093 pam-login-3.7.ebuild 1983
MD5 bf82d9e9f078fee5f23ca5777dba74ef pam-login-3.12-r1.ebuild 2655
+MD5 bee9afe35fafcb837c6cbcfd2ca4b443 pam-login-3.12.ebuild 2610
+MD5 5f0e1bd579dee97876571b01fda8bafe pam-login-3.14.ebuild 2614
MD5 a5e9be8a38e1b8f784d3cf558cff7a6b files/digest-pam-login-3.10 67
-MD5 1a6af2fd3c929133af86b14f62589872 files/digest-pam-login-3.12-r1 67
-MD5 7febd6315d85fcd5196b602732789573 files/digest-pam-login-3.7 66
-MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r1 66
-MD5 7761083b62bdcb822f1b9533aab2e06c files/pam-login-3.11-lastlog-fix.patch 362
-MD5 1a6af2fd3c929133af86b14f62589872 files/digest-pam-login-3.12 67
+MD5 387e811b73906d5f0e5d4417cccfed0e files/digest-pam-login-3.11 67
MD5 387e811b73906d5f0e5d4417cccfed0e files/digest-pam-login-3.11-r1 67
+MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r1 66
MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r2 66
-MD5 b3602716045d7154356137da6f5dcbad files/pam-login-3.6-SUPATH.patch 438
-MD5 387e811b73906d5f0e5d4417cccfed0e files/digest-pam-login-3.11 67
-MD5 bcf75778be1a620e99fcaf5d2c55a504 files/pam-login-3.11-selinux.diff 8237
+MD5 7febd6315d85fcd5196b602732789573 files/digest-pam-login-3.7 66
MD5 21df4caf263fa2ed75e574f9a067b72e files/login.defs 3229
+MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
MD5 e1f2854245d68582c0913c5d6ac9cd66 files/pam-login-3.11-selinux-gcc33.patch 512
+MD5 bcf75778be1a620e99fcaf5d2c55a504 files/pam-login-3.11-selinux.diff 8237
+MD5 b3602716045d7154356137da6f5dcbad files/pam-login-3.6-SUPATH.patch 438
+MD5 1a6af2fd3c929133af86b14f62589872 files/digest-pam-login-3.12 67
+MD5 1a6af2fd3c929133af86b14f62589872 files/digest-pam-login-3.12-r1 67
+MD5 7761083b62bdcb822f1b9533aab2e06c files/pam-login-3.11-lastlog-fix.patch 362
MD5 bd631a67641c2ecb9f2da34226ca80a8 files/digest-pam-login-3.14 67
-MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
+MD5 128c7d12948df01d7348a7edede0c2fb files/pam-login-3.14-query_user_context.diff 635
diff --git a/sys-apps/pam-login/files/pam-login-3.14-query_user_context.diff b/sys-apps/pam-login/files/pam-login-3.14-query_user_context.diff
new file mode 100644
index 000000000000..b0c042e64c4b
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-3.14-query_user_context.diff
@@ -0,0 +1,22 @@
+diff -urN pam_login-3.14.orig/src/login.c pam_login-3.14/src/login.c
+--- pam_login-3.14.orig/src/login.c 2003-10-02 17:48:32.000000000 -0500
++++ pam_login-3.14/src/login.c 2003-10-18 20:40:21.000000000 -0500
+@@ -929,7 +929,6 @@
+ int num_contexts = get_ordered_context_list (username, 0, &contextlist);
+ if (num_contexts > 0)
+ {
+-#if 0
+ ret = query_user_context (contextlist, &user_context);
+ freeconary (contextlist);
+
+@@ -940,10 +939,6 @@
+ sleep (5);
+ exit (3);
+ }
+-#else
+- user_context = (security_context_t) strdup (contextlist[0]);
+- freeconary (contextlist);
+-#endif
+ }
+ else
+ {
diff --git a/sys-apps/pam-login/pam-login-3.14.ebuild b/sys-apps/pam-login/pam-login-3.14.ebuild
index 30914646a2af..48d4490d86f0 100644
--- a/sys-apps/pam-login/pam-login-3.14.ebuild
+++ b/sys-apps/pam-login/pam-login-3.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.14.ebuild,v 1.1 2003/10/19 00:03:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.14.ebuild,v 1.2 2003/10/20 00:55:03 pebenito Exp $
inherit gnuconfig
@@ -34,6 +34,9 @@ src_unpack() {
# Do not warn on inlining for gcc-3.3, bug #21213
epatch ${FILESDIR}/${PN}-3.11-gcc33.patch
epatch ${FILESDIR}/pam-login-3.11-lastlog-fix.patch
+
+ # enable query_user_context selinux code (only affects selinux)
+ epatch ${FILESDIR}/pam-login-3.14-query_user_context.diff
}
src_compile() {