Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grubby for openSUSE:Factory checked in at 2021-04-29 22:46:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grubby (Old) and /work/SRC/openSUSE:Factory/.grubby.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grubby" Thu Apr 29 22:46:46 2021 rev:9 rq:889311 version:20200210.99d10a3 Changes: -------- --- /work/SRC/openSUSE:Factory/grubby/grubby.changes 2019-09-13 15:03:34.469278979 +0200 +++ /work/SRC/openSUSE:Factory/.grubby.new.1947/grubby.changes 2021-04-29 22:53:25.929883138 +0200 @@ -1,0 +2,12 @@ +Thu Apr 29 09:29:03 UTC 2021 - John Paul Adrian Glaubitz <[email protected]> + +- Update to 20200210.99d10a3 + * Fix maybe-uninitialized warning + * Fix stringop-overflow warning +- Fix incorrect package names in Requires + * uboot-tools => u-boot-tools + * s390-utils => s390-tools +- Disable tests on aarch64 again +- Run spec-cleaner + +------------------------------------------------------------------- Old: ---- grubby-20190801.fc69ba6.tar.xz New: ---- grubby-20200210.99d10a3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grubby.spec ++++++ --- /var/tmp/diff_new_pack.2BavD3/_old 2021-04-29 22:53:26.429880833 +0200 +++ /var/tmp/diff_new_pack.2BavD3/_new 2021-04-29 22:53:26.433880816 +0200 @@ -1,7 +1,7 @@ # # spec file for package grubby # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: grubby -Version: 20190801.fc69ba6 +Version: 20200210.99d10a3 Release: 0 Summary: Command line tool for updating bootloader configs License: GPL-2.0-or-later Group: System/Base -Url: https://github.com/rhboot/grubby +URL: https://github.com/rhboot/grubby Source0: %{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkg-config -BuildRequires: pkgconfig(blkid) -BuildRequires: pkgconfig(popt) # for make test / getopt: BuildRequires: grub2 +BuildRequires: pkgconfig BuildRequires: util-linux +BuildRequires: pkgconfig(blkid) +BuildRequires: pkgconfig(popt) %ifarch s390 s390x -Requires: s390utils-base +Requires: s390-tools %endif %ifarch %{arm} -Requires: uboot-tools +Requires: u-boot-tools %endif %description @@ -59,26 +58,27 @@ CFLAGS="%{optflags} -std=gnu99 $(pkg-config --cflags blkid popt)" LDFLAGS= grubby_LIBS="$(pkg-config --libs blkid popt)" -make %{?_smp_mflags} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" grubby_LIBS="${grubby_LIBS}" VERSION='%{version}' +%make_build CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" grubby_LIBS="${grubby_LIBS}" VERSION='%{version}' %check +%ifnarch aarch64 sed -i~ ' s@/vmlinuz-foo@/boot/vmlinuz-foo@ ' test/results/add/g2-1.16 diff -u "$_"~ "$_" && exit 1 -make test VERBOSE_TEST="-b grub2" +%make_build test VERBOSE_TEST="-b grub2" +%endif %install -make install DESTDIR="%{buildroot}" mandir="%{_mandir}" +make install DESTDIR=%{buildroot} mandir="%{_mandir}" # Remove installkernel as it is provided with mkinitrd package rm %{buildroot}/sbin/installkernel rm %{buildroot}/%{_mandir}/man8/installkernel.8 %files -%defattr(-,root,root,-) -%doc COPYING +%license COPYING /sbin/new-kernel-pkg /sbin/grubby -%{_mandir}/man8/*.8* +%{_mandir}/man8/*.8%{?ext_man} %changelog ++++++ grubby-20190801.fc69ba6.tar.xz -> grubby-20200210.99d10a3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grubby-20190801.fc69ba6/grubby.c new/grubby-20200210.99d10a3/grubby.c --- old/grubby-20190801.fc69ba6/grubby.c 2019-08-01 19:40:43.000000000 +0200 +++ new/grubby-20200210.99d10a3/grubby.c 2020-02-10 20:09:31.000000000 +0100 @@ -3206,7 +3206,7 @@ int suseGrubConfGetBoot(const char *path, char **bootPtr) { - char *grubDevice; + char *grubDevice = NULL; if (suseGrubConfGetInstallDevice(path, &grubDevice)) dbgPrintf("error looking for grub installation device\n"); @@ -5217,24 +5217,27 @@ int i = 0; for (int j = 1; j < argc; j++) i += strlen(argv[j]) + 1; - saved_command_line = malloc(i); - if (!saved_command_line) { - fprintf(stderr, "grubby: %m\n"); - exit(1); - } - saved_command_line[0] = '\0'; - int cmdline_len = 0, arg_len; - for (int j = 1; j < argc; j++) { - arg_len = strlen(argv[j]); - memcpy(saved_command_line + cmdline_len, argv[j], arg_len); - cmdline_len += arg_len; - if (j != argc - 1) { - memcpy(saved_command_line + cmdline_len, " ", 1); - cmdline_len++; - } + if (i > 0) { + saved_command_line = malloc(i); + if (!saved_command_line) { + fprintf(stderr, "grubby: %m\n"); + exit(1); + } + + saved_command_line[0] = '\0'; + int cmdline_len = 0, arg_len; + for (int j = 1; j < argc; j++) { + arg_len = strlen(argv[j]); + memcpy(saved_command_line + cmdline_len, argv[j], arg_len); + cmdline_len += arg_len; + if (j != argc - 1) { + memcpy(saved_command_line + cmdline_len, " ", 1); + cmdline_len++; + } + } + saved_command_line[cmdline_len] = '\0'; } - saved_command_line[cmdline_len] = '\0'; optCon = poptGetContext("grubby", argc, argv, options, 0); poptReadDefaultConfig(optCon, 1);
