summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-02-04 00:22:15 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-02-04 00:22:15 +0000
commitfab63597a0c2319bfdf29fbeec75a469a87f26e1 (patch)
tree822c7218aac852b5b27b237c34b9d66d0a822316 /sys-libs/pam
parentVersion bump. (diff)
downloadhistorical-fab63597a0c2319bfdf29fbeec75a469a87f26e1.tar.gz
historical-fab63597a0c2319bfdf29fbeec75a469a87f26e1.tar.bz2
historical-fab63597a0c2319bfdf29fbeec75a469a87f26e1.zip
Update static patches to not reference /usr/lib, etc directly.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'sys-libs/pam')
-rw-r--r--sys-libs/pam/ChangeLog7
-rw-r--r--sys-libs/pam/Manifest4
-rw-r--r--sys-libs/pam/files/digest-pam-0.77-r73
-rw-r--r--sys-libs/pam/pam-0.77-r7.ebuild308
4 files changed, 320 insertions, 2 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 9355ceac413a..dba2aacc6b0c 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/pam
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.61 2005/02/03 16:47:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.62 2005/02/04 00:22:15 azarah Exp $
+
+*pam-0.77-r7 (04 Feb 2005)
+
+ 04 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +pam-0.77-r7.ebuild:
+ Update static patches to not reference /usr/lib, etc directly.
*pam-0.77-r6 (03 Feb 2005)
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 94f61e200ce2..fb4b31ff56c8 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,8 +1,9 @@
MD5 98613a823c89c1040860b92880332f9d pam-0.77-r3.ebuild 7813
MD5 737b1d219c8d599538c7d61dc396b94d pam-0.77-r1.ebuild 7480
-MD5 387ad7af71edd93f09c17f98e311bd73 ChangeLog 9206
+MD5 5462f6b2e49ddb6a0e9083bf75aba000 ChangeLog 9373
MD5 ac45aab13da90aae9947ed2a112ad9a4 pam-0.77.ebuild 7429
MD5 4f5534ef7373dae1e7e4174e1b015542 pam-0.77-r4.ebuild 7814
+MD5 b88670dc86c28d90050459cee9630ba7 pam-0.77-r7.ebuild 8050
MD5 5236b3cdb8926f86382225b63b23d391 pam-0.77-r6.ebuild 7844
MD5 1d05f0436f1c273d7862099f309afe4d metadata.xml 156
MD5 cb547fcc1f1893c82cbf6edcd41a2258 pam-0.77-r2.ebuild 7764
@@ -11,6 +12,7 @@ MD5 7abfe66b5996b628696d244d462e47b0 files/digest-pam-0.77-r3 201
MD5 028c285db4076f549774c258d0eddcfc files/digest-pam-0.77-r1 201
MD5 c0fd7f7bf69f4f0effdfc66eed6d6ed2 files/digest-pam-0.77-r4 201
MD5 028c285db4076f549774c258d0eddcfc files/digest-pam-0.77 201
+MD5 41e8f5fddbc8e00ebfdc3aeadbf7c50e files/digest-pam-0.77-r7 201
MD5 b38aa656e6c205427dd4c4ba7d6d3f97 files/digest-pam-0.77-r6 201
MD5 69f8cfad7f241eb669085eaa753cd9dd files/pam-0.77-console-reset.patch 1826
MD5 7abfe66b5996b628696d244d462e47b0 files/digest-pam-0.77-r2 201
diff --git a/sys-libs/pam/files/digest-pam-0.77-r7 b/sys-libs/pam/files/digest-pam-0.77-r7
new file mode 100644
index 000000000000..5a6b66fb5bb3
--- /dev/null
+++ b/sys-libs/pam/files/digest-pam-0.77-r7
@@ -0,0 +1,3 @@
+MD5 be5a470e553ba71c20e9bbc7665f3754 Linux-PAM-0.77.tar.gz 442569
+MD5 9a2eb4b052b824b438f918fd680b98a5 pam-0.77-patches-1.8.tar.bz2 115103
+MD5 df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz 3080234
diff --git a/sys-libs/pam/pam-0.77-r7.ebuild b/sys-libs/pam/pam-0.77-r7.ebuild
new file mode 100644
index 000000000000..1626a3be455c
--- /dev/null
+++ b/sys-libs/pam/pam-0.77-r7.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.77-r7.ebuild,v 1.1 2005/02/04 00:22:15 azarah Exp $
+
+PATCH_LEVEL="1.8"
+BDB_VER="4.1.25"
+PAM_REDHAT_VER="0.77-4"
+
+RDEPEND=">=sys-libs/cracklib-2.7-r8
+ selinux? ( sys-libs/libselinux )
+ berkdb? ( >=sys-libs/db-${BDB_VER} )"
+
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ =dev-libs/glib-1.2*
+ >=sys-devel/autoconf-2.59
+ >=sys-devel/automake-1.6
+ >=sys-devel/flex-2.5.4a-r5
+ pwdb? ( >=sys-libs/pwdb-0.62 )"
+
+# Have python sandbox issues currently ...
+# doc? ( app-text/sgmltools-lite )
+
+# BDB is internalized to get a non-threaded lib for pam_userdb.so to
+# be built with. The runtime-only dependency on BDB suggests the user
+# will use the system-installed db_load to create pam_userdb databases.
+# PWDB is internalized because it is specifically designed to work
+# with Linux-PAM. I'm not really certain how pervasive the Radius
+# and NIS services of PWDB are at this point.
+#
+# With all the arch's we support, I rather use external pwdb, and then
+# link statically to it - <azarah@gentoo.org> (09 Nov 2003).
+
+#inherit needs to be after DEPEND definition to protect RDEPEND
+inherit gcc eutils flag-o-matic gnuconfig
+
+# Note that we link to static versions of glib (pam_console.so)
+# and pwdb (pam_pwdb.so) ...
+
+HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
+DESCRIPTION="Pluggable Authentication Modules"
+
+S="${WORKDIR}/Linux-PAM-${PV}"
+S2="${WORKDIR}/pam-${PV}-patches"
+SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
+ mirror://gentoo/${P}-patches-${PATCH_LEVEL}.tar.bz2
+ berkdb? ( http://www.sleepycat.com/update/snapshot/db-${BDB_VER}.tar.gz )"
+
+LICENSE="PAM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb pwdb selinux"
+
+apply_pam_patches() {
+ local x=
+ local y=
+ local patches="${T}/patches.$$"
+
+ for x in redhat gentoo
+ do
+ rm -f "${patches}"
+
+ # Need to be a '| while read x', as some lines may have spaces ...
+ cat "${S2}/list.${x}-patches" | grep -v '^#' | grep -v '^$' | while read y
+ do
+ # Remove the 'Patch[0-9]*: ' from the redhat list
+ echo "${y}" | sed -e 's|^Patch.*: \(.*\)|\1|' >> "${patches}"
+ done
+ for y in $(cat "${patches}")
+ do
+ epatch "${S2}/${x}-patches/${y}"
+ done
+ done
+}
+
+pkg_setup() {
+ local x=
+
+ if use pwdb; then
+ for x in libpwdb.a libcrack.a; do
+ if [ ! -f "${ROOT}/usr/$(get_libdir)/${x}" ]; then
+ eerror "Could not find /usr/$(get_libdir)/${x} needed to build Linux-PAM!"
+ die "Could not find /usr/$(get_libdir)/${x} needed to build Linux-PAM!"
+ fi
+ done
+ fi
+
+ return 0
+}
+
+src_unpack() {
+ unpack ${A} || die "Couldn't unpack ${A}"
+
+ cd ${S} || die
+ tar -zxf ${S2}/pam-redhat-${PAM_REDHAT_VER}.tar.gz \
+ || die "Couldn't unpack pam-redhat-${PAM_REDHAT_VER}.tar.gz"
+
+ apply_pam_patches
+
+ use selinux && epatch ${S2}/gentoo-patches/pam-selinux.patch
+
+ for readme in modules/pam_*/README ; do
+ cp -f "${readme}" doc/txts/README.$(dirname "${readme}" | \
+ sed -e 's|^modules/||')
+ done
+
+ cp /usr/share/automake/install-sh . || die
+ export WANT_AUTOCONF=2.5
+ autoconf || die
+}
+
+src_compile() {
+ export CFLAGS="${CFLAGS} -fPIC"
+
+ if use berkdb
+ then
+ einfo "Building Berkley DB ${BDB_VER}..."
+ cd ${WORKDIR}
+ cd db-${BDB_VER}/dist || die
+
+ # Pam uses berkdb, which db-4.1.x series can't detect mips64, so we fix it
+ if use mips; then
+ einfo "Updating berkdb config.{guess,sub} for mips"
+ local OLDS="${S}"
+ S="${WORKDIR}/db-${BDB_VER}/dist"
+ gnuconfig_update
+ S="${OLDS}"
+ fi
+
+ echo db_cv_mutex=UNIX/fcntl > config.cache
+ ./s_config
+ ./configure \
+ --cache-file=config.cache \
+ --disable-compat185 \
+ --disable-cxx \
+ --disable-diagnostic \
+ --disable-dump185 \
+ --disable-java \
+ --disable-rpc \
+ --disable-tcl \
+ --disable-shared \
+ --with-pic \
+ --with-uniquename=_pam \
+ --prefix=${S} \
+ --includedir=${S}/include \
+ --libdir=${S}/lib || die "Bad BDB ./configure"
+
+ # XXX hack out O_DIRECT support in db4 for now.
+ perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' \
+ db_config.h
+
+ make || die "BDB build failed"
+ make install || die
+
+ export CPPFLAGS="-I${S}/include"
+ export LDFLAGS="-L${S}/lib"
+ export LIBNAME="lib"
+ fi
+
+ if [ "${ARCH}" = "alpha" ]
+ then
+ if [ ! -z "$(strings -a /usr/lib/libglib.a | grep -i 'Compaq Computer Corp.')" ]
+ then
+ # should be LDFLAGS, but this configure is screwy.
+ echo
+ einfo "It looks like you compiled glib with ccc, this is okay, but"
+ einfo "I'll need to force gcc to link with libots...."
+ echo
+ append-flags -lots
+ sed -i -e 's/$(CC) -o/$(CC) -lots -o/g' ${S}/modules/pam_pwdb/Makefile
+ fi
+ fi
+
+ einfo "Building Linux-PAM ${PV}..."
+ cd ${S}
+ ./configure \
+ --libdir=/$(get_libdir) \
+ --enable-static-libpam \
+ --enable-fakeroot=${D} \
+ --enable-isadir=/$(get_libdir)/security \
+ --host=${CHOST} || die
+
+ # Python stuff in docs gives sandbox problems
+ sed -i -e 's|modules doc examples|modules|' Makefile
+
+ # Fix warnings for gcc-2.95.3
+ if [ "$(gcc-version)" = "2.95" ]
+ then
+ sed -i -e "s:-Wpointer-arith::" Make.Rules
+ fi
+
+ if ! use berkdb
+ then
+ # Do not build pam_userdb.so ...
+ sed -i -e "s:^HAVE_NDBM_H=yes:HAVE_NDBM_H=no:" \
+ -e "s:^HAVE_LIBNDBM=yes:HAVE_LIBNDBM=no:" \
+ -e "s:^HAVE_LIBDB=yes:HAVE_LIBDB=no:" \
+ Make.Rules
+
+ # Also edit the configuration file else the wrong include files
+ # get used
+ sed -i -e "s:^#define HAVE_NDBM_H.*$:/* #undef HAVE_NDBM_H */:" \
+ -e "s:^#define HAVE_DB_H.*$:/* #undef HAVE_DB_H */:" \
+ _pam_aconf.h
+
+ else
+ # Do not link pam_userdb.so to db-1.85 ...
+ sed -i -e "s:^HAVE_NDBM_H=yes:HAVE_NDBM_H=no:" \
+ -e "s:^HAVE_LIBNDBM=yes:HAVE_LIBNDBM=no:" \
+ Make.Rules
+
+ # Also edit the configuration file else the wrong include files
+ # get used
+ sed -i -e "s:^#define HAVE_NDBM_H.*$:/* #undef HAVE_NDBM_H */:" _pam_aconf.h
+ fi
+
+ make || die "PAM build failed"
+}
+
+src_install() {
+ local x=
+
+ einfo "Installing Linux-PAM ${PV}..."
+ make FAKEROOT=${D} \
+ LDCONFIG="" \
+ install || die
+
+ # Make sure every module built.
+ # Do not remove this, as some module can fail to build
+ # and effectively lock the user out of his system.
+ einfo "Checking if all modules were built..."
+ for x in ${S}/modules/pam_*
+ do
+ if [ -d ${x} ]
+ then
+ # Its OK if the module failed when we didnt ask for it anyway
+ if ! ls -1 ${D}/$(get_libdir)/security/$(basename ${x})*.so &> /dev/null
+ then
+ if ! use berkdb && [ "$(basename ${x})" = "pam_userdb" ]
+ then
+ continue
+ fi
+ if ! use pwdb && [ "$(basename ${x})" = "pam_pwdb" ]
+ then
+ continue
+ fi
+ if ! use pwdb && [ "$(basename ${x})" = "pam_radius" ]
+ then
+ continue
+ fi
+ eerror "ERROR: $(basename ${x}) module did not build."
+ exit 1
+ else
+ # Remove the ones we didnt want if it ended up building ok anyways
+ if ! use berkdb && [ "$(basename ${x})" = "pam_userdb" ]
+ then
+ rm -f ${D}/$(get_libdir)/security/pam_userdb*
+ fi
+ if ! use pwdb && [ "$(basename ${x})" = "pam_pwdb" ]
+ then
+ rm -f ${D}/$(get_libdir)/security/pam_pwdb*
+ fi
+ if ! use pwdb && [ "$(basename ${x})" = "pam_radius" ]
+ then
+ rm -f ${D}/$(get_libdir)/security/pam_radius*
+ fi
+ fi
+ fi
+ done
+
+ dodir /usr/$(get_libdir)
+ cd ${D}/$(get_libdir)
+ for x in pam pamc pam_misc
+ do
+ rm lib${x}.so
+ ln -s lib${x}.so.${PV} lib${x}.so
+ ln -s lib${x}.so.${PV} lib${x}.so.0
+ mv lib${x}.a ${D}/usr/$(get_libdir)
+ # See bug #4411
+ gen_usr_ldscript lib${x}.so
+ done
+
+ cd ${S}
+ doman doc/man/*.[0-9]
+
+ dodoc CHANGELOG Copyright README
+ docinto modules ; dodoc modules/README ; dodoc doc/txts/README.*
+ docinto txt ; dodoc doc/specs/*.txt #doc/txts/*.txt
+# docinto print ; dodoc doc/ps/*.ps
+
+# docinto html
+# dohtml -r doc/html/
+
+ # need this for pam_console
+ keepdir /var/run/console
+
+ insinto /etc/pam.d
+ for x in ${FILESDIR}/pam.d/*
+ do
+ if [ -f ${x} ]
+ then
+ doins ${x}
+ fi
+ done
+
+ insinto /etc/security
+ doins ${FILESDIR}/pam_env.conf
+}