Date: Wednesday, December 14, 2022 @ 18:02:47 Author: spupykin Revision: 1359154
upgpkg: schroot 1.6.13-1 Modified: schroot/trunk/PKGBUILD schroot/trunk/pam.d.schroot.patch ---------------------+ PKGBUILD | 64 +++++++++++++++++++------------------------------- pam.d.schroot.patch | 11 +++----- 2 files changed, 30 insertions(+), 45 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-14 17:48:12 UTC (rev 1359153) +++ PKGBUILD 2022-12-14 18:02:47 UTC (rev 1359154) @@ -2,13 +2,13 @@ # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.6.10 -pkgrel=32 +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') +makedepends=('boost' 'cppunit' 'cmake' 'po4a') optdepends=('btrfs-progs-unstable' 'lvm2') arch=('x86_64') conflicts=('dchroot') @@ -20,8 +20,7 @@ '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+deb9u1.debian.tar.xz"; - "https://src.fedoraproject.org/rpms/schroot/raw/rawhide/f/schroot-gcc8-assert-fix.patch"; + "https://deb.debian.org/debian/pool/main/s/schroot/schroot_$pkgver-3.debian.tar.xz"; 'arch32-example' 'arch32-config' 'arch32-copyfiles' @@ -29,48 +28,45 @@ 'arch32-nssdatabases' 'pam.d.schroot.patch' 'schroot-cppunit.patch') +sha256sums=('2d79ab1ae5ed5b06601ece4b20b7cc0ef0c0c486922693f9bedda927945cc6b3' + 'c636c1a9f4a02fe3729498c18a97730d7ae231a3ca1dd293c3f6d84a98b0a142' + '5ae07ef1b4525e9a6d9793d9d50cbf6d3f577f0a4001a2cde668d6817b03a6d5' + '11730e71d6974a2172a86f2219ff0b394524567f4d75f11b7424dced2b40ed9b' + 'e67bb203b623ae9ecd4fe034546759c60780393d85bf87a907a94f114e425942' + '8e6ea4cc6befc95a7a37edc590619a2ef0a060ad38c4d0a1830bb00c43becdb0' + '2d564a13fbf330465aa00e442dcf6845263253be96f4776075be738b0018ef38' + '68150bb913856b2f8b1d2423f3196a60a6ded7271678a9b651dc1ffbe6963196' + '604a0b312f33a07e309d7857faf4edcc2985827da08a927c1d267dbb0946a240') prepare() { - cd ${pkgname}-${pkgver} - cat "$srcdir"/debian/patches/series | while read p; do + cd re${pkgname}-${pkgver} + grep -P '^\d' "$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} + cd re${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 + mkdir -p build + cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + .. make } check() { - cd ${pkgname}-${pkgver} + cd re${pkgname}-${pkgver}/build # make -k check } package() { - cd ${pkgname}-${pkgver} + 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 @@ -78,13 +74,3 @@ 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') Modified: pam.d.schroot.patch =================================================================== --- pam.d.schroot.patch 2022-12-14 17:48:12 UTC (rev 1359153) +++ pam.d.schroot.patch 2022-12-14 18:02:47 UTC (rev 1359154) @@ -1,4 +1,6 @@ -@@ -23,13 +23,9 @@ +--- 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 @@ -7,12 +9,9 @@ -# /etc/shadow entries. -@include common-auth -@include common-account --@include common-session -- +-@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. - # session required pam_limits.so -
