schroot: update to 1.6.13.
This commit is contained in:
@@ -1,14 +1,3 @@
|
||||
--- a/sbuild/sbuild-basic-keyfile.tcc
|
||||
+++ b/sbuild/sbuild-basic-keyfile.tcc
|
||||
@@ -214,7 +214,7 @@ sbuild::basic_keyfile<K, P>::get_locale_
|
||||
}
|
||||
catch (std::runtime_error const& e) // Invalid locale
|
||||
{
|
||||
- localename = std::locale::classic();
|
||||
+ localename = std::locale::classic().name();
|
||||
}
|
||||
std::string::size_type pos;
|
||||
bool status = false;
|
||||
--- a/sbuild/sbuild-chroot-config.cc
|
||||
+++ b/sbuild/sbuild-chroot-config.cc
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
@@ -7,8 +7,6 @@ Subject: [PATCH] getent
|
||||
etc/setup.d/20nssdatabases | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git etc/setup.d/20nssdatabases etc/setup.d/20nssdatabases
|
||||
index 6f14c81..697bb1e 100755
|
||||
--- a/etc/setup.d/20nssdatabases
|
||||
+++ b/etc/setup.d/20nssdatabases
|
||||
@@ -29,7 +29,7 @@ set -e
|
||||
@@ -18,8 +16,5 @@ index 6f14c81..697bb1e 100755
|
||||
- getent "$1" > "$2"
|
||||
+ getent "$1" > "$2" 2>/dev/null || cat "/etc/$1" > "$2"
|
||||
}
|
||||
|
||||
|
||||
if [ $STAGE = "setup-start" ] || [ $STAGE = "setup-recover" ]; then
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
||||
@@ -8,8 +8,6 @@ Subject: [PATCH] getmntent fix
|
||||
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
|
||||
--- a/sbuild/sbuild-mntstream.cc
|
||||
+++ b/sbuild/sbuild-mntstream.cc
|
||||
@@ -37,9 +37,7 @@ namespace
|
||||
@@ -41,8 +39,6 @@ index d376fe5..d7324e7 100644
|
||||
|
||||
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
|
||||
--- a/sbuild/sbuild-mntstream.h
|
||||
+++ b/sbuild/sbuild-mntstream.h
|
||||
@@ -49,8 +49,7 @@ namespace sbuild
|
||||
@@ -55,6 +51,3 @@ index ea3d179..fffcdf4 100644
|
||||
};
|
||||
|
||||
/// Exception type.
|
||||
--
|
||||
2.19.0
|
||||
|
||||
|
||||
@@ -28,3 +28,4 @@
|
||||
+#include "sbuild-i18n.h"
|
||||
|
||||
using namespace sbuild;
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
--- a/man/add/pt.add
|
||||
+++ b/man/add/pt.add
|
||||
@@ -1,4 +1,3 @@
|
||||
-
|
||||
PO4A-HEADER:mode=after;position=^\.SH "VEJA TAMBÉM";beginboundary=^\.SH
|
||||
.SH TRADUTOR(ES)
|
||||
Este manual foi traduzido por AMÉRICO MONTEIRO <email> EM jUNHO 2022.
|
||||
@@ -9,17 +9,11 @@ Subject: [PATCH] remove networks
|
||||
etc/profile-templates/desktop/all/nssdatabases | 1 -
|
||||
3 files changed, 3 deletions(-)
|
||||
|
||||
diff --git etc/profile-templates/buildd/all/copyfiles etc/profile-templates/buildd/all/copyfiles
|
||||
index fe18fb3..2469d3e 100644
|
||||
--- a/etc/profile-templates/buildd/all/copyfiles
|
||||
+++ b/etc/profile-templates/buildd/all/copyfiles
|
||||
@@ -3,4 +3,3 @@
|
||||
# <source and destination>
|
||||
@@ -1,2 +1 @@
|
||||
/etc/hosts
|
||||
/etc/resolv.conf
|
||||
-/etc/networks
|
||||
diff --git etc/profile-templates/default/all/nssdatabases etc/profile-templates/default/all/nssdatabases
|
||||
index a9f1319..22efe1b 100644
|
||||
--- a/etc/profile-templates/default/all/nssdatabases
|
||||
+++ b/etc/profile-templates/default/all/nssdatabases
|
||||
@@ -1,4 +1,3 @@
|
||||
@@ -27,8 +21,6 @@ index a9f1319..22efe1b 100644
|
||||
protocols
|
||||
-networks
|
||||
hosts
|
||||
diff --git etc/profile-templates/desktop/all/nssdatabases etc/profile-templates/desktop/all/nssdatabases
|
||||
index a9f1319..22efe1b 100644
|
||||
--- a/etc/profile-templates/desktop/all/nssdatabases
|
||||
+++ b/etc/profile-templates/desktop/all/nssdatabases
|
||||
@@ -1,4 +1,3 @@
|
||||
@@ -36,6 +28,3 @@ index a9f1319..22efe1b 100644
|
||||
protocols
|
||||
-networks
|
||||
hosts
|
||||
--
|
||||
2.19.0
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
|
||||
+++ b/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,9 +1,9 @@
|
||||
# Template file for 'schroot'
|
||||
pkgname=schroot
|
||||
reverts="1.7.2_9"
|
||||
version=1.6.10
|
||||
revision=19
|
||||
_debian_version=12+deb11u1
|
||||
version=1.6.13
|
||||
revision=1
|
||||
_debian_version=7
|
||||
build_style=cmake
|
||||
configure_args="
|
||||
-Ddchroot=ON
|
||||
@@ -51,16 +51,15 @@ license="GPL-3.0-only"
|
||||
homepage="https://wiki.debian.org/Schroot"
|
||||
distfiles="
|
||||
${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
|
||||
http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
|
||||
checksum="
|
||||
3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
|
||||
7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
|
||||
${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
|
||||
checksum="2d79ab1ae5ed5b06601ece4b20b7cc0ef0c0c486922693f9bedda927945cc6b3
|
||||
6b5b03cfcbf0eb9f087c26095485839a625af90bd4892207fc6d12dfff2f635d"
|
||||
nocross=yes
|
||||
skip_extraction="schroot_${version}-${_debian_version}.debian.tar.xz"
|
||||
|
||||
post_extract() {
|
||||
bsdtar -xf $XBPS_SRCDISTDIR/schroot-${version}/$skip_extraction
|
||||
cat debian/patches/series | while read p; do
|
||||
grep '^[^#]' debian/patches/series | while read p; do
|
||||
patch -Np1 -F0 -i debian/patches/$p
|
||||
done
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user