Bug#235017, Bug#236356, New Debian grubconf-0.5.1-1

[Luis R. Rodriguez]

--jousvV0MzM2p6OtC
Content-Type: multipart/mixed; boundary="rJwd6BRFiFCcLxzm"
Content-Disposition: inline


--rJwd6BRFiFCcLxzm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable


So I've released a new grubconf deb.

This fixes Bug#235017, and I was unable to reproduce Bug#236356.
Grubconf.sf.net had a new grubconf upstream release, 0.5.1 so I've used
that. This source had some noticeable bugs so I've fixed them for our deb r=
elease.

I'm still a debian developer in review so I do not yet have upload
privileges. I believe Robert Millan last uploaded my latest grubconf
release. This needs to be uploaded as well. Please find complete deb
sources/deb here:

http://ruslug.rutgers.edu/~mcgrof/grubconf/

Upstream authors (Joseph Monti and Ryan Scotka):
Please see attached patches, they fix:
  * debian/patches/fix-dir_attempt.diff: Fixes upstream source for when=20
    filename specified is a directory
  * debian/patches/fix-makeinstall.diff: Fixes upstream source for make
    install on debian testing/unstable
  * debian/patches/fix-verbose.diff: Fixes upstream source with verbose mes=
sage
    when non-supported grub command is encountered.

Here is the deb changelog:

grubconf (0.5.1-1) unstable; urgency=3Dlow

  * new grubconf release: 0.5.1
  * debian/control: added scrollkeeper to Build-Depends. Fixes=20
    (closes: #235017)
  * debian/control: added "i386 hurd-i386 freebsd-i386 netbsd-i386"
    to Architecture field. These match the archs for which grub
    is available.
  * Unable to reproduce bug #236356.
  * removed /usr/include/grubconf/* -- unwanted
  * debian/control: Added Grub-Devel List <pkg-grub-devel@lists.alioth.debi=
an.org>
    as Maintainer, added myself as Uploader
  * debian/rules: moved to new cdbs format
  * debian/control: fixed format, removed double spaces and such
  * debian/patches/fix-dir_attempt.diff: Fixes upstream source for when=20
    filename specified is a directory
  * debian/patches/fix-makeinstall.diff: Fixes upstream source for make
    install on debian testing/unstable
  * debian/patches/fix-verbose.diff: Fixes upstream source with verbose mes=
sage
    when non-supported grub command is encountered.
   =20
I will be going on vacation later today for 5 days. If anyone needs
anything I trust pkg-grub-devel team to do the appropriate changes.

Thanks,

	Luis

--=20
GnuPG Key fingerprint =3D 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E

--rJwd6BRFiFCcLxzm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fix-dir_attempt.diff"
Content-Transfer-Encoding: quoted-printable

diff -Naur grubconf-0.5.1/src/main.c grubconf-0.5.1-mcgrof/src/main.c
--- grubconf-0.5.1/src/main.c	2003-04-17 09:33:00.000000000 -0400
+++ grubconf-0.5.1-mcgrof/src/main.c	2004-03-24 02:53:24.000000000 -0500
@@ -22,6 +22,9 @@
  * The main entry point.
  */
=20
+#include <sys/types.h>
+#include <dirent.h>
+
 #include <gnome.h>
 #include <gconf/gconf-client.h>
 #include <fcntl.h>
@@ -132,6 +135,12 @@
 		grubconf_fname =3D cwd;
 	}
=20
+	if (opendir(grubconf_fname) !=3D NULL) {
+		gtk_message (GTK_MESSAGE_ERROR, _(
+			"File passed is a directory, not a file!"));
+		return -1;
+	}
+
 	if (create_fname) {
 		// attempt to create a file
 		int fd =3D open (grubconf_fname, O_WRONLY | O_CREAT);

--rJwd6BRFiFCcLxzm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fix-makeinstall.diff"
Content-Transfer-Encoding: quoted-printable

diff -Naur grubconf-0.5.1/po/Makefile.in.in grubconf-0.5.1-mcgrof/po/Makefi=
le.in.in
--- grubconf-0.5.1/po/Makefile.in.in	2003-01-13 14:42:38.000000000 -0500
+++ grubconf-0.5.1-mcgrof/po/Makefile.in.in	2004-03-24 02:03:26.000000000 -=
0500
@@ -29,7 +29,7 @@
 INSTALL =3D @INSTALL@
 INSTALL_DATA =3D @INSTALL_DATA@
 MKINSTALLDIRS =3D @MKINSTALLDIRS@
-mkinstalldirs =3D $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTA=
LLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs =3D $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTA=
LLDIRS)" ;; *) echo "$(MKINSTALLDIRS)" ;; esac`
=20
 CC =3D @CC@
 GMSGFMT =3D @GMSGFMT@

--rJwd6BRFiFCcLxzm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fix-verbose.diff"
Content-Transfer-Encoding: quoted-printable

diff -Naur grubconf-0.5.1/src/grubconf_global.c grubconf-0.5.1-mcgrof/src/g=
rubconf_global.c
--- grubconf-0.5.1/src/grubconf_global.c	2003-05-02 16:26:33.000000000 -0400
+++ grubconf-0.5.1-mcgrof/src/grubconf_global.c	2004-03-24 04:11:37.0000000=
00 -0500
@@ -591,7 +591,7 @@
=20
 			break;
 		default:
-			gtk_message (GTK_MESSAGE_ERROR, _("Invalid command"));
+			gtk_message (GTK_MESSAGE_ERROR, _("[%s line %i] Invalid grub command en=
countered while parsing grub configuration file. Please revise your current=
 file syntax or submit bug report to grubconf developers if using latest ve=
rsion."), grubconf_fname, line_num);
 			return 0;
 			break;
 		}

--rJwd6BRFiFCcLxzm--

--jousvV0MzM2p6OtC
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAYeULat1JN+IKUl4RAvufAJ92MYQzYARy+en1Jz+pNGYm9zJxfQCfWS8R
jpdgLytYuVhbm28E09qb+f8=
=HkcI
-----END PGP SIGNATURE-----

--jousvV0MzM2p6OtC--