Hello community, here is the log from the commit of package beagle checked in at Thu Nov 16 00:58:26 CET 2006. -------- --- GNOME/beagle/beagle.changes 2006-11-14 18:56:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/beagle/beagle.changes 2006-11-15 21:36:14.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Nov 15 21:35:47 CET 2006 - joeshaw@suse.de + +- Add a patch to fix a file descriptor leak in the Konqueror + history backend. (bnc #219786) + +------------------------------------------------------------------- +Wed Nov 15 20:07:54 CET 2006 - joeshaw@suse.de + +- Update Hungarian translation. (bnc #220306) + +------------------------------------------------------------------- libbeagle.changes: same change New: ---- beagle-konqhistory-fd-leak.patch hu.po ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.ZDew4B/_old 2006-11-16 00:58:08.000000000 +0100 +++ /var/tmp/diff_new_pack.ZDew4B/_new 2006-11-16 00:58:08.000000000 +0100 @@ -18,16 +18,18 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.12 -Release: 10 +Release: 13 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz Source1: autostart-beagled.desktop Source2: autostart-beagle-search.desktop Source3: system-search.png +Source4: hu.po Patch1: %{name}-firefox-makefile.patch Patch3: beagle-log-level-warn.patch Patch4: beagle-terminal-lockdown.patch +Patch5: beagle-konqhistory-fd-leak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Prereq: /usr/sbin/groupadd /usr/sbin/useradd Requires: mono-core >= 1.1.13.5 @@ -300,8 +302,10 @@ %patch1 %patch3 %patch4 +%patch5 %build +cp %SOURCE4 po/ intltoolize --copy --force --automake libtoolize -f aclocal -I . @@ -450,6 +454,11 @@ %{prefix}/%_lib/beagle/Backends/ThunderbirdBackends.dll* %changelog -n beagle +* Wed Nov 15 2006 - joeshaw@suse.de +- Add a patch to fix a file descriptor leak in the Konqueror + history backend. (bnc #219786) +* Wed Nov 15 2006 - joeshaw@suse.de +- Update Hungarian translation. (bnc #220306) * Tue Nov 14 2006 - joeshaw@suse.de - Move the non-libbeagle pkgconfig files back into the beagle package, where they belong. This fixes a bug in which those ++++++ libbeagle.spec ++++++ --- /var/tmp/diff_new_pack.ZDew4B/_old 2006-11-16 00:58:08.000000000 +0100 +++ /var/tmp/diff_new_pack.ZDew4B/_new 2006-11-16 00:58:08.000000000 +0100 @@ -23,7 +23,7 @@ Group: Development/Libraries/GNOME Autoreqprov: on Version: 0.2.12 -Release: 7 +Release: 10 Summary: Beagle C interface Url: http://www.gnome.org/projects/beagle/ Source: beagle-%{version}.tar.gz @@ -103,6 +103,11 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n libbeagle +* Wed Nov 15 2006 - joeshaw@suse.de +- Add a patch to fix a file descriptor leak in the Konqueror + history backend. (bnc #219786) +* Wed Nov 15 2006 - joeshaw@suse.de +- Update Hungarian translation. (bnc #220306) * Tue Nov 14 2006 - joeshaw@suse.de - Move the non-libbeagle pkgconfig files back into the beagle package, where they belong. This fixes a bug in which those ++++++ beagle-konqhistory-fd-leak.patch ++++++ ? beagle-konqhistory-fd-leak.patch ? beagled/outfile.beagled_0.omap ? beagled/outfile.beagled_1.omap ? beagled/outfile.beagled_2.omap ? beagled/outfile.beagled_3.omap ? libbeagle/examples/beagle-info ? search/beagle-search.desktop.in ? tools/beagle-settings.desktop.in Index: beagled/KonqHistoryQueryable/KonqQueryable.cs =================================================================== RCS file: /cvs/gnome/beagle/beagled/KonqHistoryQueryable/KonqQueryable.cs,v retrieving revision 1.8 diff -u -p -u -r1.8 KonqQueryable.cs --- beagled/KonqHistoryQueryable/KonqQueryable.cs 4 Jun 2006 04:22:13 -0000 1.8 +++ beagled/KonqHistoryQueryable/KonqQueryable.cs 15 Nov 2006 20:29:50 -0000 @@ -175,46 +175,47 @@ namespace Beagle.Daemon.KonqQueryable { return null; } - StreamReader reader = new StreamReader (stream, latin_encoding); - string url = null; - string creation_date = null; - string mimetype = null; - string charset = null; - bool is_ok = KonqHistoryUtil.ShouldIndex (reader, - out url, - out creation_date, - out mimetype, - out charset); + using (StreamReader reader = new StreamReader (stream, latin_encoding)) { + string url = null; + string creation_date = null; + string mimetype = null; + string charset = null; + bool is_ok = KonqHistoryUtil.ShouldIndex (reader, + out url, + out creation_date, + out mimetype, + out charset); - if (!is_ok || url == String.Empty) { - //Logger.Log.Debug ("KonqQ: Skipping non-html file " + path + " of type=" + mimetype); - // finding out if a cache file should be indexed is expensive - // so, soon after we run the test, write lastwritetime attribute - FileAttributesStore.AttachLastWriteTime (path, DateTime.UtcNow); - return null; // we wont index bad files and non-html files - } + if (!is_ok || url == String.Empty) { + //Logger.Log.Debug ("KonqQ: Skipping non-html file " + path + " of type=" + mimetype); + // finding out if a cache file should be indexed is expensive + // so, soon after we run the test, write lastwritetime attribute + FileAttributesStore.AttachLastWriteTime (path, DateTime.UtcNow); + return null; // we wont index bad files and non-html files + } - Logger.Log.Debug ("KonqQ: Indexing " + path + " with url=" + url); - Uri uri = new Uri (url, true); - if (uri.Scheme == Uri.UriSchemeHttps) { - Logger.Log.Error ("Indexing secure https:// URIs is not secure!"); - return null; - } + Logger.Log.Debug ("KonqQ: Indexing " + path + " with url=" + url); + Uri uri = new Uri (url, true); + if (uri.Scheme == Uri.UriSchemeHttps) { + Logger.Log.Error ("Indexing secure https:// URIs is not secure!"); + return null; + } - Indexable indexable = new Indexable (uri); - indexable.HitType = "WebHistory"; - indexable.MimeType = KonqHistoryUtil.KonqCacheMimeType; - // store www.beaglewiki.org as www beagle org, till inpath: query is implemented - indexable.AddProperty (Property.NewUnstored ("fixme:urltoken", StringFu.UrlFuzzyDivide (url))); - // hint for the filter about the charset - indexable.AddProperty (Property.NewUnsearched (StringFu.UnindexedNamespace + "charset", charset)); + Indexable indexable = new Indexable (uri); + indexable.HitType = "WebHistory"; + indexable.MimeType = KonqHistoryUtil.KonqCacheMimeType; + // store www.beaglewiki.org as www beagle org, till inpath: query is implemented + indexable.AddProperty (Property.NewUnstored ("fixme:urltoken", StringFu.UrlFuzzyDivide (url))); + // hint for the filter about the charset + indexable.AddProperty (Property.NewUnsearched (StringFu.UnindexedNamespace + "charset", charset)); - DateTime date = new DateTime (1970, 1, 1); - date = date.AddSeconds (Int64.Parse (creation_date)); - indexable.Timestamp = date; + DateTime date = new DateTime (1970, 1, 1); + date = date.AddSeconds (Int64.Parse (creation_date)); + indexable.Timestamp = date; - indexable.ContentUri = UriFu.PathToFileUri (path); - return indexable; + indexable.ContentUri = UriFu.PathToFileUri (path); + return indexable; + } } // FIXME: Implement removefile - removing files from history doesnt really make sense ? Do they ? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org