Date: Friday, May 9, 2014 @ 10:37:33 Author: spupykin Revision: 110887
archrelease: copy trunk to community-i686, community-x86_64 Added: schroot/repos/community-i686/PKGBUILD (from rev 110886, schroot/trunk/PKGBUILD) schroot/repos/community-i686/arch32-config (from rev 110886, schroot/trunk/arch32-config) schroot/repos/community-i686/arch32-copyfiles (from rev 110886, schroot/trunk/arch32-copyfiles) schroot/repos/community-i686/arch32-example (from rev 110886, schroot/trunk/arch32-example) schroot/repos/community-i686/arch32-mount (from rev 110886, schroot/trunk/arch32-mount) schroot/repos/community-i686/arch32-nssdatabases (from rev 110886, schroot/trunk/arch32-nssdatabases) schroot/repos/community-i686/colon-completion.patch (from rev 110886, schroot/trunk/colon-completion.patch) schroot/repos/community-i686/fix-bash-completion.patch (from rev 110886, schroot/trunk/fix-bash-completion.patch) schroot/repos/community-i686/pam.d.schroot.patch (from rev 110886, schroot/trunk/pam.d.schroot.patch) schroot/repos/community-x86_64/PKGBUILD (from rev 110886, schroot/trunk/PKGBUILD) schroot/repos/community-x86_64/arch32-config (from rev 110886, schroot/trunk/arch32-config) schroot/repos/community-x86_64/arch32-copyfiles (from rev 110886, schroot/trunk/arch32-copyfiles) schroot/repos/community-x86_64/arch32-example (from rev 110886, schroot/trunk/arch32-example) schroot/repos/community-x86_64/arch32-mount (from rev 110886, schroot/trunk/arch32-mount) schroot/repos/community-x86_64/arch32-nssdatabases (from rev 110886, schroot/trunk/arch32-nssdatabases) schroot/repos/community-x86_64/colon-completion.patch (from rev 110886, schroot/trunk/colon-completion.patch) schroot/repos/community-x86_64/fix-bash-completion.patch (from rev 110886, schroot/trunk/fix-bash-completion.patch) schroot/repos/community-x86_64/pam.d.schroot.patch (from rev 110886, schroot/trunk/pam.d.schroot.patch) Deleted: schroot/repos/community-i686/PKGBUILD schroot/repos/community-i686/arch32-config schroot/repos/community-i686/arch32-copyfiles schroot/repos/community-i686/arch32-example schroot/repos/community-i686/arch32-mount schroot/repos/community-i686/arch32-nssdatabases schroot/repos/community-i686/colon-completion.patch schroot/repos/community-i686/fix-bash-completion.patch schroot/repos/community-i686/pam.d.schroot.patch schroot/repos/community-x86_64/PKGBUILD schroot/repos/community-x86_64/arch32-config schroot/repos/community-x86_64/arch32-copyfiles schroot/repos/community-x86_64/arch32-example schroot/repos/community-x86_64/arch32-mount schroot/repos/community-x86_64/arch32-nssdatabases schroot/repos/community-x86_64/colon-completion.patch schroot/repos/community-x86_64/fix-bash-completion.patch schroot/repos/community-x86_64/pam.d.schroot.patch --------------------------------------------+ /PKGBUILD | 152 +++++++++++++++++++++++++++ /arch32-config | 22 +++ /arch32-copyfiles | 12 ++ /arch32-example | 20 +++ /arch32-mount | 24 ++++ /arch32-nssdatabases | 12 ++ /colon-completion.patch | 40 +++++++ /fix-bash-completion.patch | 22 +++ /pam.d.schroot.patch | 30 +++++ community-i686/PKGBUILD | 76 ------------- community-i686/arch32-config | 11 - community-i686/arch32-copyfiles | 6 - community-i686/arch32-example | 10 - community-i686/arch32-mount | 12 -- community-i686/arch32-nssdatabases | 6 - community-i686/colon-completion.patch | 20 --- community-i686/fix-bash-completion.patch | 11 - community-i686/pam.d.schroot.patch | 15 -- community-x86_64/PKGBUILD | 76 ------------- community-x86_64/arch32-config | 11 - community-x86_64/arch32-copyfiles | 6 - community-x86_64/arch32-example | 10 - community-x86_64/arch32-mount | 12 -- community-x86_64/arch32-nssdatabases | 6 - community-x86_64/colon-completion.patch | 20 --- community-x86_64/fix-bash-completion.patch | 11 - community-x86_64/pam.d.schroot.patch | 15 -- 27 files changed, 334 insertions(+), 334 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/PKGBUILD 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,76 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> - -pkgname=schroot -pkgver=1.6.8 -pkgrel=1 -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') -optdepends=('btrfs-progs-unstable' 'lvm2') -arch=('i686' 'x86_64') -conflicts=('dchroot') -replaces=('dchroot') -provides=('schroot' 'sbuild' 'dchroot') -backup=('etc/schroot/schroot.conf' - 'etc/schroot/arch32/config' - 'etc/schroot/arch32/copyfiles' - 'etc/schroot/arch32/mount' - 'etc/schroot/arch32/nssdatabases') -source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" - 'arch32-example' - 'arch32-config' - 'arch32-copyfiles' - 'arch32-mount' - 'arch32-nssdatabases' - 'pam.d.schroot.patch' - 'colon-completion.patch' - 'fix-bash-completion.patch') -md5sums=('ab584352cb73c8e137d47ef8d160a275' - '54239847f89b9a4772910415bde6276a' - '5a3f7b839c7e0b8933748da7c5b6385b' - 'ddb2f09c02b24dab777110f9808472e1' - 'f0d5d5b5e34a860f6f90b5628c680f46' - 'af1da6edd8c8c0dafeeb2c2c4e0c840b' - 'a8d77cac806a0a9adef3f93cdbeb280a' - 'f0d03bf6c60ed119781b27b98234299c' - '5ba775d4f401e2c167414caa548b71e5') - -build() { - cd ${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/fix-bash-completion.patch - patch -p1 -i ${srcdir}/colon-completion.patch - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-dchroot \ - --enable-lvm-snapshot \ - --enable-btrfs-snapshot \ - --with-bash-completion-dir=/usr/share/bash-completion/completions/ \ - BTRFS=/sbin/btrfs \ - BTRFSCTL=/sbin/btrfsctl \ - LVCREATE=/sbin/lvcreate \ - LVREMOVE=/sbin/lvremove - # --enable-csbuild - make -} - -check() { - cd ${pkgname}-${pkgver} - make -k check -} - -package() { - 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 -} Copied: schroot/repos/community-i686/PKGBUILD (from rev 110886, schroot/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> + +pkgname=schroot +pkgver=1.6.10 +pkgrel=1 +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') +optdepends=('btrfs-progs-unstable' 'lvm2') +arch=('i686' 'x86_64') +conflicts=('dchroot') +replaces=('dchroot') +provides=('schroot' 'sbuild' 'dchroot') +backup=('etc/schroot/schroot.conf' + 'etc/schroot/arch32/config' + 'etc/schroot/arch32/copyfiles' + 'etc/schroot/arch32/mount' + 'etc/schroot/arch32/nssdatabases') +source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases' + 'pam.d.schroot.patch' + 'colon-completion.patch' + 'fix-bash-completion.patch') +md5sums=('f8ec667831487f4b12e094bc0dc9bbe3' + '54239847f89b9a4772910415bde6276a' + '5a3f7b839c7e0b8933748da7c5b6385b' + 'ddb2f09c02b24dab777110f9808472e1' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + 'a8d77cac806a0a9adef3f93cdbeb280a' + 'f0d03bf6c60ed119781b27b98234299c' + '5ba775d4f401e2c167414caa548b71e5') + +build() { + cd ${pkgname}-${pkgver} +# patch -p1 -i ${srcdir}/fix-bash-completion.patch +# patch -p1 -i ${srcdir}/colon-completion.patch + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dchroot \ + --enable-lvm-snapshot \ + --enable-btrfs-snapshot \ + --with-bash-completion-dir=/usr/share/bash-completion/completions/ \ + BTRFS=/sbin/btrfs \ + BTRFSCTL=/sbin/btrfsctl \ + LVCREATE=/sbin/lvcreate \ + LVREMOVE=/sbin/lvremove + # --enable-csbuild + make +} + +check() { + cd ${pkgname}-${pkgver} + make -k check +} + +package() { + 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 +} Deleted: community-i686/arch32-config =================================================================== --- community-i686/arch32-config 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/arch32-config 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,11 +0,0 @@ -# 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" Copied: schroot/repos/community-i686/arch32-config (from rev 110886, schroot/trunk/arch32-config) =================================================================== --- community-i686/arch32-config (rev 0) +++ community-i686/arch32-config 2014-05-09 08:37:33 UTC (rev 110887) @@ -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" Deleted: community-i686/arch32-copyfiles =================================================================== --- community-i686/arch32-copyfiles 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/arch32-copyfiles 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,6 +0,0 @@ -/etc/group -/etc/hosts -/etc/passwd -/etc/resolv.conf -/etc/localtime -/etc/locale.gen Copied: schroot/repos/community-i686/arch32-copyfiles (from rev 110886, schroot/trunk/arch32-copyfiles) =================================================================== --- community-i686/arch32-copyfiles (rev 0) +++ community-i686/arch32-copyfiles 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,6 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/localtime +/etc/locale.gen Deleted: community-i686/arch32-example =================================================================== --- community-i686/arch32-example 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/arch32-example 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,10 +0,0 @@ -[arch32] -description=Arch32 -type=directory -directory=/opt/arch32 -#users=username -groups=users -root-groups=root -profile=arch32 -personality=linux32 -#aliases=32,i686 Copied: schroot/repos/community-i686/arch32-example (from rev 110886, schroot/trunk/arch32-example) =================================================================== --- community-i686/arch32-example (rev 0) +++ community-i686/arch32-example 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,10 @@ +[arch32] +description=Arch32 +type=directory +directory=/opt/arch32 +#users=username +groups=users +root-groups=root +profile=arch32 +personality=linux32 +#aliases=32,i686 Deleted: community-i686/arch32-mount =================================================================== --- community-i686/arch32-mount 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/arch32-mount 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,12 +0,0 @@ -# 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 Copied: schroot/repos/community-i686/arch32-mount (from rev 110886, schroot/trunk/arch32-mount) =================================================================== --- community-i686/arch32-mount (rev 0) +++ community-i686/arch32-mount 2014-05-09 08:37:33 UTC (rev 110887) @@ -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 Deleted: community-i686/arch32-nssdatabases =================================================================== --- community-i686/arch32-nssdatabases 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/arch32-nssdatabases 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,6 +0,0 @@ -# System databases to copy into the chroot from the host system. -# -# <database name> -passwd -shadow -group Copied: schroot/repos/community-i686/arch32-nssdatabases (from rev 110886, schroot/trunk/arch32-nssdatabases) =================================================================== --- community-i686/arch32-nssdatabases (rev 0) +++ community-i686/arch32-nssdatabases 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group Deleted: community-i686/colon-completion.patch =================================================================== --- community-i686/colon-completion.patch 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/colon-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,20 +0,0 @@ -diff -wbBur schroot-1.6.5.org/etc/bash_completion/schroot schroot-1.6.5/etc/bash_completion/schroot ---- schroot-1.6.5.org/etc/bash_completion/schroot 2013-01-28 15:28:04.000000000 +0400 -+++ schroot-1.6.5/etc/bash_completion/schroot 2013-01-28 15:30:22.297213632 +0400 -@@ -21,14 +21,14 @@ - local cur prev options - - COMPREPLY=() -- cur=${COMP_WORDS[COMP_CWORD]} -- prev=${COMP_WORDS[COMP_CWORD-1]} -+ _get_comp_words_by_ref -n : cur prev - - # Select precisely the tokens from schroot --help that begin with a dash - options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') - - if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then - COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) -+ __ltrim_colon_completions "$cur" - else - COMPREPLY=( $(compgen -W "$options" -- $cur) ) - fi Copied: schroot/repos/community-i686/colon-completion.patch (from rev 110886, schroot/trunk/colon-completion.patch) =================================================================== --- community-i686/colon-completion.patch (rev 0) +++ community-i686/colon-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,20 @@ +diff -wbBur schroot-1.6.5.org/etc/bash_completion/schroot schroot-1.6.5/etc/bash_completion/schroot +--- schroot-1.6.5.org/etc/bash_completion/schroot 2013-01-28 15:28:04.000000000 +0400 ++++ schroot-1.6.5/etc/bash_completion/schroot 2013-01-28 15:30:22.297213632 +0400 +@@ -21,14 +21,14 @@ + local cur prev options + + COMPREPLY=() +- cur=${COMP_WORDS[COMP_CWORD]} +- prev=${COMP_WORDS[COMP_CWORD-1]} ++ _get_comp_words_by_ref -n : cur prev + + # Select precisely the tokens from schroot --help that begin with a dash + options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') + + if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then + COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) ++ __ltrim_colon_completions "$cur" + else + COMPREPLY=( $(compgen -W "$options" -- $cur) ) + fi Deleted: community-i686/fix-bash-completion.patch =================================================================== --- community-i686/fix-bash-completion.patch 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/fix-bash-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,11 +0,0 @@ ---- a/etc/bash_completion/schroot -+++ b/etc/bash_completion/schroot -@@ -15,7 +15,7 @@ - # along with this program. If not, see - # <http://www.gnu.org/licenses/>. - --have schroot && -+_have schroot && - _schroot() - { - local cur prev options Copied: schroot/repos/community-i686/fix-bash-completion.patch (from rev 110886, schroot/trunk/fix-bash-completion.patch) =================================================================== --- community-i686/fix-bash-completion.patch (rev 0) +++ community-i686/fix-bash-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,11 @@ +--- a/etc/bash_completion/schroot ++++ b/etc/bash_completion/schroot +@@ -15,7 +15,7 @@ + # along with this program. If not, see + # <http://www.gnu.org/licenses/>. + +-have schroot && ++_have schroot && + _schroot() + { + local cur prev options Deleted: community-i686/pam.d.schroot.patch =================================================================== --- community-i686/pam.d.schroot.patch 2014-05-09 08:37:01 UTC (rev 110886) +++ community-i686/pam.d.schroot.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,15 +0,0 @@ -@@ -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 - Copied: schroot/repos/community-i686/pam.d.schroot.patch (from rev 110886, schroot/trunk/pam.d.schroot.patch) =================================================================== --- community-i686/pam.d.schroot.patch (rev 0) +++ community-i686/pam.d.schroot.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -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 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/PKGBUILD 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,76 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> - -pkgname=schroot -pkgver=1.6.8 -pkgrel=1 -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') -optdepends=('btrfs-progs-unstable' 'lvm2') -arch=('i686' 'x86_64') -conflicts=('dchroot') -replaces=('dchroot') -provides=('schroot' 'sbuild' 'dchroot') -backup=('etc/schroot/schroot.conf' - 'etc/schroot/arch32/config' - 'etc/schroot/arch32/copyfiles' - 'etc/schroot/arch32/mount' - 'etc/schroot/arch32/nssdatabases') -source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" - 'arch32-example' - 'arch32-config' - 'arch32-copyfiles' - 'arch32-mount' - 'arch32-nssdatabases' - 'pam.d.schroot.patch' - 'colon-completion.patch' - 'fix-bash-completion.patch') -md5sums=('ab584352cb73c8e137d47ef8d160a275' - '54239847f89b9a4772910415bde6276a' - '5a3f7b839c7e0b8933748da7c5b6385b' - 'ddb2f09c02b24dab777110f9808472e1' - 'f0d5d5b5e34a860f6f90b5628c680f46' - 'af1da6edd8c8c0dafeeb2c2c4e0c840b' - 'a8d77cac806a0a9adef3f93cdbeb280a' - 'f0d03bf6c60ed119781b27b98234299c' - '5ba775d4f401e2c167414caa548b71e5') - -build() { - cd ${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/fix-bash-completion.patch - patch -p1 -i ${srcdir}/colon-completion.patch - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-dchroot \ - --enable-lvm-snapshot \ - --enable-btrfs-snapshot \ - --with-bash-completion-dir=/usr/share/bash-completion/completions/ \ - BTRFS=/sbin/btrfs \ - BTRFSCTL=/sbin/btrfsctl \ - LVCREATE=/sbin/lvcreate \ - LVREMOVE=/sbin/lvremove - # --enable-csbuild - make -} - -check() { - cd ${pkgname}-${pkgver} - make -k check -} - -package() { - 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 -} Copied: schroot/repos/community-x86_64/PKGBUILD (from rev 110886, schroot/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> + +pkgname=schroot +pkgver=1.6.10 +pkgrel=1 +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') +optdepends=('btrfs-progs-unstable' 'lvm2') +arch=('i686' 'x86_64') +conflicts=('dchroot') +replaces=('dchroot') +provides=('schroot' 'sbuild' 'dchroot') +backup=('etc/schroot/schroot.conf' + 'etc/schroot/arch32/config' + 'etc/schroot/arch32/copyfiles' + 'etc/schroot/arch32/mount' + 'etc/schroot/arch32/nssdatabases') +source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases' + 'pam.d.schroot.patch' + 'colon-completion.patch' + 'fix-bash-completion.patch') +md5sums=('f8ec667831487f4b12e094bc0dc9bbe3' + '54239847f89b9a4772910415bde6276a' + '5a3f7b839c7e0b8933748da7c5b6385b' + 'ddb2f09c02b24dab777110f9808472e1' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + 'a8d77cac806a0a9adef3f93cdbeb280a' + 'f0d03bf6c60ed119781b27b98234299c' + '5ba775d4f401e2c167414caa548b71e5') + +build() { + cd ${pkgname}-${pkgver} +# patch -p1 -i ${srcdir}/fix-bash-completion.patch +# patch -p1 -i ${srcdir}/colon-completion.patch + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dchroot \ + --enable-lvm-snapshot \ + --enable-btrfs-snapshot \ + --with-bash-completion-dir=/usr/share/bash-completion/completions/ \ + BTRFS=/sbin/btrfs \ + BTRFSCTL=/sbin/btrfsctl \ + LVCREATE=/sbin/lvcreate \ + LVREMOVE=/sbin/lvremove + # --enable-csbuild + make +} + +check() { + cd ${pkgname}-${pkgver} + make -k check +} + +package() { + 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 +} Deleted: community-x86_64/arch32-config =================================================================== --- community-x86_64/arch32-config 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/arch32-config 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,11 +0,0 @@ -# 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" Copied: schroot/repos/community-x86_64/arch32-config (from rev 110886, schroot/trunk/arch32-config) =================================================================== --- community-x86_64/arch32-config (rev 0) +++ community-x86_64/arch32-config 2014-05-09 08:37:33 UTC (rev 110887) @@ -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" Deleted: community-x86_64/arch32-copyfiles =================================================================== --- community-x86_64/arch32-copyfiles 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/arch32-copyfiles 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,6 +0,0 @@ -/etc/group -/etc/hosts -/etc/passwd -/etc/resolv.conf -/etc/localtime -/etc/locale.gen Copied: schroot/repos/community-x86_64/arch32-copyfiles (from rev 110886, schroot/trunk/arch32-copyfiles) =================================================================== --- community-x86_64/arch32-copyfiles (rev 0) +++ community-x86_64/arch32-copyfiles 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,6 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/localtime +/etc/locale.gen Deleted: community-x86_64/arch32-example =================================================================== --- community-x86_64/arch32-example 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/arch32-example 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,10 +0,0 @@ -[arch32] -description=Arch32 -type=directory -directory=/opt/arch32 -#users=username -groups=users -root-groups=root -profile=arch32 -personality=linux32 -#aliases=32,i686 Copied: schroot/repos/community-x86_64/arch32-example (from rev 110886, schroot/trunk/arch32-example) =================================================================== --- community-x86_64/arch32-example (rev 0) +++ community-x86_64/arch32-example 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,10 @@ +[arch32] +description=Arch32 +type=directory +directory=/opt/arch32 +#users=username +groups=users +root-groups=root +profile=arch32 +personality=linux32 +#aliases=32,i686 Deleted: community-x86_64/arch32-mount =================================================================== --- community-x86_64/arch32-mount 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/arch32-mount 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,12 +0,0 @@ -# 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 Copied: schroot/repos/community-x86_64/arch32-mount (from rev 110886, schroot/trunk/arch32-mount) =================================================================== --- community-x86_64/arch32-mount (rev 0) +++ community-x86_64/arch32-mount 2014-05-09 08:37:33 UTC (rev 110887) @@ -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 Deleted: community-x86_64/arch32-nssdatabases =================================================================== --- community-x86_64/arch32-nssdatabases 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/arch32-nssdatabases 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,6 +0,0 @@ -# System databases to copy into the chroot from the host system. -# -# <database name> -passwd -shadow -group Copied: schroot/repos/community-x86_64/arch32-nssdatabases (from rev 110886, schroot/trunk/arch32-nssdatabases) =================================================================== --- community-x86_64/arch32-nssdatabases (rev 0) +++ community-x86_64/arch32-nssdatabases 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group Deleted: community-x86_64/colon-completion.patch =================================================================== --- community-x86_64/colon-completion.patch 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/colon-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,20 +0,0 @@ -diff -wbBur schroot-1.6.5.org/etc/bash_completion/schroot schroot-1.6.5/etc/bash_completion/schroot ---- schroot-1.6.5.org/etc/bash_completion/schroot 2013-01-28 15:28:04.000000000 +0400 -+++ schroot-1.6.5/etc/bash_completion/schroot 2013-01-28 15:30:22.297213632 +0400 -@@ -21,14 +21,14 @@ - local cur prev options - - COMPREPLY=() -- cur=${COMP_WORDS[COMP_CWORD]} -- prev=${COMP_WORDS[COMP_CWORD-1]} -+ _get_comp_words_by_ref -n : cur prev - - # Select precisely the tokens from schroot --help that begin with a dash - options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') - - if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then - COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) -+ __ltrim_colon_completions "$cur" - else - COMPREPLY=( $(compgen -W "$options" -- $cur) ) - fi Copied: schroot/repos/community-x86_64/colon-completion.patch (from rev 110886, schroot/trunk/colon-completion.patch) =================================================================== --- community-x86_64/colon-completion.patch (rev 0) +++ community-x86_64/colon-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,20 @@ +diff -wbBur schroot-1.6.5.org/etc/bash_completion/schroot schroot-1.6.5/etc/bash_completion/schroot +--- schroot-1.6.5.org/etc/bash_completion/schroot 2013-01-28 15:28:04.000000000 +0400 ++++ schroot-1.6.5/etc/bash_completion/schroot 2013-01-28 15:30:22.297213632 +0400 +@@ -21,14 +21,14 @@ + local cur prev options + + COMPREPLY=() +- cur=${COMP_WORDS[COMP_CWORD]} +- prev=${COMP_WORDS[COMP_CWORD-1]} ++ _get_comp_words_by_ref -n : cur prev + + # Select precisely the tokens from schroot --help that begin with a dash + options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') + + if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then + COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) ++ __ltrim_colon_completions "$cur" + else + COMPREPLY=( $(compgen -W "$options" -- $cur) ) + fi Deleted: community-x86_64/fix-bash-completion.patch =================================================================== --- community-x86_64/fix-bash-completion.patch 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/fix-bash-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,11 +0,0 @@ ---- a/etc/bash_completion/schroot -+++ b/etc/bash_completion/schroot -@@ -15,7 +15,7 @@ - # along with this program. If not, see - # <http://www.gnu.org/licenses/>. - --have schroot && -+_have schroot && - _schroot() - { - local cur prev options Copied: schroot/repos/community-x86_64/fix-bash-completion.patch (from rev 110886, schroot/trunk/fix-bash-completion.patch) =================================================================== --- community-x86_64/fix-bash-completion.patch (rev 0) +++ community-x86_64/fix-bash-completion.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -0,0 +1,11 @@ +--- a/etc/bash_completion/schroot ++++ b/etc/bash_completion/schroot +@@ -15,7 +15,7 @@ + # along with this program. If not, see + # <http://www.gnu.org/licenses/>. + +-have schroot && ++_have schroot && + _schroot() + { + local cur prev options Deleted: community-x86_64/pam.d.schroot.patch =================================================================== --- community-x86_64/pam.d.schroot.patch 2014-05-09 08:37:01 UTC (rev 110886) +++ community-x86_64/pam.d.schroot.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -1,15 +0,0 @@ -@@ -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 - Copied: schroot/repos/community-x86_64/pam.d.schroot.patch (from rev 110886, schroot/trunk/pam.d.schroot.patch) =================================================================== --- community-x86_64/pam.d.schroot.patch (rev 0) +++ community-x86_64/pam.d.schroot.patch 2014-05-09 08:37:33 UTC (rev 110887) @@ -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 +