Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2016-11-03 11:12:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2016-10-26 13:27:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-11-03 11:12:14.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 28 04:08:19 UTC 2016 - mch...@suse.com + +- Fix new line character in distributor (bsc#1007212) + * modified grub2-default-distributor.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.00z898/_old 2016-11-03 11:12:18.000000000 +0100 +++ /var/tmp/diff_new_pack.00z898/_new 2016-11-03 11:12:18.000000000 +0100 @@ -14,10 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - # needssslcertforbuild + Name: grub2 %ifarch x86_64 ppc64 BuildRequires: gcc-32bit ++++++ grub2-default-distributor.patch ++++++ --- /var/tmp/diff_new_pack.00z898/_old 2016-11-03 11:12:18.000000000 +0100 +++ /var/tmp/diff_new_pack.00z898/_new 2016-11-03 11:12:18.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- grub-2.02~beta3.orig/grub-core/osdep/unix/config.c +++ grub-2.02~beta3/grub-core/osdep/unix/config.c -@@ -61,6 +61,140 @@ grub_util_get_localedir (void) +@@ -61,6 +61,143 @@ grub_util_get_localedir (void) return LOCALEDIR; } @@ -94,6 +94,9 @@ + + while (fgets (buf, sizeof (buf), fp)) + { ++ if (buf[grub_strlen(buf) - 1] == '\n') ++ buf[grub_strlen(buf) - 1] = '\0'; ++ + if (!os_pretty_name + && (os_pretty_name = os_release_get_val (buf, "PRETTY_NAME"))) + continue; @@ -143,7 +146,7 @@ void grub_util_load_config (struct grub_util_config *cfg) { -@@ -125,7 +259,17 @@ grub_util_load_config (struct grub_util_ +@@ -125,7 +262,17 @@ grub_util_load_config (struct grub_util_ waitpid (pid, NULL, 0); } if (f) @@ -162,7 +165,7 @@ f = grub_util_fopen (cfgfile, "r"); if (f) -@@ -136,4 +280,13 @@ grub_util_load_config (struct grub_util_ +@@ -136,4 +283,13 @@ grub_util_load_config (struct grub_util_ else grub_util_warn (_("cannot open configuration file `%s': %s"), cfgfile, strerror (errno));
