Merge lp:~rbalint/libdebian-installer/libdebian-installer-0.110ubuntu1 into lp:~ubuntu-core-dev/libdebian-installer/ubuntu

[Balint Reczey]

* Merge from Debian unstable. (LP: #1688246) Remaining changes:
  - Add more OMAP4 Panda support.
  - Add OMAP4 Blaze support.
  - Add Freescale "P4080 DS" and "QEMU e500" support.
  - Point to Bazaar packaging repository on Launchpad

[Mathieu Trudel-Lapierre (cyphermox)]

LGTM, but it will need some other rebuilds to fully take effect (libd-i has multiple reverse-depends).

I'm merging, and I'll verify that the other bits still build correctly.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2015-05-24 22:16:15 +0000
+++ Makefile.am	2017-05-04 17:27:22 +0000
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = doc include src test
+SUBDIRS = doc include src
+if ENABLE_CHECK
+SUBDIRS += test
+endif
 
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = \

=== modified file 'configure.ac'
--- configure.ac	2015-05-24 22:16:15 +0000
+++ configure.ac	2017-05-04 17:27:22 +0000
@@ -7,13 +7,18 @@
 
 AC_CHECK_FUNCS(memrchr)
 
+AC_ARG_ENABLE([check],AS_HELP_STRING([--disable-check],[Disable running the test suite]))
+
 AC_CHECK_PROGS(DOXYGEN, doxygen, true)
 
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+AS_IF([test "x$enable_check" != xno],[
+	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+])
+AM_CONDITIONAL([ENABLE_CHECK],[test "x$enable_check" != xno])
 
 LIBRARY_VERSION_MAJOR=4
 LIBRARY_VERSION_MINOR=0
-LIBRARY_VERSION_REVISION=7
+LIBRARY_VERSION_REVISION=8
 LIBRARY_VERSION="$LIBRARY_VERSION_MAJOR.$LIBRARY_VERSION_MINOR.$LIBRARY_VERSION_REVISION"
 LIBRARY_VERSION_LIBTOOL="$LIBRARY_VERSION_MAJOR:$LIBRARY_VERSION_MINOR:$LIBRARY_VERSION_REVISION"
 

=== modified file 'debian/changelog'
--- debian/changelog	2017-05-04 15:59:21 +0000
+++ debian/changelog	2017-05-04 17:27:22 +0000
@@ -1,3 +1,85 @@
+libdebian-installer (0.110ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable. (LP: #1688246) Remaining changes:
+    - Add more OMAP4 Panda support.
+    - Add OMAP4 Blaze support.
+    - Add Freescale "P4080 DS" and "QEMU e500" support.
+    - Point to Bazaar packaging repository on Launchpad
+
+ -- Balint Reczey <[e-mail]>  Thu, 04 May 2017 13:36:00 +0200
+
+libdebian-installer (0.110) unstable; urgency=medium
+
+  [ Martin Michlmayr ]
+  * subarch-arm-linux.c: Add NETGEAR ReadyNAS Duo v2.  Closes: #855965
+
+ -- Christian Perrier <[e-mail]>  Wed, 22 Mar 2017 11:59:18 +0100
+
+libdebian-installer (0.109) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * Fix build with gcc-7. Closes: #853489
+
+  [ Steven Chamberlain ]
+  * Parse SHA256 fields in Packages files.  (closes: #856210)
+  * Parse SHA256 fields in Release files.
+
+  [ Bastian Blank ]
+  * Update versions for changed symbols.
+    - Add Breaks on cdebootstrap.
+
+ -- Bastian Blank <[e-mail]>  Sun, 05 Mar 2017 11:02:27 +0000
+
+libdebian-installer (0.108) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Make Build-Depends: check optional via <!nocheck> profile.
+    Closes: #787044.
+
+ -- Christian Perrier <[e-mail]>  Tue, 30 Aug 2016 06:45:17 +0200
+
+libdebian-installer (0.107) unstable; urgency=medium
+
+  [ Steve McIntyre ]
+  * armel/armhf: Fix missing efi include FTBFS
+
+ -- Christian Perrier <[e-mail]>  Mon, 20 Jun 2016 08:21:12 +0200
+
+libdebian-installer (0.106) unstable; urgency=medium
+
+  [ Steve McIntyre ]
+  * armhf: Add EFI detection.
+
+  [ Mathieu Trudel-Lapierre ]
+  * validate the presence of efivars *or* vars under /sys/firmware/efi to
+    decide whether we should show the system as running in EFI mode;
+    either of these paths is required for efibootmgr to set a BootEntry at
+    the end of installation. Closes: #826665
+
+ -- Christian Perrier <[e-mail]>  Sun, 12 Jun 2016 09:06:30 +0200
+
+libdebian-installer (0.105) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * Add mips64el support.
+
+ -- Aurelien Jarno <[e-mail]>  Sun, 22 May 2016 15:21:37 +0200
+
+libdebian-installer (0.104) unstable; urgency=medium
+
+  [ Roger Shimizu ]
+  * armel: Add various orion5x/kirkwood based Buffalo Linkstation devices
+    supported by device-tree
+
+ -- Christian Perrier <[e-mail]>  Wed, 17 Feb 2016 07:05:06 +0100
+
+libdebian-installer (0.103) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
+
+ -- Christian Perrier <[e-mail]>  Sat, 13 Feb 2016 15:17:19 +0100
+
 libdebian-installer (0.102ubuntu3) yakkety; urgency=medium
 
   * src/system/efi.c: fix my blunder; we still need to have ret declared as an

=== modified file 'debian/control'
--- debian/control	2015-12-24 00:41:40 +0000
+++ debian/control	2017-05-04 17:27:22 +0000
@@ -4,10 +4,10 @@
 Maintainer: Ubuntu Installer Team <[e-mail]>
 XSBC-Original-Maintainer: Debian Install System Team <[e-mail]>
 Uploaders: Bastian Blank <[e-mail]>, Colin Watson <[e-mail]>, Christian Perrier <[e-mail]>, Steve McIntyre <[e-mail]>
-Build-Depends: dpkg-dev (>= 1.13.5), debhelper (>= 9), dh-autoreconf, doxygen, pkg-config, check
+Build-Depends: dpkg-dev (>= 1.13.5), debhelper (>= 9), dh-autoreconf, doxygen, pkg-config, check <!nocheck>
 Standards-Version: 3.9.6
-XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/libdebian-installer.git
-XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/libdebian-installer.git
+XS-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/libdebian-installer.git
+XS-Vcs-Git: https://anonscm.debian.org/git/d-i/libdebian-installer.git
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libdebian-installer/ubuntu
 
 Package: libdebian-installer4
@@ -15,6 +15,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: cdebootstrap (<< 0.7.6+)
 Description: Library of common debian-installer functions
  This library is used by debian-installer to perform common functions
  such as logging messages and executing commands. If you aren't
@@ -50,6 +51,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libdebian-installer4 (= ${binary:Version})
+Breaks: cdebootstrap (<< 0.7.6+)
 Description: Library of some extra debian-installer functions
  This library is used by debian-installer to perform common functions
  such as logging messages and executing commands. If you aren't

=== modified file 'debian/rules'
--- debian/rules	2013-06-07 12:14:22 +0000
+++ debian/rules	2017-05-04 17:27:22 +0000
@@ -16,6 +16,11 @@
 
 export CFLAGS
 
+ifneq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-check
+endif
+
 override_dh_auto_build:
 	dh_auto_build
 	$(MAKE) -C build/doc doc

=== modified file 'include/debian-installer/package.h'
--- include/debian-installer/package.h	2011-03-02 17:11:54 +0000
+++ include/debian-installer/package.h	2017-05-04 17:27:22 +0000
@@ -112,7 +112,7 @@
   di_slist depends;                                     /**< Any different dependency types */
   char *filename;                                       /**< Filename field */
   size_t size;                                          /**< Size field */
-  char *md5sum;                                         /**< MD5Sum field */
+  char *sha256;                                         /**< SHA256 field */
   char *short_description;                              /**< Description field, first part*/
   char *description;                                    /**< Description field, second part */
   unsigned int resolver;                                /**< @internal */

=== modified file 'include/debian-installer/package_internal.h'
--- include/debian-installer/package_internal.h	2011-03-02 17:11:54 +0000
+++ include/debian-installer/package_internal.h	2017-05-04 17:27:22 +0000
@@ -52,7 +52,7 @@
   internal_di_package_parser_field_enhances,
   internal_di_package_parser_field_filename,
   internal_di_package_parser_field_size,
-  internal_di_package_parser_field_md5sum,
+  internal_di_package_parser_field_sha256,
   internal_di_package_parser_field_description;
 
 /**

=== modified file 'include/debian-installer/release.h'
--- include/debian-installer/release.h	2011-03-02 17:11:54 +0000
+++ include/debian-installer/release.h	2017-05-04 17:27:22 +0000
@@ -40,7 +40,7 @@
   char *origin;                                 /**< Origin field */
   char *suite;                                  /**< Suite field */
   char *codename;                               /**< Codename field */
-  di_hash_table *md5sum;                        /**< checksum fields, includes di_release_file */
+  di_hash_table *sha256;                        /**< checksum fields, includes di_release_file */
   di_mem_chunk *release_file_mem_chunk;         /**< @internal */
 };
 
@@ -55,7 +55,7 @@
     di_rstring key;                             /**< @internal */
   };
   unsigned int size;                            /**< size */
-  char *sum[2];                                 /**< checksums, currently md5 and sha1 */
+  char *sum[2];                                 /**< checksums, currently md5 and sha256 */
 };
 
 di_release *di_release_alloc (void);

=== modified file 'src/exec.c'
--- src/exec.c	2013-11-14 22:09:38 +0000
+++ src/exec.c	2017-05-04 17:27:22 +0000
@@ -159,6 +159,7 @@
         break;
       case 3:
         files[1].handler = stderr_handler;
+        /* Fall through */
       case 1:
         files[0].handler = stdout_handler;
         break;

=== modified file 'src/libdebian-installer-extra.ver'
--- src/libdebian-installer-extra.ver	2004-02-01 16:38:12 +0000
+++ src/libdebian-installer-extra.ver	2017-05-04 17:27:22 +0000
@@ -9,12 +9,16 @@
     di_list_prepend_chunk;
     di_release_alloc;
     di_release_free;
+  local:
+    *;
+};
+
+LIBDI_4.8 {
+  global:
     di_release_parser_fieldinfo;
     di_release_parser_read_file;
     di_release_read_file;
-  local:
-    *;
-};
+} LIBDI_4.1;
 
 #LIBDI_PRIVATE {
 #  global:

=== modified file 'src/libdebian-installer.ver'
--- src/libdebian-installer.ver	2010-09-13 16:44:53 +0000
+++ src/libdebian-installer.ver	2017-05-04 17:27:22 +0000
@@ -26,7 +26,6 @@
     di_mem_chunk_new;
     di_mem_chunk_size;
     di_package_destroy;
-    di_package_parser_fieldinfo;
     di_package_parser_info;
     di_package_parser_read_dependency;
     di_package_parser_read_description;
@@ -37,7 +36,6 @@
     di_package_parser_write_description;
     di_package_parser_write_priority;
     di_package_parser_write_status;
-    di_package_special_read_file;
     di_package_version_compare;
     di_package_version_free;
     di_package_version_parse;
@@ -48,18 +46,10 @@
     di_packages_free;
     di_packages_get_package;
     di_packages_get_package_new;
-    di_packages_minimal_parser_fieldinfo;
-    di_packages_minimal_parser_info;
-    di_packages_parser_fieldinfo;
-    di_packages_parser_info;
     di_packages_parser_read_name;
     di_packages_resolve_dependencies;
     di_packages_resolve_dependencies_array;
     di_packages_resolve_dependencies_mark;
-    di_packages_special_read_file;
-    di_packages_special_write_file;
-    di_packages_status_parser_fieldinfo;
-    di_packages_status_parser_info;
     di_parser_info_add;
     di_parser_info_alloc;
     di_parser_info_free;
@@ -89,12 +79,8 @@
     di_system_dpkg_package_control_file_exec;
     di_system_init;
     di_system_package_destroy;
-    di_system_package_parser_fieldinfo;
-    di_system_package_parser_info;
     di_system_packages_alloc;
     di_system_packages_allocator_alloc;
-    di_system_packages_parser_info;
-    di_system_packages_status_parser_info;
     di_system_prebaseconfig_append;
     di_vlog;
   local:
@@ -160,6 +146,24 @@
     di_system_subarch_analyze_guess;
 } LIBDI_4.6;
 
+LIBDI_4.8 {
+  global:
+    di_package_parser_fieldinfo;
+    di_package_special_read_file;
+    di_packages_minimal_parser_fieldinfo;
+    di_packages_minimal_parser_info;
+    di_packages_parser_fieldinfo;
+    di_packages_parser_info;
+    di_packages_special_read_file;
+    di_packages_special_write_file;
+    di_packages_status_parser_fieldinfo;
+    di_packages_status_parser_info;
+    di_system_package_parser_fieldinfo;
+    di_system_package_parser_info;
+    di_system_packages_parser_info;
+    di_system_packages_status_parser_info;
+} LIBDI_4.7;
+
 #LIBDI_PRIVATE {
 #  global:
 #    internal_*;

=== modified file 'src/package.c'
--- src/package.c	2011-03-02 17:11:54 +0000
+++ src/package.c	2017-05-04 17:27:22 +0000
@@ -38,7 +38,7 @@
   di_free (package->architecture);
   di_free (package->version);
   di_free (package->filename);
-  di_free (package->md5sum);
+  di_free (package->sha256);
   di_free (package->short_description);
   di_free (package->description);
 

=== modified file 'src/package_parser.c'
--- src/package_parser.c	2011-03-02 17:11:54 +0000
+++ src/package_parser.c	2017-05-04 17:27:22 +0000
@@ -180,13 +180,13 @@
       di_parser_write_int,
       offsetof (di_package, size)
     ),
-  internal_di_package_parser_field_md5sum =
+  internal_di_package_parser_field_sha256 =
     DI_PARSER_FIELDINFO
     (
-      "MD5sum",
+      "SHA256",
       di_parser_read_string,
       di_parser_write_string,
-      offsetof (di_package, md5sum)
+      offsetof (di_package, sha256)
     ),
   internal_di_package_parser_field_description =
     DI_PARSER_FIELDINFO
@@ -217,7 +217,7 @@
   &internal_di_package_parser_field_enhances,
   &internal_di_package_parser_field_filename,
   &internal_di_package_parser_field_size,
-  &internal_di_package_parser_field_md5sum,
+  &internal_di_package_parser_field_sha256,
   &internal_di_package_parser_field_description,
   NULL
 };

=== modified file 'src/packages_parser.c'
--- src/packages_parser.c	2011-03-02 17:11:54 +0000
+++ src/packages_parser.c	2017-05-04 17:27:22 +0000
@@ -65,7 +65,7 @@
   &internal_di_package_parser_field_enhances,
   &internal_di_package_parser_field_filename,
   &internal_di_package_parser_field_size,
-  &internal_di_package_parser_field_md5sum,
+  &internal_di_package_parser_field_sha256,
   &internal_di_package_parser_field_description,
   NULL
 };
@@ -109,7 +109,7 @@
   &internal_di_package_parser_field_depends,
   &internal_di_package_parser_field_pre_depends,
   &internal_di_package_parser_field_filename,
-  &internal_di_package_parser_field_md5sum,
+  &internal_di_package_parser_field_sha256,
   &internal_di_package_parser_field_size,
   NULL
 };

=== modified file 'src/release.c'
--- src/release.c	2011-03-02 17:11:54 +0000
+++ src/release.c	2017-05-04 17:27:22 +0000
@@ -69,10 +69,10 @@
       NULL,
       0
     ),
-  internal_di_release_parser_field_sha1 =
+  internal_di_release_parser_field_sha256 =
     DI_PARSER_FIELDINFO
     (
-      "SHA1",
+      "SHA256",
       di_release_parser_read_file,
       NULL,
       1
@@ -87,7 +87,7 @@
   &internal_di_release_parser_field_suite,
   &internal_di_release_parser_field_codename,
   &internal_di_release_parser_field_md5sum,
-  &internal_di_release_parser_field_sha1,
+  &internal_di_release_parser_field_sha256,
   NULL
 };
 
@@ -110,7 +110,7 @@
   di_release *ret;
 
   ret = di_new0 (di_release, 1);
-  ret->md5sum = di_hash_table_new_full (di_rstring_hash, di_rstring_equal, NULL, internal_di_release_file_destroy_func);
+  ret->sha256 = di_hash_table_new_full (di_rstring_hash, di_rstring_equal, NULL, internal_di_release_file_destroy_func);
   ret->release_file_mem_chunk = di_mem_chunk_new (sizeof (di_release_file), 4096);
 
   return ret;
@@ -124,7 +124,7 @@
   di_free (release->origin);
   di_free (release->suite);
   di_free (release->codename);
-  di_hash_table_destroy (release->md5sum);
+  di_hash_table_destroy (release->sha256);
   di_mem_chunk_destroy (release->release_file_mem_chunk);
   di_free (release);
 }
@@ -169,7 +169,7 @@
   int ret;
   size_t buf_size;
   di_release *release = *data;
-  di_hash_table *table = release->md5sum;
+  di_hash_table *table = release->sha256;
 
   while (1)
   {

=== modified file 'src/system/Makefile.am'
--- src/system/Makefile.am	2015-12-24 00:41:40 +0000
+++ src/system/Makefile.am	2017-05-04 17:27:22 +0000
@@ -25,6 +25,7 @@
 	subarch-m68k-linux.c \
 	subarch-mips-linux.c \
 	subarch-mipsel-linux.c \
+	subarch-mips64el-linux.c \
 	subarch-powerpc-linux.c \
 	subarch-ppc64-linux.c \
 	subarch-ppc64el-linux.c \

=== modified file 'src/system/subarch-arm-linux.c'
--- src/system/subarch-arm-linux.c	2015-12-24 00:41:40 +0000
+++ src/system/subarch-arm-linux.c	2017-05-04 17:27:22 +0000
@@ -6,6 +6,7 @@
 #include <sys/utsname.h>
 
 #include <debian-installer/system/subarch.h>
+#include <debian-installer/system/efi.h>
 
 struct map {
 	char *entry;
@@ -64,6 +65,7 @@
     { "LaCie 2Big Network v2", "kirkwood" },
     { "LaCie 5Big Network v2", "kirkwood" },
     { "Iomega Iconnect", "kirkwood" },
+    { "NETGEAR ReadyNAS Duo v2", "kirkwood" },
     { "Buffalo/Revogear Kurobox Pro", "orion5x" },
     { "D-Link DNS-323", "orion5x" },
     { "QNAP TS-109/TS-209", "orion5x" },
@@ -71,8 +73,17 @@
     { "HP Media Vault mv2120", "orion5x" },
     { "Buffalo Linkstation LiveV3 (LS-CHL)", "orion5x" },
     { "Buffalo Linkstation LS-CHLv2", "kirkwood" }, /* aka: LS-CH1.0L */
+    { "Buffalo Linkstation LS-QVL", "kirkwood" },
+    { "Buffalo Linkstation LS-VL", "kirkwood" },
+    { "Buffalo Linkstation LS-WSXL", "kirkwood" },
+    { "Buffalo Linkstation LS-WTGL", "orion5x" },
+    { "Buffalo Linkstation LS-WVL", "kirkwood" },
+    { "Buffalo Linkstation LS-WVL/VL", "kirkwood" },
+    { "Buffalo Linkstation LS-WXL", "kirkwood" },
+    { "Buffalo Linkstation LS-WXL/WSXL", "kirkwood" },
     { "Buffalo Linkstation LS-XHL", "kirkwood" },
     { "Buffalo Linkstation Mini", "orion5x" },
+    { "Buffalo Linkstation Mini (LS-WSGL)", "orion5x" },
     { "Buffalo Linkstation Pro/Live", "orion5x" },
     { "Marvell Orion-NAS Reference Design", "orion5x" },
     { "Marvell Orion-2 Development Board", "orion5x" },
@@ -193,6 +204,10 @@
 	struct utsname sysinfo;
 	size_t uname_release_len, i;
 
+	/* If we detect EFI firmware, bail out early here */
+	if (di_system_is_efi())
+		return "efi";
+
 	/* Attempt to determine subarch based on kernel release version */
 	uname(&sysinfo);
 	uname_release_len = strlen(sysinfo.release);

=== added symlink 'src/system/subarch-mips64el-linux.c'
=== target is u'subarch-mips-linux.c'