February 2009 - openSUSE Commits - openSUSE Mailing Lists

commit glib2 for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at Fri Feb 6 17:03:21 CET 2009. -------- --- GNOME/glib2/glib2.changes 2008-12-10 14:01:39.000000000 +0100 +++ glib2/glib2.changes 2009-02-03 01:34:07.000000000 +0100 @@ -1,0 +2,95 @@ +Tue Feb 3 11:17:27 EST 2009 - mboman(a)suse.de + +- Update to version 2.19.6: + + New format macro to print goffset data: G_OFFSET_FORMAT + + GIO: + * Add a GFilter{Input,Output}Stream::close-base-stream + properties which determine whether the base stream will be + closed when the filter stream is finalized. + * g_data_input_stream_read_line and ..._read_until have + asynchronous variants now. + + Bugs fixed: + * bgo#568294 A wrong reference in the description of + g_bookmark_file_... + * bgo#563141 RFE: define G_OFFSET_FORMAT + * bgo#569105 g_time_val_to_iso8601() assumes time_t==long + * bgo#568394 dropping the last reference to a stream filter + closes... + * bgo#568741 g_buffered_input_stream_fill_async doesn't work + * bgo#568723 g_buffered_input_stream_fill_async doesn't take + count == -1 + * bgo#568575 _async functions for GDataInputStream + + Translation updates + +------------------------------------------------------------------- +Sat Jan 31 23:39:29 CET 2009 - vuntz(a)novell.com + +- Split glib2-fate300461-desktop-gettext.patch in two patches: + + glib2-bgo569829-gettext-gkeyfile.patch: this is the part that + is being discussed upstream. + + glib2-fate300461-gettext-gkeyfile-suse.patch: this is the + openSUSE specific part. + + this should be easier to maintain in the long term. +- With this split, we also fix a bug where translations in the + desktop files were always ignored, and gettext was always used. + This was not the intended behavior, and made it impossible to + customize the name/comment of a launcher, eg. +- Drop glib2-libtool.diff: upstream configure.in already contains + the change in another place. +- Drop glib-2.17.3-implicitdecl.patch: seems to compile fine + without this now. + +------------------------------------------------------------------- +Sat Jan 31 08:45:48 EST 2009 - mboman(a)suse.de + +- Update to version 2.19.5: + + Update included PCRE to 7.8 + + g_base64_decode_inplace: New function to do base64 decoding in place + + Bugs fixed: bgo#567138, bgo#566569, bgo#566573, bgo#564728, bgo#567838, + bgo#567977, bgo#512779, bgo#566770, bgo#565484 + + Translation updates + +------------------------------------------------------------------- +Thu Jan 22 22:27:44 CET 2009 - vuntz(a)novell.com + +- Do not BuildRequires desktop-file-utils. +- Fix rpmlint warning about usage of packageand. +- Do not put executable bits for files in /etc/profile.d + +------------------------------------------------------------------- +Tue Jan 6 07:57:07 EST 2009 - mboman(a)suse.de + +- Update to version 2.19.4: + + Use O_NOATIME when sniffing mimetypes + + Add a convenience method to check if a GSimpleAsyncResult + is valid + + bgo#560676 function access for g_threads_supported + + bgo#565905 There is no g_context_group_set_translation_domain + + bgo#564210 SUN Studio 12 has supported visibility attribute + + bgo#565136 GObject's "notify" signal parameters are wrong in gtk-doc + + bgo#565831 error in interface creation sample + + bgo#566348 g_file_open_tmp uses the wrong g_mkstemp on win32 + + bgo#566064 Add NOATIME flag to query_info_flags + + bgo#566170 g_async_result_verify_source_object + + Translation updates + +------------------------------------------------------------------- +Sat Dec 20 09:57:41 EST 2008 - mboman(a)suse.de + +- Update to version 2.19.3: + + bgo#508021 Add support for the CRIS and CRISv32 architectures + + bgo#526320 should not list mounts that the user doesn't have permission + to use + + bgo#558458 Cannot build gio tests on Solaris using SUN cc + + bgo#555465 GUnix{Input,Output}Stream lacks fd/close_fd_at_close property + + bgo#558298 Hide ecryptfs mounts + + bgo#515777 incorrect date&time on copy + + bgo#562452 Ensure we return G_IO_ERROR_CANCELLED if cancelling + g_simple_async_result_run_in_thread + + bgo#473150 g_type_module_use inconsistently increases the use + counter in case of error + + bgo#563150 G_GU?INT*_MODIFIER/FORMAT docs + + bgo#563156 Document printing and scanning gunichar values + + Translation updates + +------------------------------------------------------------------- @@ -7,0 +103,32 @@ +Tue Dec 9 06:30:50 EST 2008 - mboman(a)suse.de +- Update to version 2.19.2: + + GIO: + - GIcon serialization support + - new file attribute for preview images + - new function to get the full commandline + - New functions to 'shadow' mounts + + Bugs fixed: bgo#556186, bgo#557087, bgo#556921, bgo#557210, bgo#558381, + bgo#558185, bgo#558513, bgo#558672, bgo#555740, bgo#557182, bgo#528320, + bgo#556910, bgo#557592, bgo#556415, bgo#555935, bgo#552776, bgo#559448, + bgo#561212, bgo#560569, bgo#560568, bgo#559413, bgo#562378, bgo#559110, + bgo#557603, bgo#562544, bgo#547264, bgo#562638, bgo#562639, bgo#562549, + bgo#559452, bgo#559462, bgo#559517, bgo#562538, bgo#561352, bgo#561375, + bgo#561807, bgo#562393, bgo#541715, bgo#547481, bgo#548163, bgo#559633, + bgo#555486, bgo#505361, bgo#509446, bgo#553820, bgo#553724, bgo#553857, + bgo#553447, bgo#554092, bgo#528670, bgo#555224, bgo#555309, bgo#554790, + bgo#555314, bgo#555313, bgo#552861, bgo#554557, bgo#552107, bgo#551355, + bgo#555311, bgo#556101, bgo#556186, bgo#526456, bgo#553426, bgo#545350, + bgo#545351, bgo#552168, bgo#554970, bgo#554745, bgo#555121, bgo#555711, + bgo#555331, bgo#556335, bgo#556334, bgo#556422 + + Rewrite GHashTable to use open addressing with quadratic probing + + Make g_poll available as public api + + New macros g_assert_error and g_assert_no_error to assert + that a GError is set or unset + + New method to make a GPollFD for a cancellable + + When launching applications, always pass fuse file:// uris when possible, + and let gio convert such uris back to gio uris. + + Translation updates +- Disable 'make check'. See bgo#554969 +- Remove glib2-bnc402256-filename-leak.diff. Fixed upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- glib-2.17.3-implicitdecl.patch glib-2.18.2.tar.bz2 glib2-bnc402256-filename-leak.diff glib2-fate300461-desktop-gettext.patch glib2-libtool.diff New: ---- glib-2.19.6.tar.bz2 glib2-bgo569829-gettext-gkeyfile.patch glib2-fate300461-gettext-gkeyfile-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.z26721/_old 2009-02-06 16:59:46.000000000 +0100 +++ /var/tmp/diff_new_pack.z26721/_new 2009-02-06 16:59:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package glib2 (Version 2.18.2) +# spec file for package glib2 (Version 2.19.6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,8 +32,8 @@ Obsoletes: glib2-64bit %endif # -Version: 2.18.2 -Release: 5 +Version: 2.19.6 +Release: 1 Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar… @@ -49,18 +49,14 @@ Patch0: glib2-mkinstalldirs.patch # PATCH-FIX-OPENSUSE glib2-aclocal.patch Patch1: glib2-aclocal.patch -# PATCH-FIX-UPSTREAM glib2-libtool.diff schwab(a)suse.de -- apparently configure.in is invoking libtool in a bad way -Patch6: glib2-libtool.diff # PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz(a)novell.com -- Use X-KDE-SubstituteUID Patch8: glib2-bnc379332-desktop-su.patch # PATCH-FIX-UPSTREAM glib2-base64.patch pchenthill(a)novell.com bnc382708 Patch9: glib2-base64.patch -# PATCH-FIX-OPENSUSE glib-2.17.3-implicitdecl.patch crrodriguez(a)suse.de -Patch10: glib-2.17.3-implicitdecl.patch -# PATCH-FEATURE-OPENSUSE glib2-fate300461-desktop-gettext.patch fate300461 vuntz(a)novell.com -- Look for translation of desktop entry strings via gettext -Patch11: glib2-fate300461-desktop-gettext.patch -# PATCH-FIX-UPSTREAM glib2-bnc402256-filename-leak.diff bnc402256 federico(a)novell.com - Fix leak in g_local_file_get_parse_name() -Patch12: glib2-bnc402256-filename-leak.diff +# PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz(a)novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream +Patch10: glib2-bgo569829-gettext-gkeyfile.patch +# PATCH-FEATURE-OPENSUSE glib2-fate300461-gettext-gkeyfile-suse.patch fate300461 vuntz(a)novell.com -- Look for translation of desktop entry strings via gettext, part that deals with the openSUSE specific infrastructure (with desktop_translations) +Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} # For temporary %%pre script only. @@ -99,7 +95,7 @@ Group: Development/Libraries/C and C++ Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) -Supplements: packageand(branding-upstream:%{name}) +Supplements: packageand(%{name}:branding-upstream) #BRAND: The /etc/gnome_defaults.conf allows to define arbitrary #BRAND: applications as preferred defaults. # NOTE: gnome_defaults is not an upstream feature, but a SuSE @@ -415,12 +411,10 @@ %setup -q -n %{_name}-%{version} %patch0 %patch1 -%patch6 %patch8 %patch9 -%patch10 -%patch11 -%patch12 -p1 +%patch10 -p1 +%patch11 -p1 cp -a %{S:1} %{S:2} %{S:3} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then @@ -440,13 +434,14 @@ %{__make} %{?jobs:-j%jobs} %check -%{__make} %{?jobs:-j%jobs} check +# make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969 +# %{__make} %{?jobs:-j%jobs} check %install make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/profile.d -install -D -m0755 glib2.sh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh -install -D -m0755 glib2.csh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh +install -D -m0644 glib2.sh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh +install -D -m0644 glib2.csh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh install -D -m0755 SuSEconfig.glib2 $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.glib2 install -D -m0644 gnome_defaults.conf $RPM_BUILD_ROOT%{_sysconfdir}/gnome_defaults.conf mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0 $RPM_BUILD_ROOT%{_datadir}/applications @@ -559,9 +554,116 @@ %dir %{_datadir}/gtk-doc/html %changelog +* Tue Feb 03 2009 mboman(a)suse.de +- Update to version 2.19.6: + + New format macro to print goffset data: G_OFFSET_FORMAT + + GIO: + * Add a GFilter{Input,Output}Stream::close-base-stream + properties which determine whether the base stream will be + closed when the filter stream is finalized. + * g_data_input_stream_read_line and ..._read_until have + asynchronous variants now. + + Bugs fixed: + * bgo#568294 A wrong reference in the description of + g_bookmark_file_... + * bgo#563141 RFE: define G_OFFSET_FORMAT + * bgo#569105 g_time_val_to_iso8601() assumes time_t==long + * bgo#568394 dropping the last reference to a stream filter + closes... + * bgo#568741 g_buffered_input_stream_fill_async doesn't work + * bgo#568723 g_buffered_input_stream_fill_async doesn't take + count == -1 + * bgo#568575 _async functions for GDataInputStream + + Translation updates +* Sat Jan 31 2009 vuntz(a)novell.com +- Split glib2-fate300461-desktop-gettext.patch in two patches: + + glib2-bgo569829-gettext-gkeyfile.patch: this is the part that + is being discussed upstream. + + glib2-fate300461-gettext-gkeyfile-suse.patch: this is the + openSUSE specific part. + + this should be easier to maintain in the long term. +- With this split, we also fix a bug where translations in the + desktop files were always ignored, and gettext was always used. + This was not the intended behavior, and made it impossible to + customize the name/comment of a launcher, eg. +- Drop glib2-libtool.diff: upstream configure.in already contains + the change in another place. +- Drop glib-2.17.3-implicitdecl.patch: seems to compile fine + without this now. +* Sat Jan 31 2009 mboman(a)suse.de +- Update to version 2.19.5: + + Update included PCRE to 7.8 + + g_base64_decode_inplace: New function to do base64 decoding in place + + Bugs fixed: bgo#567138, bgo#566569, bgo#566573, bgo#564728, bgo#567838, + bgo#567977, bgo#512779, bgo#566770, bgo#565484 + + Translation updates +* Thu Jan 22 2009 vuntz(a)novell.com +- Do not BuildRequires desktop-file-utils. +- Fix rpmlint warning about usage of packageand. +- Do not put executable bits for files in /etc/profile.d +* Tue Jan 06 2009 mboman(a)suse.de +- Update to version 2.19.4: + + Use O_NOATIME when sniffing mimetypes + + Add a convenience method to check if a GSimpleAsyncResult + is valid + + bgo#560676 function access for g_threads_supported + + bgo#565905 There is no g_context_group_set_translation_domain + + bgo#564210 SUN Studio 12 has supported visibility attribute + + bgo#565136 GObject's "notify" signal parameters are wrong in gtk-doc + + bgo#565831 error in interface creation sample + + bgo#566348 g_file_open_tmp uses the wrong g_mkstemp on win32 + + bgo#566064 Add NOATIME flag to query_info_flags + + bgo#566170 g_async_result_verify_source_object + + Translation updates +* Sat Dec 20 2008 mboman(a)suse.de +- Update to version 2.19.3: + + bgo#508021 Add support for the CRIS and CRISv32 architectures + + bgo#526320 should not list mounts that the user doesn't have permission + to use + + bgo#558458 Cannot build gio tests on Solaris using SUN cc + + bgo#555465 GUnix{Input,Output}Stream lacks fd/close_fd_at_close property + + bgo#558298 Hide ecryptfs mounts + + bgo#515777 incorrect date&time on copy + + bgo#562452 Ensure we return G_IO_ERROR_CANCELLED if cancelling + g_simple_async_result_run_in_thread + + bgo#473150 g_type_module_use inconsistently increases the use + counter in case of error + + bgo#563150 G_GU?INT*_MODIFIER/FORMAT docs + + bgo#563156 Document printing and scanning gunichar values + + Translation updates * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) +* Tue Dec 09 2008 mboman(a)suse.de +- Update to version 2.19.2: + + GIO: + - GIcon serialization support + - new file attribute for preview images + - new function to get the full commandline + - New functions to 'shadow' mounts + + Bugs fixed: bgo#556186, bgo#557087, bgo#556921, bgo#557210, bgo#558381, + bgo#558185, bgo#558513, bgo#558672, bgo#555740, bgo#557182, bgo#528320, + bgo#556910, bgo#557592, bgo#556415, bgo#555935, bgo#552776, bgo#559448, + bgo#561212, bgo#560569, bgo#560568, bgo#559413, bgo#562378, bgo#559110, + bgo#557603, bgo#562544, bgo#547264, bgo#562638, bgo#562639, bgo#562549, + bgo#559452, bgo#559462, bgo#559517, bgo#562538, bgo#561352, bgo#561375, + bgo#561807, bgo#562393, bgo#541715, bgo#547481, bgo#548163, bgo#559633, + bgo#555486, bgo#505361, bgo#509446, bgo#553820, bgo#553724, bgo#553857, + bgo#553447, bgo#554092, bgo#528670, bgo#555224, bgo#555309, bgo#554790, + bgo#555314, bgo#555313, bgo#552861, bgo#554557, bgo#552107, bgo#551355, + bgo#555311, bgo#556101, bgo#556186, bgo#526456, bgo#553426, bgo#545350, + bgo#545351, bgo#552168, bgo#554970, bgo#554745, bgo#555121, bgo#555711, + bgo#555331, bgo#556335, bgo#556334, bgo#556422 + + Rewrite GHashTable to use open addressing with quadratic probing + + Make g_poll available as public api + + New macros g_assert_error and g_assert_no_error to assert + that a GError is set or unset + + New method to make a GPollFD for a cancellable + + When launching applications, always pass fuse file:// uris when possible, + and let gio convert such uris back to gio uris. + + Translation updates +- Disable 'make check'. See bgo#554969 +- Remove glib2-bnc402256-filename-leak.diff. Fixed upstream * Mon Dec 08 2008 vuntz(a)novell.com - Update glib2-fate300461-desktop-gettext.patch: correctly use bind_textdomain_codeset(), and also only do it once for the @@ -617,7 +719,7 @@ - Add require on libselinux for devel package. * Fri Aug 22 2008 prusnak(a)suse.cz - enabled SELinux support [Fate#303662] -* Thu Aug 21 2008 maw(a)suse.de +* Wed Aug 20 2008 maw(a)suse.de - Version the devel subpackage's requirements to avoid update breakage. * Wed Aug 06 2008 maw(a)suse.de @@ -660,14 +762,14 @@ bgo#543220, bgo#530759, bgo#535223, and bgo#543504 + Updated translations - Tag glib-2.17.3-implicitdecl.patch. -* Tue Jul 29 2008 vuntz(a)novell.com +* Mon Jul 28 2008 vuntz(a)novell.com - Add glib2-fate300461-desktop-gettext.patch to support translation of desktop entries via gettext, using the X-SUSE-Gettext-Domain key. The patch is based on a similar patch from Ubuntu. This is part of fate#300461 * Fri Jul 25 2008 sbrabec(a)suse.cz - nautilus-folder-handler added to gnome-defaults.conf (bnc#410728) -* Sun Jul 20 2008 crrodriguez(a)suse.de +* Sat Jul 19 2008 crrodriguez(a)suse.de - fix build - incidentally, this also fixes a problem on PPC caused by an endianness bug; the GTK2 build failed causing a chain of errors @@ -744,10 +846,10 @@ glib2-fix-bookmark-leak.diff, glib2-bnc379739-handle-blank-tryexec.patch, and glib2-bnc387387-gio-hide-inaccessible-mounts.patch. -* Tue May 20 2008 hpj(a)suse.de +* Mon May 19 2008 hpj(a)suse.de - Add glib2-bnc387387-gio-hide-inaccessible-mounts.patch (bnc#387387). -* Wed May 14 2008 hpj(a)suse.de +* Tue May 13 2008 hpj(a)suse.de - Add glib2-bnc379739-handle-blank-tryexec.patch (bnc#379739). * Mon May 12 2008 maw(a)suse.de - Add glib2-base64.patch (bnc#382708). @@ -764,7 +866,7 @@ Fix bnc#379332. * Tue Apr 29 2008 cthiel(a)suse.de - obsolete glib2-<arch> via baselibs.conf -* Tue Apr 22 2008 hpj(a)suse.de +* Mon Apr 21 2008 hpj(a)suse.de - Dropped previously disabled glib2-cast.patch. * Mon Apr 14 2008 maw(a)suse.de - Add glib2-fix-bookmark-leak.diff. @@ -827,7 +929,7 @@ - moved recommendation of gvfs to gtk2 * Tue Apr 01 2008 sbrabec(a)suse.cz - SuSEconfig script moved from gnome-vfs2 (bnc#372783). -* Tue Apr 01 2008 federico(a)novell.com +* Mon Mar 31 2008 federico(a)novell.com - Added glib2-bnc373149-bgo518160-gbookmark-optimizations.diff and glib2-bnc373149-bgo523877-gbookmark-optimizations.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=373149 - backport @@ -839,7 +941,7 @@ * Fix a crash in g_themed_icon_new * Update the included PCRE to 7.6 - Tag patches -* Fri Feb 29 2008 jpr(a)suse.de +* Thu Feb 28 2008 jpr(a)suse.de - Update to version 2.15.6: + GIO: * New file attributes: trash::item-count, filesystem::use-preview @@ -858,7 +960,7 @@ * Fix race conditions in g_spawn implementation on win32 * g_uri_get_scheme has been renamed go g_uri_parse_scheme + Updated translations -* Tue Feb 19 2008 maw(a)suse.de +* Mon Feb 18 2008 maw(a)suse.de - Remove glib-cast.patch at least temporarily. * Mon Feb 18 2008 maw(a)suse.de - Update to version 2.15.5: @@ -1159,7 +1261,7 @@ - 351853 GKeyFile creates non-UTF-8 error messages - Translation updates (fr,hu,ja,ku,lt,lv,ml,or, pt,ru,sv,vi,zh_CN) -* Wed Aug 30 2006 jhargadon(a)suse.de +* Tue Aug 29 2006 jhargadon(a)suse.de - update to version 2.12.2 - Normalization is following Unicode TR #29 - 348491 g_utf8_strup() and g_utf8_strdown() returns @@ -1197,11 +1299,11 @@ * Thu Mar 30 2006 sbrabec(a)suse.cz - Renamed profile to be executed after lang.*, otherwise G_FILENAME_ENCODING cannot be set. -* Fri Jan 27 2006 mls(a)suse.de +* Thu Jan 26 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Jan 18 2006 gekker(a)suse.de +* Tue Jan 17 2006 gekker(a)suse.de - Fix gstaticmutex define (#141215 patch byjblunck) -* Tue Jan 17 2006 zsu(a)suse.de +* Mon Jan 16 2006 zsu(a)suse.de - Fixed implicit cast issue introduced by bugfix #316221 http://bugzilla.gnome.org/show_bug.cgi?id=327022 * Fri Jan 13 2006 sbrabec(a)suse.cz @@ -1259,7 +1361,7 @@ - Update to version 2.6.0 * Wed Dec 22 2004 ro(a)suse.de - remove no translation (obsolete with nb present) -* Wed Dec 15 2004 gekker(a)suse.de +* Tue Dec 14 2004 gekker(a)suse.de - Update version to 2.5.7. - Remove the no-no patch, as it is upstreamed. * Tue Nov 16 2004 clahey(a)suse.de ++++++ glib-2.18.2.tar.bz2 -> glib-2.19.6.tar.bz2 ++++++ ++++ 337708 lines of diff (skipped) ++++++ glib2-bgo569829-gettext-gkeyfile.patch ++++++ Index: glib-2.19.5/glib/gkeyfile.c =================================================================== --- glib-2.19.5.orig/glib/gkeyfile.c +++ glib-2.19.5/glib/gkeyfile.c @@ -83,6 +83,7 @@ struct _GKeyFile GKeyFileFlags flags; gchar **locales; + gchar *gettext_domain; }; typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair; @@ -209,6 +210,7 @@ g_key_file_init (GKeyFile *key_file) key_file->list_separator = ';'; key_file->flags = 0; key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); + key_file->gettext_domain = NULL; } static void @@ -228,6 +230,12 @@ g_key_file_clear (GKeyFile *key_file) key_file->parse_buffer = NULL; } + if (key_file->gettext_domain) + { + g_free (key_file->gettext_domain); + key_file->gettext_domain = NULL; + } + tmp = key_file->groups; while (tmp != NULL) { @@ -448,6 +456,11 @@ g_key_file_load_from_fd (GKeyFile return FALSE; } + key_file->gettext_domain = g_key_file_get_string (key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, + NULL); + return TRUE; } @@ -554,6 +567,11 @@ g_key_file_load_from_data (GKeyFile return FALSE; } + key_file->gettext_domain = g_key_file_get_string (key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, + NULL); + return TRUE; } @@ -1662,6 +1680,8 @@ g_key_file_get_locale_string (GKeyFile GError *key_file_error; gchar **languages; gboolean free_languages = FALSE; + gboolean try_gettext = FALSE; + const gchar *msg_locale; gint i; g_return_val_if_fail (key_file != NULL, NULL); @@ -1692,6 +1712,23 @@ g_key_file_get_locale_string (GKeyFile free_languages = FALSE; } + /* we're only interested in gettext translation if we don't have a + * translation in the .desktop file itself and if the key is one of the keys + * we know we want to translate: Name, GenericName, Comment. Blindly doing + * this for all keys can give strange result for the icons, since the Icon is + * a locale string in the spec, eg. We also only get translation in the mo + * file if the requested locale is the LC_MESSAGES one. Ideally, we should do + * more and change LC_MESSAGES to use the requested locale, but there's no + * guarantee it's installed on the system and it might have some + * side-effects. Since this is a corner case, let's ignore it. */ + + msg_locale = setlocale (LC_MESSAGES, NULL); + try_gettext = msg_locale && key_file->gettext_domain && + strcmp (group_name, G_KEY_FILE_DESKTOP_GROUP) == 0 && + (strcmp (key, G_KEY_FILE_DESKTOP_KEY_NAME) == 0 || + strcmp (key, G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME) == 0 || + strcmp (key, G_KEY_FILE_DESKTOP_KEY_COMMENT) == 0); + for (i = 0; languages[i]; i++) { candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]); @@ -1708,6 +1745,39 @@ g_key_file_get_locale_string (GKeyFile translated_value = NULL; } + /* Fallback to gettext */ + if (try_gettext && !translated_value) + { + gchar *orig_value = g_key_file_get_string (key_file, group_name, key, NULL); + + if (orig_value) + { + gboolean codeset_set; + const gchar *translated; + gboolean has_gettext; + + codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL; + translated = NULL; + + translated = g_dgettext (key_file->gettext_domain, + orig_value); + has_gettext = translated != orig_value; + + g_free (orig_value); + + if (has_gettext) + { + if (codeset_set) + translated_value = g_strdup (translated); + else + translated_value = g_locale_to_utf8 (translated, + -1, NULL, NULL, NULL); + } + else + translated_value = NULL; + } + } + /* Fallback to untranslated key */ if (!translated_value) Index: glib-2.19.5/glib/gkeyfile.h =================================================================== --- glib-2.19.5.orig/glib/gkeyfile.h +++ glib-2.19.5/glib/gkeyfile.h @@ -240,6 +240,7 @@ gboolean g_key_file_remove_group #define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify" #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass" #define G_KEY_FILE_DESKTOP_KEY_URL "URL" +#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain" #define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application" #define G_KEY_FILE_DESKTOP_TYPE_LINK "Link" ++++++ glib2-fate300461-gettext-gkeyfile-suse.patch ++++++ Index: glib-2.19.5/glib/gkeyfile.c =================================================================== --- glib-2.19.5.orig/glib/gkeyfile.c +++ glib-2.19.5/glib/gkeyfile.c @@ -84,6 +84,7 @@ struct _GKeyFile gchar **locales; gchar *gettext_domain; + gchar *file_basename; }; typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair; @@ -211,6 +212,7 @@ g_key_file_init (GKeyFile *key_file) key_file->flags = 0; key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); key_file->gettext_domain = NULL; + key_file->file_basename = NULL; } static void @@ -236,6 +238,12 @@ g_key_file_clear (GKeyFile *key_file) key_file->gettext_domain = NULL; } + if (key_file->file_basename) + { + g_free (key_file->file_basename); + key_file->file_basename = NULL; + } + tmp = key_file->groups; while (tmp != NULL) { @@ -375,6 +383,39 @@ find_file_in_data_dirs (const gchar *f return fd; } +static int _g_key_file_default_textdomain_codeset_bound = 0; +#define _G_KEY_FILE_DEFAULT_DOMAIN "desktop_translations" + +static char * +_g_key_file_get_default_gettext_domain (void) +{ + if (!_g_key_file_default_textdomain_codeset_bound) + { + const char *codeset; + + _g_key_file_default_textdomain_codeset_bound = 1; + + codeset = bind_textdomain_codeset (_G_KEY_FILE_DEFAULT_DOMAIN, "UTF-8"); + + if (codeset) + _g_key_file_default_textdomain_codeset_bound |= 1 << 1; + } + + return g_strdup (_G_KEY_FILE_DEFAULT_DOMAIN); +} + +static inline gboolean +_g_key_file_is_default_gettext_domain (const char *domain) +{ + return (domain && strcmp (domain, _G_KEY_FILE_DEFAULT_DOMAIN) == 0); +} + +static inline gboolean +_g_key_file_default_gettext_domain_is_bound (void) +{ + return _g_key_file_default_textdomain_codeset_bound & (1 << 1); +} + static gboolean g_key_file_load_from_fd (GKeyFile *key_file, gint fd, @@ -461,6 +502,9 @@ g_key_file_load_from_fd (GKeyFile G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, NULL); + if (!key_file->gettext_domain) + key_file->gettext_domain = _g_key_file_get_default_gettext_domain (); + return TRUE; } @@ -510,6 +554,8 @@ g_key_file_load_from_file (GKeyFile return FALSE; } + key_file->file_basename = g_path_get_basename (file); + return TRUE; } @@ -572,6 +618,9 @@ g_key_file_load_from_data (GKeyFile G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, NULL); + if (!key_file->gettext_domain) + key_file->gettext_domain = _g_key_file_get_default_gettext_domain (); + return TRUE; } @@ -641,6 +690,9 @@ g_key_file_load_from_dirs (GKeyFile } } + if (found_file) + key_file->file_basename = g_path_get_basename (output_path); + if (found_file && full_path) *full_path = output_path; else @@ -1756,12 +1808,38 @@ g_key_file_get_locale_string (GKeyFile const gchar *translated; gboolean has_gettext; - codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL; + if (_g_key_file_is_default_gettext_domain (key_file->gettext_domain)) + codeset_set = _g_key_file_default_gettext_domain_is_bound (); + else + codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL; translated = NULL; - translated = g_dgettext (key_file->gettext_domain, - orig_value); - has_gettext = translated != orig_value; + /* first try to translate with the context */ + if (key_file->file_basename) + { + gchar *context; + gchar *context_value; + + context = g_strdup_printf ("%s(%s)", key, + key_file->file_basename); + context_value = g_strdup_printf ("%s%s%s", + context, ": ", orig_value); + + translated = g_dgettext (key_file->gettext_domain, + context_value); + has_gettext = translated != context_value; + + g_free (context_value); + g_free (context); + } + + /* no translation with the context: try without context */ + if (!has_gettext) + { + translated = g_dgettext (key_file->gettext_domain, + orig_value); + has_gettext = translated != orig_value; + } g_free (orig_value); Index: glib-2.19.5/glib/gkeyfile.h =================================================================== --- glib-2.19.5.orig/glib/gkeyfile.h +++ glib-2.19.5/glib/gkeyfile.h @@ -240,7 +240,7 @@ gboolean g_key_file_remove_group #define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify" #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass" #define G_KEY_FILE_DESKTOP_KEY_URL "URL" -#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain" +#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" #define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application" #define G_KEY_FILE_DESKTOP_TYPE_LINK "Link" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pam for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package pam for openSUSE:Factory checked in at Fri Feb 6 16:59:34 CET 2009. -------- --- pam/pam.changes 2008-12-10 14:26:57.000000000 +0100 +++ pam/pam.changes 2009-02-05 17:07:39.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 5 17:01:56 CET 2009 - kukuk(a)suse.de + +- Log failures of setrlimit in pam_limits [bnc#448314] +- Fix using of requisite in password stack [bnc#470337] + +------------------------------------------------------------------- +Tue Jan 20 12:21:08 CET 2009 - kukuk(a)suse.de + +- Regenerate documentation [bnc#448314] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libpam-password-requisite.diff pam_limits-logging.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.i21083/_old 2009-02-06 16:55:42.000000000 +0100 +++ /var/tmp/diff_new_pack.i21083/_new 2009-02-06 16:55:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pam (Version 1.0.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,7 @@ %endif # Version: 1.0.2 -Release: 15 +Release: 18 Summary: A Security Tool that Provides Authentication for Applications Source: Linux-PAM-%{version}.tar.bz2 Source1: Linux-PAM-%{version}-SUSE-docs.tar.bz2 @@ -69,6 +69,8 @@ Patch14: pam_pwhistory-type.diff Patch15: pam_time.diff Patch16: pam_limits-doc.diff +Patch17: pam_limits-logging.diff +Patch18: libpam-password-requisite.diff %description PAM (Pluggable Authentication Modules) is a system security tool that @@ -134,6 +136,8 @@ %patch14 -p0 %patch15 -p0 %patch16 -p0 +%patch17 -p0 +%patch18 -p0 %build aclocal -I m4 --install --force @@ -342,6 +346,11 @@ %{_libdir}/libpam_misc.so %changelog +* Thu Feb 05 2009 kukuk(a)suse.de +- Log failures of setrlimit in pam_limits [bnc#448314] +- Fix using of requisite in password stack [bnc#470337] +* Tue Jan 20 2009 kukuk(a)suse.de +- Regenerate documentation [bnc#448314] * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) ++++++ libpam-password-requisite.diff ++++++ --- libpam/pam_dispatch.c 3 Dec 2008 14:16:33 -0000 1.13 +++ libpam/pam_dispatch.c 4 Feb 2009 13:48:02 -0000 @@ -132,11 +132,10 @@ } /* - * use_cached_chain is how we ensure that the setcred/close_session - * and chauthtok(2) modules are called in the same order as they did - * when they were invoked as auth/open_session/chauthtok(1). This - * feature was added in 0.75 to make the behavior of pam_setcred - * sane. It was debugged by release 0.76. + * use_cached_chain is how we ensure that the setcred and + * close_session modules are called in the same order as they did + * when they were invoked as auth/open_session. This feature was + * added in 0.75 to make the behavior of pam_setcred sane. */ if (use_cached_chain != _PAM_PLEASE_FREEZE) { @@ -358,9 +357,6 @@ break; case PAM_CHAUTHTOK: h = pamh->handlers.conf.chauthtok; - if (flags & PAM_UPDATE_AUTHTOK) { - use_cached_chain = _PAM_MUST_BE_FROZEN; - } break; default: pam_syslog(pamh, LOG_ERR, "undefined fn choice; %d", choice); --- libpam/pam_password.c 24 Jul 2006 15:47:40 -0000 1.5 +++ libpam/pam_password.c 4 Feb 2009 13:48:02 -0000 @@ -24,6 +24,13 @@ return PAM_SYSTEM_ERR; } + /* applications are not allowed to set this flags */ + if (flags & (PAM_PRELIM_CHECK | PAM_UPDATE_AUTHTOK)) { + syslog(LOG_ERR, _PAM_SYSTEM_LOG_PREFIX + "PAM_PRELIM_CHECK or PAM_UPDATE_AUTHTOK set by application"); + return PAM_SYSTEM_ERR; + } + if (pamh->former.choice == PAM_NOT_STACKED) { _pam_start_timer(pamh); /* we try to make the time for a failure independent of the time it takes to @@ -58,4 +67,3 @@ return retval; } - ++++++ Linux-PAM-1.0.2-SUSE-docs.tar.bz2 ++++++ ++++ 1918 lines of diff (skipped) ++++++ Linux-PAM-docu-generated.diff ++++++ ++++ 15766 lines (skipped) ++++ between pam/Linux-PAM-docu-generated.diff ++++ and pam/Linux-PAM-docu-generated.diff ++++++ pam_limits-logging.diff ++++++ --- modules/pam_limits/pam_limits.c 7 Dec 2007 15:40:02 -0000 1.46 +++ modules/pam_limits/pam_limits.c 5 Feb 2009 15:48:49 -0000 @@ -42,7 +42,7 @@ #include <locale.h> #ifdef HAVE_LIBAUDIT -#include <libaudit.h> +#include <libaudit.h> #endif /* Module defines */ @@ -141,6 +141,73 @@ return ctrl; } +static const char * +i2str (int i) +{ + switch (i) { + case RLIMIT_CPU: + return "cpu"; + break; + case RLIMIT_FSIZE: + return "fsize"; + break; + case RLIMIT_DATA: + return "data"; + break; + case RLIMIT_STACK: + return "stack"; + break; + case RLIMIT_CORE: + return "core"; + break; + case RLIMIT_RSS: + return "rss"; + break; + case RLIMIT_NPROC: + return "nproc"; + break; + case RLIMIT_NOFILE: + return "nofile"; + break; + case RLIMIT_MEMLOCK: + return "memlock"; + break; +#ifdef RLIMIT_AS + case RLIMIT_AS: + return "as"; + break; +#endif +#ifdef RLIMIT_LOCKS + case RLIMIT_LOCKS: + return "locks"; + break; +#endif +#ifdef RLIMIT_SIGPENDING + case RLIMIT_SIGPENDING: + return "sigpending"; + break; +#endif +#ifdef RLIMIT_MSGQUEUE + case RLIMIT_MSGQUEUE: + return "msgqueue"; + break; +#endif +#ifdef RLIMIT_NICE + case RLIMIT_NICE: + return "nice"; + break; +#endif +#ifdef RLIMIT_RTPRIO + case RLIMIT_RTPRIO: + return "rtprio"; + break; +#endif + default: + return "UNKNOWN"; + break; + } +} + #define LIMITED_OK 0 /* limit setting appeared to work */ #define LIMIT_ERR 1 /* error setting a limit */ @@ -416,8 +483,8 @@ if (int_value < -20) int_value = -20; rlimit_value = 20 - int_value; -#endif break; +#endif } if ( (limit_item != LIMIT_LOGIN) @@ -575,6 +642,8 @@ int retval = LIMITED_OK; for (i=0, status=LIMITED_OK; i<RLIM_NLIMITS; i++) { + int res; + if (!pl->limits[i].supported) { /* skip it if its not known to the system */ continue; @@ -586,7 +655,11 @@ } if (pl->limits[i].limit.rlim_cur > pl->limits[i].limit.rlim_max) pl->limits[i].limit.rlim_cur = pl->limits[i].limit.rlim_max; - status |= setrlimit(i, &pl->limits[i].limit); + res = setrlimit(i, &pl->limits[i].limit); + if (res != 0) + pam_syslog(pamh, LOG_ERR, "Could not set limit for '%s': %m", + i2str(i)); + status |= res; } if (status) { @@ -595,6 +668,7 @@ status = setpriority(PRIO_PROCESS, 0, pl->priority); if (status != 0) { + pam_syslog(pamh, LOG_ERR, "Could not set limit for PRIO_PROCESS: %m"); retval = LIMIT_ERR; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server-rdp for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package xorg-x11-server-rdp for openSUSE:Factory checked in at Fri Feb 6 16:55:30 CET 2009. -------- --- xorg-x11-server-rdp/xorg-x11-server-rdp.changes 2008-09-17 23:20:49.000000000 +0200 +++ xorg-x11-server-rdp/xorg-x11-server-rdp.changes 2009-02-05 23:37:53.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 5 17:19:46 EST 2009 - davidr(a)novell.com + +- Fix x86-64 brokenness. (bnc#466369) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xserver-RDP-64bit.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server-rdp.spec ++++++ --- /var/tmp/diff_new_pack.H17896/_old 2009-02-06 16:53:43.000000000 +0100 +++ /var/tmp/diff_new_pack.H17896/_new 2009-02-06 16:53:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-server-rdp (Version 7.3.99) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3.99 -Release: 2 +Release: 4 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -93,6 +93,7 @@ Patch111: xorg-server-1.4-vnc-render_sig11.diff Patch112: fix-dpi-values.diff Patch113: xserver-RDP.diff.bz2 +Patch114: xserver-RDP-64bit.diff %description This package contains the RDP server for the X.Org Server. @@ -158,7 +159,7 @@ %patch109 -p1 %patch112 -p0 %patch113 -p1 -#%patch114 -p1 +%patch114 -p1 #%patch115 -p1 #%patch116 -p1 @@ -241,6 +242,8 @@ /usr/bin/X11rdp %changelog +* Thu Feb 05 2009 davidr(a)novell.com +- Fix x86-64 brokenness. (bnc#466369) * Wed Sep 17 2008 hfiguiere(a)suse.de - Disable XKB and use builtin fonts - Update xserver-RDP.diff ++++++ xserver-RDP-64bit.diff ++++++ commit d0b4be391d73a1feef14bb2da2d36fc411dfb22e Author: David Reveman <davidr(a)novell.com> Date: Thu Feb 5 17:08:44 2009 -0500 Include dix-config.h from rdp.h so that _XSERVER64 and other important things are defined properly when building rdp DDX. diff --git a/hw/rdp/rdp.h b/hw/rdp/rdp.h index 21126c7..b4b435c 100644 --- a/hw/rdp/rdp.h +++ b/hw/rdp/rdp.h @@ -19,6 +19,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <dix-config.h> #include <stdio.h> #include <stdarg.h> #include <stdlib.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server-dmx for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package xorg-x11-server-dmx for openSUSE:Factory checked in at Fri Feb 6 16:53:32 CET 2009. -------- --- xorg-x11-server-dmx/xorg-x11-server-dmx.changes 2009-01-22 21:57:46.000000000 +0100 +++ xorg-x11-server-dmx/xorg-x11-server-dmx.changes 2009-02-06 00:34:10.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Feb 5 18:20:05 EST 2009 - davidr(a)novell.com + +- Fix dbus policy file. (bnc#468393) + +------------------------------------------------------------------- +Thu Feb 5 12:57:36 EST 2009 - davidr(a)novell.com + +- Initializing attached keyboard devices properly. (bnc#447682) + +------------------------------------------------------------------- +Wed Feb 4 18:47:20 EST 2009 - davidr(a)novell.com + +- Detect XKB extension properly and update keycode mapping + tables when local keymaps change. (bnc#447682) (bnc#442292) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dbus-conf.diff New: ---- bug-468393_dbus-conf-and-policy.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server-dmx.spec ++++++ --- /var/tmp/diff_new_pack.j32590/_old 2009-02-06 16:48:55.000000000 +0100 +++ /var/tmp/diff_new_pack.j32590/_new 2009-02-06 16:48:55.000000000 +0100 @@ -38,7 +38,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3.99 -Release: 9 +Release: 12 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -97,7 +97,7 @@ Patch113: xserver-NOMAD.diff Patch115: xorg-java-wmhack-2.diff Patch116: xserver-add-atKeynames.h.diff -Patch117: dbus-conf.diff +Patch117: bug-468393_dbus-conf-and-policy.diff Patch118: xserver-dmx-disable-xi.diff %description @@ -263,6 +263,13 @@ %{_mandir}/man1/Xdmx.1* %changelog +* Thu Feb 05 2009 davidr(a)novell.com +- Fix dbus policy file. (bnc#468393) +* Thu Feb 05 2009 davidr(a)novell.com +- Initializing attached keyboard devices properly. (bnc#447682) +* Wed Feb 04 2009 davidr(a)novell.com +- Detect XKB extension properly and update keycode mapping + tables when local keymaps change. (bnc#447682) (bnc#442292) * Thu Jan 22 2009 davidr(a)novell.com - Composite extension check and better error message for when it is missing. (bnc#450142) ++++++ bug-468393_dbus-conf-and-policy.diff ++++++ --- a/config/xorg-server.conf.orig 2009-02-05 10:39:20.000000000 -0600 +++ b/config/xorg-server.conf 2009-02-05 10:50:35.000000000 -0600 @@ -4,10 +4,100 @@ <busconfig> <policy context="default"> <allow own="org.x.config.display0"/> - <allow send_destination="org.x.config.display0"/> - <allow send_interface="org.x.config.display0"/> + <allow send_destination="org.x.config.display0" + send_interface="org.x.config.display0"/> + <allow send_destination="org.x.config.display0" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display0" + send_interface="org.freedesktop.DBus.Properties" /> + <allow own="org.x.config.display1"/> - <allow send_destination="org.x.config.display1"/> - <allow send_interface="org.x.config.display1"/> + <allow send_destination="org.x.config.display1" + send_interface="org.x.config.display1"/> + <allow send_destination="org.x.config.display1" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display1" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display10"/> + <allow send_destination="org.x.config.display10" + send_interface="org.x.config.display10"/> + <allow send_destination="org.x.config.display10" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display10" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display11"/> + <allow send_destination="org.x.config.display11" + send_interface="org.x.config.display11"/> + <allow send_destination="org.x.config.display11" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display11" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display12"/> + <allow send_destination="org.x.config.display12" + send_interface="org.x.config.display12"/> + <allow send_destination="org.x.config.display12" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display12" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display13"/> + <allow send_destination="org.x.config.display13" + send_interface="org.x.config.display13"/> + <allow send_destination="org.x.config.display13" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display13" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display14"/> + <allow send_destination="org.x.config.display14" + send_interface="org.x.config.display14"/> + <allow send_destination="org.x.config.display14" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display14" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display15"/> + <allow send_destination="org.x.config.display15" + send_interface="org.x.config.display15"/> + <allow send_destination="org.x.config.display15" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display15" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display16"/> + <allow send_destination="org.x.config.display16" + send_interface="org.x.config.display16"/> + <allow send_destination="org.x.config.display16" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display16" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display17"/> + <allow send_destination="org.x.config.display17" + send_interface="org.x.config.display17"/> + <allow send_destination="org.x.config.display17" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display17" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display18"/> + <allow send_destination="org.x.config.display18" + send_interface="org.x.config.display18"/> + <allow send_destination="org.x.config.display18" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display18" + send_interface="org.freedesktop.DBus.Properties" /> + + <allow own="org.x.config.display19"/> + <allow send_destination="org.x.config.display19" + send_interface="org.x.config.display19"/> + <allow send_destination="org.x.config.display19" + send_interface="org.freedesktop.DBus.Introspectable" /> + <allow send_destination="org.x.config.display19" + send_interface="org.freedesktop.DBus.Properties" /> + </policy> </busconfig> ++++++ xserver-NOMAD.diff ++++++ ++++ 2119 lines (skipped) ++++ between xorg-x11-server-dmx/xserver-NOMAD.diff ++++ and xorg-x11-server-dmx/xserver-NOMAD.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Fri Feb 6 16:48:46 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-01-29 16:55:54.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2009-01-31 15:23:03.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Jan 31 15:21:21 CET 2009 - schwab(a)suse.de + +- Provide proper fallback when legacy_mem is not available. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pci-legacy-mem-fallback.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.q26322/_old 2009-02-06 16:48:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q26322/_new 2009-02-06 16:48:07.000000000 +0100 @@ -29,7 +29,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 22 +Release: 24 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -112,6 +112,7 @@ Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch Patch126: commit-a9e2030.diff Patch127: dpms_screensaver.diff +Patch128: pci-legacy-mem-fallback.diff %description This package contains the X.Org Server. @@ -233,6 +234,7 @@ %patch125 -p1 %patch126 -p1 %patch127 -p1 +%patch128 %build pushd xorg-docs-* @@ -564,6 +566,8 @@ %endif %changelog +* Sat Jan 31 2009 schwab(a)suse.de +- Provide proper fallback when legacy_mem is not available. * Thu Jan 29 2009 sndirsch(a)suse.de - reenabled Security extension (bnc #470601) * Fri Jan 16 2009 sndirsch(a)suse.de ++++++ pci-legacy-mem-fallback.diff ++++++ --- hw/xfree86/os-support/bus/linuxPci.c +++ hw/xfree86/os-support/bus/linuxPci.c @@ -493,6 +493,7 @@ xf86MapDomainMemory(int ScreenNum, int F * legacy_mem interface is unavailable. */ if ((Base > 1024*1024) || ((fd = linuxOpenLegacy(dev, "legacy_mem")) < 0)) + fallback: return linuxMapPci(ScreenNum, Flags, dev, Base, Size, PCIIOC_MMAP_IS_MEM); else @@ -501,6 +502,8 @@ xf86MapDomainMemory(int ScreenNum, int F if (fd >= 0) close(fd); if (addr == NULL || addr == MAP_FAILED) { + if (errno == ENXIO) + goto fallback; perror("mmap failure"); FatalError("xf86MapDomainMem(): mmap() failure\n"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libs for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at Fri Feb 6 16:47:56 CET 2009. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2008-12-10 14:28:40.000000000 +0100 +++ xorg-x11-libs/xorg-x11-libs.changes 2009-02-05 16:12:29.987434225 +0100 @@ -1,0 +2,6 @@ +Thu Feb 5 16:11:39 CET 2009 - sndirsch(a)suse.de + +- split out libpixman (bnc #439019) +- split out libpciaccess (bnc #438226) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.l15450/_old 2009-02-06 16:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.l15450/_new 2009-02-06 16:45:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-libs (Version 7.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ # Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 8 +Release: 9 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -148,6 +148,144 @@ Suhaib Siddiqi Susan Angebrandt +%package -n libpixman-1-0 +License: X11/MIT +Summary: Pixman library +Group: System/Libraries +Provides: xorg-x11-libs:/usr/X11R6/%{_lib}/libpixman-1.so.0 +AutoReqProv: on + +%description -n libpixman-1-0 +Pixman library. + + + +Authors: +-------- + + Apple Computer Corporation + Dave Lemke + David Dawes + Derek Wang + Frank Giessler + Jim Gettys + Juliusz Chroboczek + Jungshik Shin + Keith Packard + Kensuke Matsuzaki + Marc La France + Mark Leisher + Noah Levitt + Phil Karlton + Ralf Habacker + Shunsuke Akiyama + Suhaib Siddiqi + Susan Angebrandt + +%package -n libpixman-1-0-devel +License: X11/MIT +Summary: Include Files and Libraries mandatory for X11 Development +Group: Development/Libraries/X11 +Provides: xorg-x11-devel:/usr/X11R6/%{_lib}/libpixman-1.so +Requires: libpixman-1-0 + +%description -n libpixman-1-0-devel +This package contains all necessary include files and libraries needed +to develop X11 applications that require these. + + + +Authors: +-------- + + Apple Computer Corporation + Dave Lemke + David Dawes + Derek Wang + Frank Giessler + Jim Gettys + Juliusz Chroboczek + Jungshik Shin + Keith Packard + Kensuke Matsuzaki + Marc La France + Mark Leisher + Noah Levitt + Phil Karlton + Ralf Habacker + Shunsuke Akiyama + Suhaib Siddiqi + Susan Angebrandt + +%package -n libpciaccess0 +License: X11/MIT +Summary: pciaccess library +Group: System/Libraries +Provides: xorg-x11-libs:/usr/X11R6/%{_lib}/usr/lib64/libpciaccess.so.0 +AutoReqProv: on + +%description -n libpciaccess0 +pciaccess library. + + + +Authors: +-------- + + Apple Computer Corporation + Dave Lemke + David Dawes + Derek Wang + Frank Giessler + Jim Gettys + Juliusz Chroboczek + Jungshik Shin + Keith Packard + Kensuke Matsuzaki + Marc La France + Mark Leisher + Noah Levitt + Phil Karlton + Ralf Habacker + Shunsuke Akiyama + Suhaib Siddiqi + Susan Angebrandt + +%package -n libpciaccess0-devel +License: X11/MIT +Summary: Include Files and Libraries mandatory for X11 Development +Group: Development/Libraries/X11 +Provides: xorg-x11-devel:/usr/X11R6/%{_lib}/usr/lib64/libpciaccess.so +Requires: libpciaccess0 + +%description -n libpciaccess0-devel +This package contains all necessary include files and libraries needed +to develop X11 applications that require these. + + + +Authors: +-------- + + Apple Computer Corporation + Dave Lemke + David Dawes + Derek Wang + Frank Giessler + Jim Gettys + Juliusz Chroboczek + Jungshik Shin + Keith Packard + Kensuke Matsuzaki + Marc La France + Mark Leisher + Noah Levitt + Phil Karlton + Ralf Habacker + Shunsuke Akiyama + Suhaib Siddiqi + Susan Angebrandt + %prep %setup -T -c %{name} for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done @@ -214,17 +352,27 @@ test -L usr/include/X11 && rm usr/include/X11 exit 0 +%post -n libpixman-1-0 -p /sbin/ldconfig + +%postun -n libpixman-1-0 -p /sbin/ldconfig + +%post -n libpciaccess0 -p /sbin/ldconfig + +%postun -n libpciaccess0 -p /sbin/ldconfig + %files %defattr(-,root,root) /usr/include/X11/bitmaps/ /usr/include/X11/pixmaps/ /usr/%{_lib}/*.so.* +%exclude /usr/%{_lib}/libpixman-1.so.0* +%exclude /usr/%{_lib}/libpciaccess.so.0* %files -n xorg-x11-devel %defattr(-,root,root) -%dir /usr/include/pixman-1 /usr/bin/xft-config /usr/include/*.h +%exclude /usr/include/pciaccess.h /usr/include/X11/*.h /usr/include/X11/Xaw/ /usr/include/X11/Xcursor/ @@ -232,18 +380,45 @@ /usr/include/X11/XprintAppUtil/ /usr/include/X11/extensions/*.h /usr/include/X11/fonts/*.h -/usr/include/pixman-1/pixman.h -/usr/include/pixman-1/pixman-version.h /usr/include/xcb/ /usr/%{_lib}/*.a /usr/%{_lib}/*.la +%exclude /usr/%{_lib}/libpixman-1.*a +%exclude /usr/%{_lib}/libpciaccess.*a /usr/%{_lib}/*.so +%exclude /usr/%{_lib}/libpixman-1.so.0* +%exclude /usr/%{_lib}/libpciaccess.so.0* /usr/%{_lib}/pkgconfig/*.pc /usr/share/aclocal/*.m4 %{_mandir}/man1/* %{_mandir}/man3/* +%files -n libpixman-1-0 +%defattr(-,root,root) +/usr/%{_lib}/libpixman-1.so.0* + +%files -n libpixman-1-0-devel +%defattr(-,root,root) +%dir /usr/include/pixman-1 +/usr/include/pixman-1/pixman.h +/usr/include/pixman-1/pixman-version.h +/usr/%{_lib}/libpixman-1.*a +/usr/%{_lib}/libpixman-1.so + +%files -n libpciaccess0 +%defattr(-,root,root) +/usr/%{_lib}/libpciaccess.so.0* + +%files -n libpciaccess0-devel +%defattr(-,root,root) +/usr/include/pciaccess.h +/usr/%{_lib}/libpciaccess.*a +/usr/%{_lib}/libpciaccess.so + %changelog +* Thu Feb 05 2009 sndirsch(a)suse.de +- split out libpixman (bnc #439019) +- split out libpciaccess (bnc #438226) * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Fri Feb 6 16:45:45 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-02 22:17:01.000000000 +0100 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-05 15:24:06.290583221 +0100 @@ -1,0 +2,7 @@ +Thu Feb 5 15:17:02 CET 2009 - sndirsch(a)suse.de + +- xf86-video-intel-sdvo_detect.diff + * supposed to fix external output detection on Macbooks; only + applied on openSUSE > 11.1 for now (bnc #425252) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-intel-sdvo_detect.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.IP3003/_old 2009-02-06 16:39:04.000000000 +0100 +++ /var/tmp/diff_new_pack.IP3003/_new 2009-02-06 16:39:04.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 34 +Release: 36 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -98,6 +98,7 @@ Patch63: xf86-video-intel-SDVO_LVDS.diff Patch64: xf86-video-vesa_DefaultRefresh.diff Patch65: xf86-video-intel-commit-1e974ff.diff +Patch66: xf86-video-intel-sdvo_detect.diff Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff @@ -130,6 +131,9 @@ %patch62 -p1 %patch63 -p1 %patch65 -p1 +%if %suse_version > 1110 +%patch66 -p1 +%endif popd pushd xf86-video-nv-* %patch3 -p0 @@ -266,6 +270,10 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Thu Feb 05 2009 sndirsch(a)suse.de +- xf86-video-intel-sdvo_detect.diff + * supposed to fix external output detection on Macbooks; only + applied on openSUSE > 11.1 for now (bnc #425252) * Mon Feb 02 2009 sndirsch(a)suse.de - xf86-video-intel-commit-1e974ff.diff * Try to always probe SDVOC on 965G/965GM. Detect bit of SDVOC ++++++ xf86-video-intel-sdvo_detect.diff ++++++ diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c index 256d16d..011e1c9 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -1756,7 +1756,9 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device) xf86OutputPtr output; I830OutputPrivatePtr intel_output; struct i830_sdvo_priv *dev_priv; + I830Ptr pI830 ; int i; + int val; unsigned char ch[0x40]; I2CBusPtr i2cbus = NULL, ddcbus; char name[60]; @@ -1821,16 +1823,15 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device) } intel_output->pI2CBus = i2cbus; - - /* Read the regs to test if we can talk to the device */ - for (i = 0; i < 0x40; i++) { - if (!i830_sdvo_read_byte_quiet(output, i, &ch[i])) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "No SDVO device found on SDVO%c\n", - output_device == SDVOB ? 'B' : 'C'); - xf86OutputDestroy (output); - return FALSE; - } + + pI830 = I830PTR(pScrn); + val = INREG(SDVOB); + if (0 == (val & 0x04)) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "No SDVO device found on SDVO%c\n", + output_device == SDVOB ? 'B' : 'C'); + xf86OutputDestroy (output); + return FALSE; } /* Set up our wrapper I2C bus for DDC. It acts just like the regular I2C ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11 for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Fri Feb 6 16:38:55 CET 2009. -------- --- xorg-x11/xorg-x11.changes 2008-12-20 02:22:04.000000000 +0100 +++ xorg-x11/xorg-x11.changes 2009-02-05 12:59:28.961179097 +0100 @@ -1,0 +2,17 @@ +Thu Feb 5 12:52:37 CET 2009 - sndirsch(a)suse.de + +- /etc/X11/xinit/xserverrc + * replace '$(hostname -f)' with 'localhost' (bnc #438288) +- /etc/X11/xdm/Xstartup + * no longer try $(hostname -f) (bnc #438288) + +------------------------------------------------------------------- +Thu Feb 5 09:34:15 CET 2009 - sndirsch(a)suse.de + +- /usr/X11R6/bin/xauth compatibility link no longer required + (bnc #471013) +- moved /etc/X11/rstart/rstartd.real to /usr/bin for FHS/FSSTND + compliance (bnc #470983) +- no longer package libxrx.a/libxrxnest.a + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.u14285/_old 2009-02-06 16:34:38.000000000 +0100 +++ /var/tmp/diff_new_pack.u14285/_new 2009-02-06 16:34:38.000000000 +0100 @@ -26,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 9 +Release: 11 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -338,9 +338,12 @@ popd %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/twm.desktop ;; +### bnc #471013 +%if %suse_version <= 1110 xauth-*) ln -s /usr/bin/xauth $RPM_BUILD_ROOT/usr/X11R6/bin/xauth ;; +%endif xcalc-*) %suse_update_desktop_file -i -u xcalc Calculator ;; @@ -416,6 +419,12 @@ ln -s /usr/bin/xset $RPM_BUILD_ROOT/usr/X11R6/bin/xset %endif ;; + rstartd-*) + # for FHS/FSSTND compliance (bnc #470983) + mv $RPM_BUILD_ROOT/etc/X11/rstart/rstartd.real $RPM_BUILD_ROOT/usr/bin/ + sed -i 's+/etc/X11/rstart/rstartd.real+/usr/bin/rstartd.real+' \ + $RPM_BUILD_ROOT/usr/bin/rstartd + ;; *) ;; esac @@ -493,7 +502,8 @@ /usr/include/X11/bitmaps/* /usr/%{_lib}/X11/xdm/ /usr/%{_lib}/X11/xedit/ -/usr/%{_lib}/libxrx* +/usr/%{_lib}/libxrx*.so +%exclude /usr/%{_lib}/libxrx*.*a /usr/share/X11/ /usr/share/applications/*.desktop /usr/share/icons/* @@ -517,10 +527,23 @@ %files xauth %defattr(-,root,root) /usr/bin/xauth +%if %suse_version <= 1110 /usr/X11R6/bin/xauth +%endif %{_mandir}/man1/xauth.1* %changelog +* Thu Feb 05 2009 sndirsch(a)suse.de +- /etc/X11/xinit/xserverrc + * replace '$(hostname -f)' with 'localhost' (bnc #438288) +- /etc/X11/xdm/Xstartup + * no longer try $(hostname -f) (bnc #438288) +* Thu Feb 05 2009 sndirsch(a)suse.de +- /usr/X11R6/bin/xauth compatibility link no longer required + (bnc #471013) +- moved /etc/X11/rstart/rstartd.real to /usr/bin for FHS/FSSTND + compliance (bnc #470983) +- no longer package libxrx.a/libxrxnest.a * Sat Dec 20 2008 sndirsch(a)suse.de - /etc/X11/xdm/Xsetup * use '-keyfile /usr/share/X11/app-defaults/xvkbd.default' for ++++++ xdm.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup --- old/etc/X11/xdm/Xstartup 2008-10-22 18:11:05.000000000 +0200 +++ new/etc/X11/xdm/Xstartup 2009-02-05 12:58:13.000000000 +0100 @@ -75,7 +75,6 @@ while test "$RUID" = "0" ; do test "$LOCATION" = "console" && break test "$LOCATION" = "localhost" && break - test "$LOCATION" = "`hostname -f`" && break test -s /etc/sysconfig/displaymanager && . /etc/sysconfig/displaymanager test "$DISPLAYMANAGER_ROOT_LOGIN_REMOTE" = "yes" && break $xmessage -timeout 10 -default okay -center "No foreign root login allowed" ++++++ xinit.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xinit/xserverrc new/etc/X11/xinit/xserverrc --- old/etc/X11/xinit/xserverrc 2004-07-23 04:01:29.000000000 +0200 +++ new/etc/X11/xinit/xserverrc 2009-02-05 12:51:57.000000000 +0100 @@ -32,12 +32,7 @@ args="$args -nolisten tcp" if test -x "`type -p keygen`" -a "$done" != "yes" ; then - if [ ! -x "`type -p hostname`" ] ; then - echo "startx: can't get my hostname - exiting" 1>&2 - exit 1 - else - host=`hostname -f` - fi + host=localhost trap "echo" 1 2 15 cookie="MIT-MAGIC-COOKIE-1 `keygen`" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit e2fsprogs for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at Fri Feb 6 16:34:22 CET 2009. -------- --- e2fsprogs/e2fsprogs.changes 2009-01-14 09:28:00.000000000 +0100 +++ e2fsprogs/e2fsprogs.changes 2009-02-04 14:07:10.000000000 +0100 @@ -1,0 +2,92 @@ +Tue Feb 3 15:14:47 CET 2009 - mkoenig(a)suse.de + +- update to version 1.41.4: + debugfs: + * enhance the "ncheck" command + * enhance "hash" command + * fix a potential memory leak + * fix the usage message for logdump command + * fix ncheck command so that it prints all of the names of + hardlinks in the same directory + * e2fsprogs 1.41 broke debugfs's logdump command for normal + ext3/4 filesystems with 32-bit block numbers, when the headers + for 64-bit block numbers was added. This regression has been fixed + * ncheck command has been fixed to avoid printing garbage + characters at the end of file names + e2fsck: + * don't accidentally print the translation file's + header when asking the user a custom question + * print the correct inode number for uinit_bg related problems + * will now offer to clear the test_fs flag if the ext4 filesystem + is available on linux + * fix a bug where in preen mode, if there are disk I/O errors + while trying to close a filesystem can lead to infinite loops + * no longer abort an fsck run if block group has an errant + INODE_UNINIT flag + * distinguish between fragmented directories and fragmented + files in verbose mode statistics and in the fragcheck report + * fix a bug which caused it double count non-contiguous + extent-based inodes + * e2fsck will leave some slack space when repacking directories + to allow room for a few directory entries to be added without + causing leaf nodes to be split right away + * fix a bug which caused e2fsck to crash when it comes across a + corrupted interior node in an extent tree + * e2fsck problem descriptions involving the journal are no longer + referred to as "ext3" problems, since ext4 filesystems also have + journals + * fix a long-standing bug in e2fsck which would cause it to crash + when replying journals for filesystems with block sizes greater + than 8k + badblocks: + * support for normal files which are greater than 2GB + * display the time and percentage complete when in verbose mode + resize2fs: + * fix a potential memory corruption problem + * fix a bug in resize2fs where passing in a bogus new size of + 0 blocks will cause resize2fs to drop into an infinite loop + * fix resize2fs for ext4 filesystems + tune2fs: + * now updates the block group checksums when changing the UUID + to avoid causing e2fsck to complain vociferously at the next reboot + * inode size resizing algorithms have been fixed so it is not + vastly inefficient for moderate-to-large filesystems + * fix inode resizing algorithm so it will not corrupt filesystems + laid out for RAID filesystems; in addition, tune2fs will refuse + to change the inode size for filesystems that have the flex_bg + feature enabled + dumpe2fs: + * fix bug which caused dumpe2fs to abort with an error if run on a + filesystem that contained an external journal + mke2fs: + * new option -U, which allows the user to specify the UUID that + should be used for the new filesystem + * treat devices that are exactly 16TB as if they were 16TB minus + one block + blkid: + * fix a file descriptor leak in libblkid + * correctly detect whether the ext4 and ext4dev filesystems + are available, so that the ext4dev->ext4 fallback code works + correctly + * fixed a bug which could sometimes cause blkid to return an + exit value of zero for a non-existent device + * recognize ext3 filesystems that have the test_fs flag + set as ext3 filesystems + * recognize btrfs filesystems and swap devices currently used + by user-level software suspend + libext2fs: + * add a check in the Unix I/O functions in libext2fs so that + when a device is opened read/write, return an error if the + device is read-only using the BLKROGET ioctl +- the libcom_err patches for bnc#66534 have been removed because + git commit d7f45af802330a0e1450afa05185d3722e77a76c + should fix the problem +- remove patches + e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch + e2fsprogs-1.41.1-function_signature_fix.patch + e2fsprogs-1.41.1-link_fix.patch + libcom_err-disable_test.patch + libcom_err-mutex.patch + libcom_err-no-init_error_table.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch e2fsprogs-1.41.1-function_signature_fix.patch e2fsprogs-1.41.1-link_fix.patch e2fsprogs-1.41.1.tar.bz2 libcom_err-disable_test.patch libcom_err-mutex.patch libcom_err-no-init_error_table.patch New: ---- e2fsprogs-1.41.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.e28250/_old 2009-02-06 16:30:52.000000000 +0100 +++ /var/tmp/diff_new_pack.e28250/_new 2009-02-06 16:30:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package e2fsprogs (Version 1.41.1) +# spec file for package e2fsprogs (Version 1.41.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,8 +31,8 @@ Obsoletes: e2fsprogs-64bit %endif # -Version: 1.41.1 -Release: 13 +Version: 1.41.4 +Release: 1 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -47,15 +47,8 @@ Patch2: e2fsprogs-base_devt.patch Patch3: e2fsprogs-libvolume_id-support.patch Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch -Patch6: e2fsprogs-1.41.1-link_fix.patch Patch7: e2fsprogs-1.41.1-splash_support.patch -Patch8: e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch -Patch9: e2fsprogs-1.41.1-function_signature_fix.patch # libcom_err patches -# 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict -Patch31: libcom_err-no-init_error_table.patch -Patch32: libcom_err-disable_test.patch -Patch33: libcom_err-mutex.patch Patch34: libcom_err-compile_et_permissions.patch # Do not suppress make commands Patch99: e2fsprogs-no_cmd_hiding.patch @@ -268,14 +261,8 @@ %patch2 -p1 %patch3 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 # libcom_err patches -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 %patch34 -p1 %if %{no_command_hiding} %patch99 -p1 @@ -319,7 +306,6 @@ %check make check -make gcc-wall %clean rm -rf $RPM_BUILD_ROOT @@ -493,6 +479,95 @@ %{_mandir}/man3/com_err.3.gz %changelog +* Tue Feb 03 2009 mkoenig(a)suse.de +- update to version 1.41.4: + debugfs: + * enhance the "ncheck" command + * enhance "hash" command + * fix a potential memory leak + * fix the usage message for logdump command + * fix ncheck command so that it prints all of the names of + hardlinks in the same directory + * e2fsprogs 1.41 broke debugfs's logdump command for normal + ext3/4 filesystems with 32-bit block numbers, when the headers + for 64-bit block numbers was added. This regression has been fixed + * ncheck command has been fixed to avoid printing garbage + characters at the end of file names + e2fsck: + * don't accidentally print the translation file's + header when asking the user a custom question + * print the correct inode number for uinit_bg related problems + * will now offer to clear the test_fs flag if the ext4 filesystem + is available on linux + * fix a bug where in preen mode, if there are disk I/O errors + while trying to close a filesystem can lead to infinite loops + * no longer abort an fsck run if block group has an errant + INODE_UNINIT flag + * distinguish between fragmented directories and fragmented + files in verbose mode statistics and in the fragcheck report + * fix a bug which caused it double count non-contiguous + extent-based inodes + * e2fsck will leave some slack space when repacking directories + to allow room for a few directory entries to be added without + causing leaf nodes to be split right away + * fix a bug which caused e2fsck to crash when it comes across a + corrupted interior node in an extent tree + * e2fsck problem descriptions involving the journal are no longer + referred to as "ext3" problems, since ext4 filesystems also have + journals + * fix a long-standing bug in e2fsck which would cause it to crash + when replying journals for filesystems with block sizes greater + than 8k + badblocks: + * support for normal files which are greater than 2GB + * display the time and percentage complete when in verbose mode + resize2fs: + * fix a potential memory corruption problem + * fix a bug in resize2fs where passing in a bogus new size of + 0 blocks will cause resize2fs to drop into an infinite loop + * fix resize2fs for ext4 filesystems + tune2fs: + * now updates the block group checksums when changing the UUID + to avoid causing e2fsck to complain vociferously at the next reboot + * inode size resizing algorithms have been fixed so it is not + vastly inefficient for moderate-to-large filesystems + * fix inode resizing algorithm so it will not corrupt filesystems + laid out for RAID filesystems; in addition, tune2fs will refuse + to change the inode size for filesystems that have the flex_bg + feature enabled + dumpe2fs: + * fix bug which caused dumpe2fs to abort with an error if run on a + filesystem that contained an external journal + mke2fs: + * new option -U, which allows the user to specify the UUID that + should be used for the new filesystem + * treat devices that are exactly 16TB as if they were 16TB minus + one block + blkid: + * fix a file descriptor leak in libblkid + * correctly detect whether the ext4 and ext4dev filesystems + are available, so that the ext4dev->ext4 fallback code works + correctly + * fixed a bug which could sometimes cause blkid to return an + exit value of zero for a non-existent device + * recognize ext3 filesystems that have the test_fs flag + set as ext3 filesystems + * recognize btrfs filesystems and swap devices currently used + by user-level software suspend + libext2fs: + * add a check in the Unix I/O functions in libext2fs so that + when a device is opened read/write, return an error if the + device is read-only using the BLKROGET ioctl +- the libcom_err patches for bnc#66534 have been removed because + git commit d7f45af802330a0e1450afa05185d3722e77a76c + should fix the problem +- remove patches + e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch + e2fsprogs-1.41.1-function_signature_fix.patch + e2fsprogs-1.41.1-link_fix.patch + libcom_err-disable_test.patch + libcom_err-mutex.patch + libcom_err-no-init_error_table.patch * Tue Jan 13 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Thu Dec 04 2008 mkoenig(a)suse.de ++++++ e2fsprogs-1.41.1.tar.bz2 -> e2fsprogs-1.41.4.tar.bz2 ++++++ ++++ 67067 lines of diff (skipped) ++++++ e2fsprogs-libvolume_id-support.patch ++++++ --- /var/tmp/diff_new_pack.e28250/_old 2009-02-06 16:30:58.000000000 +0100 +++ /var/tmp/diff_new_pack.e28250/_new 2009-02-06 16:30:58.000000000 +0100 @@ -1,7 +1,7 @@ -diff --git a/misc/Makefile.in b/misc/Makefile.in -index be362e9..80af1b3 100644 ---- a/misc/Makefile.in -+++ b/misc/Makefile.in +Index: e2fsprogs-1.41.4/misc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/misc/Makefile.in 2008-11-15 18:33:33.000000000 +0100 ++++ e2fsprogs-1.41.4/misc/Makefile.in 2009-02-03 12:45:22.000000000 +0100 @@ -40,7 +40,7 @@ UUIDD_OBJS= uuidd.o DUMPE2FS_OBJS= dumpe2fs.o BADBLOCKS_OBJS= badblocks.o @@ -10,18 +10,18 @@ +FSCK_OBJS= fsck.o base_device.o ismounted.o fsck_volume_id.o BLKID_OBJS= blkid.o FILEFRAG_OBJS= filefrag.o + E2UNDO_OBJS= e2undo.o +@@ -81,6 +81,9 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) + STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) + STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) -@@ -62,6 +62,9 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) - LIBS_BLKID= $(LIBBLKID) $(LIBUUID) - DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) - -+LIBS_VOLID= -lvolume_id -+DEPLIBS_VOLID= ++LIBVOLID= -lvolume_id ++DEPLIBVOLID= + LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) -@@ -117,10 +120,6 @@ base_device: base_device.c +@@ -184,10 +187,6 @@ base_device: base_device.c @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ -DDEBUG -o base_device @@ -32,22 +32,29 @@ mklost+found: $(MKLPF_OBJS) @echo " LD $@" @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) -@@ -157,9 +156,9 @@ dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID) - @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ - $(LIBS_E2P) $(LIBUUID) $(LIBINTL) +@@ -250,14 +249,14 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O + $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \ + $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL) + +-fsck: $(FSCK_OBJS) $(DEPLIBBLKID) ++fsck: $(FSCK_OBJS) $(DEPLIBVOLID) + @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL) ++ @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBVOLID) $(LIBINTL) --fsck: $(FSCK_OBJS) $(DEBLIBS_BLKID) -+fsck: $(FSCK_OBJS) $(DEBLIBS_VOLID) +-fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID) ++fsck.profiled: $(PROFILED_FSCK_OBJS) $(DEPLIBVOLID) @echo " LD $@" -- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL) -+ @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL) + @$(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \ +- $(PROFILED_LIBBLKID) $(LIBINTL) ++ $(LIBVOLID) $(LIBINTL) badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) @echo " LD $@" -diff --git a/misc/base_device.c b/misc/base_device.c -index 6237d0e..c3261fc 100644 ---- a/misc/base_device.c -+++ b/misc/base_device.c +Index: e2fsprogs-1.41.4/misc/base_device.c +=================================================================== +--- e2fsprogs-1.41.4.orig/misc/base_device.c 2009-02-03 12:24:08.000000000 +0100 ++++ e2fsprogs-1.41.4/misc/base_device.c 2009-02-03 12:24:48.000000000 +0100 @@ -27,6 +27,8 @@ #endif #include <ctype.h> @@ -57,11 +64,11 @@ #include "fsck.h" -diff --git a/misc/fsck.c b/misc/fsck.c -index 5cf1a1c..ad1d7a9 100644 ---- a/misc/fsck.c -+++ b/misc/fsck.c -@@ -59,7 +59,6 @@ +Index: e2fsprogs-1.41.4/misc/fsck.c +=================================================================== +--- e2fsprogs-1.41.4.orig/misc/fsck.c 2009-02-03 12:24:08.000000000 +0100 ++++ e2fsprogs-1.41.4/misc/fsck.c 2009-02-03 12:24:48.000000000 +0100 +@@ -61,7 +61,6 @@ #include "../version.h" #include "nls-enable.h" #include "fsck.h" @@ -69,7 +76,7 @@ #ifndef _PATH_MNTTAB #define _PATH_MNTTAB "/etc/fstab" -@@ -118,7 +117,6 @@ struct fs_info *filesys_info = NULL, *filesys_last = NULL; +@@ -122,7 +121,6 @@ struct fs_info *filesys_info = NULL, *fi struct fsck_instance *instance_list; const char *fsck_prefix_path = "/sbin:/sbin/fs.d:/sbin/fs:/etc/fs:/etc"; char *fsck_path = 0; @@ -77,7 +84,7 @@ static char *string_copy(const char *s) { -@@ -296,7 +294,7 @@ static int parse_fstab_line(char *line, struct fs_info **ret_fs) +@@ -298,7 +296,7 @@ static int parse_fstab_line(char *line, parse_escape(freq); parse_escape(passno); @@ -86,8 +93,8 @@ if (dev) device = dev; -@@ -321,7 +319,7 @@ static void interpret_type(struct fs_info *fs) - +@@ -323,7 +321,7 @@ static void interpret_type(struct fs_inf + if (strcmp(fs->type, "auto") != 0) return; - t = blkid_get_tag_value(cache, "TYPE", fs->device); @@ -95,7 +102,7 @@ if (t) { free(fs->type); fs->type = t; -@@ -1104,7 +1102,7 @@ static void PRS(int argc, char *argv[]) +@@ -1120,7 +1118,7 @@ static void PRS(int argc, char *argv[]) progname); exit(EXIT_ERROR); } @@ -104,7 +111,7 @@ if (!dev && strchr(arg, '=')) { /* * Check to see if we failed because -@@ -1250,7 +1248,7 @@ int main(int argc, char *argv[]) +@@ -1266,7 +1264,7 @@ int main(int argc, char *argv[]) bindtextdomain(NLS_CAT_NAME, LOCALEDIR); textdomain(NLS_CAT_NAME); #endif @@ -113,7 +120,7 @@ PRS(argc, argv); if (!notitle) -@@ -1319,6 +1317,6 @@ int main(int argc, char *argv[]) +@@ -1337,6 +1335,6 @@ int main(int argc, char *argv[]) } status |= wait_many(FLAG_WAIT_ALL); free(fsck_path); @@ -121,11 +128,11 @@ + fsck_put_cache(); return status; } -diff --git a/misc/fsck.h b/misc/fsck.h -index 55cb525..242b21e 100644 ---- a/misc/fsck.h -+++ b/misc/fsck.h -@@ -66,5 +66,10 @@ struct fsck_instance { +Index: e2fsprogs-1.41.4/misc/fsck.h +=================================================================== +--- e2fsprogs-1.41.4.orig/misc/fsck.h 2009-02-03 12:24:08.000000000 +0100 ++++ e2fsprogs-1.41.4/misc/fsck.h 2009-02-03 12:24:48.000000000 +0100 +@@ -66,6 +66,11 @@ struct fsck_instance { struct fsck_instance *next; }; @@ -134,13 +141,13 @@ +extern char *fsck_get_devname(const char *device); +extern char *fsck_get_fstype(const char *device); + - extern char *base_device(const char *device); - extern const char *identify_fs(const char *fs_name, const char *fs_types); -diff --git a/misc/fsck_volume_id.c b/misc/fsck_volume_id.c -new file mode 100644 -index 0000000..9456394 ---- /dev/null -+++ b/misc/fsck_volume_id.c + extern dev_t base_devt(const char *device); + extern int match_device(const char *dev1, const char *dev2); + +Index: e2fsprogs-1.41.4/misc/fsck_volume_id.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ e2fsprogs-1.41.4/misc/fsck_volume_id.c 2009-02-03 12:24:48.000000000 +0100 @@ -0,0 +1,132 @@ +/* + * Wrapper for libvolume_id ++++++ e2fsprogs-no_cmd_hiding.patch ++++++ --- /var/tmp/diff_new_pack.e28250/_old 2009-02-06 16:30:58.000000000 +0100 +++ /var/tmp/diff_new_pack.e28250/_new 2009-02-06 16:30:58.000000000 +0100 @@ -1,7 +1,7 @@ -Index: e2fsprogs-1.41.1/lib/Makefile.elf-lib +Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib =================================================================== ---- e2fsprogs-1.41.1.orig/lib/Makefile.elf-lib 2008-01-01 22:47:01.000000000 +0100 -+++ e2fsprogs-1.41.1/lib/Makefile.elf-lib 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib 2008-10-07 16:22:39.000000000 +0200 ++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib 2009-02-03 13:09:04.000000000 +0100 @@ -15,7 +15,7 @@ all:: image real-subdirs:: Makefile @@ -11,10 +11,10 @@ ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION) ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION) -Index: e2fsprogs-1.41.1/lib/ext2fs/Makefile.in +Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/lib/ext2fs/Makefile.in 2008-09-01 17:36:59.000000000 +0200 -+++ e2fsprogs-1.41.1/lib/ext2fs/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in 2008-10-07 16:22:39.000000000 +0200 ++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -176,149 +176,118 @@ BSDLIB_INSTALL_DIR = $(root_libdir) all:: ext2fs.pc @@ -216,10 +216,10 @@ @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a @for i in $(HFILES); do \ -Index: e2fsprogs-1.41.1/lib/blkid/Makefile.in +Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/lib/blkid/Makefile.in 2008-08-28 16:26:31.000000000 +0200 -+++ e2fsprogs-1.41.1/lib/blkid/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in 2008-10-07 16:22:39.000000000 +0200 ++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) @@ -301,10 +301,10 @@ test_probe: test_probe.in Makefile @echo "Creating test_probe..." -Index: e2fsprogs-1.41.1/lib/e2p/Makefile.in +Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/lib/e2p/Makefile.in 2008-08-30 05:22:54.000000000 +0200 -+++ e2fsprogs-1.41.1/lib/e2p/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in 2008-10-07 16:22:39.000000000 +0200 ++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ @@ -325,10 +325,10 @@ $(srcdir)/ostype.c $(ALL_CFLAGS) tst_feature: $(srcdir)/feature.c -Index: e2fsprogs-1.41.1/lib/ss/Makefile.in +Index: e2fsprogs-1.41.4/lib/ss/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/lib/ss/Makefile.in 2008-08-25 06:19:56.000000000 +0200 -+++ e2fsprogs-1.41.1/lib/ss/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in 2008-10-07 16:22:39.000000000 +0200 ++++ e2fsprogs-1.41.4/lib/ss/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds XTRA_CFLAGS= -I$(srcdir)/../et @@ -401,10 +401,10 @@ $(LIBSS) $(LIBCOM_ERR) check:: all test_ss -Index: e2fsprogs-1.41.1/lib/uuid/Makefile.in +Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100 -+++ e2fsprogs-1.41.1/lib/uuid/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ @@ -489,10 +489,10 @@ uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status @echo " CONFIG.STATUS $@" -Index: e2fsprogs-1.41.1/e2fsck/Makefile.in +Index: e2fsprogs-1.41.4/e2fsck/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-09-05 14:41:09.000000000 +0200 -+++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-09-05 14:44:03.000000000 +0200 +--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in 2009-02-03 13:08:51.000000000 +0100 ++++ e2fsprogs-1.41.4/e2fsck/Makefile.in 2009-02-03 13:12:32.000000000 +0100 @@ -32,9 +32,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree @@ -505,7 +505,7 @@ # # Flags for using Checker -@@ -109,43 +108,35 @@ all:: profiled $(PROGS) e2fsck $(MANPAGE +@@ -110,43 +109,35 @@ all:: profiled $(PROGS) e2fsck $(MANPAGE @PROFILE_CMT@all:: e2fsck.profiled prof_err.c prof_err.h: prof_err.et @@ -549,7 +549,7 @@ - @echo " LD $@" - @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ + $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ - $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) + $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS) tst_region: region.c - @echo " LD $@" @@ -558,7 +558,7 @@ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) check:: tst_refcount tst_region tst_crc32 -@@ -154,21 +145,17 @@ check:: tst_refcount tst_region tst_crc3 +@@ -155,21 +146,17 @@ check:: tst_refcount tst_region tst_crc3 LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32 extend: extend.o @@ -584,7 +584,7 @@ profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \ $(ALL_CFLAGS) -@@ -177,16 +164,13 @@ profiled: +@@ -178,16 +165,13 @@ profiled: @PROFILE_CMT@ @mkdir profiled e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in @@ -604,7 +604,7 @@ $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs -@@ -194,17 +178,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE +@@ -195,17 +179,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE echo " INSTALL $(root_sbindir)/$$i"; \ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ done @@ -626,7 +626,7 @@ $(DESTDIR)$(root_sbindir)/fsck.ext4dev @for i in $(MANPAGES); do \ for j in $(COMPRESS_EXT); do \ -@@ -220,17 +200,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE +@@ -221,17 +201,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE echo " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done @@ -648,10 +648,10 @@ $(DESTDIR)$(man8dir)/fsck.ext4dev.8 install-strip: install -Index: e2fsprogs-1.41.1/debugfs/Makefile.in +Index: e2fsprogs-1.41.4/debugfs/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/debugfs/Makefile.in 2008-06-18 05:53:42.000000000 +0200 -+++ e2fsprogs-1.41.1/debugfs/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in 2008-06-18 05:53:42.000000000 +0200 ++++ e2fsprogs-1.41.4/debugfs/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -29,26 +29,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $( DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) @@ -684,10 +684,10 @@ $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs -Index: e2fsprogs-1.41.1/resize/Makefile.in +Index: e2fsprogs-1.41.4/resize/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/resize/Makefile.in 2007-06-30 14:58:35.000000000 +0200 -+++ e2fsprogs-1.41.1/resize/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/resize/Makefile.in 2007-06-30 14:58:35.000000000 +0200 ++++ e2fsprogs-1.41.4/resize/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) @@ -726,10 +726,10 @@ $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs -Index: e2fsprogs-1.41.1/util/Makefile.in +Index: e2fsprogs-1.41.4/util/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/util/Makefile.in 2007-06-30 14:58:37.000000000 +0200 -+++ e2fsprogs-1.41.1/util/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/util/Makefile.in 2007-06-30 14:58:37.000000000 +0200 ++++ e2fsprogs-1.41.4/util/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c @MCONFIG@ @@ -754,10 +754,10 @@ gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status @echo " CONFIG.STATUS $@" -Index: e2fsprogs-1.41.1/tests/progs/Makefile.in +Index: e2fsprogs-1.41.4/tests/progs/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/tests/progs/Makefile.in 2008-06-18 05:53:42.000000000 +0200 -+++ e2fsprogs-1.41.1/tests/progs/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/tests/progs/Makefile.in 2008-06-18 05:53:42.000000000 +0200 ++++ e2fsprogs-1.41.4/tests/progs/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(LIBCOM_ERR) @@ -790,10 +790,10 @@ clean: $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \ -Index: e2fsprogs-1.41.1/lib/et/Makefile.in +Index: e2fsprogs-1.41.4/lib/et/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/lib/et/Makefile.in 2008-09-05 14:41:09.000000000 +0200 -+++ e2fsprogs-1.41.1/lib/et/Makefile.in 2008-09-05 14:41:14.000000000 +0200 +--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in 2009-02-03 13:08:51.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/et/Makefile.in 2009-02-03 13:09:04.000000000 +0100 @@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) # what to build... # @@ -812,20 +812,24 @@ @MAKEFILE_LIBRARY@ @MAKEFILE_ELF@ -Index: e2fsprogs-1.41.1/misc/Makefile.in +Index: e2fsprogs-1.41.4/misc/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/misc/Makefile.in 2008-09-05 14:41:09.000000000 +0200 -+++ e2fsprogs-1.41.1/misc/Makefile.in 2008-09-05 14:47:27.000000000 +0200 -@@ -73,200 +73,154 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) +--- e2fsprogs-1.41.4.orig/misc/Makefile.in 2009-02-03 13:08:51.000000000 +0100 ++++ e2fsprogs-1.41.4/misc/Makefile.in 2009-02-03 13:15:53.000000000 +0100 +@@ -90,9 +90,8 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree .c.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $< -o $@ +-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< + $(CC) -c $(ALL_CFLAGS) $< -o $@ ++@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \ + all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \ $(FMANPAGES) $(LPROGS) +@@ -107,266 +106,209 @@ profiled: + @PROFILE_CMT@ @mkdir profiled prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et - @echo " COMPILE_ET prof_err.et" @@ -840,7 +844,10 @@ profile.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@ +-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \ + $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@ ++@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \ + @PROFILE_CMT@ $(srcdir)/../e2fsck/profile.c findsuper: findsuper.o - @echo " LD $@" @@ -852,17 +859,18 @@ - @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o + $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o - e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) + e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \ + $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \ - $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) + $(LIBBLKID) $(LIBEXT2FS) $(LIBINTL) - tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) + tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \ + $(DEPLIBUUID) $(LIBEXT2FS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ + $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ - $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) + $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBS_E2P) $(LIBINTL) tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID) - @echo " LD $@" @@ -871,21 +879,50 @@ $(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \ $(STATIC_LIBE2P) $(LIBINTL) - blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID) + tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \ + $(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \ + $(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBBLKID) \ + $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \ + $(PROFILED_LIBS) + + blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS) - @echo " LD $@" -- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL) -+ $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL) +- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \ ++ $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \ + $(LIBEXT2FS) + + blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \ + $(PROFILED_LIBEXT2FS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \ + $(PROFILED_LIBBLKID) $(LIBINTL) $(PROFILED_LIBEXT2FS) e2image: $(E2IMAGE_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL) + e2image.profiled: $(PROFILED_E2IMAGE_OBJS) $(PROFILED_DEPLIBS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \ + $(PROFILED_E2IMAGE_OBJS) $(PROFILED_LIBS) $(LIBINTL) + e2undo: $(E2UNDO_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL) + e2undo.profiled: $(PROFILED_E2UNDO_OBJS) $(PROFILED_DEPLIBS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \ + $(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL) + base_device: base_device.c - @echo " LD $@" - @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ @@ -897,11 +934,12 @@ - @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) - mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID) + mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \ + $(LIBEXT2FS) - @echo " LD $@" -- @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \ -+ $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \ - $(LIBE2P) $(LIBUUID) $(LIBINTL) +- @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \ ++ $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \ + $(LIBUUID) $(LIBEXT2FS) $(LIBE2P) $(LIBINTL) mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID) - @echo " LD $@" @@ -910,6 +948,15 @@ $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \ $(STATIC_LIBUUID) $(LIBINTL) + mke2fs.profiled: $(PROFILED_MKE2FS_OBJS) $(PROFILED_DEPLIBS) \ + $(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \ + $(PROFILED_MKE2FS_OBJS) $(PROFILED_LIBBLKID) \ + $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \ + $(PROFILED_LIBS) + chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) @@ -925,37 +972,80 @@ - @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) + uuidgen.profiled: $(PROFILED_UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \ + $(PROFILED_UUIDGEN_OBJS) $(PROFILED_LIBUUID) $(LIBINTL) + uuidd: $(UUIDD_OBJS) $(DEPLIBUUID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) + uuidd.profiled: $(PROFILED_UUIDD_OBJS) $(PROFILED_DEPLIBUUID) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \ + $(PROFILED_LIBUUID) $(LIBINTL) + dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ + $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ $(LIBS_E2P) $(LIBUUID) $(LIBINTL) - fsck: $(FSCK_OBJS) $(DEBLIBS_VOLID) + dumpe2fs.profiled: $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \ + $(PROFILED_LIBE2P) $(PROFILED_DEPLIBUUID) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \ + $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \ + $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL) + + fsck: $(FSCK_OBJS) $(DEPLIBVOLID) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBVOLID) $(LIBINTL) ++ $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBVOLID) $(LIBINTL) + + fsck.profiled: $(PROFILED_FSCK_OBJS) $(DEPLIBVOLID) - @echo " LD $@" -- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL) -+ $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL) +- @$(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \ + $(LIBVOLID) $(LIBINTL) badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) + badblocks.profiled: $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_DEPLIBS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \ + $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_LIBS) $(LIBINTL) + logsave: logsave.o - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o + $(CC) $(ALL_LDFLAGS) -o logsave logsave.o + logsave.profiled: profiled/logsave.o +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o ++ $(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o + filefrag: $(FILEFRAG_OBJS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) + $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) + filefrag.profiled: $(PROFILED_FILEFRAG_OBJS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \ ++ $(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \ + $(PROFILED_FILEFRAG_OBJS) + tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) - @echo " LD $@" $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) @@ -1062,7 +1152,7 @@ $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ -@@ -281,23 +235,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i +@@ -381,23 +323,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i echo " INSTALL $(sbindir)/$$i"; \ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ done @@ -1092,7 +1182,7 @@ $(DESTDIR)$(root_sbindir)/findfs @for i in $(UPROGS); do \ echo " INSTALL $(bindir)/$$i"; \ -@@ -316,17 +264,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i +@@ -416,17 +352,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i done @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc33 for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package gcc33 for openSUSE:Factory checked in at Fri Feb 6 16:27:10 CET 2009. -------- --- gcc33/gcc33.changes 2009-01-25 18:58:05.000000000 +0100 +++ gcc33/gcc33.changes 2009-02-04 16:43:48.000000000 +0100 @@ -2 +2,6 @@ -Sun Jan 25 18:57:59 CET 2009 - ro(a)suse.de +Wed Feb 4 16:34:35 CET 2009 - rguenther(a)suse.de + +- add baselibs.conf to build libstdc++33-x86. [bnc#471625] + +------------------------------------------------------------------- +Sun Jan 25 19:02:11 CET 2009 - ro(a)suse.de @@ -6,0 +12,5 @@ +Wed Jan 14 10:57:25 CET 2009 - rguenther(a)suse.de + +- Obsolete compat-libstdc++-64bit from libstdc++33 for ppc64. [bnc#437293] + +------------------------------------------------------------------- libgcj33.changes: same change calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc33.spec ++++++ --- /var/tmp/diff_new_pack.Ux3782/_old 2009-02-06 16:21:23.000000000 +0100 +++ /var/tmp/diff_new_pack.Ux3782/_new 2009-02-06 16:21:23.000000000 +0100 @@ -112,7 +112,7 @@ Url: http://gcc.gnu.org/ License: GPL v2 or later Version: 3.3.3 -Release: 9 +Release: 12 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -3.3 @@ -389,6 +389,9 @@ %if "" == "" Provides: compat-libstdc++:%{_libdir}/libstdc++.so.5 Obsoletes: compat-libstdc++ +%ifarch ppc64 +Obsoletes: compat-libstdc++-64bit +%endif %else %if %{build_primary_64bit} Provides: compat-libstdc++:%{_prefix}/lib/libstdc++.so.5 @@ -431,6 +434,9 @@ %if "-32bit" == "" Provides: compat-libstdc++:%{_libdir}/libstdc++.so.5 Obsoletes: compat-libstdc++ +%ifarch ppc64 +Obsoletes: compat-libstdc++-64bit +%endif %else %if %{build_primary_64bit} Provides: compat-libstdc++:%{_prefix}/lib/libstdc++.so.5 @@ -471,6 +477,9 @@ %if "-64bit" == "" Provides: compat-libstdc++:%{_libdir}/libstdc++.so.5 Obsoletes: compat-libstdc++ +%ifarch ppc64 +Obsoletes: compat-libstdc++-64bit +%endif %else %if %{build_primary_64bit} Provides: compat-libstdc++:%{_prefix}/lib/libstdc++.so.5 @@ -2108,8 +2117,12 @@ %endif %changelog +* Wed Feb 04 2009 rguenther(a)suse.de +- add baselibs.conf to build libstdc++33-x86. [bnc#471625] * Sun Jan 25 2009 ro(a)suse.de - update check-build.sh again +* Wed Jan 14 2009 rguenther(a)suse.de +- Obsolete compat-libstdc++-64bit from libstdc++33 for ppc64. [bnc#437293] * Fri Nov 21 2008 ro(a)suse.de - update check-build.sh * Wed Nov 12 2008 matz(a)suse.de ++++++ libgcj33.spec ++++++ --- /var/tmp/diff_new_pack.Ux3782/_old 2009-02-06 16:21:23.000000000 +0100 +++ /var/tmp/diff_new_pack.Ux3782/_new 2009-02-06 16:21:23.000000000 +0100 @@ -123,7 +123,7 @@ Url: http://gcc.gnu.org/ License: GPL v2 or later; LGPL v2.1 or later Version: 3.3.3 -Release: 9 +Release: 12 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -3.3 @@ -1053,8 +1053,12 @@ %endif %changelog +* Wed Feb 04 2009 rguenther(a)suse.de +- add baselibs.conf to build libstdc++33-x86. [bnc#471625] * Sun Jan 25 2009 ro(a)suse.de - update check-build.sh again +* Wed Jan 14 2009 rguenther(a)suse.de +- Obsolete compat-libstdc++-64bit from libstdc++33 for ppc64. [bnc#437293] * Fri Nov 21 2008 ro(a)suse.de - update check-build.sh * Wed Nov 12 2008 matz(a)suse.de ++++++ baselibs.conf ++++++ targettype x86 package libstdc++33 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.Ux3782/_old 2009-02-06 16:21:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Ux3782/_new 2009-02-06 16:21:26.000000000 +0100 @@ -297,6 +297,9 @@ %if "@variant@" == "" Provides: compat-libstdc++:%{_libdir}/libstdc++.so.5 Obsoletes: compat-libstdc++ +%ifarch ppc64 +Obsoletes: compat-libstdc++-64bit +%endif %else %if %{build_primary_64bit} Provides: compat-libstdc++:%{_prefix}/lib/libstdc++.so.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0