Date: Saturday, January 21, 2023 @ 15:32:42
Author: felixonmars
Revision: 1387399
archrelease: copy trunk to community-staging-x86_64
Added:
schroot/repos/community-staging-x86_64/
schroot/repos/community-staging-x86_64/PKGBUILD
(from rev 1387396, schroot/trunk/PKGBUILD)
schroot/repos/community-staging-x86_64/arch32-config
(from rev 1387396, schroot/trunk/arch32-config)
schroot/repos/community-staging-x86_64/arch32-copyfiles
(from rev 1387396, schroot/trunk/arch32-copyfiles)
schroot/repos/community-staging-x86_64/arch32-example
(from rev 1387396, schroot/trunk/arch32-example)
schroot/repos/community-staging-x86_64/arch32-mount
(from rev 1387396, schroot/trunk/arch32-mount)
schroot/repos/community-staging-x86_64/arch32-nssdatabases
(from rev 1387396, schroot/trunk/arch32-nssdatabases)
schroot/repos/community-staging-x86_64/pam.d.schroot.patch
(from rev 1387396, schroot/trunk/pam.d.schroot.patch)
schroot/repos/community-staging-x86_64/schroot-cppunit.patch
(from rev 1387396, schroot/trunk/schroot-cppunit.patch)
schroot/repos/community-staging-x86_64/schroot-gcc8-assert-fix.patch
(from rev 1387397, schroot/trunk/schroot-gcc8-assert-fix.patch)
-------------------------------+
PKGBUILD | 80 ++++++++++++++++++++++++++++++++++++++++
arch32-config | 11 +++++
arch32-copyfiles | 6 +++
arch32-example | 10 +++++
arch32-mount | 12 ++++++
arch32-nssdatabases | 6 +++
pam.d.schroot.patch | 17 ++++++++
schroot-cppunit.patch | 11 +++++
schroot-gcc8-assert-fix.patch | 38 +++++++++++++++++++
9 files changed, 191 insertions(+)
Copied: schroot/repos/community-staging-x86_64/PKGBUILD (from rev 1387396,
schroot/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2023-01-21 15:32:42 UTC (rev 1387399)
@@ -0,0 +1,80 @@
+# Maintainer: Sergej Pupykin <[email protected]>
+# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot
de>
+
+pkgname=schroot
+pkgver=1.6.13
+pkgrel=3
+pkgdesc="Allows users to execute shell commands under different root
filesystems. (Successor to dchroot)."
+url="https://packages.qa.debian.org/s/schroot.html";
+license=('GPL3')
+depends=('pam' 'boost-libs' 'e2fsprogs')
+makedepends=('boost' 'cppunit' 'cmake' 'po4a')
+optdepends=('btrfs-progs-unstable' 'lvm2')
+arch=('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=("https://deb.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz";
+
"https://deb.debian.org/debian/pool/main/s/schroot/schroot_$pkgver-3.debian.tar.xz";
+ "schroot-gcc8-assert-fix.patch"
+ 'arch32-example'
+ 'arch32-config'
+ 'arch32-copyfiles'
+ 'arch32-mount'
+ 'arch32-nssdatabases'
+ 'pam.d.schroot.patch'
+ 'schroot-cppunit.patch')
+sha256sums=('2d79ab1ae5ed5b06601ece4b20b7cc0ef0c0c486922693f9bedda927945cc6b3'
+ 'c636c1a9f4a02fe3729498c18a97730d7ae231a3ca1dd293c3f6d84a98b0a142'
+ 'b11cb87532001ebefd809e2e59750d1afc63551d603eed027c0ba0f3c075a0d6'
+ '5ae07ef1b4525e9a6d9793d9d50cbf6d3f577f0a4001a2cde668d6817b03a6d5'
+ '11730e71d6974a2172a86f2219ff0b394524567f4d75f11b7424dced2b40ed9b'
+ 'e67bb203b623ae9ecd4fe034546759c60780393d85bf87a907a94f114e425942'
+ '8e6ea4cc6befc95a7a37edc590619a2ef0a060ad38c4d0a1830bb00c43becdb0'
+ '2d564a13fbf330465aa00e442dcf6845263253be96f4776075be738b0018ef38'
+ '68150bb913856b2f8b1d2423f3196a60a6ded7271678a9b651dc1ffbe6963196'
+ '604a0b312f33a07e309d7857faf4edcc2985827da08a927c1d267dbb0946a240')
+
+prepare() {
+ cd re${pkgname}-${pkgver}
+ grep -P '^\d' "$srcdir"/debian/patches/series | while read p; do
+ patch -p1 -i "$srcdir"/debian/patches/$p
+ done
+ # https://bugs.archlinux.org/task/73481
+ patch -p1 -i ../schroot-gcc8-assert-fix.patch
+}
+
+build() {
+ cd re${pkgname}-${pkgver}
+ export CFLAGS="$CFLAGS -ffat-lto-objects"
+ export CXXFLAGS="$CXXFLAGS -ffat-lto-objects"
+ export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+ mkdir -p build
+ cd build
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ ..
+ make
+}
+
+check() {
+ cd re${pkgname}-${pkgver}/build
+# make -k check
+}
+
+package() {
+ cd re${pkgname}-${pkgver}/build
+ 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 1387396,
schroot/trunk/arch32-config)
===================================================================
--- community-staging-x86_64/arch32-config (rev 0)
+++ community-staging-x86_64/arch32-config 2023-01-21 15:32:42 UTC (rev
1387399)
@@ -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
1387396, schroot/trunk/arch32-copyfiles)
===================================================================
--- community-staging-x86_64/arch32-copyfiles (rev 0)
+++ community-staging-x86_64/arch32-copyfiles 2023-01-21 15:32:42 UTC (rev
1387399)
@@ -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
1387396, schroot/trunk/arch32-example)
===================================================================
--- community-staging-x86_64/arch32-example (rev 0)
+++ community-staging-x86_64/arch32-example 2023-01-21 15:32:42 UTC (rev
1387399)
@@ -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 1387396,
schroot/trunk/arch32-mount)
===================================================================
--- community-staging-x86_64/arch32-mount (rev 0)
+++ community-staging-x86_64/arch32-mount 2023-01-21 15:32:42 UTC (rev
1387399)
@@ -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
1387396, schroot/trunk/arch32-nssdatabases)
===================================================================
--- community-staging-x86_64/arch32-nssdatabases
(rev 0)
+++ community-staging-x86_64/arch32-nssdatabases 2023-01-21 15:32:42 UTC
(rev 1387399)
@@ -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/pam.d.schroot.patch (from rev
1387396, schroot/trunk/pam.d.schroot.patch)
===================================================================
--- community-staging-x86_64/pam.d.schroot.patch
(rev 0)
+++ community-staging-x86_64/pam.d.schroot.patch 2023-01-21 15:32:42 UTC
(rev 1387399)
@@ -0,0 +1,17 @@
+--- schroot.orig 2022-12-14 20:36:45.095117766 +0300
++++ schroot 2022-12-14 20:42:10.205125720 +0300
+@@ -23,12 +23,8 @@
+ # 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-noninteractive
++account required pam_unix.so
++session required pam_unix.so
+
+ # Sets up user limits, please uncomment and read /etc/security/limits.conf
+ # to enable this functionality.
Copied: schroot/repos/community-staging-x86_64/schroot-cppunit.patch (from rev
1387396, schroot/trunk/schroot-cppunit.patch)
===================================================================
--- community-staging-x86_64/schroot-cppunit.patch
(rev 0)
+++ community-staging-x86_64/schroot-cppunit.patch 2023-01-21 15:32:42 UTC
(rev 1387399)
@@ -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/schroot-gcc8-assert-fix.patch
(from rev 1387397, schroot/trunk/schroot-gcc8-assert-fix.patch)
===================================================================
--- community-staging-x86_64/schroot-gcc8-assert-fix.patch
(rev 0)
+++ community-staging-x86_64/schroot-gcc8-assert-fix.patch 2023-01-21
15:32:42 UTC (rev 1387399)
@@ -0,0 +1,38 @@
+--- ./sbuild/sbuild-util.cc.orig 2018-05-05 12:39:09.706894741 -0400
++++ ./sbuild/sbuild-util.cc 2018-05-05 12:41:46.963886076 -0400
+@@ -630,7 +630,7 @@
+ ::passwd *pwd_result;
+
+ while ((error = getpwuid_r(uid, this,
+- &buffer[0], buffer.capacity(),
++ buffer.data(), buffer.capacity(),
+ &pwd_result)) == ERANGE)
+ {
+ size <<= 1;
+@@ -653,7 +653,7 @@
+ ::passwd *pwd_result;
+
+ while ((error = getpwnam_r(name, this,
+- &buffer[0], buffer.capacity(),
++ buffer.data(), buffer.capacity(),
+ &pwd_result)) == ERANGE)
+ {
+ size <<= 1;
+@@ -739,7 +739,7 @@
+ ::group *grp_result;
+
+ while ((error = getgrgid_r(gid, this,
+- &buffer[0], buffer.capacity(),
++ buffer.data(), buffer.capacity(),
+ &grp_result)) == ERANGE)
+ {
+ size <<= 1;
+@@ -762,7 +762,7 @@
+ ::group *grp_result;
+
+ while ((error = getgrnam_r(name, this,
+- &buffer[0], buffer.capacity(),
++ buffer.data(), buffer.capacity(),
+ &grp_result)) == ERANGE)
+ {
+ size <<= 1;
