Hello community,
here is the log from the commit of package rpmlint-mini
checked in at Mon Mar 10 18:34:39 CET 2008.
--------
--- rpmlint-mini/rpmlint-mini.changes 2008-02-13 15:59:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/rpmlint-mini/rpmlint-mini.changes 2008-03-10 16:09:48.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 10 16:09:33 CET 2008 - dmueller@suse.de
+
+- update desktop-file-validate to 0.14
+ * for changelog, see desktop-file-utils package
+
+-------------------------------------------------------------------
Old:
----
desktop-file-utils-0.14.tar.bz2
New:
----
desktop-file-utils-0.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint-mini.spec ++++++
--- /var/tmp/diff_new_pack.F27859/_old 2008-03-10 18:34:19.000000000 +0100
+++ /var/tmp/diff_new_pack.F27859/_new 2008-03-10 18:34:19.000000000 +0100
@@ -15,12 +15,12 @@
BuildRequires: glib2-devel pkg-config rpm-python rpmlint
Summary: Rpm correctness checker
Version: 1.0
-Release: 102
+Release: 119
Url: http://rpmlint.zarb.org/
License: GPL v2 or later
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: desktop-file-utils-0.14.tar.bz2
+Source: desktop-file-utils-0.15.tar.bz2
Patch10: static-desktop-file-validate.diff
Source100: rpmlint-deps.txt
Source101: rpmlint.wrapper
@@ -38,7 +38,7 @@
Gwenole Beauchesne
%prep
-%setup -q -n desktop-file-utils-0.14
+%setup -q -n desktop-file-utils-0.15
%patch10
%build
@@ -96,6 +96,9 @@
/opt/testing
%changelog
+* Mon Mar 10 2008 dmueller@suse.de
+- update desktop-file-validate to 0.14
+ * for changelog, see desktop-file-utils package
* Wed Feb 13 2008 dmueller@suse.de
- update to (also) build rpmlint 0.82
* Thu Nov 22 2007 dmueller@suse.de
++++++ desktop-file-utils-0.14.tar.bz2 -> desktop-file-utils-0.15.tar.bz2 ++++++
++++ 2418 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.14/ChangeLog new/desktop-file-utils-0.15/ChangeLog
--- old/desktop-file-utils-0.14/ChangeLog 2007-09-01 16:47:07.000000000 +0200
+++ new/desktop-file-utils-0.15/ChangeLog 2008-02-11 20:11:53.000000000 +0100
@@ -1,3 +1,39 @@
+2008-02-11 Vincent Untz
+
+ * NEWS: version 0.15
+
+2008-02-05 Vincent Untz
+
+ Fix crash with really small lines that are invalid, like just "a".
+ Fox bug #14386.
+
+ * src/validate.c: (validate_line_looks_like_group): only return
+ something in *group if the group argument is not NULL, and if the line
+ is actually a group one
+ (validate_parse_line): ensure we pass NULL initial values to some
+ functions, and don't leak key and value when processing a key-value
+ line before the first group
+
+2008-01-20 Vincent Untz
+
+ * src/update-desktop-database.c: (process_desktop_file): don't get the
+ MimeType key from the first start group (which might not exist), but
+ from the Desktop Entry group
+ Fix GNOME bug #509526.
+ * src/validate.c: (handle_icon_key): mention that Ray's change is
+ temporary
+
+2006-11-07 Ray Strode
+
+ * src/validate.c: Consider icon names with extensions a
+ warning and not an error for now.
+
+2007-09-01 Vincent Untz
+
+ * configure.in: post-release bump to 0.15
+
+==================== 0.14 ====================
+
2007-09-01 Vincent Untz
* NEWS: version 0.14
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.14/configure.in new/desktop-file-utils-0.15/configure.in
--- old/desktop-file-utils-0.14/configure.in 2007-09-01 16:09:27.000000000 +0200
+++ new/desktop-file-utils-0.15/configure.in 2007-09-01 16:50:02.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([desktop-file-utils], [0.14],
+AC_INIT([desktop-file-utils], [0.15],
[https://bugs.freedesktop.org/enter_bug.cgi?product=desktop-file-utils])
AC_CONFIG_SRCDIR(src/validate.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.14/NEWS new/desktop-file-utils-0.15/NEWS
--- old/desktop-file-utils-0.14/NEWS 2007-09-01 16:46:52.000000000 +0200
+++ new/desktop-file-utils-0.15/NEWS 2008-02-11 20:10:22.000000000 +0100
@@ -1,4 +1,13 @@
============
+Version 0.15
+============
+
+ o make the extension check for Icon key a warning instead of an error for now
+ (Ray Strode)
+ o Fix a crash in update-desktop-database when there's no group (Vincent)
+ o Fix a crash in the validator happening for very small lines (Vincent)
+
+============
Version 0.14
============
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.14/src/update-desktop-database.c new/desktop-file-utils-0.15/src/update-desktop-database.c
--- old/desktop-file-utils-0.14/src/update-desktop-database.c 2006-04-19 00:08:10.000000000 +0200
+++ new/desktop-file-utils-0.15/src/update-desktop-database.c 2008-01-20 20:27:21.000000000 +0100
@@ -33,6 +33,8 @@
#include
#include
+#include "keyfileutils.h"
+
#define NAME "update-desktop-database"
#define CACHE_FILENAME "mimeinfo.cache"
#define TEMP_CACHE_FILENAME_PREFIX ".mimeinfo.cache.XXXXXX"
@@ -189,7 +191,7 @@
}
mime_types = g_key_file_get_string_list (keyfile,
- g_key_file_get_start_group (keyfile),
+ GROUP_DESKTOP_ENTRY,
"MimeType", NULL, &load_error);
g_key_file_free (keyfile);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.14/src/validate.c new/desktop-file-utils-0.15/src/validate.c
--- old/desktop-file-utils-0.14/src/validate.c 2007-08-18 10:31:31.000000000 +0200
+++ new/desktop-file-utils-0.15/src/validate.c 2008-02-05 13:06:11.000000000 +0100
@@ -734,10 +734,11 @@
return FALSE;
}
+ /* FIXME: in the future, we should make this fatal again */
if (g_str_has_suffix (value, ".png") ||
g_str_has_suffix (value, ".xpm") ||
g_str_has_suffix (value, ".svg")) {
- print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon "
+ print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon "
"name with an extension, but there should be no extension "
"as described in the Icon Theme Specification if the "
"value is not an absolute path\n",
@@ -1910,7 +1911,8 @@
"The validation will continue, with the trailing spaces "
"ignored.\n", line);
- *group = g_strndup (chomped + 1, strlen (chomped) - 2);
+ if (group && result)
+ *group = g_strndup (chomped + 1, strlen (chomped) - 2);
g_free (chomped);
@@ -1987,6 +1989,7 @@
if (validate_line_is_comment (kf, line))
return;
+ group = NULL;
if (validate_line_looks_like_group (kf, line, &group)) {
if (!kf->current_group &&
(strcmp (group, GROUP_DESKTOP_ENTRY) &&
@@ -2011,6 +2014,8 @@
return;
}
+ key = NULL;
+ value = NULL;
if (validate_line_looks_like_entry (kf, line, &key, &value)) {
if (kf->current_group) {
GSList *keys;
@@ -2024,6 +2029,11 @@
keys = g_slist_prepend (keys, keyvalue);
g_hash_table_replace (kf->groups, g_strdup (kf->current_group), keys);
} else {
+ if (key)
+ g_free (key);
+ if (value)
+ g_free (value);
+
print_fatal (kf, "file contains entry \"%s\" before the first group, "
"but only comments are accepted before the first "
"group\n", line);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
