Date: Wednesday, December 14, 2022 @ 18:03:36
Author: spupykin
Revision: 1359155
archrelease: copy trunk to community-x86_64
Added:
schroot/repos/community-x86_64/PKGBUILD
(from rev 1359154, schroot/trunk/PKGBUILD)
schroot/repos/community-x86_64/arch32-config
(from rev 1359154, schroot/trunk/arch32-config)
schroot/repos/community-x86_64/arch32-copyfiles
(from rev 1359154, schroot/trunk/arch32-copyfiles)
schroot/repos/community-x86_64/arch32-example
(from rev 1359154, schroot/trunk/arch32-example)
schroot/repos/community-x86_64/arch32-mount
(from rev 1359154, schroot/trunk/arch32-mount)
schroot/repos/community-x86_64/arch32-nssdatabases
(from rev 1359154, schroot/trunk/arch32-nssdatabases)
schroot/repos/community-x86_64/pam.d.schroot.patch
(from rev 1359154, schroot/trunk/pam.d.schroot.patch)
schroot/repos/community-x86_64/schroot-cppunit.patch
(from rev 1359154, schroot/trunk/schroot-cppunit.patch)
Deleted:
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/pam.d.schroot.patch
schroot/repos/community-x86_64/schroot-cppunit.patch
-----------------------+
PKGBUILD | 166 +++++++++++++++++++++---------------------------
arch32-config | 22 +++---
arch32-copyfiles | 12 +--
arch32-example | 20 ++---
arch32-mount | 24 +++---
arch32-nssdatabases | 12 +--
pam.d.schroot.patch | 35 ++++------
schroot-cppunit.patch | 22 +++---
8 files changed, 149 insertions(+), 164 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-14 18:02:47 UTC (rev 1359154)
+++ PKGBUILD 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -1,90 +0,0 @@
-# Maintainer: Sergej Pupykin <[email protected]>
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot
de>
-
-pkgname=schroot
-pkgver=1.6.10
-pkgrel=32
-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' 'lockdev' 'boost-libs' 'e2fsprogs')
-makedepends=('boost' 'cppunit')
-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=("http://http.debian.net/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz";
-
"http://http.debian.net/debian/pool/main/s/schroot/schroot_$pkgver-3+deb9u1.debian.tar.xz";
-
"https://src.fedoraproject.org/rpms/schroot/raw/rawhide/f/schroot-gcc8-assert-fix.patch";
- 'arch32-example'
- 'arch32-config'
- 'arch32-copyfiles'
- 'arch32-mount'
- 'arch32-nssdatabases'
- 'pam.d.schroot.patch'
- 'schroot-cppunit.patch')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- 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
- # https://bugs.archlinux.org/task/73481
- patch -p1 -i ../schroot-gcc8-assert-fix.patch
- ./bootstrap
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- export CFLAGS="$CFLAGS -ffat-lto-objects"
- export CXXFLAGS="$CXXFLAGS -ffat-lto-objects"
- 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
-}
-sha256sums=('3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b'
- '56bc82fc8ae7f6ca7eef506ccc1dca1211b2c84d83efc50d24670b8bdb9ea8bb'
- '7a15406681e5b06431033ad3fe3212a28c7af7dd9ea3a3e945f4bb95d800bd86'
- '5ae07ef1b4525e9a6d9793d9d50cbf6d3f577f0a4001a2cde668d6817b03a6d5'
- '11730e71d6974a2172a86f2219ff0b394524567f4d75f11b7424dced2b40ed9b'
- 'e67bb203b623ae9ecd4fe034546759c60780393d85bf87a907a94f114e425942'
- '8e6ea4cc6befc95a7a37edc590619a2ef0a060ad38c4d0a1830bb00c43becdb0'
- '2d564a13fbf330465aa00e442dcf6845263253be96f4776075be738b0018ef38'
- 'c7a46fa1c901b41c1d1928771bf4036e1fdb779f6a8241d2acf9fc0d72cd7572'
- '604a0b312f33a07e309d7857faf4edcc2985827da08a927c1d267dbb0946a240')
Copied: schroot/repos/community-x86_64/PKGBUILD (from rev 1359154,
schroot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -0,0 +1,76 @@
+# 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=1
+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' 'lockdev' '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";
+ 'arch32-example'
+ 'arch32-config'
+ 'arch32-copyfiles'
+ 'arch32-mount'
+ 'arch32-nssdatabases'
+ 'pam.d.schroot.patch'
+ 'schroot-cppunit.patch')
+sha256sums=('2d79ab1ae5ed5b06601ece4b20b7cc0ef0c0c486922693f9bedda927945cc6b3'
+ 'c636c1a9f4a02fe3729498c18a97730d7ae231a3ca1dd293c3f6d84a98b0a142'
+ '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
+}
+
+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
+}
Deleted: arch32-config
===================================================================
--- arch32-config 2022-12-14 18:02:47 UTC (rev 1359154)
+++ arch32-config 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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 1359154,
schroot/trunk/arch32-config)
===================================================================
--- arch32-config (rev 0)
+++ arch32-config 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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: arch32-copyfiles
===================================================================
--- arch32-copyfiles 2022-12-14 18:02:47 UTC (rev 1359154)
+++ arch32-copyfiles 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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 1359154,
schroot/trunk/arch32-copyfiles)
===================================================================
--- arch32-copyfiles (rev 0)
+++ arch32-copyfiles 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -0,0 +1,6 @@
+/etc/group
+/etc/hosts
+/etc/passwd
+/etc/resolv.conf
+/etc/localtime
+/etc/locale.gen
Deleted: arch32-example
===================================================================
--- arch32-example 2022-12-14 18:02:47 UTC (rev 1359154)
+++ arch32-example 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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 1359154,
schroot/trunk/arch32-example)
===================================================================
--- arch32-example (rev 0)
+++ arch32-example 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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: arch32-mount
===================================================================
--- arch32-mount 2022-12-14 18:02:47 UTC (rev 1359154)
+++ arch32-mount 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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 1359154,
schroot/trunk/arch32-mount)
===================================================================
--- arch32-mount (rev 0)
+++ arch32-mount 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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: arch32-nssdatabases
===================================================================
--- arch32-nssdatabases 2022-12-14 18:02:47 UTC (rev 1359154)
+++ arch32-nssdatabases 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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 1359154,
schroot/trunk/arch32-nssdatabases)
===================================================================
--- arch32-nssdatabases (rev 0)
+++ arch32-nssdatabases 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -0,0 +1,6 @@
+# System databases to copy into the chroot from the host system.
+#
+# <database name>
+passwd
+shadow
+group
Deleted: pam.d.schroot.patch
===================================================================
--- pam.d.schroot.patch 2022-12-14 18:02:47 UTC (rev 1359154)
+++ pam.d.schroot.patch 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -1,18 +0,0 @@
-@@ -23,13 +23,9 @@
- # 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
--
-+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.
- # session required pam_limits.so
-
Copied: schroot/repos/community-x86_64/pam.d.schroot.patch (from rev 1359154,
schroot/trunk/pam.d.schroot.patch)
===================================================================
--- pam.d.schroot.patch (rev 0)
+++ pam.d.schroot.patch 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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.
Deleted: schroot-cppunit.patch
===================================================================
--- schroot-cppunit.patch 2022-12-14 18:02:47 UTC (rev 1359154)
+++ schroot-cppunit.patch 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -1,11 +0,0 @@
---- 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-x86_64/schroot-cppunit.patch (from rev 1359154,
schroot/trunk/schroot-cppunit.patch)
===================================================================
--- schroot-cppunit.patch (rev 0)
+++ schroot-cppunit.patch 2022-12-14 18:03:36 UTC (rev 1359155)
@@ -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"
