Add patch to fix linking on selinux systems. Thanks to Stephen Bennett for reporting...

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 2875275b41bc560df6db683540cebf2903c9e97f..2617d012bf56de09a00a641395cbff1eccc8806e 100644 (file)
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.133 2006/11/06 08:02:02 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.134 2006/11/24 14:06:14 flameeyes Exp $
+
+*pam-0.99.6.3-r2 (24 Nov 2006)
+
+  24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-0.99.6.3-selinux.patch, +pam-0.99.6.3-r2.ebuild:
+  Add patch to fix linking on selinux systems. Thanks to Stephen Bennett for
+  reporting in bug #156124.
 
   30 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> pam-0.99.6.3-r1.ebuild:
   Use /usr/lib directory even on non-multilib systems.

diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index c2d8454878f94eda78916f68abdc247ed5bb65f1..36efdfe8dfba99e656a7f1c4f89b859a4f17b334 100644 (file)
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -9,6 +9,10 @@ AUX Linux-PAM-0.99.6.3-linking.patch 1829 RMD160 f186fa717ce61b1da1f5b90efda2bce
 MD5 fbc028dbec6354a7b3262987c561d202 files/Linux-PAM-0.99.6.3-linking.patch 1829
 RMD160 f186fa717ce61b1da1f5b90efda2bce3ae83325f files/Linux-PAM-0.99.6.3-linking.patch 1829
 SHA256 ffd0925b46f21ca291e3f2a7d5bca79e92713593c97b335d6d0e8b884bf35449 files/Linux-PAM-0.99.6.3-linking.patch 1829
+AUX Linux-PAM-0.99.6.3-selinux.patch 841 RMD160 f6fc2ed0b94c9783818e503eeb6c9686fb620b90 SHA1 fb720a7ffd9ad8237457d75584b794a8ae58f3b5 SHA256 c366c8b83cc4d5ee69f9c19be969bc6583eea94c1efc8be2096ff7cea8811dee
+MD5 6a085b63836f75d0387c1a7ede12d7bc files/Linux-PAM-0.99.6.3-selinux.patch 841
+RMD160 f6fc2ed0b94c9783818e503eeb6c9686fb620b90 files/Linux-PAM-0.99.6.3-selinux.patch 841
+SHA256 c366c8b83cc4d5ee69f9c19be969bc6583eea94c1efc8be2096ff7cea8811dee files/Linux-PAM-0.99.6.3-selinux.patch 841
 AUX README.pam_console 2619 RMD160 9b8d2ffcc20d781146aa485e6754b4b221689adf SHA1 544471e26f47447319c76d37c7d4dc2047f83b13 SHA256 edc959cefb01cf0b0a1fc42d43fcb388f7dc5c073166da611fa614ad2953870c
 MD5 4d915415e30dcbd724c8054970deec6a files/README.pam_console 2619
 RMD160 9b8d2ffcc20d781146aa485e6754b4b221689adf files/README.pam_console 2619
@@ -59,10 +63,14 @@ EBUILD pam-0.99.6.3-r1.ebuild 3082 RMD160 582fd65b6c5bf8c51218e854cdf8136976fdad
 MD5 de2ae487f272b7dc2de9c928760aa2f6 pam-0.99.6.3-r1.ebuild 3082
 RMD160 582fd65b6c5bf8c51218e854cdf8136976fdadc9 pam-0.99.6.3-r1.ebuild 3082
 SHA256 5862527fcaa956d81404e16f626707a128eccc7fc9da3fd7042139aa09d5a50d pam-0.99.6.3-r1.ebuild 3082
-MISC ChangeLog 21479 RMD160 f95a6eacad739f762b0dd1d93fffab689985d7cf SHA1 c064d7308ab373df679d75b4f63ee2dd4f231994 SHA256 e79e44ec368282e8c388f8d35b49e0e94386df7f9ed22bdefe5fdd85ffb3b166
-MD5 7dc14a0337f7c0e6aebabfbd13bf4476 ChangeLog 21479
-RMD160 f95a6eacad739f762b0dd1d93fffab689985d7cf ChangeLog 21479
-SHA256 e79e44ec368282e8c388f8d35b49e0e94386df7f9ed22bdefe5fdd85ffb3b166 ChangeLog 21479
+EBUILD pam-0.99.6.3-r2.ebuild 3128 RMD160 054b819d316a03ca41113a10621556cff47ce9bb SHA1 ba601f4c965f7046791f15fd2b4e5266e1ae9658 SHA256 96324f126049657f00996b3b9d8b2f6654ef85a78937afa07a81dfa6b7e82b51
+MD5 a612fd0d15dce14dc0068cd9a573a60f pam-0.99.6.3-r2.ebuild 3128
+RMD160 054b819d316a03ca41113a10621556cff47ce9bb pam-0.99.6.3-r2.ebuild 3128
+SHA256 96324f126049657f00996b3b9d8b2f6654ef85a78937afa07a81dfa6b7e82b51 pam-0.99.6.3-r2.ebuild 3128
+MISC ChangeLog 21742 RMD160 36e0f520705c6b80d0353d95c197312a5a9e8db1 SHA1 982b986a895f63ac4b9aafb62986e22207456dcd SHA256 ac8d0aa444ad2b297413170c79d0c73299ce5362f743025ac16adbac4dea722a
+MD5 d1e7455652af8bee5de5918aa381989e ChangeLog 21742
+RMD160 36e0f520705c6b80d0353d95c197312a5a9e8db1 ChangeLog 21742
+SHA256 ac8d0aa444ad2b297413170c79d0c73299ce5362f743025ac16adbac4dea722a ChangeLog 21742
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -76,10 +84,13 @@ SHA256 c3edc3912942659b0d5bdffd75c393e13641be489aad277aa72846079b2cacb0 files/di
 MD5 908844567621b16e0e2bdecb789c27a3 files/digest-pam-0.99.6.3-r1 259
 RMD160 3f02ccfaf84966f22db9306c6aa912fe1de07a76 files/digest-pam-0.99.6.3-r1 259
 SHA256 ec33fef3deb83b8589594fee5532ab7e8ddfbd29feb56497f8779bfd419ac8f7 files/digest-pam-0.99.6.3-r1 259
+MD5 908844567621b16e0e2bdecb789c27a3 files/digest-pam-0.99.6.3-r2 259
+RMD160 3f02ccfaf84966f22db9306c6aa912fe1de07a76 files/digest-pam-0.99.6.3-r2 259
+SHA256 ec33fef3deb83b8589594fee5532ab7e8ddfbd29feb56497f8779bfd419ac8f7 files/digest-pam-0.99.6.3-r2 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVq4PamhnQswr0vIRAoPwAJoCh1e/0wcOJpWh1xoM3/eAxlx5KACfaVVn
-BA+S9b6mLqVC5DPGlrgWvss=
-=zJQB
+iD8DBQFFZvxeAiZjviIA2XgRAjZ8AKDaOkjACVg9C8oUmFUavVp3CWJHsACdEnma
+e5+JudNtiL1S462Qox5qEms=
+=dbyI
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/pam/files/Linux-PAM-0.99.6.3-selinux.patch b/sys-libs/pam/files/Linux-PAM-0.99.6.3-selinux.patch
new file mode 100644 (file)
index 0000000..833daf9
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-0.99.6.3-selinux.patch
@@ -0,0 +1,18 @@
+Index: Linux-PAM-0.99.6.3/modules/pam_selinux/Makefile.am
+===================================================================
+--- Linux-PAM-0.99.6.3.orig/modules/pam_selinux/Makefile.am
++++ Linux-PAM-0.99.6.3/modules/pam_selinux/Makefile.am
+@@ -19,10 +19,10 @@ secureconfdir = $(SCONFIGDIR)
+ 
+ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+       -I$(top_srcdir)/libpam_misc/include
+-AM_LDFLAGS = -no-undefined \
+-      -L$(top_builddir)/libpam -lpam @LIBSELINUX@
++AM_LDFLAGS = -no-undefined
+ 
+-pam_selinux_check_LDFLAGS = -L$(top_builddir)/libpam_misc -lpam_misc
++pam_selinux_check_LDADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ -L$(top_builddir)/libpam_misc -lpam_misc
++pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@
+ 
+ if HAVE_VERSIONING
+   pam_selinux_la_LDFLAGS = -avoid-version -module \

diff --git a/sys-libs/pam/files/digest-pam-0.99.6.3-r2 b/sys-libs/pam/files/digest-pam-0.99.6.3-r2
new file mode 100644 (file)
index 0000000..48bbbca
--- /dev/null
+++ b/sys-libs/pam/files/digest-pam-0.99.6.3-r2
@@ -0,0 +1,3 @@
+MD5 4c2830ed55a41e795af6a482009a036c Linux-PAM-0.99.6.3.tar.bz2 863340
+RMD160 9c02478d0b5fe5af72b736a64ede6b09618c98e0 Linux-PAM-0.99.6.3.tar.bz2 863340
+SHA256 8468b0fd062cead62a66a048280d28ed70420eefc55b5c9a3fdb361891f2ccd4 Linux-PAM-0.99.6.3.tar.bz2 863340

diff --git a/sys-libs/pam/pam-0.99.6.3-r2.ebuild b/sys-libs/pam/pam-0.99.6.3-r2.ebuild
new file mode 100644 (file)
index 0000000..aa21570
--- /dev/null
+++ b/sys-libs/pam/pam-0.99.6.3-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.6.3-r2.ebuild,v 1.1 2006/11/24 14:06:14 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit libtool multilib eutils autotools pam toolchain-funcs
+
+MY_P="Linux-PAM-${PV}"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+
+SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/${MY_P}.tar.bz2"
+
+LICENSE="PAM"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~ppc ~s390 ~sh ~x86"
+IUSE="nls elibc_FreeBSD selinux vim-syntax"
+
+RDEPEND="nls? ( virtual/libintl )
+       >=sys-libs/cracklib-2.8.3
+       sys-libs/pwdb
+       selinux? ( >=sys-libs/libselinux-1.28 )"
+DEPEND="${RDEPEND}
+       ~app-text/docbook-xml-dtd-4.1.2
+       ~app-text/docbook-xml-dtd-4.3
+       ~app-text/docbook-xml-dtd-4.4
+       nls? ( sys-devel/gettext )"
+PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="confcache"
+
+PROVIDE="virtual/pam"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       mkdir -p doc/txts
+       for readme in modules/pam_*/README; do
+               cp -f "${readme}" doc/txts/README.$(dirname "${readme}" | \
+                       sed -e 's|^modules/||')
+       done
+
+       epatch "${FILESDIR}/${MY_P}-berkdb.patch"
+       epatch "${FILESDIR}/${MY_P}-linking.patch"
+       epatch "${FILESDIR}/${MY_P}-selinux.patch"
+
+       AT_M4DIR="m4" eautoreconf
+
+       elibtoolize
+}
+
+src_compile() {
+       local myconf
+
+       # don't build documentation as it doesn't seem to really work
+       export SGML2PS=no
+       export SGML2TXT=no
+       export SGML2HTML=no
+       export SGML2LATEX=no
+       export PS2PDF=no
+
+       if use hppa || use elibc_FreeBSD; then
+               myconf="${myconf} --disable-pie"
+       fi
+
+       econf \
+               $(use_enable nls) \
+               $(use_enable selinux) \
+               --libdir=/usr/$(get_libdir) \
+               --disable-berkdb \
+               --enable-securedir=/$(get_libdir)/security \
+               --enable-isadir=/$(get_libdir)/security \
+               --disable-dependency-tracking \
+               --disable-prelude \
+               --enable-docdir=/usr/share/doc/${PF} \
+               ${myconf} || die "econf failed"
+       emake || die "emake failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       # Need to be suid
+       fperms u+s /sbin/unix_chkpwd
+
+       dodir /$(get_libdir)
+       mv "${D}/usr/$(get_libdir)/libpam.so"* "${D}/$(get_libdir)/"
+       mv "${D}/usr/$(get_libdir)/libpamc.so"* "${D}/$(get_libdir)/"
+       mv "${D}/usr/$(get_libdir)/libpam_misc.so"* "${D}/$(get_libdir)/"
+       gen_usr_ldscript libpam.so libpamc.so libpam_misc.so
+
+       # No, we don't really need .la files for PAM modules.
+       rm -f "${D}/$(get_libdir)/security/"*.la
+
+       dodoc CHANGELOG ChangeLog README AUTHORS Copyright
+       docinto modules ; dodoc doc/txts/README.*
+
+       for x in "${FILESDIR}/pam.d-0.99/"*; do
+               [[ -f "${x}" ]] && dopamd "${x}"
+       done
+
+       # Remove the wrongly isntalled manpage
+       rm -f "${D}"/usr/share/man/man8/pam_userdb.8*
+}
+
+pkg_postinst() {
+       elog "Since version 0.99 we don't apply RedHat patches anymore, thus stuff"
+       elog "like pam_stack is not present (replaced by the 'include' directive)."
+       elog "The pam_userdb module is now moved in sys-auth/pam_userdb."
+       elog "The pam_console module is now moved in sys-auth/pam_console."
+}