June 2006 - openSUSE Commits - openSUSE Mailing Lists

commit k3b
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package k3b checked in at Fri Jun 2 02:03:01 CEST 2006. -------- --- KDE/k3b/k3b.changes 2006-05-26 10:59:25.000000000 +0200 +++ k3b/k3b.changes 2006-06-01 11:36:31.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 1 11:36:27 CEST 2006 - stbinner(a)suse.de + +- handle blank DVDs differently than blank CDs (#177787) + +------------------------------------------------------------------- New: ---- install-dvd-desktops.diff k3b_create_data_dvd.desktop k3b_create_video_dvd.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.TVhGQQ/_old 2006-06-02 02:02:31.000000000 +0200 +++ /var/tmp/diff_new_pack.TVhGQQ/_new 2006-06-02 02:02:31.000000000 +0200 @@ -25,10 +25,12 @@ Summary: A Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools Version: 0.12.15 -Release: 6 +Release: 7 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 Source1: %name-i18n-%version.tar.bz2 +Source2: k3b_create_data_dvd.desktop +Source3: k3b_create_video_dvd.desktop Patch1: %name-resmgr.diff Patch2: hide-misleading-message.diff Patch3: sound.diff @@ -38,6 +40,7 @@ Patch7: %name-dvdformatting_umount.diff Patch8: use-kdeeject.diff Patch9: %name-fix_mountpoint.diff +Patch10: install-dvd-desktops.diff %if %suse_version > 930 Requires: hal-resmgr %endif @@ -113,6 +116,8 @@ %patch7 %patch8 %patch9 +%patch10 +cp %{SOURCE2} %{SOURCE3} src/konqi/ . /etc/opt/kde3/common_options update_admin cd ../k3b-i18n-%version @@ -207,6 +212,8 @@ %endif %changelog -n k3b +* Thu Jun 01 2006 - stbinner(a)suse.de +- handle blank DVDs differently than blank CDs (#177787) * Fri May 26 2006 - adrian(a)suse.de - fix %%opensuse_bs for autobuild * Wed May 24 2006 - adrian(a)suse.de ++++++ install-dvd-desktops.diff ++++++ --- src/konqi/Makefile.am 2006/05/24 14:10:22 1.1 +++ src/konqi/Makefile.am 2006/05/24 14:10:55 @@ -1,7 +1,9 @@ konqservice_DATA = k3b_create_data_cd.desktop \ + k3b_create_data_dvd.desktop \ k3b_create_audio_cd.desktop \ k3b_create_video_cd.desktop \ + k3b_create_video_dvd.desktop \ k3b_write_bin_image.desktop \ k3b_write_iso_image.desktop konqservicedir = $(kde_datadir)/konqueror/servicemenus ++++++ k3b-add-to-media.diff ++++++ --- /var/tmp/diff_new_pack.TVhGQQ/_old 2006-06-02 02:02:32.000000000 +0200 +++ /var/tmp/diff_new_pack.TVhGQQ/_new 2006-06-02 02:02:32.000000000 +0200 @@ -12,7 +12,7 @@ +++ k3b-0.12.10/src/konqi/k3b_create_data_cd.desktop 2006-02-01 16:02:03.015018225 +0100 @@ -4 +4 @@ -ServiceTypes=all/allfiles,inode/directory -+ServiceTypes=all/allfiles,inode/directory,media/blankcd,media/blankdvd ++ServiceTypes=all/allfiles,inode/directory,media/blankcd @@ -8 +8 @@ -Exec=k3b --datacd %F +Exec=k3b --datacd %U ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 idzebra
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package idzebra checked in at Fri Jun 2 02:02:20 CEST 2006. -------- --- idzebra/idzebra.changes 2006-01-25 21:36:35.000000000 +0100 +++ idzebra/idzebra.changes 2006-06-01 11:51:04.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 11:50:21 CEST 2006 - ke(a)suse.de + +- Version 1.3.34: + Bug fixes, for example fix for XPath indexing. + +------------------------------------------------------------------- Old: ---- idzebra-1.3.32.tar.gz New: ---- idzebra-1.3.34.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ idzebra.spec ++++++ --- /var/tmp/diff_new_pack.6OY6mq/_old 2006-06-02 02:02:09.000000000 +0200 +++ /var/tmp/diff_new_pack.6OY6mq/_new 2006-06-02 02:02:09.000000000 +0200 @@ -1,18 +1,18 @@ # -# spec file for package idzebra (Version 1.3.32) +# spec file for package idzebra (Version 1.3.34) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: idzebra BuildRequires: expat libyaz-devel openssl-devel readline-devel tcl-devel tcpd-devel -Version: 1.3.32 +Version: 1.3.34 Release: 1 Requires: yaz License: Other License(s), see package, GPL @@ -20,11 +20,11 @@ Source: ftp://ftp.indexdata.dk/pub/zebra/idzebra-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.indexdata.dk/zebra/ -Summary: Fielded free-text engine with a Z39.50 frontend +Summary: Fielded Free Text Engine with a Z39.50 Front-End %description -Zebra is a fielded free-text indexing and retrieval engine with a -Z39.50 frontend. You can use any compatible, commercial or freeware +Zebra is a fielded free text indexing and retrieval engine with a +Z39.50 front-end. You can use any compatible, commercial, or freeware Z39.50 client to access data stored in Zebra. @@ -101,6 +101,9 @@ %{_mandir}/*/* %changelog -n idzebra +* Thu Jun 01 2006 - ke(a)suse.de +- Version 1.3.34: + Bug fixes, for example fix for XPath indexing. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Nov 11 2005 - ke(a)suse.de ++++++ idzebra-1.3.32.tar.gz -> idzebra-1.3.34.tar.gz ++++++ ++++ 12466 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fetchmail
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package fetchmail checked in at Fri Jun 2 02:02:03 CEST 2006. -------- --- fetchmail/fetchmail.changes 2006-04-03 17:09:50.000000000 +0200 +++ fetchmail/fetchmail.changes 2006-06-01 16:43:48.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 16:43:40 CEST 2006 - sbrabec(a)suse.cz + +- By default run as non-root user fetchmail (159764#c1). +- Implemented "oneshot" in the init script (159764#c8). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fetchmail.spec ++++++ --- /var/tmp/diff_new_pack.MiAA6c/_old 2006-06-02 02:01:42.000000000 +0200 +++ /var/tmp/diff_new_pack.MiAA6c/_new 2006-06-02 02:01:42.000000000 +0200 @@ -16,7 +16,7 @@ Group: Productivity/Networking/Email/Utilities Autoreqprov: on Version: 6.3.2 -Release: 9 +Release: 15 Source: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.logrotate @@ -124,6 +124,10 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp sysconfig.%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates +%pre +usr/sbin/useradd -r -o -g daemon -s /bin/false \ + -c "mail retrieval daemon" -d /usr/bin fetchmail 2>/dev/null || : + %post %{fillup_and_insserv} @@ -152,6 +156,9 @@ %doc %{_mandir}/man1/fetchmailconf.1.gz %changelog -n fetchmail +* Thu Jun 01 2006 - sbrabec(a)suse.cz +- By default run as non-root user fetchmail (159764#c1). +- Implemented "oneshot" in the init script (159764#c8). * Mon Apr 03 2006 - sbrabec(a)suse.cz - Backported fixes for two crashes (159764#c9, 159764#c10). * Wed Jan 25 2006 - mls(a)suse.de ++++++ fetchmail.init ++++++ --- fetchmail/fetchmail.init 2004-09-24 14:00:42.000000000 +0200 +++ fetchmail/fetchmail.init 2006-04-03 15:36:28.000000000 +0200 @@ -39,16 +39,19 @@ else exit 6; fi; } # Read config -FETCHMAIL_POLLING_INTERVAL=600 -FETCHMAIL_FETCHALL=yes -FETCHMAIL_FETCHALL_OPTION= -FETCHMAIL_SILENT=no -FETCHMAIL_SILENT_OPTION= -FETCHMAIL_EXPERT_OPTIONS= +FETCHMAIL_POLLING_INTERVAL="600" +FETCHMAIL_FETCHALL="yes" +FETCHMAIL_SILENT="no" +FETCHMAIL_USER="fetchmail" +FETCHMAIL_EXPERT_OPTIONS="" + . $FETCHMAIL_CONFIG + +FETCHMAIL_FETCHALL_OPTION= if [ $FETCHMAIL_FETCHALL = "yes" ] ; then FETCHMAIL_FETCHALL_OPTION=" -a" fi +FETCHMAIL_SILENT_OPTION= if [ $FETCHMAIL_SILENT = "yes" ] ; then FETCHMAIL_SILENT_OPTION=" -s" fi @@ -88,11 +91,22 @@ # considered a success. case "$1" in + oneshot) + # Check for mails once just now. + if checkproc $FETCHMAIL_BIN ; then + # Trigger fetching of existing daemon. Root UID is OK. + su $FETCHMAIL_USER -c $FETCHMAIL_BIN + else + startproc -u $FETCHMAIL_USER $FETCHMAIL_BIN -d 0$FETCHMAIL_FETCHALL_OPTION$FETCHMAIL_SILENT_OPTION $FETCHMAIL_EXPERT_OPTIONS -f $FETCHMAIL_RC -L /var/log/fetchmail 2>&1 + fi + # Remember status and don'ŧ be verbose + rc_status + ;; start) echo -n "Starting fetchmail" ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - startproc $FETCHMAIL_BIN -d $FETCHMAIL_POLLING_INTERVAL$FETCHMAIL_FETCHALL_OPTION$FETCHMAIL_SILENT_OPTION $FETCHMAIL_EXPERT_OPTIONS -f $FETCHMAIL_RC -L /var/log/fetchmail 2>&1 + startproc -u $FETCHMAIL_USER $FETCHMAIL_BIN -d $FETCHMAIL_POLLING_INTERVAL$FETCHMAIL_FETCHALL_OPTION$FETCHMAIL_SILENT_OPTION $FETCHMAIL_EXPERT_OPTIONS -f $FETCHMAIL_RC -L /var/log/fetchmail 2>&1 # Remember status and be verbose rc_status -v @@ -188,7 +202,7 @@ test $FETCHMAIL_CONFIG -nt /var/run/fetchmail.pid || test $FETCHMAIL_RC -nt /var/run/fetchmail.pid && echo reload ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + echo "Usage: $0 {oneshot|start|stop|status|try-restart|restart|force-reload|reload}" exit 1 ;; esac ++++++ sysconfig.fetchmail ++++++ --- fetchmail/sysconfig.fetchmail 2004-09-24 13:56:57.000000000 +0200 +++ fetchmail/sysconfig.fetchmail 2006-06-01 16:03:22.000000000 +0200 @@ -7,7 +7,7 @@ # Polling interval in seconds for daemon mode. Mails are regularly # fetched in this interval. # -FETCHMAIL_POLLING_INTERVAL=600 +FETCHMAIL_POLLING_INTERVAL="600" ## Type: yesno ## Default: yes @@ -16,7 +16,7 @@ # retrieve only new messages and keep old (seen) messages, disable # this option. # -FETCHMAIL_FETCHALL=yes +FETCHMAIL_FETCHALL="yes" ## Type: yesno ## Default: no @@ -25,12 +25,23 @@ # not want to log every single message fetchmail downloads or keeps on # the server every time it polls, enable this option. # -FETCHMAIL_SILENT=no +FETCHMAIL_SILENT="no" + +## Type: list(fetchmail,root) +## Default: fetchmail +# +# Fetchmail runs by default as a non-root user. This is more secure, but +# can cause problems when using delivery via MDA. In this case, change +# it to "root". +# +FETCHMAIL_USER="fetchmail" ## Type: string ## Default: "" # # Any additional fetchmail options. See fetchmail(1) manual page for -# more information. +# more information. If you want to use --mda option, it may be required +# to change FETCHMAIL_USER to root. Consult your MDA documentation for +# more. # -FETCHMAIL_EXPERT_OPTIONS= +FETCHMAIL_EXPERT_OPTIONS="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package MozillaFirefox checked in at Fri Jun 2 02:01:29 CEST 2006. -------- --- MozillaFirefox/MozillaFirefox.changes 2006-05-23 21:13:01.000000000 +0200 +++ MozillaFirefox/MozillaFirefox.changes 2006-06-01 20:35:51.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 20:34:43 CEST 2006 - stark(a)suse.de + +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) + +------------------------------------------------------------------- Old: ---- 1.5.0.3.patch default_homepage.diff default_homepage.diff.sle10 firefox-1.5.0.3-source.tar.bz2 New: ---- firefox-1.5.0.4-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.66uauJ/_old 2006-06-02 02:00:35.000000000 +0200 +++ /var/tmp/diff_new_pack.66uauJ/_new 2006-06-02 02:00:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 1.5.0.3) +# spec file for package MozillaFirefox (Version 1.5.0.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ %if %sles_version == 10 Obsoletes: mozilla %endif -Version: 1.5.0.3 -Release: 11 +Version: 1.5.0.4 +Release: 1 Summary: Mozilla Firefox Web Browser URL: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -39,10 +39,8 @@ Source16: firefox.1 Source17: firefox-suse-default-prefs.js Source18: firefox.schemas -Patch0: 1.5.0.3.patch Patch1: visibility.patch Patch2: rpath.patch -Patch3: default_homepage.diff Patch4: pango-cairo.patch Patch5: abuild.patch # NSPR bmo #270502 @@ -83,7 +81,6 @@ Patch33: observer-lock.patch # integration Patch34: skin-selection.patch -Patch35: default_homepage.diff.sle10 # pango-cairo.patch dbus.patch startup.patch Patch100: configure.patch # system-nss.patch @@ -107,7 +104,7 @@ Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`) %endif %define _unpackaged_files_terminate_build 0 -%define releasedate 2006042500 +%define releasedate 2006052700 %define progname firefox %define progdir %{_prefix}/%_lib/firefox %define nld9 %(if grep -q sles9-sld /.buildenv; then echo 1; else echo 0; fi) @@ -154,15 +151,8 @@ %prep %setup -n mozilla -b 7 -b 4 -b 8 -q cd $RPM_BUILD_DIR/mozilla -%patch0 %patch1 %patch2 -# home-page -%if %sles_version == 10 -%patch35 -%else -%patch3 -%endif %patch4 %patch5 %patch6 @@ -249,7 +239,6 @@ ac_add_options --enable-static ac_add_options --disable-shared ac_add_options --disable-tests -ac_add_options --enable-startup-notification #ac_add_options --enable-debug EOF %if %is_plus || %suse_version >= 930 @@ -278,6 +267,11 @@ ac_add_options --enable-extensions="dbus default" EOF %endif +%if %suse_version >= 1010 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-startup-notification +EOF +%endif %if %milestone cat << EOF >> $MOZCONFIG ac_add_options --enable-official-branding @@ -356,13 +350,21 @@ (cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE5}) # browserconfig.properties %if %sles_version == 10 -sed "s;browser.startup.homepage=.*;browser.startup.homepage=http://www.novell.co… -s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=http://www.novell.com/linux/suselinux;g" \ - dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties -%else sed "s;browser.startup.homepage=.*;browser.startup.homepage=http://www.novell.co… s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=http://w…" \ dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +cat << EOF >> $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +browser.throbber.url=http://www.novell.com/linux/sle10 +startup.homepage_override_url=http://www.novell.com/linux/sle10 +EOF +%else +sed "s;browser.startup.homepage=.*;browser.startup.homepage=http://www.novell.co… +s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=http://www.novell.com/linux/suselinux/%suse_version;g" \ + dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +cat << EOF >> $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +browser.throbber.url=http://www.novell.com/linux/suselinux/%suse_version +startup.homepage_override_url=http://www.novell.com/linux/suselinux/%suse_version +EOF %endif mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ %if %milestone @@ -496,6 +498,9 @@ %defattr(-,root,root) %changelog -n MozillaFirefox +* Thu Jun 01 2006 - stark(a)suse.de +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) * Tue May 23 2006 - stark(a)suse.de - complete implementation of startup-notification (#115417) (including autoconf and remote support) ++++++ firefox-1.5.0.3-source.tar.bz2 -> firefox-1.5.0.4-source.tar.bz2 ++++++ MozillaFirefox/firefox-1.5.0.3-source.tar.bz2 MozillaFirefox/firefox-1.5.0.4-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-suse-default-prefs.js ++++++ --- MozillaFirefox/firefox-suse-default-prefs.js 2006-05-23 21:12:59.000000000 +0200 +++ MozillaFirefox/firefox-suse-default-prefs.js 2006-06-01 20:21:39.000000000 +0200 @@ -16,3 +16,5 @@ pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch +pref("startup.homepage_override_url", "resource:/browserconfig.properties"); +pref("browser.throbber.url", "resource:/browserconfig.properties"); ++++++ l10n.tar.bz2 ++++++ MozillaFirefox/l10n.tar.bz2 MozillaFirefox/l10n.tar.bz2 differ: char 11, line 1 ++++++ observer-lock.patch ++++++ --- /var/tmp/diff_new_pack.66uauJ/_old 2006-06-02 02:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.66uauJ/_new 2006-06-02 02:00:39.000000000 +0200 @@ -7,17 +7,17 @@ Index: xpcom/ds/nsObserverList.cpp =================================================================== RCS file: /cvsroot/mozilla/xpcom/ds/nsObserverList.cpp,v -retrieving revision 3.31 -diff -u -p -6 -r3.31 nsObserverList.cpp ---- xpcom/ds/nsObserverList.cpp 30 Jul 2004 02:43:13 -0000 3.31 -+++ xpcom/ds/nsObserverList.cpp 16 May 2006 04:09:08 -0000 -@@ -102,32 +102,38 @@ nsresult - nsObserverList::RemoveObserver(nsIObserver* anObserver) - { - PRBool removed = PR_FALSE; +retrieving revision 3.31.30.1 +diff -u -p -6 -r3.31.30.1 nsObserverList.cpp +--- xpcom/ds/nsObserverList.cpp 28 Apr 2006 02:25:00 -0000 3.31.30.1 ++++ xpcom/ds/nsObserverList.cpp 28 May 2006 19:23:22 -0000 +@@ -105,32 +105,37 @@ nsObserverList::RemoveObserver(nsIObserv NS_ENSURE_ARG(anObserver); + // Prevent the observer from being destroyed while we're inside the lock. + nsCOMPtr<nsIObserver> kungFuDeathGrip(anObserver); + - nsAutoLock lock(mLock); - - if (!mObserverList) @@ -37,7 +37,9 @@ - } else - observerRef = anObserver; + } -+ + +- if (!removed && observerRef) +- removed = mObserverList->RemoveElement(observerRef); + nsAutoLock lock(mLock); + + if (!mObserverList) @@ -46,12 +48,9 @@ + if (observerRef) { + removed = mObserverList->RemoveElement(observerRef); + } - -- if (!removed && observerRef) -- removed = mObserverList->RemoveElement(observerRef); -+ if (!removed && anObserver) { -+ removed = mObserverList->RemoveElement(anObserver); -+ } ++ ++ if (!removed && anObserver) ++ removed = mObserverList->RemoveElement(anObserver); #else + nsAutoLock lock(mLock); + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gtk2
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package gtk2 checked in at Fri Jun 2 02:00:39 CEST 2006. -------- --- GNOME/gtk2/gtk2.changes 2006-05-28 04:34:24.000000000 +0200 +++ gtk2/gtk2.changes 2006-06-01 13:59:29.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 1 13:56:24 CEST 2006 - sbrabec(a)suse.cz + +- Fixed I18N of file selector navigation buttons (#180696). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.f2ej7a/_old 2006-06-02 01:52:38.000000000 +0200 +++ /var/tmp/diff_new_pack.f2ej7a/_new 2006-06-02 01:52:38.000000000 +0200 @@ -22,7 +22,7 @@ Requires: gnome-filesystem PreReq: /usr/bin/touch /bin/rm /bin/rmdir Version: 2.8.10 -Release: 43 +Release: 45 Summary: Library for Creation of Graphical User Interfaces Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtk+/2.8/gtk+-%{version}.tar.bz2 Source1: SuSEconfig.gtk2 @@ -371,6 +371,8 @@ %{prefix}/share/gtk-doc/html/* %changelog -n gtk2 +* Thu Jun 01 2006 - sbrabec(a)suse.cz +- Fixed I18N of file selector navigation buttons (#180696). * Sun May 28 2006 - joeshaw(a)suse.de - Add gtk2-filechooserbutton-signal-disconnect-fix.patch to fix a crash when a GtkFileChooserButton is destroyed but not ++++++ gtk2-filesel-navbuttons.patch ++++++ --- /var/tmp/diff_new_pack.f2ej7a/_old 2006-06-02 01:52:39.000000000 +0200 +++ /var/tmp/diff_new_pack.f2ej7a/_new 2006-06-02 01:52:39.000000000 +0200 @@ -112,7 +112,7 @@ + gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); + -+ label = gtk_label_new_with_mnemonic ("_Home"); ++ label = gtk_label_new_with_mnemonic (_("_Home")); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), home_button); + gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); @@ -134,7 +134,7 @@ + gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); + -+ label = gtk_label_new_with_mnemonic ("D_esktop"); ++ label = gtk_label_new_with_mnemonic (_("D_esktop")); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), desk_button); + gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); @@ -156,7 +156,7 @@ + gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); + -+ label = gtk_label_new_with_mnemonic ("Docu_ments"); ++ label = gtk_label_new_with_mnemonic (_("Docu_ments")); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), docs_button); + gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-vfs2
by root＠suse.de 01 Jun '06

01 Jun '06

Hello community, here is the log from the commit of package gnome-vfs2 checked in at Fri Jun 2 01:52:31 CEST 2006. -------- --- GNOME/gnome-vfs2/gnome-vfs2.changes 2006-05-19 17:44:55.000000000 +0200 +++ gnome-vfs2/gnome-vfs2.changes 2006-06-01 19:52:13.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 1 19:51:53 CEST 2006 - federico(a)novell.com + +- Added gnome-vfs2-172870-unmount-uses-hal-udi-from-drive.diff to fix + part of https://bugzilla.novell.com/show_bug.cgi?id=172870. This + makes unmounting floppy drives work correctly. + +------------------------------------------------------------------- New: ---- gnome-vfs2-172870-unmount-uses-hal-udi-from-drive.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-vfs2.spec ++++++ --- /var/tmp/diff_new_pack.RPRyDH/_old 2006-06-02 01:52:20.000000000 +0200 +++ /var/tmp/diff_new_pack.RPRyDH/_new 2006-06-02 01:52:20.000000000 +0200 @@ -19,7 +19,7 @@ Requires: gnome-mime-data Autoreqprov: on Version: 2.12.2 -Release: 59 +Release: 61 Summary: The GNOME 2.x Desktop Virtual File System Libraries URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +50,7 @@ Patch31: gnome-vfs2-171156-ftp-large-files.diff Patch32: gnome-vfs2-149355-novfs-is-not-local.diff Patch33: gnome-vfs2-smb-bufsize.patch +Patch34: gnome-vfs2-172870-unmount-uses-hal-udi-from-drive.diff Obsoletes: gnome-vfs-extras Provides: gnome-vfs-extras @@ -159,6 +160,7 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 gnome-patch-translation-update # These patches have it's own translation management: %patch20 @@ -266,6 +268,10 @@ %{prefix}/share/gtk-doc/html/gnome-vfs-2.0 %changelog -n gnome-vfs2 +* Thu Jun 01 2006 - federico(a)novell.com +- Added gnome-vfs2-172870-unmount-uses-hal-udi-from-drive.diff to fix + part of https://bugzilla.novell.com/show_bug.cgi?id=172870. This + makes unmounting floppy drives work correctly. * Fri May 19 2006 - dave(a)suse.de - Work around a problem with samba servers not liking to return > 64k bytes. ++++++ gnome-vfs2-172870-unmount-uses-hal-udi-from-drive.diff ++++++ 2006-05-23 Federico Mena Quintero <federico(a)novell.com> * libgnomevfs/gnome-vfs-volume-ops.c (mount_unmount_operation): See if the HAL property "volume.mount.valid_options" has "uid=". In this case, add an uid option to our dbus message. This makes the mount be writable by the user. 2006-05-22 Federico Mena Quintero <federico(a)novell.com> * libgnomevfs/gnome-vfs-volume-ops.c (dispatch_callback_idle_cb): Call force_probe() before calling the user's callback, in a similar fashion to report_mount_result(). We need this so that the volume monitor will update itself. This way the user's callback will get a consistent view of the volume monitor's state. (force_probe): Move outside of the "#if !defined (USE_HAL)" block. 2006-05-21 Federico Mena Quintero <federico(a)novell.com> * libgnomevfs/gnome-vfs-volume-ops.c (gnome_vfs_volume_unmount): If the volume doesn't have a HAL UDI, get it from the corresponding drive. This is merged from CVS. Fixes the gnome-vfs part of https://bugzilla.novell.com/show_bug.cgi?id=172870 --- gnome-vfs/libgnomevfs/gnome-vfs-volume-ops.c.orig 2006-05-21 20:12:34.000000000 -0500 +++ gnome-vfs/libgnomevfs/gnome-vfs-volume-ops.c 2006-05-21 20:13:49.000000000 -0500 @@ -89,6 +89,37 @@ enum { UNMOUNT = 0x4, }; +static void +force_probe (void) +{ + GnomeVFSVolumeMonitor *volume_monitor; + GnomeVFSClient *client; + GNOME_VFS_Daemon daemon; + CORBA_Environment ev; + GnomeVFSDaemonForceProbeCallback callback; + + volume_monitor = gnome_vfs_get_volume_monitor (); + + if (gnome_vfs_get_is_daemon ()) { + callback = _gnome_vfs_get_daemon_force_probe_callback(); + (*callback) (GNOME_VFS_VOLUME_MONITOR (volume_monitor)); + } else { + client = _gnome_vfs_get_client (); + daemon = _gnome_vfs_client_get_daemon (client); + + if (daemon != CORBA_OBJECT_NIL) { + CORBA_exception_init (&ev); + GNOME_VFS_Daemon_forceProbe (daemon, + BONOBO_OBJREF (client), + &ev); + if (BONOBO_EX (&ev)) { + CORBA_exception_free (&ev); + } + CORBA_Object_release (daemon, NULL); + } + } +} + #if !defined (USE_HAL) && !defined (G_OS_WIN32) typedef struct { @@ -155,37 +186,6 @@ generate_unmount_error_message (char *st return message; } -static void -force_probe (void) -{ - GnomeVFSVolumeMonitor *volume_monitor; - GnomeVFSClient *client; - GNOME_VFS_Daemon daemon; - CORBA_Environment ev; - GnomeVFSDaemonForceProbeCallback callback; - - volume_monitor = gnome_vfs_get_volume_monitor (); - - if (gnome_vfs_get_is_daemon ()) { - callback = _gnome_vfs_get_daemon_force_probe_callback(); - (*callback) (GNOME_VFS_VOLUME_MONITOR (volume_monitor)); - } else { - client = _gnome_vfs_get_client (); - daemon = _gnome_vfs_client_get_daemon (client); - - if (daemon != CORBA_OBJECT_NIL) { - CORBA_exception_init (&ev); - GNOME_VFS_Daemon_forceProbe (daemon, - BONOBO_OBJREF (client), - &ev); - if (BONOBO_EX (&ev)) { - CORBA_exception_free (&ev); - } - CORBA_Object_release (daemon, NULL); - } - } -} - static gboolean report_mount_result (gpointer callback_data) { @@ -359,6 +359,14 @@ dispatch_callback_idle_cb (gpointer data closure = data; + /* fprintf (stderr, "LOG: gnome-vfs dispatch_callback_idle_cb(): d-bus call %s. Calling force_probe().\n", + closure->succeeded ? "SUCCEDED" : "FAILED"); */ + + /* We want to force probing here so that the daemon + can refresh and tell us (and everyone else) of the new + volume before we call the callback */ + force_probe (); + (* closure->callback) (closure->succeeded, closure->error_message, closure->detailed_error_message, @@ -388,6 +396,46 @@ queue_dispatch_callback (gboolean succee g_idle_add (dispatch_callback_idle_cb, closure); } +#ifdef USE_HAL +static gboolean +uid_is_valid_option (DBusConnection *dbus_ctx, const char *hal_udi) +{ + LibHalContext *hal_ctx; + DBusError error; + char **options; + char **p; + gboolean retval; + + hal_ctx = libhal_ctx_new (); + if (!hal_ctx) + return FALSE; + + libhal_ctx_set_dbus_connection (hal_ctx, dbus_ctx); + + dbus_error_init (&error); + + if (!libhal_ctx_init (hal_ctx, &error)) { + dbus_error_free (&error); + libhal_ctx_free (hal_ctx); + return FALSE; + } + + retval = FALSE; + + options = libhal_device_get_property_strlist (hal_ctx, hal_udi, "volume.mount.valid_options", NULL); + for (p = options; *p; p++) { + if (strcmp (*p, "uid=") == 0) + retval = TRUE; + } + libhal_free_string_array (options); + + libhal_ctx_shutdown (hal_ctx, NULL); + libhal_ctx_free (hal_ctx); + + return retval; +} +#endif + static void mount_unmount_operation (const char *mount_point, const char *device_path, @@ -427,17 +475,28 @@ mount_unmount_operation (const char *mou } if ((flags & MOUNT)) { - char *options[] = { NULL }; + GPtrArray *options; char *mount_point = ""; char *fstype = ""; - + char uid[32]; + + options = g_ptr_array_new (); + + if (uid_is_valid_option (dbus_ctx, hal_udi)) { + g_snprintf (uid, sizeof (uid), "uid=%d", getuid ()); + g_ptr_array_add (options, uid); + } + if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, - DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { + DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options->pdata, options->len, DBUS_TYPE_INVALID)) { queue_dispatch_callback (FALSE, _("Could not append args to dbus message"), method, callback, user_data); g_warning ("Mount failed for %s: could not append args to dbus message", hal_udi); dbus_message_unref (dmesg); + g_ptr_array_free (options, TRUE); goto exception; } + + g_ptr_array_free (options, TRUE); } if ((flags & UNMOUNT)) { @@ -666,14 +725,27 @@ gnome_vfs_volume_unmount (GnomeVFSVolume type = gnome_vfs_volume_get_volume_type (volume); if (type == GNOME_VFS_VOLUME_TYPE_MOUNTPOINT) { + char *hal_udi; + uri = gnome_vfs_volume_get_activation_uri (volume); mount_path = gnome_vfs_get_local_path_from_uri (uri); g_free (uri); device_path = gnome_vfs_volume_get_device_path (volume); filesystem_type = gnome_vfs_volume_get_filesystem_type (volume); + + hal_udi = gnome_vfs_volume_get_hal_udi (volume); + if (hal_udi == NULL) { + GnomeVFSDrive *drive; + drive = gnome_vfs_volume_get_drive (volume); + if (drive != NULL) { + hal_udi = gnome_vfs_drive_get_hal_udi (drive); + gnome_vfs_drive_unref (drive); + } + } + mount_unmount_operation (mount_path, device_path, - gnome_vfs_volume_get_hal_udi (volume), + hal_udi, filesystem_type, gnome_vfs_volume_get_device_type (volume), UNMOUNT, @@ -681,6 +753,7 @@ gnome_vfs_volume_unmount (GnomeVFSVolume g_free (mount_path); g_free (device_path); g_free (filesystem_type); + g_free (hal_udi); } else { unmount_connected_server (volume, callback, user_data); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gdm
by root＠suse.de 01 Jun '06

01 Jun '06

Hello community, here is the log from the commit of package gdm checked in at Fri Jun 2 01:51:46 CEST 2006. -------- --- GNOME/gdm/gdm.changes 2006-06-01 00:32:01.000000000 +0200 +++ gdm/gdm.changes 2006-06-01 01:07:03.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 01:06:50 CEST 2006 - hpj(a)suse.de + +- Don't let any user configure GDM from the login screen if a + theme with user list is in effect. Fixes Novell bug #180219. + +------------------------------------------------------------------- New: ---- gdm-2.8.0.7-prevent-unauthorized-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.Ffs2ai/_old 2006-06-02 01:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.Ffs2ai/_new 2006-06-02 01:51:33.000000000 +0200 @@ -22,7 +22,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.8.0.7 -Release: 65 +Release: 66 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -55,6 +55,7 @@ Patch25: gdm-2.8.0.7-user-must-own-iceauthority.patch Patch26: gdm-2.8.0.7-some-info-in-dialog.patch Patch27: gdm-no-ja-in-console.patch +Patch28: gdm-2.8.0.7-prevent-unauthorized-config.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} @@ -112,6 +113,7 @@ %patch25 -p1 %patch26 -p1 %patch27 +%patch28 -p1 gnome-patch-translation-update # This patch has its own translation updater. %patch18 @@ -239,6 +241,9 @@ %endif %changelog -n gdm +* Thu Jun 01 2006 - hpj(a)suse.de +- Don't let any user configure GDM from the login screen if a + theme with user list is in effect. Fixes Novell bug #180219. * Thu Jun 01 2006 - dreveman(a)suse.de - Fix bg patch and change gdm.conf patch so we pass -br to X server for black root window. (bnc 179847) ++++++ gdm-2.8.0.7-prevent-unauthorized-config.patch ++++++ diff -Nurp gdm-2.8.0.7-pre/gui/gdmlogin.c gdm-2.8.0.7-post/gui/gdmlogin.c --- gdm-2.8.0.7-pre/gui/gdmlogin.c 2006-05-31 16:20:02.000000000 -0500 +++ gdm-2.8.0.7-post/gui/gdmlogin.c 2006-05-31 16:40:35.000000000 -0500 @@ -801,6 +801,8 @@ gdm_parse_enriched_string (const char *p static void gdm_run_gdmconfig (GtkWidget *w, gpointer data) { + gtk_widget_set_sensitive (browser, FALSE); + /* we should be now fine for focusing new windows */ gdm_wm_focus_new_windows (TRUE); diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter.c gdm-2.8.0.7-post/gui/greeter/greeter.c --- gdm-2.8.0.7-pre/gui/greeter/greeter.c 2006-05-31 16:20:02.000000000 -0500 +++ gdm-2.8.0.7-post/gui/greeter/greeter.c 2006-05-31 16:40:31.000000000 -0500 @@ -438,7 +438,6 @@ greeter_ctrl_handler (GIOChannel *source buf[len-1] = '\0'; greeter_item_pam_set_user (buf); - greeter_item_ulist_enable (); printf ("%c\n", STX); fflush (stdout); break; @@ -595,6 +594,7 @@ greeter_ctrl_handler (GIOChannel *source printf ("%c\n", STX); fflush (stdout); greeter_ignore_buttons (FALSE); + greeter_item_ulist_enable (); break; case GDM_QUIT: @@ -1568,6 +1568,9 @@ main (int argc, char *argv[]) gtk_window_move (GTK_WINDOW (window), gdm_wm_screen.x, gdm_wm_screen.y); gtk_widget_show_now (window); + greeter_item_ulist_set_user (NULL); + greeter_item_ulist_enable (); + /* can it ever happen that it'd be NULL here ??? */ if G_UNLIKELY (window->window != NULL) { diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_item_ulist.c gdm-2.8.0.7-post/gui/greeter/greeter_item_ulist.c --- gdm-2.8.0.7-pre/gui/greeter/greeter_item_ulist.c 2005-11-22 14:43:50.000000000 -0600 +++ gdm-2.8.0.7-post/gui/greeter/greeter_item_ulist.c 2006-05-31 16:40:31.000000000 -0500 @@ -325,8 +325,6 @@ greeter_item_ulist_setup (void) force_no_tree_separators (user_list); greeter_generate_userlist (user_list); - if ( ! DOING_GDM_DEVELOPMENT) - greeter_item_ulist_disable (); /* Reset size of the widget canvas item so it * is the same size as the userlist. This diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_system.c gdm-2.8.0.7-post/gui/greeter/greeter_system.c --- gdm-2.8.0.7-pre/gui/greeter/greeter_system.c 2006-05-31 16:20:02.000000000 -0500 +++ gdm-2.8.0.7-post/gui/greeter/greeter_system.c 2006-05-31 16:40:31.000000000 -0500 @@ -121,6 +121,11 @@ greeter_suspend_handler (void) static void greeter_config_handler (void) { + greeter_item_ulist_disable (); + + /* Unselect the user */ + greeter_item_ulist_set_user (NULL); + /* we should be now fine for focusing new windows */ gdm_wm_focus_new_windows (TRUE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fvwm2
by root＠suse.de 01 Jun '06

01 Jun '06

Hello community, here is the log from the commit of package fvwm2 checked in at Fri Jun 2 01:50:59 CEST 2006. -------- --- fvwm2/cdesim.changes 2006-01-25 21:36:04.000000000 +0100 +++ fvwm2/cdesim.changes 2006-06-01 15:44:12.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 30 15:03:29 CEST 2006 - pnemec(a)suse.cz + +- updated to 2.5.16 + clean up in code see changelog +- patches (-64bit, -grab_pointer, -conf) are in upstream now +- patch -ia64 is in upstream only partially + +------------------------------------------------------------------- fvwm2.changes: same change Old: ---- fvwm-2.5.12-64bit.patch fvwm-2.5.12-conf.patch fvwm-2.5.12-config.patch fvwm-2.5.12-gcc-warnings.patch fvwm-2.5.12-grab_pointer.patch fvwm-2.5.12-ia64.patch fvwm-2.5.12.tar.bz2 New: ---- fvwm-2.5.16-gcc-warnings.patch fvwm-2.5.16-ia64.patch fvwm-2.5.16.tar.bz2 fvwm-configure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdesim.spec ++++++ --- /var/tmp/diff_new_pack.pbsvnH/_old 2006-06-02 01:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.pbsvnH/_new 2006-06-02 01:50:34.000000000 +0200 @@ -18,19 +18,17 @@ Requires: fvwm2 Autoreqprov: on Version: 0.42 -Release: 1258 -%define fvwmver 2.5.12 +Release: 1270 +%define fvwmver 2.5.16 Summary: CDE Simulator Source: cdesim-%{version}.tar.bz2 Source1: fvwm-%{fvwmver}.tar.bz2 Source2: CDEBanner.tar.bz2 Source3: %name.desktop Patch0: cdesim-%{version}.patch -Patch1: fvwm-%{fvwmver}-config.patch +Patch1: fvwm-configure.patch +Patch2: fvwm-%{fvwmver}-gcc-warnings.patch Patch3: fvwm-%{fvwmver}-ia64.patch -Patch4: fvwm-%{fvwmver}-conf.patch -Patch5: fvwm-%{fvwmver}-grab_pointer.patch -Patch6: fvwm-%{fvwmver}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,10 +60,10 @@ ln -sf fvwm-%{fvwmver} fvwm cd fvwm-%{fvwmver} %patch1 +%patch2 %patch3 -%patch4 -%patch5 -%patch6 +# +# build %build cd fvwm @@ -116,6 +114,11 @@ %changelog -n cdesim +* Tue May 30 2006 - pnemec(a)suse.cz +- updated to 2.5.16 + clean up in code see changelog +- patches (-64bit, -grab_pointer, -conf) are in upstream now +- patch -ia64 is in upstream only partially * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 04 2006 - lmichnovic(a)suse.cz ++++++ fvwm2.spec ++++++ --- /var/tmp/diff_new_pack.pbsvnH/_old 2006-06-02 01:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.pbsvnH/_new 2006-06-02 01:50:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package fvwm2 (Version 2.5.12) +# spec file for package fvwm2 (Version 2.5.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,22 +17,19 @@ Provides: fvwmicns windowmanager xpmroot Obsoletes: fvwm xpmroot Autoreqprov: on -Version: 2.5.12 -Release: 7 +Version: 2.5.16 +Release: 1 Summary: Improved Version of FVWM Window Manager URL: http://www.fvwm.org Source0: fvwm-%{version}.tar.bz2 Source1: fvwm_icons.tar.bz2 Source3: %name.desktop Source4: system.fvwm2rc -Patch0: fvwm-%{version}-config.patch -Patch2: fvwm-%{version}-ia64.patch -Patch3: fvwm-%{version}-conf.patch -Patch4: fvwm-%{version}-grab_pointer.patch -Patch6: fvwm-%{version}-64bit.patch -Patch7: fvwm-%{version}-gcc-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: xdg-menu, desktop-data, mktemp, xli +Patch0: fvwm-configure.patch +Patch1: fvwm-%{version}-gcc-warnings.patch +Patch2: fvwm-%{version}-ia64.patch %description FVWM is a virtual desktop window manager for the X Window System. @@ -50,14 +47,12 @@ %prep %setup -q -n fvwm-%{version} %patch0 +%patch1 %patch2 -%patch3 -%patch4 -%patch6 -%patch7 -# mkdir icons tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 +# +# build %build %{?suse_update_config:%{suse_update_config -f}} @@ -96,11 +91,6 @@ # icons install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/pixmaps install -m 644 icons/* $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fvwm2/pixmaps -# -# Remove xpmroot, it conflicts with the xpmroot package -# xpmroot does not exist any longer -#rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/xpmroot -#rm -f $RPM_BUILD_ROOT/usr/X11R6/man/man?/xpmroot.* # install kdm/gdm entry install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/ install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/xsessions/ @@ -124,6 +114,11 @@ /usr/share/xsessions %changelog -n fvwm2 +* Tue May 30 2006 - pnemec(a)suse.cz +- updated to 2.5.16 + clean up in code see changelog +- patches (-64bit, -grab_pointer, -conf) are in upstream now +- patch -ia64 is in upstream only partially * Fri Feb 17 2006 - pnemec(a)suse.cz - fixed menu entry #150221 * Wed Jan 25 2006 - mls(a)suse.de ++++++ fvwm-2.5.12-gcc-warnings.patch -> fvwm-2.5.16-gcc-warnings.patch ++++++ --- fvwm2/fvwm-2.5.12-gcc-warnings.patch 2005-10-20 14:12:50.000000000 +0200 +++ fvwm2/fvwm-2.5.16-gcc-warnings.patch 2006-06-01 14:02:37.000000000 +0200 @@ -1,6 +1,6 @@ --- fvwm/borders.c +++ fvwm/borders.c -@@ -3872,6 +3872,7 @@ +@@ -3912,6 +3912,7 @@ #define ROTATE_RECTANGLE(rot, r, vs_frame, vs_titlebar, vs_title) \ { \ rectangle tr; \ @@ -10,7 +10,7 @@ case ROTATION_270: /* ccw */ \ --- libs/Flocale.c +++ libs/Flocale.c -@@ -422,7 +422,7 @@ +@@ -419,7 +419,7 @@ int **l_to_v) { char *str1, *str2, *str3; @@ -19,13 +19,3 @@ int i; Bool do_iconv = True; const char *bidi_charset; -@@ -535,8 +535,7 @@ - { - free(str2); - } -- *do_free = True; -- len1 = len2; -+ *do_free = True; len1 = len2; - str1 = str3; - } - /* if we failed to do BIDI convert, return string string from ++++++ fvwm-2.5.12-ia64.patch -> fvwm-2.5.16-ia64.patch ++++++ --- fvwm2/fvwm-2.5.12-ia64.patch 2005-05-16 13:49:37.000000000 +0200 +++ fvwm2/fvwm-2.5.16-ia64.patch 2006-06-01 10:44:29.000000000 +0200 @@ -1,66 +1,37 @@ ---- fvwm/stack.c 2004-07-16 12:48:34.000000000 +0200 -+++ fvwm/stack.c 2005-05-16 13:48:08.855240323 +0200 -@@ -109,8 +109,8 @@ - for (t1 = Scr.FvwmRoot.stack_next; t1 != &Scr.FvwmRoot; - t1 = t1->stack_next) +--- fvwm/stack.c ++++ fvwm/stack.c +@@ -111,7 +111,7 @@ + t1 = t1->stack_next) { -- fprintf(stderr," l=%d fw=0x%08x f=0x%08x '%s'\n", t1->layer, -- (int)t1, (int)FW_W_FRAME(t1), t1->name.name); -+ fprintf(stderr," l=%d fw=%p f=%p '%s'\n", t1->layer, + fprintf(stderr," l=%d fw=%p f=0x%08x '%s'\n", t1->layer, +- t1, (int)FW_W_FRAME(t1), t1->name.name); + t1, FW_W_FRAME(t1), t1->name.name); } return; -@@ -168,8 +168,8 @@ - stderr, - "vsrc: stack ring is corrupt -" - " fvwm will probably crash! " -- "0x%08x -> 0x%08x but 0x%08x <- 0x%08x\n", -- (int)t2, (int)t1, (int)(t1->stack_prev), (int)t1); -+ "%p -> %p but %p <- %p\n", -+ t2, t1, t1->stack_prev, t1); - dump_stack_ring(); - return; - } -@@ -193,15 +193,15 @@ - { +@@ -199,14 +199,14 @@ fprintf( stderr,"vsrc: window already died:" -- " fw=0x%08x w=0x%08x '%s'\n", -- (int)t1, (int)FW_W_FRAME(t1), t1->name.name); -+ " fw=%p w=%p '%s'\n", + " fw=%p w=0x%08x '%s'\n", +- t1, (int)FW_W_FRAME(t1), t1->name.name); + t1, FW_W_FRAME(t1), t1->name.name); } else if (i >= last_index) { fprintf( stderr, "vsrc: window is at wrong position" -- " in stack ring: fw=0x%08x f=0x%08x '%s'\n", -- (int)t1, (int)FW_W_FRAME(t1), -+ " in stack ring: fw=%p f=%p '%s'\n", + " in stack ring: fw=%p f=0x%08x '%s'\n", +- t1, (int)FW_W_FRAME(t1), + t1, FW_W_FRAME(t1), t1->name.name); dump_stack_ring(); fprintf(stderr,"dumping X stacking order:\n"); -@@ -214,8 +214,8 @@ - if (FW_W_FRAME(t1) == children[i]) +@@ -222,7 +222,7 @@ { fprintf( -- stderr, " f=0x%08x\n", + stderr, " f=0x%08x\n", - (int)children[i]); -+ stderr, " f=%p\n", + children[i]); break; } } ---- modules/FvwmGtk/windowlist.c 2003-06-29 21:53:25.000000000 +0200 -+++ modules/FvwmGtk/windowlist.c 2005-05-16 13:48:08.873241736 +0200 -@@ -277,7 +277,7 @@ - compare_desk (const window_list_entry **u1, const window_list_entry **u2) - { - int r = (*u1)->desk - (*u2)->desk; -- return ((r != 0) ? r : (int) u1 - (int) u2); -+ return ((r != 0) ? r : (u1 > u2) - (u1 < u2)); - } - - static int ++++++ fvwm-2.5.12.tar.bz2 -> fvwm-2.5.16.tar.bz2 ++++++ ++++ 91192 lines of diff (skipped) ++++++ fvwm-configure.patch ++++++ --- configure.ac +++ configure.ac @@ -81,7 +81,7 @@ [if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR=""; fi], []) -FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR" +FVWM_MODULEDIR='${libexecdir}' FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR" FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib" FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc ++++++ system.fvwm2rc ++++++ --- fvwm2/system.fvwm2rc 2006-02-17 09:20:55.000000000 +0100 +++ fvwm2/system.fvwm2rc 2006-05-30 12:48:50.000000000 +0200 @@ -24,7 +24,7 @@ #paths specific to fvwm2 ModulePath /usr/X11R6/lib/X11/fvwm2 -ImagePath /usr/X11R6/share/icons/xpm/hicolor/all:/usr/X11R6/share/icons/xpm/locolor/all:/usr/X11R6/lib/X11/fvwm2/pixmaps:/usr/share/wallpapers +ImagePath /usr/X11R6/lib/X11/fvwm2/pixmaps:/usr/share/wallpapers #colors @@ -71,7 +71,6 @@ + "I" Quit AddToFunc InitFunction + "I" Module FvwmBanner - + "I" Exec susewmif xmessages + "I" Exec xterm -ls -geometry +150+85 + "I" Module FvwmButtons + "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png @@ -79,13 +78,11 @@ AddToFunc RestartFunction + "I" Module FvwmBanner + "I" Module FvwmButtons - + "I" Exec xmessages - + "I" Exec fvwm-root /usr/share/wallpapers/suse9.1-default.png+ "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png + + "I" Exec fvwm-root /usr/share/wallpapers/suse9.1-default.png + + "I" Exec xli -onroot -fillscreen -border /usr/share/wallpapers/suse9.1-default.png AddToFunc ExitFunction + "I" Exec xsetroot - + "I" Exec susewmif kill - + "I" Exec xsetroot #fvwm window modifier functions @@ -118,14 +115,14 @@ + "XV" Exec xv AddToMenu bartoolspopup "Tools" Title - + "Mozilla" Exec mozilla + + "Firefox" Exec firefox AddToMenu barshellspopup "Shell in XTerm" Title + "Shell in XTerm" Exec xterm -e bash -login + "Root shell" Function RootShell AddToMenu barsusepopup "SUSE" Title - + "Control Center" Exec xterm -e su - -cyast2 + + "Control Center" Exec xterm -e su - -c yast2 + "Help" Exec susehelp + "SUSE menu" Popup xdg_menu @@ -434,10 +431,9 @@ #button bar popup menus Key s A SM Function "barsusepopupfunc" -Key g A SM Function "bargraphicpopupfunc" +Key g A SM Function "bargraphicspopupfunc" Key t A SM Function "bartoolspopupfunc" -Key l A SM Function "barshellpopupfunc" -Key m A SM Function "MailFunc" +Key l A SM Function "barshellspopupfunc" Key F1 A SM Restart fvwm2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 freetype2
by root＠suse.de 01 Jun '06

01 Jun '06

Hello community, here is the log from the commit of package freetype2 checked in at Fri Jun 2 01:50:25 CEST 2006. -------- --- freetype2/freetype2.changes 2006-03-21 14:04:21.000000000 +0100 +++ freetype2/freetype2.changes 2006-06-01 13:03:42.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 01 13:02:51 CEST 2006 - mfabian(a)suse.de + +- Bugzilla #154928: fix several integer overflows. + +------------------------------------------------------------------- +Mon Apr 24 17:27:36 CEST 2006 - mfabian(a)suse.de + +- Bugzilla #133086: enable kerning, see + http://lists.nongnu.org/archive/html/freetype-devel/2005-09/msg00027.html + +------------------------------------------------------------------- ft2demos.changes: same change New: ---- bugzilla-133086-enable-kerning.patch bugzilla-154928-integer-overflows.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.e3cmgU/_old 2006-06-02 01:45:47.000000000 +0200 +++ /var/tmp/diff_new_pack.e3cmgU/_new 2006-06-02 01:45:47.000000000 +0200 @@ -15,7 +15,7 @@ Group: System/Libraries Autoreqprov: on Version: 2.1.10 -Release: 11 +Release: 18 URL: http://www.freetype.org Summary: A TrueType Font Library Source0: http://savannah.nongnu.org/download/freetype/freetype-2.1.10.tar.bz2 @@ -29,6 +29,8 @@ Patch6: bugzilla-158156-memory-leak.patch Patch7: bugzilla-158573-fix-orientation-detection.patch Patch8: bugzilla-159166-reduce-embolden-distance.patch +Patch9: bugzilla-133086-enable-kerning.patch +Patch10: bugzilla-154928-integer-overflows.patch Patch100: freetype2-bc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,6 +73,8 @@ %patch6 -p 1 %patch7 -p 1 %patch8 -p 1 +%patch9 -p 1 +%patch10 -p 1 # The byte code interpreter is compiled in by default # because of the following patch ('%patch100'). # For most fonts it is disabled again by default in the @@ -118,6 +122,11 @@ /usr/share/aclocal/* %changelog -n freetype2 +* Thu Jun 01 2006 - mfabian(a)suse.de +- Bugzilla #154928: fix several integer overflows. +* Mon Apr 24 2006 - mfabian(a)suse.de +- Bugzilla #133086: enable kerning, see + http://lists.nongnu.org/archive/html/freetype-devel/2005-09/msg00027.html * Tue Mar 21 2006 - dmueller(a)suse.de - build parallel * Mon Mar 20 2006 - zsu(a)suse.de ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.e3cmgU/_old 2006-06-02 01:45:47.000000000 +0200 +++ /var/tmp/diff_new_pack.e3cmgU/_new 2006-06-02 01:45:47.000000000 +0200 @@ -16,7 +16,7 @@ Group: Productivity/Publishing/Other Autoreqprov: on Version: 2.1.10 -Release: 12 +Release: 19 %define freetype_version 2.1.10 URL: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs @@ -32,6 +32,8 @@ Patch6: bugzilla-158156-memory-leak.patch Patch7: bugzilla-158573-fix-orientation-detection.patch Patch8: bugzilla-159166-reduce-embolden-distance.patch +Patch9: bugzilla-133086-enable-kerning.patch +Patch10: bugzilla-154928-integer-overflows.patch Patch50: bugzilla-159304-fix-ftview-glyph-index.patch Patch100: freetype2-bc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +59,8 @@ %patch6 -p 1 %patch7 -p 1 %patch8 -p 1 +%patch9 -p 1 +%patch10 -p 1 pushd ../ft2demos-%{version} %patch50 -p 1 popd @@ -102,6 +106,11 @@ %{_bindir}/testname %changelog -n ft2demos +* Thu Jun 01 2006 - mfabian(a)suse.de +- Bugzilla #154928: fix several integer overflows. +* Mon Apr 24 2006 - mfabian(a)suse.de +- Bugzilla #133086: enable kerning, see + http://lists.nongnu.org/archive/html/freetype-devel/2005-09/msg00027.html * Tue Mar 21 2006 - dmueller(a)suse.de - build parallel * Mon Mar 20 2006 - zsu(a)suse.de ++++++ bugzilla-133086-enable-kerning.patch ++++++ diff -ru freetype-2.1.10.orig/src/sfnt/sfobjs.c freetype-2.1.10/src/sfnt/sfobjs.c --- freetype-2.1.10.orig/src/sfnt/sfobjs.c 2005-05-21 19:22:28.000000000 +0200 +++ freetype-2.1.10/src/sfnt/sfobjs.c 2006-04-24 17:24:53.000000000 +0200 @@ -555,7 +555,7 @@ if ( face->vertical_info ) flags |= FT_FACE_FLAG_VERTICAL; -#if 0 +#if 1 /* kerning available ? */ if ( TT_FACE_HAS_KERNING( face ) ) flags |= FT_FACE_FLAG_KERNING; ++++++ bugzilla-154928-integer-overflows.patch ++++++ diff -ru freetype-2.1.10.orig/include/freetype/fterrdef.h freetype-2.1.10/include/freetype/fterrdef.h --- freetype-2.1.10.orig/include/freetype/fterrdef.h 2004-02-12 09:33:20.000000000 +0100 +++ freetype-2.1.10/include/freetype/fterrdef.h 2006-05-31 13:14:36.000000000 +0200 @@ -4,7 +4,7 @@ /* */ /* FreeType error codes (specification). */ /* */ -/* Copyright 2002, 2004 by */ +/* Copyright 2002, 2004, 2006 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -226,6 +226,8 @@ "`ENCODING' field missing" ) FT_ERRORDEF_( Missing_Bbx_Field, 0xB6, \ "`BBX' field missing" ) + FT_ERRORDEF_( Bbx_Too_Big, 0xB7, \ + "`BBX' too big" ) /* END */ diff -ru freetype-2.1.10.orig/src/base/ftutil.c freetype-2.1.10/src/base/ftutil.c --- freetype-2.1.10.orig/src/base/ftutil.c 2005-03-03 23:59:06.000000000 +0100 +++ freetype-2.1.10/src/base/ftutil.c 2006-05-31 17:44:11.000000000 +0200 @@ -67,6 +67,14 @@ } FT_MEM_ZERO( *P, size ); } + else if ( size < 0 ) + { + /* may help catch/prevent security issues */ + FT_ERROR(( "FT_QAlloc:" )); + FT_ERROR(( " Negative size requested. (%ld requested)\n", + size )); + return FT_Err_Invalid_Argument; + } else *P = NULL; @@ -99,6 +107,14 @@ return FT_Err_Out_Of_Memory; } } + else if ( size < 0 ) + { + /* may help catch/prevent security issues */ + FT_ERROR(( "FT_QAlloc:" )); + FT_ERROR(( " Negative size requested. (%ld requested)\n", + size )); + return FT_Err_Invalid_Argument; + } else *P = NULL; @@ -128,7 +144,11 @@ return FT_Alloc( memory, size, P ); /* if the new block if zero-sized, clear the current one */ - if ( size <= 0 ) + if ( size < 0 || current < 0 ) + { + return FT_Err_Invalid_Argument; + } + else if ( size == 0 ) { FT_Free( memory, P ); return FT_Err_Ok; @@ -170,7 +190,11 @@ return FT_QAlloc( memory, size, P ); /* if the new block if zero-sized, clear the current one */ - if ( size <= 0 ) + if ( size < 0 || current < 0 ) + { + return FT_Err_Invalid_Argument; + } + else if ( size == 0 ) { FT_Free( memory, P ); return FT_Err_Ok; diff -ru freetype-2.1.10.orig/src/bdf/bdflib.c freetype-2.1.10/src/bdf/bdflib.c --- freetype-2.1.10.orig/src/bdf/bdflib.c 2005-05-21 19:19:52.000000000 +0200 +++ freetype-2.1.10/src/bdf/bdflib.c 2006-05-31 13:14:36.000000000 +0200 @@ -1092,6 +1092,7 @@ #define ERRMSG1 "[line %ld] Missing \"%s\" line.\n" #define ERRMSG2 "[line %ld] Font header corrupted or missing fields.\n" #define ERRMSG3 "[line %ld] Font glyphs corrupted or missing fields.\n" +#define ERRMSG4 "[line %ld] BBX too big.\n" static FT_Error @@ -1805,6 +1806,9 @@ /* And finally, gather up the bitmap. */ if ( ft_memcmp( line, "BITMAP", 6 ) == 0 ) { + unsigned long bitmap_size; + + if ( !( p->flags & _BDF_BBX ) ) { /* Missing BBX field. */ @@ -1815,7 +1819,16 @@ /* Allocate enough space for the bitmap. */ glyph->bpr = ( glyph->bbx.width * p->font->bpp + 7 ) >> 3; - glyph->bytes = (unsigned short)( glyph->bpr * glyph->bbx.height ); + + bitmap_size = glyph->bpr * glyph->bbx.height; + if ( bitmap_size > 0xFFFFU ) + { + FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG4, lineno )); + error = BDF_Err_Bbx_Too_Big; + goto Exit; + } + else + glyph->bytes = (unsigned short)bitmap_size; if ( FT_NEW_ARRAY( glyph->bitmap, glyph->bytes ) ) goto Exit; freetype-2.1.10/src/bdfだけに発見: bdflib.c.orig diff -ru freetype-2.1.10.orig/src/cff/cffgload.c freetype-2.1.10/src/cff/cffgload.c --- freetype-2.1.10.orig/src/cff/cffgload.c 2005-04-18 06:53:05.000000000 +0200 +++ freetype-2.1.10/src/cff/cffgload.c 2006-05-31 13:16:29.000000000 +0200 @@ -2284,7 +2284,7 @@ FT_LOCAL_DEF( FT_Error ) cff_slot_load( CFF_GlyphSlot glyph, CFF_Size size, - FT_Int glyph_index, + FT_UInt glyph_index, FT_Int32 load_flags ) { FT_Error error; @@ -2330,7 +2330,7 @@ error = sfnt->load_sbit_image( face, (FT_ULong)size->strike_index, - (FT_UInt)glyph_index, + glyph_index, (FT_Int)load_flags, stream, &glyph->root.bitmap, @@ -2393,7 +2393,12 @@ /* subsetted font, glyph_indices and CIDs are identical, though */ if ( cff->top_font.font_dict.cid_registry != 0xFFFFU && cff->charset.cids ) - glyph_index = cff->charset.cids[glyph_index]; + { + if ( glyph_index < cff->charset.max_cid ) + glyph_index = cff->charset.cids[glyph_index]; + else + glyph_index = 0; + } cff_decoder_init( &decoder, face, size, glyph, hinting, FT_LOAD_TARGET_MODE( load_flags ) ); diff -ru freetype-2.1.10.orig/src/cff/cffgload.h freetype-2.1.10/src/cff/cffgload.h --- freetype-2.1.10.orig/src/cff/cffgload.h 2004-05-13 23:59:17.000000000 +0200 +++ freetype-2.1.10/src/cff/cffgload.h 2006-05-31 13:14:36.000000000 +0200 @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -196,7 +196,7 @@ FT_LOCAL( FT_Error ) cff_slot_load( CFF_GlyphSlot glyph, CFF_Size size, - FT_Int glyph_index, + FT_UInt glyph_index, FT_Int32 load_flags ); diff -ru freetype-2.1.10.orig/src/cff/cffload.c freetype-2.1.10/src/cff/cffload.c --- freetype-2.1.10.orig/src/cff/cffload.c 2005-05-06 07:49:46.000000000 +0200 +++ freetype-2.1.10/src/cff/cffload.c 2006-05-31 13:14:38.000000000 +0200 @@ -1235,7 +1235,7 @@ } /* access element */ - if ( off1 ) + if ( off1 && off2 > off1 ) { *pbyte_len = off2 - off1; @@ -1688,6 +1688,8 @@ for ( i = 0; i < num_glyphs; i++ ) charset->cids[charset->sids[i]] = (FT_UShort)i; + + charset->max_cid = max_cid; } Exit: @@ -2011,7 +2013,7 @@ if ( error ) goto Exit; - + /* if it is a CID font, we stop there */ if ( top->cid_registry != 0xFFFFU ) goto Exit; @@ -2040,6 +2042,9 @@ FT_FRAME_EXIT(); if ( error ) goto Exit; + + /* ensure that 'num_blue_values' is even */ + priv->num_blue_values &= ~1; } /* read the local subrs, if any */ freetype-2.1.10/src/cffだけに発見: cffload.c.orig diff -ru freetype-2.1.10.orig/src/cff/cfftypes.h freetype-2.1.10/src/cff/cfftypes.h --- freetype-2.1.10.orig/src/cff/cfftypes.h 2003-12-20 08:30:05.000000000 +0100 +++ freetype-2.1.10/src/cff/cfftypes.h 2006-05-31 13:14:36.000000000 +0200 @@ -5,7 +5,7 @@ /* Basic OpenType/CFF type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2001, 2002, 2003 by */ +/* Copyright 1996-2001, 2002, 2003, 2006 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -84,6 +84,7 @@ FT_UShort* sids; FT_UShort* cids; /* the inverse mapping of `sids'; only needed */ /* for CID-keyed fonts */ + FT_UInt max_cid; } CFF_CharsetRec, *CFF_Charset; diff -ru freetype-2.1.10.orig/src/pshinter/pshglob.c freetype-2.1.10/src/pshinter/pshglob.c --- freetype-2.1.10.orig/src/pshinter/pshglob.c 2004-04-02 09:13:53.000000000 +0200 +++ freetype-2.1.10/src/pshinter/pshglob.c 2006-05-31 13:14:38.000000000 +0200 @@ -150,7 +150,7 @@ FT_UNUSED( target ); - for ( ; read_count > 0; read_count -= 2 ) + for ( ; read_count > 1; read_count -= 2 ) { FT_Int reference, delta; FT_UInt count; diff -ru freetype-2.1.10.orig/src/sfnt/ttcmap.c freetype-2.1.10/src/sfnt/ttcmap.c --- freetype-2.1.10.orig/src/sfnt/ttcmap.c 2005-05-11 16:37:40.000000000 +0200 +++ freetype-2.1.10/src/sfnt/ttcmap.c 2006-05-31 15:51:55.000000000 +0200 @@ -2145,13 +2145,12 @@ offset = TT_NEXT_ULONG( p ); if ( offset && - table + offset + 2 < limit && - table + offset >= table ) + offset <= face->cmap_size -2 ) { FT_Byte* cmap = table + offset; volatile FT_UInt format = TT_PEEK_USHORT( cmap ); const TT_CMap_Class* volatile pclazz = tt_cmap_classes; - TT_CMap_Class clazz; + TT_CMap_Class volatile clazz; for ( ; *pclazz; pclazz++ ) diff -ru freetype-2.1.10.orig/src/type1/t1load.c freetype-2.1.10/src/type1/t1load.c --- freetype-2.1.10.orig/src/type1/t1load.c 2005-04-14 13:39:28.000000000 +0200 +++ freetype-2.1.10/src/type1/t1load.c 2006-05-31 13:14:38.000000000 +0200 @@ -1989,6 +1989,9 @@ keyword_flags ); if ( error ) goto Exit; + + /* ensure even-ness of 'num_blue_values' */ + priv->num_blue_values &= ~1; #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 eog
by root＠suse.de 01 Jun '06

01 Jun '06

Hello community, here is the log from the commit of package eog checked in at Fri Jun 2 01:42:57 CEST 2006. -------- --- GNOME/eog/eog.changes 2006-03-27 00:39:46.000000000 +0200 +++ eog/eog.changes 2006-06-01 21:14:13.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 21:13:40 CEST 2006 - joeshaw(a)suse.de + +- Add a patch to fix a crash when toggling very quickly between + two images. (bnc #180396) + +------------------------------------------------------------------- New: ---- eog-fast-image-switch-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eog.spec ++++++ --- /var/tmp/diff_new_pack.8PtjOl/_old 2006-06-02 01:39:11.000000000 +0200 +++ /var/tmp/diff_new_pack.8PtjOl/_new 2006-06-02 01:39:12.000000000 +0200 @@ -20,10 +20,11 @@ Obsoletes: eog2 Autoreqprov: on Version: 2.12.2 -Release: 14 +Release: 22 Summary: Eye of GNOME for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Patch: eog-casts.patch +Patch1: eog-fast-image-switch-crash.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -38,6 +39,7 @@ %prep %setup -q %patch +%patch1 %build rename no nb po/no.* @@ -92,6 +94,9 @@ %{prefix}/share/pixmaps/eog %changelog -n eog +* Thu Jun 01 2006 - joeshaw(a)suse.de +- Add a patch to fix a crash when toggling very quickly between + two images. (bnc #180396) * Mon Mar 27 2006 - ro(a)suse.de - remove scrollkeeper stuff if created on s390* * Tue Feb 28 2006 - sbrabec(a)suse.cz ++++++ eog-fast-image-switch-crash.patch ++++++ Index: libeog/eog-image.c =================================================================== RCS file: /cvs/gnome/eog/libeog/eog-image.c,v retrieving revision 1.58.6.1 diff -u -p -u -r1.58.6.1 eog-image.c --- libeog/eog-image.c 13 Oct 2005 03:05:31 -0000 1.58.6.1 +++ libeog/eog-image.c 31 May 2006 17:12:52 -0000 @@ -917,8 +917,7 @@ eog_image_load (EogImage *img, guint dat } if (eog_image_has_data (img, data2read)) { - g_warning ("Image %s has requested data already loaded.\n", - eog_image_get_caption (img)); + return TRUE; } if (priv->status == EOG_IMAGE_STATUS_FAILED) { Index: shell/eog-window.c =================================================================== RCS file: /cvs/gnome/eog/shell/eog-window.c,v retrieving revision 1.152.6.3 diff -u -p -u -r1.152.6.3 eog-window.c --- shell/eog-window.c 30 Oct 2005 04:01:12 -0000 1.152.6.3 +++ shell/eog-window.c 31 May 2006 17:12:52 -0000 @@ -2972,7 +2972,7 @@ job_image_load_finished (EogJob *job, gp g_assert_not_reached (); } - g_object_unref (image); + eog_image_data_unref (image); } static void @@ -3020,10 +3020,12 @@ handle_image_selection_changed (EogWrapL data = g_new0 (EogJobImageLoadData, 1); EOG_JOB_DATA (data)->window = window; - data->image = image; /* no additional ref required, since - * its already increased by - * eog_wrap_lsit_get_first_selected_image - */ + data->image = eog_image_data_ref (image); + + /* Need to unref this, because the refcount was already + * increased by eog_wrap_list_get_first_selected_image + */ + g_object_unref (image); job = eog_job_new_full (data, job_image_load_action, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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