Date: Monday, September 11, 2017 @ 20:34:18 Author: bpiotrowski Revision: 257029
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: schroot/repos/community-staging-i686/ schroot/repos/community-staging-i686/PKGBUILD (from rev 257028, schroot/trunk/PKGBUILD) schroot/repos/community-staging-i686/arch32-config (from rev 257028, schroot/trunk/arch32-config) schroot/repos/community-staging-i686/arch32-copyfiles (from rev 257028, schroot/trunk/arch32-copyfiles) schroot/repos/community-staging-i686/arch32-example (from rev 257028, schroot/trunk/arch32-example) schroot/repos/community-staging-i686/arch32-mount (from rev 257028, schroot/trunk/arch32-mount) schroot/repos/community-staging-i686/arch32-nssdatabases (from rev 257028, schroot/trunk/arch32-nssdatabases) schroot/repos/community-staging-i686/fix-bash-completion.patch (from rev 257028, schroot/trunk/fix-bash-completion.patch) schroot/repos/community-staging-i686/pam.d.schroot.patch (from rev 257028, schroot/trunk/pam.d.schroot.patch) schroot/repos/community-staging-i686/schroot-cppunit.patch (from rev 257028, schroot/trunk/schroot-cppunit.patch) schroot/repos/community-staging-x86_64/ schroot/repos/community-staging-x86_64/PKGBUILD (from rev 257028, schroot/trunk/PKGBUILD) schroot/repos/community-staging-x86_64/arch32-config (from rev 257028, schroot/trunk/arch32-config) schroot/repos/community-staging-x86_64/arch32-copyfiles (from rev 257028, schroot/trunk/arch32-copyfiles) schroot/repos/community-staging-x86_64/arch32-example (from rev 257028, schroot/trunk/arch32-example) schroot/repos/community-staging-x86_64/arch32-mount (from rev 257028, schroot/trunk/arch32-mount) schroot/repos/community-staging-x86_64/arch32-nssdatabases (from rev 257028, schroot/trunk/arch32-nssdatabases) schroot/repos/community-staging-x86_64/fix-bash-completion.patch (from rev 257028, schroot/trunk/fix-bash-completion.patch) schroot/repos/community-staging-x86_64/pam.d.schroot.patch (from rev 257028, schroot/trunk/pam.d.schroot.patch) schroot/repos/community-staging-x86_64/schroot-cppunit.patch (from rev 257028, schroot/trunk/schroot-cppunit.patch) ----------------------------------------------------+ community-staging-i686/PKGBUILD | 88 +++++++++++++++++++ community-staging-i686/arch32-config | 11 ++ community-staging-i686/arch32-copyfiles | 6 + community-staging-i686/arch32-example | 10 ++ community-staging-i686/arch32-mount | 12 ++ community-staging-i686/arch32-nssdatabases | 6 + community-staging-i686/fix-bash-completion.patch | 11 ++ community-staging-i686/pam.d.schroot.patch | 15 +++ community-staging-i686/schroot-cppunit.patch | 11 ++ community-staging-x86_64/PKGBUILD | 88 +++++++++++++++++++ community-staging-x86_64/arch32-config | 11 ++ community-staging-x86_64/arch32-copyfiles | 6 + community-staging-x86_64/arch32-example | 10 ++ community-staging-x86_64/arch32-mount | 12 ++ community-staging-x86_64/arch32-nssdatabases | 6 + community-staging-x86_64/fix-bash-completion.patch | 11 ++ community-staging-x86_64/pam.d.schroot.patch | 15 +++ community-staging-x86_64/schroot-cppunit.patch | 11 ++ 18 files changed, 340 insertions(+) Copied: schroot/repos/community-staging-i686/PKGBUILD (from rev 257028, schroot/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,88 @@ +# $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=17 +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-libs' 'e2fsprogs') +makedepends=('boost' 'cppunit') +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" + "http://http.debian.net/debian/pool/main/s/schroot/schroot_$pkgver-3.debian.tar.xz" + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases' + 'pam.d.schroot.patch' + 'schroot-cppunit.patch' + 'fix-bash-completion.patch') +md5sums=('f8ec667831487f4b12e094bc0dc9bbe3' + '6ac9df83936f350ffe178fbe042829a1' + '54239847f89b9a4772910415bde6276a' + '5a3f7b839c7e0b8933748da7c5b6385b' + 'ddb2f09c02b24dab777110f9808472e1' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + 'a8d77cac806a0a9adef3f93cdbeb280a' + '4c744c38b1541359de5696c65a508e5e' + '5ba775d4f401e2c167414caa548b71e5') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "$srcdir"/fix-bash-completion.patch + cat "$srcdir"/debian/patches/series | while read p; do + patch -p1 -i "$srcdir"/debian/patches/$p + done + # fix configure with cppunit 1.4 + patch -p1 -i ../schroot-cppunit.patch + ./bootstrap +} + +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 \ + --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-staging-i686/arch32-config (from rev 257028, schroot/trunk/arch32-config) =================================================================== --- community-staging-i686/arch32-config (rev 0) +++ community-staging-i686/arch32-config 2017-09-11 20:34:18 UTC (rev 257029) @@ -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" Copied: schroot/repos/community-staging-i686/arch32-copyfiles (from rev 257028, schroot/trunk/arch32-copyfiles) =================================================================== --- community-staging-i686/arch32-copyfiles (rev 0) +++ community-staging-i686/arch32-copyfiles 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,6 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/localtime +/etc/locale.gen Copied: schroot/repos/community-staging-i686/arch32-example (from rev 257028, schroot/trunk/arch32-example) =================================================================== --- community-staging-i686/arch32-example (rev 0) +++ community-staging-i686/arch32-example 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 Copied: schroot/repos/community-staging-i686/arch32-mount (from rev 257028, schroot/trunk/arch32-mount) =================================================================== --- community-staging-i686/arch32-mount (rev 0) +++ community-staging-i686/arch32-mount 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 Copied: schroot/repos/community-staging-i686/arch32-nssdatabases (from rev 257028, schroot/trunk/arch32-nssdatabases) =================================================================== --- community-staging-i686/arch32-nssdatabases (rev 0) +++ community-staging-i686/arch32-nssdatabases 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group Copied: schroot/repos/community-staging-i686/fix-bash-completion.patch (from rev 257028, schroot/trunk/fix-bash-completion.patch) =================================================================== --- community-staging-i686/fix-bash-completion.patch (rev 0) +++ community-staging-i686/fix-bash-completion.patch 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 Copied: schroot/repos/community-staging-i686/pam.d.schroot.patch (from rev 257028, schroot/trunk/pam.d.schroot.patch) =================================================================== --- community-staging-i686/pam.d.schroot.patch (rev 0) +++ community-staging-i686/pam.d.schroot.patch 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 + Copied: schroot/repos/community-staging-i686/schroot-cppunit.patch (from rev 257028, schroot/trunk/schroot-cppunit.patch) =================================================================== --- community-staging-i686/schroot-cppunit.patch (rev 0) +++ community-staging-i686/schroot-cppunit.patch 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,11 @@ +--- schroot-1.6.10/configure.ac.orig 2017-05-20 09:50:30.146864516 +0000 ++++ schroot-1.6.10/configure.ac 2017-05-20 09:51:26.216792794 +0000 +@@ -336,7 +336,7 @@ + [HAVE_UUID=yes], + [HAVE_UUID=no]) + +-AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes]) ++PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no]) + AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"]) + + SCHROOT_CFLAGS="$UUID_CFLAGS" Copied: schroot/repos/community-staging-x86_64/PKGBUILD (from rev 257028, schroot/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,88 @@ +# $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=17 +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-libs' 'e2fsprogs') +makedepends=('boost' 'cppunit') +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" + "http://http.debian.net/debian/pool/main/s/schroot/schroot_$pkgver-3.debian.tar.xz" + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases' + 'pam.d.schroot.patch' + 'schroot-cppunit.patch' + 'fix-bash-completion.patch') +md5sums=('f8ec667831487f4b12e094bc0dc9bbe3' + '6ac9df83936f350ffe178fbe042829a1' + '54239847f89b9a4772910415bde6276a' + '5a3f7b839c7e0b8933748da7c5b6385b' + 'ddb2f09c02b24dab777110f9808472e1' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + 'a8d77cac806a0a9adef3f93cdbeb280a' + '4c744c38b1541359de5696c65a508e5e' + '5ba775d4f401e2c167414caa548b71e5') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "$srcdir"/fix-bash-completion.patch + cat "$srcdir"/debian/patches/series | while read p; do + patch -p1 -i "$srcdir"/debian/patches/$p + done + # fix configure with cppunit 1.4 + patch -p1 -i ../schroot-cppunit.patch + ./bootstrap +} + +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 \ + --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-staging-x86_64/arch32-config (from rev 257028, schroot/trunk/arch32-config) =================================================================== --- community-staging-x86_64/arch32-config (rev 0) +++ community-staging-x86_64/arch32-config 2017-09-11 20:34:18 UTC (rev 257029) @@ -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" Copied: schroot/repos/community-staging-x86_64/arch32-copyfiles (from rev 257028, schroot/trunk/arch32-copyfiles) =================================================================== --- community-staging-x86_64/arch32-copyfiles (rev 0) +++ community-staging-x86_64/arch32-copyfiles 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,6 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/localtime +/etc/locale.gen Copied: schroot/repos/community-staging-x86_64/arch32-example (from rev 257028, schroot/trunk/arch32-example) =================================================================== --- community-staging-x86_64/arch32-example (rev 0) +++ community-staging-x86_64/arch32-example 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 Copied: schroot/repos/community-staging-x86_64/arch32-mount (from rev 257028, schroot/trunk/arch32-mount) =================================================================== --- community-staging-x86_64/arch32-mount (rev 0) +++ community-staging-x86_64/arch32-mount 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 Copied: schroot/repos/community-staging-x86_64/arch32-nssdatabases (from rev 257028, schroot/trunk/arch32-nssdatabases) =================================================================== --- community-staging-x86_64/arch32-nssdatabases (rev 0) +++ community-staging-x86_64/arch32-nssdatabases 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group Copied: schroot/repos/community-staging-x86_64/fix-bash-completion.patch (from rev 257028, schroot/trunk/fix-bash-completion.patch) =================================================================== --- community-staging-x86_64/fix-bash-completion.patch (rev 0) +++ community-staging-x86_64/fix-bash-completion.patch 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 Copied: schroot/repos/community-staging-x86_64/pam.d.schroot.patch (from rev 257028, schroot/trunk/pam.d.schroot.patch) =================================================================== --- community-staging-x86_64/pam.d.schroot.patch (rev 0) +++ community-staging-x86_64/pam.d.schroot.patch 2017-09-11 20:34:18 UTC (rev 257029) @@ -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 + Copied: schroot/repos/community-staging-x86_64/schroot-cppunit.patch (from rev 257028, schroot/trunk/schroot-cppunit.patch) =================================================================== --- community-staging-x86_64/schroot-cppunit.patch (rev 0) +++ community-staging-x86_64/schroot-cppunit.patch 2017-09-11 20:34:18 UTC (rev 257029) @@ -0,0 +1,11 @@ +--- schroot-1.6.10/configure.ac.orig 2017-05-20 09:50:30.146864516 +0000 ++++ schroot-1.6.10/configure.ac 2017-05-20 09:51:26.216792794 +0000 +@@ -336,7 +336,7 @@ + [HAVE_UUID=yes], + [HAVE_UUID=no]) + +-AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes]) ++PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no]) + AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"]) + + SCHROOT_CFLAGS="$UUID_CFLAGS"