Permalink
Browse files

sync upstream funtoo-overlay updates

merged:

  cb-overlay: 54b8480
  • Loading branch information...
1 parent 54b8480 commit e46e133e833ca220ae985a3d060c4130730e242b @shrinidhi666 shrinidhi666 committed Apr 17, 2012
@@ -1,12 +0,0 @@
-auth required pam_env.so
-auth sufficient pam_unix.so
-auth required pam_ldap.so use_first_pass
-account sufficient pam_unix.so
-account sufficient pam_localuser.so
-account required pam_ldap.so
-password sufficient pam_unix.so
-password required pam_ldap.so try_first_pass
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_ldap.so
-
@@ -4,7 +4,7 @@
EAPI=3
-inherit eutils pam
+inherit eutils
DESCRIPTION="PAM base configuration files"
HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512 kerberos minimal ldaplogin"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512 kerberos minimal"
RESTRICT="binchecks"
RDEPEND="
@@ -35,10 +35,6 @@ RDEPEND="
>=sys-libs/pam-1.1.0
sys-auth/pam_krb5
)
- ldaplogin? (
- sys-auth/pam_ldap
- sys-auth/nss_ldap
- )
!<sys-freebsd/freebsd-pam-modules-6.2-r1
!<sys-libs/pam-0.99.9.0-r1"
DEPEND="app-portage/portage-utils"
@@ -83,9 +79,6 @@ src_compile() {
src_install() {
emake GIT=true DESTDIR="${ED}" install || die "emake install failed"
- if use ldaplogin; then
- dopamd "${FILESDIR}/system-auth.cb_allow_ldap"
- fi
}
pkg_postinst() {
@@ -2,3 +2,5 @@ DIST linux-2.6_3.2.12-1.diff.gz 5776093 RMD160 b527c5d2b9952ae9b17ca30bc6c8247c0
DIST linux-2.6_3.2.12.orig.tar.gz 98460274 RMD160 b733ccc17eb507a80e44707138351d8ec143f039 SHA1 1e992bb2522c2ef3ee56318b0ecd32062fed9c1a SHA256 49759e95876a8dfc9334fbacd3c5b88d481fe172eae54bb69300e4ec4bce091a
DIST linux-2.6_3.2.14-1.diff.gz 5756357 RMD160 379ca0c91881e9d627efa1e891ea7f374a59786a SHA1 26454096689b14c1a85325c4a984605b5b28ed0e SHA256 4896969152d1ebc57112bfd01a5fa5db5809fafb1c50cda9076604471dfcca80
DIST linux-2.6_3.2.14.orig.tar.gz 98469236 RMD160 0684288ec76d555314bf3d8c07c3c86d44e34ce2 SHA1 d290b26c48354a78c65882fd7bd4e9d4f7d8236e SHA256 fc40acd185c0b4a2455c7bb3a05c994f040ae07eb80aae0b4dd0897b9df406a1
+DIST linux-2.6_3.2.15-1.diff.gz 5903422 RMD160 da4fe33ad34c59557408585ab046388076151884 SHA1 14b1ae458bcaab16ad1330400fdf39889f1c3e72 SHA256 ae56dae6da4e0aa7cf27ba6328f6270410cebb6ae684d43f63a732c6ce9ff2c4
+DIST linux-2.6_3.2.15.orig.tar.gz 98466631 RMD160 d67eae5a4fe1ddf2d0d1bba7ef0f2a6650cc123a SHA1 887114c6f5329120ff69271c650e739dccacba6e SHA256 4832fca824dbd0da212eadf622ddc58e301e47776dd4dd821a301184e6f0e22f
@@ -0,0 +1,158 @@
+# Copyright 2011 Funtoo Technologies
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit mount-boot
+
+SLOT=$PVR
+CKV=3.2.15
+KV_FULL=${PN}-${PVR}
+EXTRAVERSION=-1
+KERNEL_ARCHIVE="linux-2.6_${PV}.orig.tar.gz"
+RESTRICT="binchecks strip"
+# based on : http://packages.ubuntu.com/maverick/linux-image-2.6.35-22-server
+LICENSE="GPL-2"
+KEYWORDS="*"
+IUSE="openvz binary"
+DEPEND="binary? ( >=sys-kernel/genkernel-3.4.12.6-r4 )"
+RDEPEND="binary? ( >=sys-fs/udev-160 )"
+DESCRIPTION="Debian Sources (and optional binary kernel)"
+HOMEPAGE="http://www.debian.org"
+MAINPATCH="linux-2.6_${PV}${EXTRAVERSION}.diff.gz"
+SRC_URI="http://ftp.bg.debian.org/debian/pool/main/l/linux-2.6/${KERNEL_ARCHIVE}
+ http://ftp.bg.debian.org/debian/pool/main/l/linux-2.6/${MAINPATCH}"
+S="$WORKDIR/linux-${CKV}"
+
+apply() {
+ p=$1; shift
+ case "${p##*.}" in
+ gz)
+ ca="gzip -dc"
+ ;;
+ bz2)
+ ca="bzip2 -dc"
+ ;;
+ xz)
+ ca="xz -dc"
+ ;;
+ *)
+ ca="cat"
+ ;;
+ esac
+ [ ! -e $p ] && die "patch $p not found"
+ echo "Applying patch $p"; $ca $p | patch $* || die "patch $p failed"
+}
+
+pkg_setup() {
+ unset ARCH; unset LDFLAGS #will interfere with Makefile if set
+}
+
+src_unpack() {
+ cd ${WORKDIR}
+ unpack ${KERNEL_ARCHIVE}
+}
+
+src_prepare() {
+ cd ${WORKDIR}
+ apply $DISTDIR/$MAINPATCH -p1
+
+ # debian-specific stuff....
+
+ mv linux-* ${S##*/} || die
+ mv debian ${S##*/}/ || die
+ cd ${S}
+ sed -i \
+ -e 's/^sys.path.append.*$/sys.path.append(".\/debian\/lib\/python")/' \
+ -e 's/^_default_home =.*$/_default_home = ".\/debian\/patches"/' \
+ debian/bin/patch.apply || die
+ python2 debian/bin/patch.apply $KV_DEB || die
+ if use openvz
+ then
+ python2 debian/bin/patch.apply -a $ARCH -f openvz || die
+ fi
+
+ # end of debian-specific stuff...
+
+ sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile || die
+ sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile || die
+ rm -f .config >/dev/null
+ cp -a debian ${T} || die "couldn't back up debian dir (will be wiped by mrproper)"
+ make -s mrproper || die "make mrproper failed"
+ cp -a ${T}/debian . || die "couldn't restore debian directory"
+ make -s include/linux/version.h || die "make include/linux/version.h failed"
+ #mv "${TEMP}/configs" "${S}" || die
+ cd ${S}
+ local opts
+ use openvz && opts="openvz"
+ local myarch="amd64"
+ [ "$ARCH" = "x86" ] && myarch="i386"
+ cp ${FILESDIR}/config-extract . || die
+ chmod +x config-extract || die
+ ./config-extract ${myarch} ${opts} || die
+ cp .config ${T}/config || die
+ make -s mrproper || die "make mrproper failed"
+ make -s include/linux/version.h || die "make include/linux/version.h failed"
+}
+
+src_compile() {
+ ! use binary && return
+ install -d ${WORKDIR}/out/{lib,boot}
+ install -d ${T}/{cache,twork}
+ install -d $WORKDIR/build $WORKDIR/out/lib/firmware
+ genkernel \
+ --no-save-config \
+ --kernel-config="$T/config" \
+ --kernname="${PN}" \
+ --build-src="$S" \
+ --build-dst=${WORKDIR}/build \
+ --makeopts="${MAKEOPTS}" \
+ --firmware-dst=${WORKDIR}/out/lib/firmware \
+ --cachedir="${T}/cache" \
+ --tempdir="${T}/twork" \
+ --logfile="${WORKDIR}/genkernel.log" \
+ --bootdir="${WORKDIR}/out/boot" \
+ --lvm \
+ --luks \
+ --iscsi \
+ --module-prefix="${WORKDIR}/out" \
+ all || die "genkernel failed"
+}
+
+src_install() {
+ # copy sources into place:
+ dodir /usr/src
+ cp -a ${S} ${D}/usr/src/linux-${P} || die
+ cd ${D}/usr/src/linux-${P}
+ # prepare for real-world use and 3rd-party module building:
+ make mrproper || die
+ cp ${T}/config .config || die
+ cp -a ${T}/debian debian || die
+ yes "" | make oldconfig || die
+ # if we didn't use genkernel, we're done. The kernel source tree is left in
+ # an unconfigured state - you can't compile 3rd-party modules against it yet.
+ use binary || return
+ make prepare || die
+ make scripts || die
+ # OK, now the source tree is configured to allow 3rd-party modules to be
+ # built against it, since we want that to work since we have a binary kernel
+ # built.
+ cp -a ${WORKDIR}/out/* ${D}/ || die "couldn't copy output files into place"
+ # module symlink fixup:
+ rm -f ${D}/lib/modules/*/source || die
+ rm -f ${D}/lib/modules/*/build || die
+ cd ${D}/lib/modules
+ # module strip:
+ find -iname *.ko -exec strip --strip-debug {} \;
+ # back to the symlink fixup:
+ local moddir="$(ls -d [23]*)"
+ ln -s /usr/src/linux-${P} ${D}/lib/modules/${moddir}/source || die
+ ln -s /usr/src/linux-${P} ${D}/lib/modules/${moddir}/build || die
+}
+
+pkg_postinst() {
+ if [ ! -e ${ROOT}usr/src/linux ]
+ then
+ ln -s linux-${P} ${ROOT}usr/src/linux
+ fi
+}
@@ -6,8 +6,11 @@ DIST config-2.6.32-042stab044.17.i686 105165 RMD160 5f35eedf01e10f8e351183597894
DIST config-2.6.32-042stab044.17.x86_64 100385 RMD160 382bb4548c089f50ab861ec45395b4dce879c22a SHA1 e8bfc608173211f0de3aad6b83aeb7bc2bc6f91d SHA256 bd5249d1a6e505e48d9131dcf8c5526413c9ab25061e458f8167449e8e29d8d6
DIST config-2.6.32-042stab049.6.i686 105965 RMD160 85c5e309d781d22e3ca9ef60d5430e46870b3443 SHA1 834de68f9d6b77cb4c2a9c368aaf5bd44cc62409 SHA256 f78da97369a2074dfec2b1dcad1775e4c9a568a128be763922de9e24ba4458df
DIST config-2.6.32-042stab049.6.x86_64 101162 RMD160 1ea43042a416b955c17d15ee204bfb5d7b767c6b SHA1 309e17296bf814cdee4cbd29e9e68169b37e9454 SHA256 a58f83ee196163e5d4f5ee8e1bf4cad8b0cb46e9c587db28fbf49f82dc5b034c
+DIST config-2.6.32-042stab053.5.i686 106048 RMD160 234581fdcd958b075f855bbe160c90aff73047b7 SHA1 77ae813713fb78f93bf247f6b482edfb599ef116 SHA256 4e6eaeeba3af5f18220640a0b368d85fa96f2c275c23422a1a6ac44ab71ca13f
+DIST config-2.6.32-042stab053.5.x86_64 101272 RMD160 d7ca31b83e4349ee22f0282a58a04c48c3ed7515 SHA1 c3af08c1deb3dc55e080e0e3fb5efe88a2acf55f SHA256 f179294688626f40100b3850a1ce23bd2943fa46d4b05512da51a0185690379b
DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
DIST patch-042stab039.10-combined.gz 15807030 RMD160 8228caf42626f787e09f1204479054a497087152 SHA1 e7faae939dfe62be017053089337a0e760b7201e SHA256 be0b5239baac4b371012d23b295414729fb3d8f68fa1765308c1e3f6f67651a5
DIST patch-042stab044.11-combined.gz 15840950 RMD160 ae0e3cdb31b488452c3046a907bd33aec7048613 SHA1 d23d5d8ed110d977822916d50a71c38db7624472 SHA256 43f3c1a83631b867d04141b00edb05a720eb1d23ce732f4b2feaf37a84ede40f
DIST patch-042stab044.17-combined.gz 15841149 RMD160 cd83d3454db30dd581de25806fa38612dad0a38b SHA1 6e7039b119842f8913ebaa01f92c326c28d335cf SHA256 804f912e461d5082ea5017242225afc767426d376757ac91bfb69fd2f5820150
DIST patch-042stab049.6-combined.gz 24433316 RMD160 863163a3850bc710fe5ca18bc97c4efba209965e SHA1 c2fd480a772144586f49460d272b5621a8554a1a SHA256 ce86500935b37c89d8d70d6ceec616f558531db33ed661e0aa32a6ac11bf09a0
+DIST patch-042stab053.5-combined.gz 24570552 RMD160 eac0426e5aebd3cf230f368153e3a5d9e4cdd11d SHA1 5c4905d3a1da8f92a0e3c642503814863374b028 SHA256 0064f1a37a3617b8ced4b1401400051b939eb15497e6a21a9f1d183160b7de94
Oops, something went wrong.

0 comments on commit e46e133

Please sign in to comment.