diff options
| -rw-r--r-- | dev-util/schroot/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/schroot/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/schroot/files/schroot-1.2.3-pam.patch | 46 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.2.3-r3.ebuild (renamed from dev-util/schroot/schroot-1.2.3-r2.ebuild) | 8 |
4 files changed, 15 insertions, 53 deletions
diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog index 65170b1c9636..affc904ffe79 100644 --- a/dev-util/schroot/ChangeLog +++ b/dev-util/schroot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/schroot # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.6 2009/10/17 02:02:58 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.7 2009/11/12 02:06:50 abcd Exp $ + +*schroot-1.2.3-r3 (12 Nov 2009) + + 12 Nov 2009; Jonathan Callen <abcd@gentoo.org> -schroot-1.2.3-r2.ebuild, + +schroot-1.2.3-r3.ebuild, -files/schroot-1.2.3-pam.patch: + Use pamd_mimic_system to use the primary pam configuration; drop old + revision 17 Oct 2009; Jonathan Callen <abcd@gentoo.org> -schroot-1.2.3-r1.ebuild, schroot-1.2.3-r2.ebuild: diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest index 9f085201efe4..ea7eddc03a4c 100644 --- a/dev-util/schroot/Manifest +++ b/dev-util/schroot/Manifest @@ -1,9 +1,8 @@ AUX schroot-1.2.3-autotools.patch 4432 RMD160 1ecd6ff54c4a24ff311ed44fbecd231b0aa3c8bf SHA1 931533d5451c974fc961b5d57c06d082bb46e9d2 SHA256 5aa0984dd93441c28ba790d7dcad762f77ebc35ea05238f47ad73adc9de79c19 -AUX schroot-1.2.3-pam.patch 1977 RMD160 d1f4434554e75353f43e9df94787cdeded38b23d SHA1 a016b42b7d3acf6543cf2d26d658852912c40196 SHA256 438605a5976f151f31acdec9671d42992c19d69bf6a1ae8ab3b29f221e4899a2 AUX schroot-1.2.3-tests.patch 3731 RMD160 0cb5ccf9f4cc526c7c80fe2fc3b0faa2d3e2ddbb SHA1 78d28c87f42f292434c2ec99029c98ec4ad26b26 SHA256 901c9d33b492c7a6d3cd75cebcc898985bf32563a5dde6fdafcd8df7168200e6 AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8 AUX schroot.initd 844 RMD160 11eca8fd477b215d5b4964b582573ce14f116d25 SHA1 fe687d49e7d80342d46767f5e5fe63eed94a805d SHA256 f0f44c9fed06438f72f58825f67316c5069d58a6dfe3e1a33d0092b4fac1fb9f DIST schroot_1.2.3.orig.tar.gz 25486414 RMD160 2c8c4bb92c870a6c0514df528d13f73b8f1b6d05 SHA1 1775aa19e3cb3237d8aa3cc36e3382d7e2c2919b SHA256 c3bca449abdf28b66f6aede8892ce61967b5c1d758ba567e8648ccfb0cf914ec -EBUILD schroot-1.2.3-r2.ebuild 2098 RMD160 51990d578dc1f669619049b7d7d436d9717dfac2 SHA1 09babf9228c318c8de388fbf43eabaaf8b1ab67c SHA256 aabc9e598016a606d943c436cff65a9ed206181fcb9b8a03b69516d13e16ff85 -MISC ChangeLog 1330 RMD160 45b81af065d8242f113f89dcc54a0096ab32cf54 SHA1 cd0f29be8e0e22c768d3cce4789415815d3fd6c9 SHA256 2b744158b9c6fa4d66be9ee57644b34c6346eb70e15a5ee1a936c9fbccefe02e +EBUILD schroot-1.2.3-r3.ebuild 2153 RMD160 9576e70eb124c06829cdd70978162f3150bfb890 SHA1 d100763eeb73290b5f19fab55da6712a22b91fca SHA256 74a7fd1382763a8c9238ee0e6e60e86938d41fe67c465fb59d32128ca7e66b79 +MISC ChangeLog 1581 RMD160 0ef7dcc98e34a4db019d08dcc4b3968e6a55fc5d SHA1 ad39a9b29c8adf6157973b0aa6dfc749d8338954 SHA256 214111677aca94cc61961cfab390a237a6c4c1c172e4353adc73e5a4700bae46 MISC metadata.xml 384 RMD160 083cf5152883690484a973130318aef0d2c4f349 SHA1 d464ac6af08d92976517ae5715e1936c408c168d SHA256 58018798cc44ed856afd8c3c0e957aae8aabf548cc716e675604acc456fc20ef diff --git a/dev-util/schroot/files/schroot-1.2.3-pam.patch b/dev-util/schroot/files/schroot-1.2.3-pam.patch deleted file mode 100644 index 2cc6d659e558..000000000000 --- a/dev-util/schroot/files/schroot-1.2.3-pam.patch +++ /dev/null @@ -1,46 +0,0 @@ -removes the dependency on debian specific pam files. Updates the pam -configuration to behave as it does on debian. - -contributed by Nick Fortino (nfortino@gmail.com) 1/15/2009 - ---- schroot-1.2.1/bin/schroot/pam/schroot.old -+++ schroot-1.2.1/bin/schroot/pam/schroot -@@ -23,12 +23,32 @@ - # time restrainst on schroot usage. - # account requisite pam_time.so - --# The standard Unix authentication modules, used with --# NIS (man nsswitch) as well as normal /etc/passwd and --# /etc/shadow entries. --@include common-auth --@include common-account --@include common-session -+# here are the per-package modules (the "Primary" block) -+auth [success=1 default=ignore] pam_unix.so nullok_secure -+# here's the fallback if no module succeeds -+auth requisite pam_deny.so -+# prime the stack with a positive return value if there isn't one already; -+# this avoids us returning an error just because nothing sets a success code -+# since the modules above will each just jump around -+auth required pam_permit.so -+ -+# here are the per-package modules (the "Primary" block) -+account [success=1 new_authtok_reqd=done default=ignore] pam_unix.so -+# here's the fallback if no module succeeds -+account requisite pam_deny.so -+# prime the stack with a positive return value if there isn't one already; -+# this avoids us returning an error just because nothing sets a success code -+# since the modules above will each just jump around -+account required pam_permit.so -+ -+# here are the per-package modules (the "Primary" block) -+session [default=1] pam_permit.so -+# here's the fallback if no module succeeds -+session requisite pam_deny.so -+# prime the stack with a positive return value if there isn't one already; -+# this avoids us returning an error just because nothing sets a success code -+# since the modules above will each just jump around -+session required pam_permit.so - - # Sets up user limits, please uncomment and read /etc/security/limits.conf - # to enable this functionality. diff --git a/dev-util/schroot/schroot-1.2.3-r2.ebuild b/dev-util/schroot/schroot-1.2.3-r3.ebuild index e8b752bfb1b5..0272d4aedcc6 100644 --- a/dev-util/schroot/schroot-1.2.3-r2.ebuild +++ b/dev-util/schroot/schroot-1.2.3-r3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r2.ebuild,v 1.2 2009/10/17 02:02:58 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r3.ebuild,v 1.1 2009/11/12 02:06:50 abcd Exp $ EAPI="2" -inherit autotools base +inherit autotools base pam DESCRIPTION="Utility to execute commands in a chroot environment" HOMEPAGE="http://packages.debian.org/source/sid/schroot" @@ -33,7 +33,6 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${P}-autotools.patch" - "${FILESDIR}/${P}-pam.patch" "${FILESDIR}/${P}-tests.patch" ) @@ -77,6 +76,9 @@ src_install() { dohtml doc/schroot/html/* || die "installation of html docs failed" fi + rm -f "${D}"/etc/pam.d/schroot + pamd_mimic_system schroot auth account session + # Remove *.la files find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed" } |