Le dimanche 19 avril 2020 à 16:22:57+0200, Pierre-Elliott Bécue a écrit : > [snip] Dear Adam, Stripping all useless commits, here is the Debdiff I get. Note that the version isn't 3.0.4-3~deb10u1 as 3.0.4-3 contains only packaging changes that I didn't include. Should you wish me to release 3.0.4-3~deb10u1, we would have to make an empty changelog for 3.0.4-3 over which I could do the changelog entry to release into buster. Cheers! -- Pierre-Elliott Bécue GPG: 9AE0 4D98 6400 E3B6 7528 F493 0D44 2664 1949 74E2 It's far easier to fight for one's principles than to live up to them.
diff -Nru lxc-templates-3.0.3/configure lxc-templates-3.0.4/configure
--- lxc-templates-3.0.3/configure 2018-11-23 01:48:22.000000000 +0100
+++ lxc-templates-3.0.4/configure 2019-06-22 00:57:26.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lxc-templates 3.0.3.
+# Generated by GNU Autoconf 2.69 for lxc-templates 3.0.4.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='lxc-templates'
PACKAGE_TARNAME='lxc-templates'
-PACKAGE_VERSION='3.0.3'
-PACKAGE_STRING='lxc-templates 3.0.3'
+PACKAGE_VERSION='3.0.4'
+PACKAGE_STRING='lxc-templates 3.0.4'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1321,7 +1321,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures lxc-templates 3.0.3 to adapt to many kinds of systems.
+\`configure' configures lxc-templates 3.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of lxc-templates 3.0.3:";;
+ short | recursive ) echo "Configuration of lxc-templates 3.0.4:";;
esac
cat <<\_ACEOF
@@ -1500,7 +1500,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-lxc-templates configure 3.0.3
+lxc-templates configure 3.0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1752,7 +1752,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by lxc-templates $as_me 3.0.3, which was
+It was created by lxc-templates $as_me 3.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2615,7 +2615,7 @@
# Define the identity of the package.
PACKAGE='lxc-templates'
- VERSION='3.0.3'
+ VERSION='3.0.4'
cat >>confdefs.h <<_ACEOF
@@ -6134,7 +6134,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by lxc-templates $as_me 3.0.3, which was
+This file was extended by lxc-templates $as_me 3.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6195,7 +6195,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-lxc-templates config.status 3.0.3
+lxc-templates config.status 3.0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru lxc-templates-3.0.3/configure.ac lxc-templates-3.0.4/configure.ac
--- lxc-templates-3.0.3/configure.ac 2018-11-23 01:48:17.000000000 +0100
+++ lxc-templates-3.0.4/configure.ac 2019-06-22 00:57:21.000000000 +0200
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([lxc-templates], [3.0.3])
+AC_INIT([lxc-templates], [3.0.4])
AM_INIT_AUTOMAKE
# We need pkg-config
diff -Nru lxc-templates-3.0.3/debian/changelog lxc-templates-3.0.4/debian/changelog
--- lxc-templates-3.0.3/debian/changelog 2018-12-04 08:47:01.000000000 +0100
+++ lxc-templates-3.0.4/debian/changelog 2020-04-19 18:13:31.000000000 +0200
@@ -1,3 +1,23 @@
+lxc-templates (3.0.4-2+deb10u1) buster; urgency=medium
+
+ * Rebuild for Buster
+
+ -- Pierre-Elliott Bécue <peb@debian.org> Sun, 19 Apr 2020 18:13:31 +0200
+
+lxc-templates (3.0.4-2) unstable; urgency=medium
+
+ * d/p/0001: [lxc-debian] Handle languages that are only UTF-8 encoded
+ (Closes: #950840)
+
+ -- Pierre-Elliott Bécue <peb@debian.org> Sun, 19 Apr 2020 18:12:58 +0200
+
+lxc-templates (3.0.4-1) unstable; urgency=medium
+
+ * New upstream release 3.0.4
+ * d/lxc-templates.lintian-overrides: Disable warning for access to dpkg DB
+
+ -- Pierre-Elliott Bécue <peb@debian.org> Tue, 20 Aug 2019 13:49:53 +0200
+
lxc-templates (3.0.3-1) unstable; urgency=medium
* d/control:
diff -Nru lxc-templates-3.0.3/debian/lxc-templates.lintian-overrides lxc-templates-3.0.4/debian/lxc-templates.lintian-overrides
--- lxc-templates-3.0.3/debian/lxc-templates.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ lxc-templates-3.0.4/debian/lxc-templates.lintian-overrides 2020-04-19 18:06:04.000000000 +0200
@@ -0,0 +1,3 @@
+# Done in the newly installed container for generating SSH keys. Not the cleanest way, but working and not dangerous.
+lxc-templates: uses-dpkg-database-directly usr/share/lxc/templates/lxc-debian
+lxc-templates: uses-dpkg-database-directly usr/share/lxc/templates/lxc-ubuntu
diff -Nru lxc-templates-3.0.3/debian/patches/0001-lxc-debian-Handle-languages-that-are-only-UTF-8-enco.patch lxc-templates-3.0.4/debian/patches/0001-lxc-debian-Handle-languages-that-are-only-UTF-8-enco.patch
--- lxc-templates-3.0.3/debian/patches/0001-lxc-debian-Handle-languages-that-are-only-UTF-8-enco.patch 1970-01-01 01:00:00.000000000 +0100
+++ lxc-templates-3.0.4/debian/patches/0001-lxc-debian-Handle-languages-that-are-only-UTF-8-enco.patch 2020-04-19 18:12:49.000000000 +0200
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Pierre-Elliott_B=C3=A9cue?= <peb@debian.org>
+Date: Wed, 15 Apr 2020 16:55:15 +0200
+Subject: [lxc-debian] Handle languages that are only UTF-8 encoded
+
+---
+ templates/lxc-debian.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
+index 4388478..f6b9f2c 100644
+--- a/templates/lxc-debian.in
++++ b/templates/lxc-debian.in
+@@ -129,7 +129,8 @@ EOF
+ chroot "$rootfs" locale-gen en_US.UTF-8 UTF-8
+ chroot "$rootfs" update-locale LANG=en_US.UTF-8
+ else
+- encoding=$(echo "$LANG" | cut -d. -f2)
++ encoding=$(locale charmap)
++ [ -z "${encoding}" ] && encoding="UTF-8"
+ chroot "$rootfs" sed -e "s/^# \(${LANG} ${encoding}\)/\1/" \
+ -i /etc/locale.gen 2> /dev/null
+ cat >> "$rootfs/etc/locale.gen" << EOF
diff -Nru lxc-templates-3.0.3/debian/patches/series lxc-templates-3.0.4/debian/patches/series
--- lxc-templates-3.0.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ lxc-templates-3.0.4/debian/patches/series 2020-04-19 18:12:49.000000000 +0200
@@ -0,0 +1 @@
+0001-lxc-debian-Handle-languages-that-are-only-UTF-8-enco.patch
diff -Nru lxc-templates-3.0.3/templates/lxc-plamo.in lxc-templates-3.0.4/templates/lxc-plamo.in
--- lxc-templates-3.0.3/templates/lxc-plamo.in 2018-11-23 01:48:17.000000000 +0100
+++ lxc-templates-3.0.4/templates/lxc-plamo.in 2019-06-22 00:57:21.000000000 +0200
@@ -52,7 +52,10 @@
# download a mini plamo into a cache
echo "Downloading Plamo-$release minimal..."
cd $ptcache
- case $DLSCHEME in http) depth=2 ;; ftp) depth=3 ;; esac
+ case $DLSCHEME in
+ http|https) depth=2 ;;
+ ftp) depth=3 ;;
+ esac
rej=${IGNOREPKGS%% *} ; [ -n "$rej" ] && rej="$rej-*"
if [ `echo $IGNOREPKGS | wc -w` -gt 1 ] ; then
for p in ${IGNOREPKGS#* } ; do rej="$rej,$p-*" ; done
@@ -123,6 +126,7 @@
pkgtool="pkgtools"
else
pkgtool="hdsetup"
+ LANG=C
fi
( cd $dlcache ; tar xpJf "$pkgtool"-*.txz ; rm -rf tmp usr var )
@@ -428,7 +432,7 @@
ADDONPKGS=${ADDONPKGS-"`echo contrib/Hamradio/{morse,qrq}`"}
fi
-DLSCHEME=${DLSCHEME:-"http"}
+DLSCHEME=${DLSCHEME:-"https"}
MIRRORSRV=${MIRRORSRV:-"repository.plamolinux.org"}
MIRRORPATH=${MIRRORPATH:-"/pub/linux/Plamo"}
CATEGORIES=${CATEGORIES-"00_base 01_minimum"}
diff -Nru lxc-templates-3.0.3/templates/lxc-slackware.in lxc-templates-3.0.4/templates/lxc-slackware.in
--- lxc-templates-3.0.3/templates/lxc-slackware.in 2018-11-23 01:48:17.000000000 +0100
+++ lxc-templates-3.0.4/templates/lxc-slackware.in 2019-06-22 00:57:21.000000000 +0200
@@ -566,6 +566,7 @@
gzip
hostname
iputils
+libpsl
libunistring
logrotate
mpfr
@@ -574,6 +575,7 @@
ncurses
openssh
openssl-solibs
+pcre2
pkgtools
procps-ng
sed
Attachment:
signature.asc
Description: PGP signature