diff options
Diffstat (limited to 'community/schroot')
| -rw-r--r-- | community/schroot/PKGBUILD | 95 | ||||
| -rw-r--r-- | community/schroot/arch32-config | 11 | ||||
| -rw-r--r-- | community/schroot/arch32-copyfiles | 7 | ||||
| -rw-r--r-- | community/schroot/arch32-example | 10 | ||||
| -rw-r--r-- | community/schroot/arch32-mount | 12 | ||||
| -rw-r--r-- | community/schroot/arch32-nssdatabases | 6 | ||||
| -rw-r--r-- | community/schroot/pam.d.schroot.patch | 15 |
7 files changed, 105 insertions, 51 deletions
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 0e13a1e1a..513e190b1 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 52459 2011-07-25 20:06:11Z jelle $ +# $Id: PKGBUILD 59179 2011-11-21 13:59:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot pkgver=1.4.23 -pkgrel=1 -pkgdesc="Allows users to execute shell commands under different root filesystems. \ - (Successor to dchroot)." +pkgrel=2 +pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') depends=('pam' 'lockdev' 'boost' 'e2fsprogs') @@ -16,62 +15,56 @@ conflicts=('dchroot') replaces=('dchroot') provides=('schroot' 'sbuild' 'dchroot') backup=('etc/schroot/schroot.conf' - 'etc/schroot/script-arch32' - 'etc/schroot/mount-arch32' - 'etc/schroot/copyfiles-arch32') + 'etc/schroot/arch32/config' + 'etc/schroot/arch32/copyfiles' + 'etc/schroot/arch32/mount' + 'etc/schroot/arch32/nssdatabases') options=(!libtool) source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2" - 'script-arch32' - 'copyfiles-arch32' - 'mount-arch32') + 'pam.d.schroot.patch' + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases') md5sums=('73873e0fee83a45655ed8efa246a1e26' - '8e86445e188129232e1782d978dfc967' - 'd4558d5691fbdaa46ce669e8f327133b' - 'f0d5d5b5e34a860f6f90b5628c680f46') + 'a8d77cac806a0a9adef3f93cdbeb280a' + '1e34db5387c4e5de911e15d8a9208bdb' + '5a3f7b839c7e0b8933748da7c5b6385b' + '06db41d42f9fce5449a28feb76ded556' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b') build() { - cd ${pkgname}-${pkgver} - - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \ - --enable-dchroot --enable-lvm-snapshot --enable-btrfs-snapshot \ - BTRFS=/sbin/btrfs \ - BTRFSCTL=/sbin/btrfsctl \ - LVCREATE=/sbin/lvcreate \ - LVREMOVE=/sbin/lvremove -# --enable-csbuild - - make + cd ${pkgname}-${pkgver} + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dchroot \ + --enable-lvm-snapshot \ + --enable-btrfs-snapshot \ + BTRFS=/sbin/btrfs \ + BTRFSCTL=/sbin/btrfsctl \ + LVCREATE=/sbin/lvcreate \ + LVREMOVE=/sbin/lvremove + # --enable-csbuild + make } check() { - cd ${pkgname}-${pkgver} - - make -k check + cd ${pkgname}-${pkgver} + make -k check } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=$pkgdir install - - install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot - cat >> $pkgdir/etc/schroot/schroot.conf << EOF - -[Arch32] -description=Arch32 -type=directory -directory=/opt/arch32 -priority=1 -#users=username -groups=users -root-groups=root -script-config=script-arch32 -personality=linux32 -aliases=32,default - -EOF + cd ${pkgname}-${pkgver} + make DESTDIR=$pkgdir install + install -dm 755 ${pkgdir}/etc/schroot/arch32 + install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32 + rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/* + install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example + patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot } diff --git a/community/schroot/arch32-config b/community/schroot/arch32-config new file mode 100644 index 000000000..0ee72d522 --- /dev/null +++ b/community/schroot/arch32-config @@ -0,0 +1,11 @@ +# Default settings for chroot setup and exec scripts. +# See schroot-script-config(5) for further details. + +# Filesystems to mount inside the chroot. +FSTAB="/etc/schroot/arch32/mount" + +# Files to copy from the host system into the chroot. +COPYFILES="/etc/schroot/arch32/copyfiles" + +# System databases to copy into the chroot +NSSDATABASES="/etc/schroot/arch32/nssdatabases" diff --git a/community/schroot/arch32-copyfiles b/community/schroot/arch32-copyfiles new file mode 100644 index 000000000..88f093ceb --- /dev/null +++ b/community/schroot/arch32-copyfiles @@ -0,0 +1,7 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/rc.conf +/etc/localtime +/etc/locale.gen diff --git a/community/schroot/arch32-example b/community/schroot/arch32-example new file mode 100644 index 000000000..3f059e3c0 --- /dev/null +++ b/community/schroot/arch32-example @@ -0,0 +1,10 @@ +[arch32] +description=Arch32 +type=directory +directory=/opt/arch32 +#users=username +groups=users +root-groups=root +script-config=arch32/config +personality=linux32 +#aliases=32,i686 diff --git a/community/schroot/arch32-mount b/community/schroot/arch32-mount new file mode 100644 index 000000000..075d6e451 --- /dev/null +++ b/community/schroot/arch32-mount @@ -0,0 +1,12 @@ +# mount.defaults: static file system information for chroots. +# Note that the mount point will be prefixed by the chroot path +# (CHROOT_PATH) +# +# <file system> <mount point> <type> <options> <dump> <pass> +proc /proc proc defaults 0 0 +/dev /dev none rw,bind 0 0 +#/dev/pts /dev/pts none rw,bind 0 0 +tmpfs /dev/shm tmpfs defaults 0 0 +/sys /sys none rw,bind 0 0 +/tmp /tmp none rw,bind 0 0 +/home /home none rw,bind 0 0 diff --git a/community/schroot/arch32-nssdatabases b/community/schroot/arch32-nssdatabases new file mode 100644 index 000000000..815ddce3f --- /dev/null +++ b/community/schroot/arch32-nssdatabases @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group diff --git a/community/schroot/pam.d.schroot.patch b/community/schroot/pam.d.schroot.patch new file mode 100644 index 000000000..528acb5f7 --- /dev/null +++ b/community/schroot/pam.d.schroot.patch @@ -0,0 +1,15 @@ +@@ -23,13 +23,6 @@ + # 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 +- + # Sets up user limits, please uncomment and read /etc/security/limits.conf + # to enable this functionality. + # session required pam_limits.so + |