December 2011 - openSUSE Commits - openSUSE Mailing Lists

commit eject for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package eject for openSUSE:Factory checked in at 2011-12-01 12:23:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eject (Old) and /work/SRC/openSUSE:Factory/.eject.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eject", Maintainer is "PUzel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/eject/eject.changes 2011-09-23 01:56:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.eject.new/eject.changes 2011-12-01 12:23:59.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 14:21:03 UTC 2011 - coolo(a)suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eject.spec ++++++ --- /var/tmp/diff_new_pack.9weV7Z/_old 2011-12-01 12:24:00.000000000 +0100 +++ /var/tmp/diff_new_pack.9weV7Z/_new 2011-12-01 12:24:00.000000000 +0100 @@ -15,16 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: eject -BuildRequires: recode sg3_utils-devel -License: GPL v2 or later +BuildRequires: automake +BuildRequires: recode +BuildRequires: sg3_utils-devel +License: GPL-2.0+ Group: System/Base Url: http://eject.sourceforge.net/ Summary: A Program to Eject Media under Software Control Version: 2.1.0 -Release: 143 +Release: 0 Source: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-subfs.diff Patch3: %{name}-%{version}-scsi.diff -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cellwriter for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package cellwriter for openSUSE:Factory checked in at 2011-12-01 12:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cellwriter (Old) and /work/SRC/openSUSE:Factory/.cellwriter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cellwriter", Maintainer is "DKukawka(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/cellwriter/cellwriter.changes 2011-09-23 01:53:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cellwriter.new/cellwriter.changes 2011-12-01 12:23:43.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Nov 30 10:33:34 UTC 2011 - coolo(a)suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Sat Sep 17 22:45:13 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cellwriter.spec ++++++ --- /var/tmp/diff_new_pack.SCRzty/_old 2011-12-01 12:23:45.000000000 +0100 +++ /var/tmp/diff_new_pack.SCRzty/_new 2011-12-01 12:23:45.000000000 +0100 @@ -15,21 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: cellwriter Summary: Character-based handwriting input panel Version: 1.3.4 -Release: 45 +Release: 0 Source0: %{name}-%{version}.tar.bz2 # feel free to improve this patch and please upstream it Patch0: %{name}-no-copy-dt-needed-entries.patch Url: http://risujin.org/cellwriter/ Group: System/GUI/GNOME BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: GPL v2 or later -BuildRequires: gtk2-devel update-desktop-files xorg-x11-devel +License: GPL-2.0+ +BuildRequires: automake gtk2-devel update-desktop-files xorg-x11-devel Requires: gtk2 %description @@ -39,12 +38,6 @@ you entered is sent to the currently focused application as if typed on the keyboard. - - -Authors: --------- - Michael Levin <risujin(a)risujin.org> - %prep %setup -q %patch0 -p1 @@ -54,15 +47,12 @@ autoreconf -fi %configure \ --without-gnome -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall %suse_update_desktop_file -i -G "Handwriting Input Panel" cellwriter Utility Accessibility -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc README NEWS COPYING AUTHORS -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2011-12-01 12:23:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-11-29 15:07:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2011-12-01 12:23:38.000000000 +0100 @@ -2 +2 @@ -Tue Nov 29 07:40:07 CET 2011 - autobuild(a)suse.de +Thu Dec 1 06:40:04 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-11-29 +- automated update on 2011-12-01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.Eyopff/_old 2011-12-01 12:23:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Eyopff/_new 2011-12-01 12:23:40.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD3c Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2011.11.29 +Version: 2011.12.1 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.Eyopff/_old 2011-12-01 12:23:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Eyopff/_new 2011-12-01 12:23:40.000000000 +0100 @@ -82567,6 +82567,12 @@ Chatsworth CA 91311 UNITED STATES +10-F9-6F (hex) LG Electronics +10F96F (base 16) LG Electronics + 60-39 , Kasan-dong, Gumcheon-gu + Seoul 153-801 + KOREA, REPUBLIC OF + 10-F9-EE (hex) Nokia Corporation 10F9EE (base 16) Nokia Corporation Yrttipellontie 6 @@ -83220,6 +83226,12 @@ Xindian City, Taipei County 231 TAIWAN, REPUBLIC OF CHINA +1C-51-B5 (hex) Techaya LTD +1C51B5 (base 16) Techaya LTD + P.O.B 1500 + Pardes Hanna 3700 + ISRAEL + 1C-5C-55 (hex) PRIMA Cinema, Inc 1C5C55 (base 16) PRIMA Cinema, Inc 1903 Wright Place, Suite 320 @@ -84755,6 +84767,12 @@ Zywiec Slaskie 34-300 POLAND +34-2F-6E (hex) Anywire corporation +342F6E (base 16) Anywire corporation + 8-1 Shimo-inden Inouchi + Nagaokakyo Kyoto pref. 617-0813 + JAPAN + 34-40-B5 (hex) IBM 3440B5 (base 16) IBM 3039 E Cornwallis Rd @@ -88180,6 +88198,13 @@ Shenzhen Guangdong 518057 CHINA +64-5E-BE (hex) Yahoo! JAPAN +645EBE (base 16) Yahoo! JAPAN + Midtown Tower + 9-7-1 Akasaka + Minato-ku Tokyo 107-6211 + JAPAN + 64-65-C0 (hex) Nuvon, Inc 6465C0 (base 16) Nuvon, Inc 3130 Alpine Road @@ -88491,6 +88516,13 @@ Hsin Tien Taipei Hsien 231 TAIWAN, REPUBLIC OF CHINA +68-16-05 (hex) Systems And Electronic Development FZCO +681605 (base 16) Systems And Electronic Development FZCO + Roundabout no. 8 + Factory unit no. FB-06 + Jebel Ali free Zone Dubai P.O.Box 61129 + UNITED ARAB EMIRATES + 68-1A-B2 (hex) zte corporation 681AB2 (base 16) zte corporation 12/F.,zte R&D Building,Kejinan Road @@ -90607,6 +90639,12 @@ Littleton MA 01460 UNITED STATES +80-DB-31 (hex) Power Quotient International Co., Ltd. +80DB31 (base 16) Power Quotient International Co., Ltd. + 8F., No. 49, Sec. 4, Jhongyang Rd., Tu Cheng Dist., + New Taipei City 23675 + TAIWAN, REPUBLIC OF CHINA + 80-EE-73 (hex) Shuttle Inc. 80EE73 (base 16) Shuttle Inc. No. 30 Lane 76, Rei Kuang Rd @@ -92715,6 +92753,13 @@ Busan 608-042 KOREA, REPUBLIC OF +A0-41-A7 (hex) NL Ministry of Defense +A041A7 (base 16) NL Ministry of Defense + Rijks Zee-en Marinehaven + P O Box 1000 + Den Helder Noord Helder 1780 VA + NETHERLANDS + A0-42-3F (hex) Tyan Computer Corp A0423F (base 16) Tyan Computer Corp 3288 Larurelview Court @@ -93857,6 +93902,12 @@ Umraniye Istanbul 34775 TURKEY +B0-1C-91 (hex) Elim Co +B01C91 (base 16) Elim Co + 4F Gagu Plaza B/D 81-9, jeongja-dong, Jangan-gu, + Suwon city Gyeonggi-Do 440-300 + KOREA, REPUBLIC OF + B0-38-29 (hex) Siliconware Precision Industries Co., Ltd. B03829 (base 16) Siliconware Precision Industries Co., Ltd. No. 123, Sec.3, Da Fong Rd, Tantzu, @@ -96186,6 +96237,12 @@ Seoul 152-847 KOREA, REPUBLIC OF +CC-EE-D9 (hex) Deto Mechatronic GmbH +CCEED9 (base 16) Deto Mechatronic GmbH + Gewerbepark S�d 11 + Kufstein Tirol 6330 + AUSTRIA + CC-EF-48 (hex) Cisco Systems CCEF48 (base 16) Cisco Systems 80 West Tasman Dr. @@ -98188,6 +98245,13 @@ San Diego CA 92121 UNITED STATES +E8-6D-6E (hex) Control & Display Systems Ltd t/a CDSRail +E86D6E (base 16) Control & Display Systems Ltd t/a CDSRail + Unit 1, Fulcrum 4, + Solent Way + Whiteley Hampshire PO15 7FT + UNITED KINGDOM + E8-75-7F (hex) FIRS Technologies(Shenzhen) Co., Ltd E8757F (base 16) FIRS Technologies(Shenzhen) Co., Ltd Rm 12A, Area A, Hongsong Business Building, Tairan 9th Rd, Chegongmiao, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit amarok for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2011-12-01 12:23:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amarok", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2011-11-07 14:07:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2011-12-01 12:23:35.000000000 +0100 @@ -1,0 +2,29 @@ +Wed Nov 30 14:00:38 UTC 2011 - mlin(a)suse.com + +- Add amarok-fix-infinite-loop-eating-CPU.diff + * Fix infinite loop in context view eating CPU until main + window is shown (bnc#733421) + +------------------------------------------------------------------- +Tue Nov 15 23:37:39 UTC 2011 - tittiatcoke(a)gmail.com + +- Update to 2.5 Beta 1 (2.4.90) + * New "equals" match in collection filter + * Enable dropping tracks on empty area in Saved Playlists to + create new playlist. + * Added a "create new playlist" action in the empty space of the + Saved Playlists. (bko#202725) + * Add new type of optional tokens in format string + (Collection Organizer) (bko#264874) + * Music store based on the Amazon catalogue. + * Auto-save the playlist so that it is not lost if Amarok + crashes. + * Both Delete and Move to Trash actions are now offered in the + collection browser context menu. (bko#286356) + * New USB Mass Storage media-device plugin using the Amarok + Collection Scanner. + * Playlist: Don't group albums without name. (bko#243344) + * Total rewrite of Automated Playlist Generator algorithm. + * Several bugfixes + +------------------------------------------------------------------- Old: ---- amarok-2.4.3.tar.bz2 New: ---- amarok-2.4.90.tar.bz2 amarok-fix-infinite-loop-eating-CPU.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100 @@ -19,20 +19,22 @@ %bcond_with ffmpeg Name: amarok -Version: 2.4.3 -Release: 4 +Version: 2.4.90 +Release: 1 Summary: Media Player for KDE License: GPLv2+ Url: http://amarok.kde.org/ Group: Productivity/Multimedia/Sound/Players -Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.t… +Source0: ftp://ftp.kde.org/pub/kde/unstable/amarok/%{version}/src/%{name}-%{version}… # PATCH-FEATURE-OPENSUSE ksuseinstall.diff llunak(a)novell.com -- Support for on-demand codecs install using ksuseinstall Patch1: ksuseinstall.diff # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 llunak(a)novell.com -- Increase initial preference to be used for audio files instead of Kaffeine Patch2: initial-preference.diff # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe(a)gmx.net -- Support for the changed mimetype for flac files Patch3: flac_mimetype_bnc671581.diff +# PATCH-FIX-UPSTREAM amarok-fix-infinite-loop-eating-CPU.diff bnc#733421 mlin(a)suse.com -- Fix infinite loop in context view eating CPU until main window is shown +Patch4: amarok-fix-infinite-loop-eating-CPU.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # Required for the fdupes macro @@ -50,18 +52,18 @@ %endif BuildRequires: libgcrypt-devel BuildRequires: libgpod-devel >= 0.7.0 -BuildRequires: libkde4-devel +BuildRequires: libkde4-devel >= 4.6.0 BuildRequires: libksuseinstall-devel BuildRequires: liblastfm-devel BuildRequires: libmtp-devel -BuildRequires: libmygpo-qt-devel +BuildRequires: libmygpo-qt-devel >= 1.0.5 BuildRequires: libmysqlclient-devel BuildRequires: libmysqld-devel BuildRequires: libopenssl-devel BuildRequires: libqca2-devel BuildRequires: libqjson-devel BuildRequires: loudmouth-devel -BuildRequires: mysql +BuildRequires: mysql-community-server BuildRequires: qt4-qtscript BuildRequires: taglib-devel BuildRequires: taglib-extras-devel @@ -93,6 +95,7 @@ %if 0%{?suse_version} > 1130 %patch3 %endif +%patch4 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ amarok-2.4.3.tar.bz2 -> amarok-2.4.90.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/amarok/amarok-2.4.3.tar.bz2 /work/SRC/openSUSE:Factory/.amarok.new/amarok-2.4.90.tar.bz2 differ: char 11, line 1 ++++++ amarok-fix-infinite-loop-eating-CPU.diff ++++++ commit 79bd9a7c6777e3f5d4e723bc5d3b00e5d6fe532b Author: Matěj Laitl <matej(a)laitl.cz> Date: Sun Nov 27 15:24:55 2011 +0100 Fix infinite loop in context view eating CPU until main window is shown We used to use _scene_ sceneRect in VerticalToolbarContainment::updateGeometry() to update applets and geometry, but that leaded to infinite loop (across mainloop) - m_applets->setGeometry(), refresh() would enlarge _scene_ sceneRect by a few pixels which would trigger updateGeometry() and so on... We now use _view_ sceneRect to update geometry. Rick W. Chen discovered some glitches in applet collapsing when this patch is applied, but he has a patch for that in the works and this is more serious problem, so pushing this. REVIEW: 103271 BUG: 278897 FIXED-IN: 2.5 Index: amarok-2.4.90/src/context/containments/verticallayout/VerticalToolbarContainment.cpp =================================================================== --- amarok-2.4.90.orig/src/context/containments/verticallayout/VerticalToolbarContainment.cpp +++ amarok-2.4.90/src/context/containments/verticallayout/VerticalToolbarContainment.cpp @@ -118,7 +118,18 @@ void Context::VerticalToolbarContainment::updateGeometry() { Context::Containment::updateGeometry(); - QRectF rect = scene()->sceneRect(); + + /* We used to use _scene_ sceneRect here to update applets and geomtery, but that + * leaded to infinite loop (across mainloop) - see bug 278897. + * (m_applets->setGeometry(), refresh() would enlarge _scene_ sceneRect by a few + * pixels which would trigger updateGeometry() and so on...) + * + * We now use _view_ sceneRect to update geometry and do nothing without a view + */ + if(!view()) + return; + + QRectF rect = view()->sceneRect(); setGeometry( rect ); m_applets->setGeometry( rect ); m_applets->refresh(); ++++++ flac_mimetype_bnc671581.diff ++++++ --- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100 @@ -1,6 +1,6 @@ --- src/amarok.desktop 2011-01-11 16:58:05.000000000 +0100 +++ src/amarok.desktop_patched 2011-02-15 21:44:08.000000000 +0100 -@@ -176,7 +176,7 @@ +@@ -183,7 +183,7 @@ Icon=amarok # Add pure audio formats here, for other formats see amarok_*.desktop files # See bug 242292 ++++++ initial-preference.diff ++++++ --- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/amarok.desktop.orig +++ src/amarok.desktop -@@ -180,5 +180,6 @@ MimeType=audio/aac;audio/mp4;audio/mpeg; +@@ -187,5 +187,6 @@ X-DocPath=amarok/index.html X-KDE-Keywords=music,podcast X-KDE-Protocols=http ++++++ ksuseinstall.diff ++++++ --- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100 @@ -1,7 +1,7 @@ -diff -uNr amarok-2.4.3.orig/src/CMakeLists.txt amarok-2.4.3/src/CMakeLists.txt ---- amarok-2.4.3.orig/src/CMakeLists.txt 2011-07-28 16:04:45.000000000 +0300 -+++ amarok-2.4.3/src/CMakeLists.txt 2011-08-01 20:24:43.751000029 +0300 -@@ -918,6 +918,7 @@ +diff -urB amarok-2.4.90/src/CMakeLists.txt new/src/CMakeLists.txt +--- amarok-2.4.90/src/CMakeLists.txt 2011-11-14 12:26:13.000000000 +0100 ++++ new/src/CMakeLists.txt 2011-11-16 00:30:36.752709749 +0100 +@@ -934,6 +934,7 @@ amarokcore amarokocsclient amarok-transcoding @@ -9,9 +9,10 @@ ) if( TAGLIB_FOUND ) -diff -uNr amarok-2.4.3.orig/src/EngineController.cpp amarok-2.4.3/src/EngineController.cpp ---- amarok-2.4.3.orig/src/EngineController.cpp 2011-07-28 16:04:45.000000000 +0300 -+++ amarok-2.4.3/src/EngineController.cpp 2011-08-01 20:28:18.760000029 +0300 +Only in new/src: CMakeLists.txt.orig +diff -urB amarok-2.4.90/src/EngineController.cpp new/src/EngineController.cpp +--- amarok-2.4.90/src/EngineController.cpp 2011-11-14 12:26:13.000000000 +0100 ++++ new/src/EngineController.cpp 2011-11-16 00:30:36.753709749 +0100 @@ -54,6 +54,8 @@ #include <QTextDocument> #include <QtCore/qmath.h> @@ -21,7 +22,7 @@ namespace The { EngineController* engineController() { return EngineController::instance(); } } -@@ -280,6 +282,7 @@ +@@ -300,6 +302,7 @@ bool EngineController::installDistroCodec() { @@ -29,7 +30,7 @@ KService::List services = KServiceTypeTrader::self()->query( "Amarok/CodecInstall" , QString( "[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == 'phonon-%1'").arg( "xine" ) ); //todo - figure out how to query Phonon for the current backend loaded -@@ -289,6 +292,12 @@ +@@ -309,6 +312,12 @@ QString installScript = service->exec(); if( !installScript.isNull() ) //just a sanity check { @@ -42,7 +43,7 @@ KGuiItem installButton( i18n( "Install MP3 Support" ) ); if(KMessageBox::questionYesNo( The::mainWindow() , i18n("Amarok currently cannot play MP3 files. Do you want to install support for MP3?") -@@ -297,11 +306,29 @@ +@@ -317,11 +326,29 @@ , KStandardGuiItem::no() , "codecInstallWarning" ) == KMessageBox::Yes ) { @@ -72,3 +73,4 @@ return false; } +Only in new/src: EngineController.cpp.orig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alacarte for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package alacarte for openSUSE:Factory checked in at 2011-12-01 12:23:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alacarte (Old) and /work/SRC/openSUSE:Factory/.alacarte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alacarte", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/alacarte/alacarte.changes 2011-10-28 19:14:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alacarte.new/alacarte.changes 2011-12-01 12:23:26.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Nov 5 11:16:07 UTC 2011 - gber(a)opensuse.org + +- Added alacarte-support-exo-desktop-item-edit.patch in order to + support exo-desktop-item-edit as an alternative to + gnome-desktop-item-edit (bnc#728482) + +------------------------------------------------------------------- New: ---- alacarte-support-exo-desktop-item-edit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alacarte.spec ++++++ --- /var/tmp/diff_new_pack.dtvO57/_old 2011-12-01 12:23:27.000000000 +0100 +++ /var/tmp/diff_new_pack.dtvO57/_new 2011-12-01 12:23:27.000000000 +0100 @@ -29,6 +29,8 @@ Patch0: alacarte-no-settings.menu.patch # PATCH-NEEDS-REBASE alacarte_system_edit_mode.patch sreeves(a)novell.com (was PATCH-FEATURE-OPENSUSE) Patch1: alacarte_system_edit_mode.patch +# PATCH-FEATURE-UPSTREAM alacarte-support-exo-desktop-item-edit.patch bnc#728482 bgo#664114 gber(a)opensuse.org -- Add support for exo-desktop-item-edit as an alternative to gnome-desktop-item-edit +Patch2: alacarte-support-exo-desktop-item-edit.patch BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: intltool @@ -58,6 +60,7 @@ # Needs rebase. Reenable suse_update_desktop_file call below when enabling # again # %patch1 -p0 +%patch2 -p1 %build # Patch is disabled ++++++ alacarte-support-exo-desktop-item-edit.patch ++++++ diff -ur alacarte-0.13.2.orig/Alacarte/MainWindow.py alacarte-0.13.2/Alacarte/MainWindow.py --- alacarte-0.13.2.orig/Alacarte/MainWindow.py 2011-11-05 11:02:03.910000019 +0100 +++ alacarte-0.13.2/Alacarte/MainWindow.py 2011-11-05 12:12:33.947999962 +0100 @@ -41,6 +41,7 @@ dnd_both = [dnd_items[0],] + dnd_menus drag_data = None edit_pool = [] + desktop_item_editor = util.getCommandPath(['gnome-desktop-item-edit', 'exo-desktop-item-edit']) def __init__(self, datadir, version, argv): self.file_path = datadir @@ -294,7 +295,7 @@ else: parent = menus[iter][2] file_path = os.path.join(util.getUserDirectoryPath(), util.getUniqueFileId('alacarte-made', '.directory')) - process = subprocess.Popen(['gnome-desktop-item-edit', file_path], env=os.environ) + process = subprocess.Popen([self.desktop_item_editor, file_path], env=os.environ) gobject.timeout_add(100, self.waitForNewMenuProcess, process, parent.menu_id, file_path) def on_new_item_button_clicked(self, button): @@ -307,7 +308,7 @@ else: parent = menus[iter][2] file_path = os.path.join(util.getUserItemPath(), util.getUniqueFileId('alacarte-made', '.desktop')) - process = subprocess.Popen(['gnome-desktop-item-edit', file_path], env=os.environ) + process = subprocess.Popen([self.desktop_item_editor, file_path], env=os.environ) gobject.timeout_add(100, self.waitForNewItemProcess, process, parent.menu_id, file_path) def on_new_separator_button_clicked(self, button): @@ -378,7 +379,7 @@ self.editor._MenuEditor__addUndo([item,]) if file_path not in self.edit_pool: self.edit_pool.append(file_path) - process = subprocess.Popen(['gnome-desktop-item-edit', file_path], env=os.environ) + process = subprocess.Popen([self.desktop_item_editor, file_path], env=os.environ) gobject.timeout_add(100, self.waitForEditProcess, process, file_path) def on_menu_tree_cursor_changed(self, treeview): diff -ur alacarte-0.13.2.orig/Alacarte/util.py alacarte-0.13.2/Alacarte/util.py --- alacarte-0.13.2.orig/Alacarte/util.py 2009-04-17 15:03:43.000000000 +0200 +++ alacarte-0.13.2/Alacarte/util.py 2011-11-05 11:27:45.565999997 +0100 @@ -122,6 +122,15 @@ append += 1 return new_filepath +def getCommandPath(commands): + paths = os.environ['PATH'].split(os.pathsep) + for command in commands: + for path in paths: + command_path = os.path.join(path, command) + if os.access(command_path, os.X_OK): + return command_path + return None + def getUserMenuPath(): menu_dir = None if os.environ.has_key('XDG_CONFIG_HOME'): -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxml2 for openSUSE:11.4
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package libxml2 for openSUSE:11.4 checked in at Thu Dec 1 12:12:08 CET 2011. -------- --- old-versions/11.4/UPDATES/all/libxml2/libxml2.changes 2011-06-29 14:11:08.000000000 +0200 +++ 11.4/libxml2/libxml2.changes 2011-11-28 16:40:25.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 28 15:31:52 UTC 2011 - vcizek(a)suse.com + +- add libxml2-CVE-2011-2821.patch (bnc#732787) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- libxml2-CVE-2011-2821.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml2.spec ++++++ --- /var/tmp/diff_new_pack.Ws4PjO/_old 2011-12-01 12:11:54.000000000 +0100 +++ /var/tmp/diff_new_pack.Ws4PjO/_new 2011-12-01 12:11:54.000000000 +0100 @@ -19,7 +19,7 @@ Name: libxml2 Version: 2.7.8 -Release: 16.<RELEASE17> +Release: 16.<RELEASE19> License: MIT License (or similar) Summary: A Library to Manipulate XML Files Url: http://xmlsoft.org @@ -29,6 +29,7 @@ Patch1: noxref.patch Patch2: libxml2-CVE-2010-4494.patch Patch3: libxml2-CVE-2011-1944.patch +Patch4: libxml2-CVE-2011-2821.patch BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: zlib-devel @@ -101,6 +102,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure --disable-static \ ++++++ libxml2-CVE-2011-2821.patch ++++++ >From f5048b3e71fc30ad096970b8df6e7af073bae4cb Mon Sep 17 00:00:00 2001 From: Daniel Veillard <veillard(a)redhat.com> Date: Thu, 18 Aug 2011 09:10:13 +0000 Subject: Hardening of XPath evaluation Add a mechanism of frame for XPath evaluation when entering a function or a scoped evaluation, also fix a potential problem in predicate evaluation. --- Index: libxml2-2.7.8/include/libxml/xpath.h =================================================================== --- libxml2-2.7.8.orig/include/libxml/xpath.h 2010-10-12 08:25:32.000000000 +0200 +++ libxml2-2.7.8/include/libxml/xpath.h 2011-11-28 16:34:41.290246643 +0100 @@ -68,7 +68,8 @@ XPATH_UNDEF_PREFIX_ERROR, XPATH_ENCODING_ERROR, XPATH_INVALID_CHAR_ERROR, - XPATH_INVALID_CTXT + XPATH_INVALID_CTXT, + XPATH_STACK_ERROR } xmlXPathError; /* @@ -380,6 +381,8 @@ xmlXPathCompExprPtr comp; /* the precompiled expression */ int xptr; /* it this an XPointer expression */ xmlNodePtr ancestor; /* used for walking preceding axis */ + + int valueFrame; /* used to limit Pop on the stack */ }; /************************************************************************ Index: libxml2-2.7.8/xpath.c =================================================================== --- libxml2-2.7.8.orig/xpath.c 2011-11-28 16:34:31.000000000 +0100 +++ libxml2-2.7.8/xpath.c 2011-11-28 16:37:19.692872328 +0100 @@ -252,6 +252,7 @@ "Encoding error\n", "Char out of XML range\n", "Invalid or incomplete context\n", + "Stack usage errror\n", "?? Unknown error ??\n" /* Must be last in the list! */ }; #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ @@ -2398,6 +2399,42 @@ ************************************************************************/ /** + * xmlXPathSetFrame: + * @ctxt: an XPath parser context + * + * Set the callee evaluation frame + * + * Returns the previous frame value to be restored once done + */ +static int +xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { + int ret; + + if (ctxt == NULL) + return(0); + ret = ctxt->valueFrame; + ctxt->valueFrame = ctxt->valueNr; + return(ret); +} + +/** + * xmlXPathPopFrame: + * @ctxt: an XPath parser context + * @frame: the previous frame value + * + * Remove the callee evaluation frame + */ +static void +xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { + if (ctxt == NULL) + return; + if (ctxt->valueNr < ctxt->valueFrame) { + xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); + } + ctxt->valueFrame = frame; +} + +/** * valuePop: * @ctxt: an XPath evaluation context * @@ -2412,6 +2449,12 @@ if ((ctxt == NULL) || (ctxt->valueNr <= 0)) return (NULL); + + if (ctxt->valueNr <= ctxt->valueFrame) { + xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); + return (NULL); + } + ctxt->valueNr--; if (ctxt->valueNr > 0) ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; @@ -6154,6 +6197,7 @@ ret->valueNr = 0; ret->valueMax = 10; ret->value = NULL; + ret->valueFrame = 0; ret->context = ctxt; ret->comp = comp; @@ -11712,6 +11756,7 @@ xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; xmlNodePtr oldContextNode, contextNode = NULL; xmlXPathContextPtr xpctxt = ctxt->context; + int frame; #ifdef LIBXML_XPTR_ENABLED /* @@ -11731,6 +11776,8 @@ */ exprOp = &ctxt->comp->steps[op->ch2]; for (i = 0; i < set->nodeNr; i++) { + xmlXPathObjectPtr tmp; + if (set->nodeTab[i] == NULL) continue; @@ -11758,23 +11805,25 @@ xmlXPathNodeSetAddUnique(contextObj->nodesetval, contextNode); + frame = xmlXPathSetFrame(ctxt); valuePush(ctxt, contextObj); res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); + tmp = valuePop(ctxt); + xmlXPathPopFrame(ctxt, frame); if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { - xmlXPathObjectPtr tmp; - /* pop the result if any */ - tmp = valuePop(ctxt); - if (tmp != contextObj) { + while (tmp != contextObj) { /* * Free up the result * then pop off contextObj, which will be freed later */ xmlXPathReleaseObject(xpctxt, tmp); - valuePop(ctxt); + tmp = valuePop(ctxt); } goto evaluation_error; } + /* push the result back onto the stack */ + valuePush(ctxt, tmp); if (res) pos++; @@ -13378,7 +13427,9 @@ xmlXPathFunction func; const xmlChar *oldFunc, *oldFuncURI; int i; + int frame; + frame = xmlXPathSetFrame(ctxt); if (op->ch1 != -1) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); @@ -13386,15 +13437,18 @@ xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: parameter error\n"); ctxt->error = XPATH_INVALID_OPERAND; + xmlXPathPopFrame(ctxt, frame); return (total); } - for (i = 0; i < op->value; i++) + for (i = 0; i < op->value; i++) { if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: parameter error\n"); ctxt->error = XPATH_INVALID_OPERAND; + xmlXPathPopFrame(ctxt, frame); return (total); } + } if (op->cache != NULL) XML_CAST_FPTR(func) = op->cache; else { @@ -13410,6 +13464,7 @@ xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", (char *)op->value4, (char *)op->value5); + xmlXPathPopFrame(ctxt, frame); return (total); } func = xmlXPathFunctionLookupNS(ctxt->context, @@ -13431,6 +13486,7 @@ func(ctxt, op->value); ctxt->context->function = oldFunc; ctxt->context->functionURI = oldFuncURI; + xmlXPathPopFrame(ctxt, frame); return (total); } case XPATH_OP_ARG: @@ -14334,6 +14390,7 @@ ctxt->valueNr = 0; ctxt->valueMax = 10; ctxt->value = NULL; + ctxt->valueFrame = 0; } #ifdef XPATH_STREAMING if (ctxt->comp->stream) { Index: libxml2-2.7.8/xpointer.c =================================================================== --- libxml2-2.7.8.orig/xpointer.c 2010-10-12 08:25:33.000000000 +0200 +++ libxml2-2.7.8/xpointer.c 2011-11-28 16:34:41.296246819 +0100 @@ -1269,6 +1269,7 @@ ctxt->valueNr = 0; ctxt->valueMax = 10; ctxt->value = NULL; + ctxt->valueFrame = 0; } SKIP_BLANKS; if (CUR == '/') { continue with "q"... 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 fail2ban for openSUSE:11.4
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package fail2ban for openSUSE:11.4 checked in at Thu Dec 1 12:11:47 CET 2011. -------- --- old-versions/11.4/UPDATES/all/fail2ban/fail2ban.changes 2011-09-01 16:09:20.000000000 +0200 +++ 11.4/fail2ban/fail2ban.changes 2011-11-25 15:48:43.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 25 13:51:35 UTC 2011 - lchiquitto(a)suse.com + +- Drop stale socket files on startup (bnc#537239, bnc#730044) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fail2ban.spec ++++++ --- /var/tmp/diff_new_pack.XiEp1m/_old 2011-12-01 12:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.XiEp1m/_new 2011-12-01 12:11:30.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %fillup_prereq AutoReqProv: on Version: 0.8.4 -Release: 11.<RELEASE12> +Release: 11.<RELEASE14> Url: http://www.fail2ban.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ fail2ban.init ++++++ --- /var/tmp/diff_new_pack.XiEp1m/_old 2011-12-01 12:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.XiEp1m/_new 2011-12-01 12:11:30.000000000 +0100 @@ -50,6 +50,7 @@ # Socket directory FAIL2BAN_SOCK_DIR="/var/run/fail2ban" +FAIL2BAN_SOCK="$FAIL2BAN_SOCK_DIR/fail2ban.sock" # Read config . $FAIL2BAN_CONFIG @@ -64,6 +65,11 @@ if [ ! -d $FAIL2BAN_SOCK_DIR ]; then mkdir -p $FAIL2BAN_SOCK_DIR fi + if [ -e $FAIL2BAN_SOCK ]; then + if ! lsof -n $FAIL2BAN_SOCK &>/dev/null; then + rm $FAIL2BAN_SOCK + fi + fi ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. startproc $FAIL2BAN_CLI -q $FAIL2BAN_OPTIONS start > /dev/null 2>&1 continue with "q"... 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 libxml2 for openSUSE:11.3
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package libxml2 for openSUSE:11.3 checked in at Thu Dec 1 12:11:25 CET 2011. -------- --- old-versions/11.3/UPDATES/all/libxml2/libxml2.changes 2011-06-29 14:10:59.000000000 +0200 +++ 11.3/libxml2/libxml2.changes 2011-11-28 16:25:17.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 28 15:24:29 UTC 2011 - vcizek(a)suse.com + +- add libxml2-CVE-2011-2821.patch (bnc#732787) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- libxml2-CVE-2011-2821.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml2-python.spec ++++++ --- /var/tmp/diff_new_pack.riC8d6/_old 2011-12-01 12:11:12.000000000 +0100 +++ /var/tmp/diff_new_pack.riC8d6/_new 2011-12-01 12:11:12.000000000 +0100 @@ -25,7 +25,7 @@ AutoReqProv: on Summary: Python Bindings for libxml2 Version: 2.7.7 -Release: 4.<RELEASE4> +Release: 4.<RELEASE5> Source: libxml2-%{version}.tar.bz2 Source1: libxml2-python-rpmlintrc %py_requires ++++++ libxml2.spec ++++++ --- /var/tmp/diff_new_pack.riC8d6/_old 2011-12-01 12:11:12.000000000 +0100 +++ /var/tmp/diff_new_pack.riC8d6/_new 2011-12-01 12:11:12.000000000 +0100 @@ -25,12 +25,13 @@ Summary: A Library to Manipulate XML Files Url: http://xmlsoft.org Version: 2.7.7 -Release: 4.<RELEASE7> +Release: 4.<RELEASE9> Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch1: libxml2-xpath-ns-attr-axis.patch Patch2: libxml2-CVE-2010-4494.patch Patch3: libxml2-CVE-2011-1944.patch +Patch4: libxml2-CVE-2011-2821.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 @@ -105,6 +106,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure \ ++++++ libxml2-CVE-2011-2821.patch ++++++ >From f5048b3e71fc30ad096970b8df6e7af073bae4cb Mon Sep 17 00:00:00 2001 From: Daniel Veillard <veillard(a)redhat.com> Date: Thu, 18 Aug 2011 09:10:13 +0000 Subject: Hardening of XPath evaluation Add a mechanism of frame for XPath evaluation when entering a function or a scoped evaluation, also fix a potential problem in predicate evaluation. --- Index: libxml2-2.7.6/include/libxml/xpath.h =================================================================== --- libxml2-2.7.6.orig/include/libxml/xpath.h 2009-09-24 17:31:59.000000000 +0200 +++ libxml2-2.7.6/include/libxml/xpath.h 2011-11-25 15:53:41.300858185 +0100 @@ -68,7 +68,8 @@ XPATH_UNDEF_PREFIX_ERROR, XPATH_ENCODING_ERROR, XPATH_INVALID_CHAR_ERROR, - XPATH_INVALID_CTXT + XPATH_INVALID_CTXT, + XPATH_STACK_ERROR } xmlXPathError; /* @@ -380,6 +381,8 @@ xmlXPathCompExprPtr comp; /* the precompiled expression */ int xptr; /* it this an XPointer expression */ xmlNodePtr ancestor; /* used for walking preceding axis */ + + int valueFrame; /* used to limit Pop on the stack */ }; /************************************************************************ Index: libxml2-2.7.6/xpath.c =================================================================== --- libxml2-2.7.6.orig/xpath.c 2011-11-25 15:51:55.000000000 +0100 +++ libxml2-2.7.6/xpath.c 2011-11-25 15:56:00.907034977 +0100 @@ -252,6 +252,7 @@ "Encoding error\n", "Char out of XML range\n", "Invalid or incomplete context\n", + "Stack usage errror\n", "?? Unknown error ??\n" /* Must be last in the list! */ }; #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ @@ -2398,6 +2399,42 @@ ************************************************************************/ /** + * xmlXPathSetFrame: + * @ctxt: an XPath parser context + * + * Set the callee evaluation frame + * + * Returns the previous frame value to be restored once done + */ +static int +xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { + int ret; + + if (ctxt == NULL) + return(0); + ret = ctxt->valueFrame; + ctxt->valueFrame = ctxt->valueNr; + return(ret); +} + +/** + * xmlXPathPopFrame: + * @ctxt: an XPath parser context + * @frame: the previous frame value + * + * Remove the callee evaluation frame + */ +static void +xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { + if (ctxt == NULL) + return; + if (ctxt->valueNr < ctxt->valueFrame) { + xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); + } + ctxt->valueFrame = frame; +} + +/** * valuePop: * @ctxt: an XPath evaluation context * @@ -2412,6 +2449,12 @@ if ((ctxt == NULL) || (ctxt->valueNr <= 0)) return (NULL); + + if (ctxt->valueNr <= ctxt->valueFrame) { + xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); + return (NULL); + } + ctxt->valueNr--; if (ctxt->valueNr > 0) ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; @@ -6154,6 +6197,7 @@ ret->valueNr = 0; ret->valueMax = 10; ret->value = NULL; + ret->valueFrame = 0; ret->context = ctxt; ret->comp = comp; @@ -11699,6 +11743,7 @@ xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; xmlNodePtr oldContextNode, contextNode = NULL; xmlXPathContextPtr xpctxt = ctxt->context; + int frame; #ifdef LIBXML_XPTR_ENABLED /* @@ -11718,6 +11763,8 @@ */ exprOp = &ctxt->comp->steps[op->ch2]; for (i = 0; i < set->nodeNr; i++) { + xmlXPathObjectPtr tmp; + if (set->nodeTab[i] == NULL) continue; @@ -11745,23 +11792,25 @@ xmlXPathNodeSetAddUnique(contextObj->nodesetval, contextNode); + frame = xmlXPathSetFrame(ctxt); valuePush(ctxt, contextObj); res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); + tmp = valuePop(ctxt); + xmlXPathPopFrame(ctxt, frame); if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { - xmlXPathObjectPtr tmp; - /* pop the result if any */ - tmp = valuePop(ctxt); - if (tmp != contextObj) { + while (tmp != contextObj) { /* * Free up the result * then pop off contextObj, which will be freed later */ xmlXPathReleaseObject(xpctxt, tmp); - valuePop(ctxt); + tmp = valuePop(ctxt); } goto evaluation_error; } + /* push the result back onto the stack */ + valuePush(ctxt, tmp); if (res) pos++; @@ -13365,7 +13414,9 @@ xmlXPathFunction func; const xmlChar *oldFunc, *oldFuncURI; int i; + int frame; + frame = xmlXPathSetFrame(ctxt); if (op->ch1 != -1) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); @@ -13373,15 +13424,18 @@ xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: parameter error\n"); ctxt->error = XPATH_INVALID_OPERAND; + xmlXPathPopFrame(ctxt, frame); return (total); } - for (i = 0; i < op->value; i++) + for (i = 0; i < op->value; i++) { if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: parameter error\n"); ctxt->error = XPATH_INVALID_OPERAND; + xmlXPathPopFrame(ctxt, frame); return (total); } + } if (op->cache != NULL) XML_CAST_FPTR(func) = op->cache; else { @@ -13397,6 +13451,7 @@ xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", (char *)op->value4, (char *)op->value5); + xmlXPathPopFrame(ctxt, frame); return (total); } func = xmlXPathFunctionLookupNS(ctxt->context, @@ -13418,6 +13473,7 @@ func(ctxt, op->value); ctxt->context->function = oldFunc; ctxt->context->functionURI = oldFuncURI; + xmlXPathPopFrame(ctxt, frame); return (total); } case XPATH_OP_ARG: @@ -14321,6 +14377,7 @@ ctxt->valueNr = 0; ctxt->valueMax = 10; ctxt->value = NULL; + ctxt->valueFrame = 0; } #ifdef XPATH_STREAMING if (ctxt->comp->stream) { Index: libxml2-2.7.6/xpointer.c =================================================================== --- libxml2-2.7.6.orig/xpointer.c 2009-09-24 17:32:00.000000000 +0200 +++ libxml2-2.7.6/xpointer.c 2011-11-25 15:53:41.306858364 +0100 @@ -1269,6 +1269,7 @@ ctxt->valueNr = 0; ctxt->valueMax = 10; ctxt->value = NULL; + ctxt->valueFrame = 0; } SKIP_BLANKS; if (CUR == '/') { continue with "q"... 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:11.3
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:11.3 checked in at Thu Dec 1 12:11:02 CET 2011. -------- --- old-versions/11.3/UPDATES/all/xorg-x11-server/xorg-x11-server.changes 2011-05-30 17:29:22.000000000 +0200 +++ 11.3/xorg-x11-server/xorg-x11-server.changes 2011-11-30 15:46:23.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Nov 30 14:37:17 UTC 2011 - sndirsch(a)suse.com + +- U_Fix-CVE-2011-4028-File-disclosure-vulnerability.patch + * use O_NOFOLLOW to open the existing lock file, so symbolic + links aren't followed, thus avoid revealing if it point to + an existing file. (bnc #722944) +- U_Fix-CVE-2011-4029-File-permission-change-vulnerabili.patch + * Use fchmod() to change permissions of the lock file instead + of chmod(), thus avoid the race that can be exploited to set + a symbolic link to any file or directory in the system. + (bnc #722944) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- U_Fix-CVE-2011-4028-File-disclosure-vulnerability.patch U_Fix-CVE-2011-4029-File-permission-change-vulnerabili.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.G9Tz16/_old 2011-12-01 12:10:45.000000000 +0100 +++ /var/tmp/diff_new_pack.G9Tz16/_new 2011-12-01 12:10:45.000000000 +0100 @@ -32,7 +32,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.5_%{dirsuffix} -Release: 10.<RELEASE13> +Release: 10.<RELEASE15> License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -119,6 +119,8 @@ Patch214: CVE-2010-2240-address_space_limit.patch Patch215: CVE-2010-2240-tree_depth_limit.patch Patch216: xorg-x11-server-gl-apps-crash.patch +Patch217: U_Fix-CVE-2011-4028-File-disclosure-vulnerability.patch +Patch218: U_Fix-CVE-2011-4029-File-permission-change-vulnerabili.patch %if %moblin Patch300: moblin-use_preferred_mode_for_all_outputs.diff %endif @@ -248,6 +250,8 @@ %patch214 -p1 %patch215 -p1 %patch216 -p1 +%patch217 -p1 +%patch218 -p1 %if %moblin %patch300 -p1 %endif ++++++ U_Fix-CVE-2011-4028-File-disclosure-vulnerability.patch ++++++ >From 6ba44b91e37622ef8c146d8f2ac92d708a18ed34 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb <matthieu.herrb(a)laas.fr> Date: Mon, 17 Oct 2011 22:26:12 +0200 Subject: [PATCH] Fix CVE-2011-4028: File disclosure vulnerability. use O_NOFOLLOW to open the existing lock file, so symbolic links aren't followed, thus avoid revealing if it point to an existing file. Signed-off-by: Matthieu Herrb <matthieu.herrb(a)laas.fr> Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> --- os/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/os/utils.c b/os/utils.c index e8ecb71..fe49254 100644 --- a/os/utils.c +++ b/os/utils.c @@ -318,7 +318,7 @@ LockServer(void) /* * Read the pid from the existing file */ - lfd = open(LockFile, O_RDONLY); + lfd = open(LockFile, O_RDONLY|O_NOFOLLOW); if (lfd < 0) { unlink(tmp); FatalError("Can't read lock file %s\n", LockFile); -- 1.7.7 ++++++ U_Fix-CVE-2011-4029-File-permission-change-vulnerabili.patch ++++++ >From b67581cf825940fdf52bf2e0af4330e695d724a4 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb <matthieu.herrb(a)laas.fr> Date: Mon, 17 Oct 2011 22:27:35 +0200 Subject: [PATCH] Fix CVE-2011-4029: File permission change vulnerability. Use fchmod() to change permissions of the lock file instead of chmod(), thus avoid the race that can be exploited to set a symbolic link to any file or directory in the system. Signed-off-by: Matthieu Herrb <matthieu.herrb(a)laas.fr> Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> --- os/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/os/utils.c b/os/utils.c index fe49254..07cf4c2 100644 --- a/os/utils.c +++ b/os/utils.c @@ -297,7 +297,7 @@ LockServer(void) FatalError("Could not create lock file in %s\n", tmp); (void) sprintf(pid_str, "%10ld\n", (long)getpid()); (void) write(lfd, pid_str, 11); - (void) chmod(tmp, 0444); + (void) fchmod(lfd, 0444); (void) close(lfd); /* -- 1.7.7 continue with "q"... 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