mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-13 18:43:51 +02:00
schroot: revert to 1.6.10
This commit is contained in:
Andrea Brancaleoni
parent
2040d7baee
commit
9e4febea25
6 changed files with 135 additions and 145 deletions
|
|
@ -1,60 +0,0 @@
|
||||||
From f7ecc01d4e773ac532c3fc990833ca4d1cda6a7b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andrea Brancaleoni <miwaxe@gmail.com>
|
|
||||||
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<mntstream::error_code>::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
|
|
||||||
|
|
||||||
60
srcpkgs/schroot/patches/getmntent.patch
Normal file
60
srcpkgs/schroot/patches/getmntent.patch
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
From db62a534ebcf60391d9e0acffa641e60dfba18fb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrea Brancaleoni <abc@pompel.me>
|
||||||
|
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
|
||||||
|
|
||||||
|
|
@ -1,38 +1,25 @@
|
||||||
From 65ed89fedb34278d5b86777ca402f7194cf0809e Mon Sep 17 00:00:00 2001
|
From 73936a423227aa78b7682bdd3edc20643763807b Mon Sep 17 00:00:00 2001
|
||||||
From: Andrea Brancaleoni <miwaxe@gmail.com>
|
From: Andrea Brancaleoni <abc@pompel.me>
|
||||||
Date: Mon, 24 Aug 2015 02:42:40 +0200
|
Date: Wed, 19 Sep 2018 11:22:47 +0200
|
||||||
Subject: [PATCH] musl
|
Subject: [PATCH] musl
|
||||||
|
|
||||||
---
|
---
|
||||||
lib/bin-common/run.h | 2 ++
|
sbuild/sbuild-feature.cc | 2 ++
|
||||||
lib/sbuild/auth/pam.cc | 1 +
|
1 file changed, 2 insertions(+)
|
||||||
2 files changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git lib/bin-common/run.h lib/bin-common/run.h
|
diff --git sbuild/sbuild-feature.cc sbuild/sbuild-feature.cc
|
||||||
index 2bb9762..cce630d 100644
|
index 5ac4725..9902db3 100644
|
||||||
--- lib/bin-common/run.h
|
--- sbuild/sbuild-feature.cc
|
||||||
+++ lib/bin-common/run.h
|
+++ sbuild/sbuild-feature.cc
|
||||||
@@ -29,6 +29,8 @@
|
@@ -20,6 +20,8 @@
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
|
||||||
|
|
||||||
+#include <libintl.h>
|
+#include <libintl.h>
|
||||||
+
|
+
|
||||||
namespace bin_common
|
#include "sbuild-feature.h"
|
||||||
{
|
|
||||||
|
using namespace sbuild;
|
||||||
diff --git lib/sbuild/auth/pam.cc lib/sbuild/auth/pam.cc
|
--
|
||||||
index 84663c2..feda6f0 100644
|
2.19.0
|
||||||
--- lib/sbuild/auth/pam.cc
|
|
||||||
+++ lib/sbuild/auth/pam.cc
|
|
||||||
@@ -30,6 +30,7 @@
|
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#include <syslog.h>
|
|
||||||
+#include <libintl.h>
|
|
||||||
|
|
||||||
#include <boost/format.hpp>
|
|
||||||
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
||||||
|
|
|
||||||
11
srcpkgs/schroot/patches/schroot-cppunit.patch
Normal file
11
srcpkgs/schroot/patches/schroot-cppunit.patch
Normal file
|
|
@ -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"
|
||||||
|
|
@ -1,52 +1,39 @@
|
||||||
# Template file for 'schroot'
|
# Template file for 'schroot'
|
||||||
pkgname=schroot
|
pkgname=schroot
|
||||||
version=1.7.2
|
reverts="1.7.2_9"
|
||||||
revision=9
|
version=1.6.10
|
||||||
build_style=cmake
|
revision=7
|
||||||
|
_debian_version=3+deb9u1
|
||||||
|
build_pie=yes
|
||||||
|
build_style=gnu-configure
|
||||||
configure_args="
|
configure_args="
|
||||||
-DCMAKE_INSTALL_SYSCONFDIR=/etc
|
--enable-dchroot
|
||||||
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
|
--enable-lvm-snapshot
|
||||||
-Ddchroot=ON
|
--enable-btrfs-snapshot
|
||||||
-Ddchroot-dsa=ON
|
--enable-block-device
|
||||||
-Ddebug=OFF
|
--enable-loopback
|
||||||
-Dbash_completion_dir=/usr/share/bash-completion/completions
|
--enable-uuid
|
||||||
-Dlvm-snapshot=ON
|
BTRFS=/usr/bin/btrfs
|
||||||
-Dbtrfs-snapshot=ON
|
BTRFSCTL=/usr/bin/btrfsctl
|
||||||
|
LVCREATE=/usr/sbin/lvcreate
|
||||||
-DBOOST_REGEX_EXITCODE=0
|
LVREMOVE=/usr/sbin/lvremove"
|
||||||
-DSTD_REGEX_BROKEN_EXITCODE=1
|
|
||||||
-DSTD_REGEX_EXITCODE=0" # fixes cross compilation
|
|
||||||
conf_files="
|
conf_files="
|
||||||
/etc/pam.d/schroot
|
/etc/schroot/minimal/nssdatabases
|
||||||
/etc/schroot/default/copyfiles
|
/etc/schroot/minimal/fstab
|
||||||
/etc/schroot/default/nssdatabases
|
/etc/schroot/minimal/copyfiles
|
||||||
/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/buildd/nssdatabases
|
/etc/schroot/buildd/nssdatabases
|
||||||
/etc/schroot/buildd/fstab
|
/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/nssdatabases
|
||||||
/etc/schroot/desktop/fstab
|
/etc/schroot/desktop/fstab
|
||||||
/etc/schroot/minimal/copyfiles
|
/etc/schroot/desktop/copyfiles
|
||||||
/etc/schroot/minimal/nssdatabases
|
/etc/schroot/sbuild/nssdatabases
|
||||||
/etc/schroot/minimal/fstab"
|
/etc/schroot/sbuild/fstab
|
||||||
|
/etc/schroot/sbuild/copyfiles"
|
||||||
make_dirs="
|
make_dirs="
|
||||||
/var/lib/schroot/unpack 0755 root root
|
/var/lib/schroot/unpack 0755 root root
|
||||||
/var/lib/schroot/union/underlay 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/session 0755 root root
|
||||||
/var/lib/schroot/mount 0755 root root
|
/var/lib/schroot/mount 0755 root root
|
||||||
/etc/schroot/chroot.d 0755 root root"
|
/etc/schroot/chroot.d 0755 root root"
|
||||||
hostmakedepends="pkg-config groff"
|
hostmakedepends="cmake pkg-config automake libtool"
|
||||||
makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel gtest-devel"
|
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"
|
short_desc="Allows users to execute commands in different chroots"
|
||||||
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
|
||||||
license="GPL-3"
|
license="GPL-3"
|
||||||
homepage="https://wiki.debian.org/Schroot"
|
homepage="https://wiki.debian.org/Schroot"
|
||||||
distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz"
|
distfiles="
|
||||||
checksum="0fabc156da95cfcd63493bf1c3a438efa4a550c4f280d8f1c6f9e67c3d424661"
|
${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
|
||||||
|
${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
|
||||||
LDFLAGS="-lboost_regex"
|
checksum="
|
||||||
|
3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
|
||||||
|
56bc82fc8ae7f6ca7eef506ccc1dca1211b2c84d83efc50d24670b8bdb9ea8bb"
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
sed -i 's/warn/message/g' man/CMakeLists.txt
|
cat ../debian/patches/series | while read p; do
|
||||||
sed -i '/networks/d' \
|
patch -p1 -i ../debian/patches/$p
|
||||||
etc/profile-templates/default/all/nssdatabases \
|
done
|
||||||
etc/profile-templates/desktop/all/nssdatabases \
|
autoreconf -fi
|
||||||
etc/profile-templates/buildd/all/copyfiles
|
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
chmod 4755 $PKGDESTDIR/usr/bin/$pkgname
|
vmkdir usr/share/bash-completion/completions
|
||||||
rm -r $PKGDESTDIR/usr/include $PKGDESTDIR/usr/lib/pkgconfig
|
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
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue