diff --git a/srcpkgs/schroot/patches/0001-getmntent-fix.patch b/srcpkgs/schroot/patches/0001-getmntent-fix.patch deleted file mode 100644 index 2c844edc36..0000000000 --- a/srcpkgs/schroot/patches/0001-getmntent-fix.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f7ecc01d4e773ac532c3fc990833ca4d1cda6a7b Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Mon, 24 Aug 2015 18:25:10 +0200 -Subject: [PATCH] getmntent fix - ---- - lib/sbuild/mntstream.cc | 15 ++------------- - lib/sbuild/mntstream.h | 3 +-- - 2 files changed, 3 insertions(+), 15 deletions(-) - -diff --git lib/sbuild/mntstream.cc lib/sbuild/mntstream.cc -index 7f5e7d4..44b472d 100644 ---- lib/sbuild/mntstream.cc -+++ lib/sbuild/mntstream.cc -@@ -31,9 +31,7 @@ namespace sbuild - error::error_strings = - { - // TRANSLATORS: %1% = mount file name -- {mntstream::MNT_OPEN, N_("Failed to open mount file ‘%1%’")}, -- // TRANSLATORS: %1% = mount file name -- {mntstream::MNT_READ, N_("Failed to read mount file ‘%1%’")} -+ {mntstream::MNT_OPEN, N_("Failed to open mount file ‘%1%’")} - }; - - mntstream::mntentry::mntentry (const struct mntent& entry): -@@ -94,16 +92,7 @@ namespace sbuild - errno = 0; - entry = getmntent(mntfile); - -- if (entry == 0) // EOF or error -- { -- //std::cerr << "Mount file read error: "; -- if (errno) // error -- { -- this->error_status = true; -- throw error(this->file, MNT_READ, strerror(errno)); -- } -- return; -- } -+ if (entry == 0) return; - - mntentry newentry(*entry); // make a mntentry - this->data.push_back(newentry); // push onto the end of the list -diff --git lib/sbuild/mntstream.h lib/sbuild/mntstream.h -index a406d6e..7e52559 100644 ---- lib/sbuild/mntstream.h -+++ lib/sbuild/mntstream.h -@@ -49,8 +49,7 @@ namespace sbuild - /// Error codes. - enum error_code - { -- MNT_OPEN, ///< Failed to open mount file. -- MNT_READ ///< Failed to read mount file. -+ MNT_OPEN ///< Failed to open mount file. - }; - - /// Exception type. --- -2.5.0 - diff --git a/srcpkgs/schroot/patches/0001-getent.patch b/srcpkgs/schroot/patches/getent.patch similarity index 100% rename from srcpkgs/schroot/patches/0001-getent.patch rename to srcpkgs/schroot/patches/getent.patch diff --git a/srcpkgs/schroot/patches/getmntent.patch b/srcpkgs/schroot/patches/getmntent.patch new file mode 100644 index 0000000000..12e65519ee --- /dev/null +++ b/srcpkgs/schroot/patches/getmntent.patch @@ -0,0 +1,60 @@ +From db62a534ebcf60391d9e0acffa641e60dfba18fb Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Wed, 19 Sep 2018 10:36:36 +0200 +Subject: [PATCH] getmntent fix + +--- + sbuild/sbuild-mntstream.cc | 15 ++------------- + sbuild/sbuild-mntstream.h | 3 +-- + 2 files changed, 3 insertions(+), 15 deletions(-) + +diff --git sbuild/sbuild-mntstream.cc sbuild/sbuild-mntstream.cc +index d376fe5..d7324e7 100644 +--- sbuild/sbuild-mntstream.cc ++++ sbuild/sbuild-mntstream.cc +@@ -37,9 +37,7 @@ namespace + emap init_errors[] = + { + // TRANSLATORS: %1% = mount file name +- emap(mntstream::MNT_OPEN, N_("Failed to open mount file ‘%1%’")), +- // TRANSLATORS: %1% = mount file name +- emap(mntstream::MNT_READ, N_("Failed to read mount file ‘%1%’")) ++ emap(mntstream::MNT_OPEN, N_("Failed to open mount file ‘%1%’")) + }; + + } +@@ -109,16 +107,7 @@ mntstream::read(int quantity) + errno = 0; + entry = getmntent(mntfile); + +- if (entry == 0) // EOF or error +- { +- //std::cerr << "Mount file read error: "; +- if (errno) // error +- { +- this->error_status = true; +- throw error(this->file, MNT_READ, strerror(errno)); +- } +- return; +- } ++ if (entry == 0) return; + + mntentry newentry(*entry); // make a mntentry + this->data.push_back(newentry); // push onto the end of the list +diff --git sbuild/sbuild-mntstream.h sbuild/sbuild-mntstream.h +index ea3d179..fffcdf4 100644 +--- sbuild/sbuild-mntstream.h ++++ sbuild/sbuild-mntstream.h +@@ -49,8 +49,7 @@ namespace sbuild + /// Error codes. + enum error_code + { +- MNT_OPEN, ///< Failed to open mount file. +- MNT_READ ///< Failed to read mount file. ++ MNT_OPEN ///< Failed to open mount file. + }; + + /// Exception type. +-- +2.19.0 + diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/musl.patch index 1d1d6c74f8..83a6dfa6b3 100644 --- a/srcpkgs/schroot/patches/musl.patch +++ b/srcpkgs/schroot/patches/musl.patch @@ -1,38 +1,25 @@ -From 65ed89fedb34278d5b86777ca402f7194cf0809e Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Mon, 24 Aug 2015 02:42:40 +0200 +From 73936a423227aa78b7682bdd3edc20643763807b Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Wed, 19 Sep 2018 11:22:47 +0200 Subject: [PATCH] musl --- - lib/bin-common/run.h | 2 ++ - lib/sbuild/auth/pam.cc | 1 + - 2 files changed, 3 insertions(+) + sbuild/sbuild-feature.cc | 2 ++ + 1 file changed, 2 insertions(+) -diff --git lib/bin-common/run.h lib/bin-common/run.h -index 2bb9762..cce630d 100644 ---- lib/bin-common/run.h -+++ lib/bin-common/run.h -@@ -29,6 +29,8 @@ +diff --git sbuild/sbuild-feature.cc sbuild/sbuild-feature.cc +index 5ac4725..9902db3 100644 +--- sbuild/sbuild-feature.cc ++++ sbuild/sbuild-feature.cc +@@ -20,6 +20,8 @@ + #include - #include - + +#include + - namespace bin_common - { - -diff --git lib/sbuild/auth/pam.cc lib/sbuild/auth/pam.cc -index 84663c2..feda6f0 100644 ---- lib/sbuild/auth/pam.cc -+++ lib/sbuild/auth/pam.cc -@@ -30,6 +30,7 @@ - #include - - #include -+#include - - #include - --- -2.5.0 + #include "sbuild-feature.h" + + using namespace sbuild; +-- +2.19.0 diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch new file mode 100644 index 0000000000..f7f4fd6b45 --- /dev/null +++ b/srcpkgs/schroot/patches/schroot-cppunit.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2017-05-20 09:50:30.146864516 +0000 ++++ 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" diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index 62edd6fe69..b500924e99 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -1,52 +1,39 @@ # Template file for 'schroot' pkgname=schroot -version=1.7.2 -revision=9 -build_style=cmake +reverts="1.7.2_9" +version=1.6.10 +revision=7 +_debian_version=3+deb9u1 +build_pie=yes +build_style=gnu-configure configure_args=" - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -Ddchroot=ON - -Ddchroot-dsa=ON - -Ddebug=OFF - -Dbash_completion_dir=/usr/share/bash-completion/completions - -Dlvm-snapshot=ON - -Dbtrfs-snapshot=ON - - -DBOOST_REGEX_EXITCODE=0 - -DSTD_REGEX_BROKEN_EXITCODE=1 - -DSTD_REGEX_EXITCODE=0" # fixes cross compilation + --enable-dchroot + --enable-lvm-snapshot + --enable-btrfs-snapshot + --enable-block-device + --enable-loopback + --enable-uuid + BTRFS=/usr/bin/btrfs + BTRFSCTL=/usr/bin/btrfsctl + LVCREATE=/usr/sbin/lvcreate + LVREMOVE=/usr/sbin/lvremove" conf_files=" - /etc/pam.d/schroot - /etc/schroot/default/copyfiles - /etc/schroot/default/nssdatabases - /etc/schroot/default/fstab - /etc/schroot/setup.d/05file - /etc/schroot/setup.d/05lvm - /etc/schroot/setup.d/50chrootname - /etc/schroot/setup.d/70services - /etc/schroot/setup.d/05btrfs - /etc/schroot/setup.d/00check - /etc/schroot/setup.d/20copyfiles - /etc/schroot/setup.d/15binfmt - /etc/schroot/setup.d/20nssdatabases - /etc/schroot/setup.d/99check - /etc/schroot/setup.d/10mount - /etc/schroot/setup.d/15killprocs - /etc/schroot/setup.d/05union - /etc/schroot/schroot.conf - /etc/schroot/sbuild/copyfiles - /etc/schroot/sbuild/nssdatabases - /etc/schroot/sbuild/fstab - /etc/schroot/buildd/copyfiles + /etc/schroot/minimal/nssdatabases + /etc/schroot/minimal/fstab + /etc/schroot/minimal/copyfiles /etc/schroot/buildd/nssdatabases /etc/schroot/buildd/fstab - /etc/schroot/desktop/copyfiles + /etc/schroot/buildd/copyfiles + /etc/schroot/default/nssdatabases + /etc/schroot/default/fstab + /etc/schroot/default/copyfiles + /etc/schroot/schroot.conf /etc/schroot/desktop/nssdatabases /etc/schroot/desktop/fstab - /etc/schroot/minimal/copyfiles - /etc/schroot/minimal/nssdatabases - /etc/schroot/minimal/fstab" + /etc/schroot/desktop/copyfiles + /etc/schroot/sbuild/nssdatabases + /etc/schroot/sbuild/fstab + /etc/schroot/sbuild/copyfiles" make_dirs=" /var/lib/schroot/unpack 0755 root root /var/lib/schroot/union/underlay 0755 root root @@ -54,26 +41,31 @@ make_dirs=" /var/lib/schroot/session 0755 root root /var/lib/schroot/mount 0755 root root /etc/schroot/chroot.d 0755 root root" -hostmakedepends="pkg-config groff" -makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel gtest-devel" +hostmakedepends="cmake pkg-config automake libtool" +makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel gettext-devel cppunit-devel" short_desc="Allows users to execute commands in different chroots" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://wiki.debian.org/Schroot" -distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz" -checksum="0fabc156da95cfcd63493bf1c3a438efa4a550c4f280d8f1c6f9e67c3d424661" - -LDFLAGS="-lboost_regex" +distfiles=" +${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz +${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz" +checksum=" +3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b +56bc82fc8ae7f6ca7eef506ccc1dca1211b2c84d83efc50d24670b8bdb9ea8bb" pre_configure() { - sed -i 's/warn/message/g' man/CMakeLists.txt - sed -i '/networks/d' \ - etc/profile-templates/default/all/nssdatabases \ - etc/profile-templates/desktop/all/nssdatabases \ - etc/profile-templates/buildd/all/copyfiles + cat ../debian/patches/series | while read p; do + patch -p1 -i ../debian/patches/$p + done + autoreconf -fi } post_install() { - chmod 4755 $PKGDESTDIR/usr/bin/$pkgname - rm -r $PKGDESTDIR/usr/include $PKGDESTDIR/usr/lib/pkgconfig + vmkdir usr/share/bash-completion/completions + mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions + # Remove development files + rm -rf ${DESTDIR}/usr/include \ + ${DESTDIR}/usr/lib/*.a \ + ${DESTDIR}/usr/lib/pkgconfig }