April 2011 - openSUSE Commits - openSUSE Mailing Lists

commit python-py2pack for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '11

28 Apr '11

Hello community, here is the log from the commit of package python-py2pack for openSUSE:Factory checked in at Thu Apr 28 03:19:10 CEST 2011. -------- --- python-py2pack/python-py2pack.changes 2011-03-31 16:22:26.000000000 +0200 +++ python-py2pack/python-py2pack.changes 2011-04-27 11:49:16.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 27 09:47:18 UTC 2011 - saschpe(a)suse.de + +- Update to version 0.3.15 + * Minor SUSE template fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- py2pack-0.3.14.tar.gz New: ---- py2pack-0.3.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-py2pack.spec ++++++ --- /var/tmp/diff_new_pack.xmW5R8/_old 2011-04-28 03:18:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xmW5R8/_new 2011-04-28 03:18:25.000000000 +0200 @@ -16,13 +16,10 @@ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - %define mod_name py2pack Name: python-%{mod_name} -Version: 0.3.14 +Version: 0.3.15 Release: 1 Url: http://github.com/saschpe/py2pack Summary: Generate distribution packages from Python packages on PyPI @@ -30,17 +27,19 @@ Group: Development/Languages/Python Source: %{mod_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-argparse BuildRequires: python-devel BuildRequires: python-jinja2 -Requires: python-jinja2 -BuildRequires: python-argparse Requires: python-argparse +Requires: python-jinja2 %if 0%{?suse_version} %py_requires -%if %{?suse_version: %{suse_version} > 1110} +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif %endif +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description This script allows to generate RPM spec or DEB dsc files from Python modules. ++++++ py2pack-0.3.14.tar.gz -> py2pack-0.3.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py2pack-0.3.14/PKG-INFO new/py2pack-0.3.15/PKG-INFO --- old/py2pack-0.3.14/PKG-INFO 2011-03-31 16:18:09.000000000 +0200 +++ new/py2pack-0.3.15/PKG-INFO 2011-04-27 10:47:06.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: py2pack -Version: 0.3.14 +Version: 0.3.15 Summary: Generate distribution packages from Python packages on PyPI Home-page: http://github.com/saschpe/py2pack Author: Sascha Peilicke diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py2pack-0.3.14/py2pack/__init__.py new/py2pack-0.3.15/py2pack/__init__.py --- old/py2pack-0.3.14/py2pack/__init__.py 2011-03-31 16:16:07.000000000 +0200 +++ new/py2pack-0.3.15/py2pack/__init__.py 2011-04-27 10:46:13.000000000 +0200 @@ -1,5 +1,5 @@ __doc__ = 'Generate distribution packages from Python packages on PyPI' __author__ = 'Sascha Peilicke <saschpe(a)gmx.de>' -__version__ = '0.3.14' +__version__ = '0.3.15' from py2pack import list, search, fetch, generate, main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py2pack-0.3.14/py2pack/templates/opensuse.spec new/py2pack-0.3.15/py2pack/templates/opensuse.spec --- old/py2pack-0.3.14/py2pack/templates/opensuse.spec 2011-03-31 16:15:35.000000000 +0200 +++ new/py2pack-0.3.15/py2pack/templates/opensuse.spec 2011-04-26 15:18:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-{{ name|lower }} +# spec file for package python-{{ name }} # # Copyright (c) {{ year }} SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,10 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define mod_name {{ name|lower }} +%define mod_name {{ name }} Name: python-%{mod_name} Version: {{ version }} @@ -27,16 +25,12 @@ Summary: {{ summary }} License: {{ license }} Group: Development/Languages/Python -{%- if name != name|lower %} -Source: {{ name }}-%{version}{{ ending }} -{%- else %} Source: %{mod_name}-%{version}{{ ending }} -{%- endif %} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel {%- for req in requires %} -BuildRequires: python-{{ req|lower|replace('(','')|replace(')','') }} -Requires: python-{{ req|lower|replace('(','')|replace(')','') }} +BuildRequires: python-{{ req|replace('(','')|replace(')','') }} +Requires: python-{{ req|replace('(','')|replace(')','') }} {%- endfor %} %if 0%{?suse_version} %py_requires @@ -44,16 +38,14 @@ BuildArch: noarch %endif %endif +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description {{ description }} %prep -{%- if name != name|lower %} -%setup -q -n {{ name }}-%{version} -{%- else %} %setup -q -n %{mod_name}-%{version} -{%- endif %} %build export CFLAGS="%{optflags}" @@ -66,8 +58,8 @@ rm -rf %{buildroot} %files -%defattr(-,root,root,-) +%defattr(-,root,root) # You may have to add additional files here (documentation and binaries mostly) -%python_sitelib/%{mod_name}* +%{python_sitelib}/* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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.4
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:11.4 checked in at Thu Apr 28 01:26:09 CEST 2011. -------- --- old-versions/11.4/all/xorg-x11-server/xorg-x11-server.changes 2011-02-15 11:35:52.000000000 +0100 +++ 11.4/xorg-x11-server/xorg-x11-server.changes 2011-04-26 18:27:23.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 26 16:23:18 UTC 2011 - mhopf(a)novell.com + +- bnc #605015 + - Enable use of all keyboard layouts, independent of remotely set layout + - Remove obsolete xorg-server-xf4vnc-bug605015-vnc-umlauts.diff + - xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff + This should basically already enable the use of other keyboards, if the + remote keyboard stays at US. + - xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff + This patch fixes keycode lookup (not using any static keyboard layout any + more) and ISO-Level3-Shift handling (enabling the use of keyboard layouts + that use AltGr for reaching certain characters). + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/xorg-x11-server Destination is old-versions/11.4/UPDATES/all/xorg-x11-server calling whatdependson for 11.4-i586 Old: ---- xorg-server-xf4vnc-bug605015-vnc-umlauts.diff New: ---- xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.1t84DQ/_old 2011-04-28 01:25:49.000000000 +0200 +++ /var/tmp/diff_new_pack.1t84DQ/_new 2011-04-28 01:25:49.000000000 +0200 @@ -32,7 +32,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.6_%{dirsuffix} -Release: 15.<RELEASE3> +Release: 15.<RELEASE20> License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -79,7 +79,8 @@ Patch48: xorg-server-xf4vnc-fix.diff Patch49: xorg-server-xf4vnc-fixes_1_8.diff Patch50: xorg-server-xf4vnc-fixes_1_9.diff -Patch51: xorg-server-xf4vnc-bug605015-vnc-umlauts.diff +Patch51: xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff +Patch52: xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff %endif Patch45: bug-197858_dpms.diff Patch67: xorg-docs.diff @@ -206,7 +207,8 @@ %patch48 -p1 %patch49 -p0 %patch50 -p1 -#%patch51 -p1 +%patch51 -p1 +%patch52 -p1 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch45 -p0 ++++++ xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff ++++++ This patch fixes keyboard handling for XInput enabled servers. W/o this patch the wrong keyboard was used for adding new KeyCodes. This should basically already enable the use of other keyboards, if the remote keyboard stays at US. mhopf - 21/04/2011 Index: xorg-server-1.9.3/hw/vnc/kbdptr.c =================================================================== --- xorg-server-1.9.3.orig/hw/vnc/kbdptr.c +++ xorg-server-1.9.3/hw/vnc/kbdptr.c @@ -46,19 +46,17 @@ #endif #define KEY_IS_PRESSED(keycode) \ - (kbdDevice->key->down[(keycode) >> 3] & (1 << ((keycode) & 7))) + (inputInfo.keyboard->key->down[(keycode) >> 3] & (1 << ((keycode) & 7))) static void vncXConvertCase(KeySym sym, KeySym *lower, KeySym *upper); -static DeviceIntPtr ptrDevice = NULL, kbdDevice = NULL; +static DeviceIntPtr ptrDevice = NULL; void vncSetKeyboardDevice(DeviceIntPtr kbd) { - if (kbdDevice && kbd) - return; /* set once */ - kbdDevice = kbd; + // obsoleted by inputInfo } @@ -145,10 +143,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf Bool shiftMustBeReleased = FALSE; Bool shiftMustBePressed = FALSE; - if (!kbdDevice) - return; - - keySyms = XkbGetCoreMap(kbdDevice); + keySyms = XkbGetCoreMap(inputInfo.keyboard); #ifdef CORBA if (cl) { @@ -259,40 +254,40 @@ KbdAddEvent(Bool down, KeySym keySym, rf shiftMustBePressed = TRUE; } - XkbApplyMappingChange(kbdDevice, keySyms, keyCode, 1, NULL, serverClient); + XkbApplyMappingChange(inputInfo.keyboard, keySyms, keyCode, 1, NULL, serverClient); ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n", (int)keySym, keyCode); } - xkb = &kbdDevice->key->xkbInfo->state; + xkb = &inputInfo.keyboard->key->xkbInfo->state; if (down) { if (shiftMustBePressed && !(XkbStateFieldFromRec(xkb) & ShiftMask)) { fakeShiftPress = TRUE; - EnqueueKey(kbdDevice, KeyPress, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_L_KEY_CODE); } if (shiftMustBeReleased && (XkbStateFieldFromRec(xkb) & ShiftMask)) { if (KEY_IS_PRESSED(SHIFT_L_KEY_CODE)) { fakeShiftLRelease = TRUE; - EnqueueKey(kbdDevice, KeyRelease, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyRelease, SHIFT_L_KEY_CODE); } if (KEY_IS_PRESSED(SHIFT_R_KEY_CODE)) { fakeShiftRRelease = TRUE; - EnqueueKey(kbdDevice, KeyRelease, SHIFT_R_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyRelease, SHIFT_R_KEY_CODE); } } } - EnqueueKey(kbdDevice, type, keyCode); + EnqueueKey(inputInfo.keyboard, type, keyCode); if (fakeShiftPress) { - EnqueueKey(kbdDevice, KeyRelease, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyRelease, SHIFT_L_KEY_CODE); } if (fakeShiftLRelease) { - EnqueueKey(kbdDevice, KeyPress, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_L_KEY_CODE); } if (fakeShiftRRelease) { - EnqueueKey(kbdDevice, KeyPress, SHIFT_R_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_R_KEY_CODE); } } @@ -343,15 +338,15 @@ KbdReleaseAllKeys(void) { int i, j; - if (!kbdDevice) + if (!inputInfo.keyboard) return; for (i = 0; i < DOWN_LENGTH; i++) { - if (kbdDevice->key->down[i] != 0) { + if (inputInfo.keyboard->key->down[i] != 0) { for (j = 0; j < 8; j++) { - if (kbdDevice->key->down[i] & (1 << j)) { + if (inputInfo.keyboard->key->down[i] & (1 << j)) { int detail = (i << 3) | j; - EnqueueKey(kbdDevice, KeyRelease, detail); + EnqueueKey(inputInfo.keyboard, KeyRelease, detail); } } } ++++++ xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff ++++++ This patch fixes keycode lookup (not using any static keyboard layout any more) and ISO-Level3-Shift handling (enabling the use of keyboard layouts that use AltGr for reaching certain characters). Note that the implementation is still imperfect. Keyboard layouts that use a different key than AltGr for ISO-Level3-Shift will show some weird behavior. Mode_Switch is also not supported, so keyboard switching via Mode_Switch might not work as intended either. Suggesting the use of input methods in these cases (they will hopefully work). mhopf - 21/04/2011 Index: xorg-server-1.9.3/hw/vnc/kbdptr.c =================================================================== --- xorg-server-1.9.3.orig/hw/vnc/kbdptr.c +++ xorg-server-1.9.3/hw/vnc/kbdptr.c @@ -142,6 +142,10 @@ KbdAddEvent(Bool down, KeySym keySym, rf Bool fakeShiftRRelease = FALSE; Bool shiftMustBeReleased = FALSE; Bool shiftMustBePressed = FALSE; + Bool fakeLevel3Press = FALSE; + Bool fakeLevel3Release = FALSE; + Bool level3MustBeReleased = FALSE; + Bool level3MustBePressed = FALSE; keySyms = XkbGetCoreMap(inputInfo.keyboard); @@ -161,6 +165,12 @@ KbdAddEvent(Bool down, KeySym keySym, rf * * Alan. */ + /* Never use predefined keys. + * This is inherently incapable of dealing with changing + * keyboard layouts. Not being able to work with non-local xmodmaps + * is a nuisance at worst, and probably even preferred. + * 2011-04-15 mhopf(a)suse.de */ +#if 0 #if !XFREE86VNC /* First check if it's one of our predefined keys. If so then we can make some attempt at allowing an xmodmap inside a VNC desktop behave @@ -187,6 +197,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf } } #endif +#endif if (!keyCode) { @@ -201,18 +212,27 @@ KbdAddEvent(Bool down, KeySym keySym, rf for (i = 0; i < NO_OF_KEYS * keySyms->mapWidth; i++) { if (keySym == keySyms->map[i]) { + int j, numSyms = 0; keyCode = MIN_KEY_CODE + i / keySyms->mapWidth; - if (keySyms->map[(i / keySyms->mapWidth) - * keySyms->mapWidth + 1] != NoSymbol) { - + for (j = 0; j < keySyms->mapWidth; j++) + if (keySyms->map[(i / keySyms->mapWidth) + * keySyms->mapWidth + j] != NoSymbol) + numSyms++; + if (numSyms > 1) { /* this keycode has more than one symbol associated with - it, so shift state is important */ + it, so shift/Level3_shift state is important */ - if ((i % keySyms->mapWidth) == 0) + if (((i % keySyms->mapWidth) & 1) == 0) shiftMustBeReleased = TRUE; else shiftMustBePressed = TRUE; + /* Does NOT consider Mode_shift (entries 2-3) */ + if (((i % keySyms->mapWidth) & 4) == 0) + level3MustBeReleased = TRUE; + else { + level3MustBePressed = TRUE; + } } break; } @@ -252,6 +272,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf shiftMustBeReleased = TRUE; else shiftMustBePressed = TRUE; + level3MustBeReleased = TRUE; } XkbApplyMappingChange(inputInfo.keyboard, keySyms, keyCode, 1, NULL, serverClient); @@ -262,6 +283,16 @@ KbdAddEvent(Bool down, KeySym keySym, rf xkb = &inputInfo.keyboard->key->xkbInfo->state; if (down) { + // TODO: would require to check which keycodes are actually + // bound to ISO_Level3_Shift and/or Shift_L + if (level3MustBePressed && !KEY_IS_PRESSED(ISO_LEVEL3_KEY_CODE)) { + fakeLevel3Press = TRUE; + EnqueueKey(inputInfo.keyboard, KeyPress, ISO_LEVEL3_KEY_CODE); + } + if (level3MustBeReleased && KEY_IS_PRESSED(ISO_LEVEL3_KEY_CODE)) { + fakeLevel3Release = TRUE; + EnqueueKey(inputInfo.keyboard, KeyRelease, ISO_LEVEL3_KEY_CODE); + } if (shiftMustBePressed && !(XkbStateFieldFromRec(xkb) & ShiftMask)) { fakeShiftPress = TRUE; EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_L_KEY_CODE); @@ -289,6 +320,12 @@ KbdAddEvent(Bool down, KeySym keySym, rf if (fakeShiftRRelease) { EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_R_KEY_CODE); } + if (fakeLevel3Press) { + EnqueueKey(inputInfo.keyboard, KeyRelease, ISO_LEVEL3_KEY_CODE); + } + if (fakeLevel3Release) { + EnqueueKey(inputInfo.keyboard, KeyPress, ISO_LEVEL3_KEY_CODE); + } } Index: xorg-server-1.9.3/hw/vnc/keyboard.h =================================================================== --- xorg-server-1.9.3.orig/hw/vnc/keyboard.h +++ xorg-server-1.9.3/hw/vnc/keyboard.h @@ -32,6 +32,7 @@ #define META_R_KEY_CODE (MIN_KEY_CODE + 108) #define ALT_L_KEY_CODE (MIN_KEY_CODE + 56) #define ALT_R_KEY_CODE (MIN_KEY_CODE + 105) +#define ISO_LEVEL3_KEY_CODE ALT_R_KEY_CODE static KeySym map[MAX_KEY_CODE * GLYPHS_PER_KEY] = { /* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:11.3 checked in at Thu Apr 28 01:25:06 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/xorg-x11-server/xorg-x11-server.changes 2010-08-19 15:48:07.000000000 +0200 +++ 11.3/xorg-x11-server/xorg-x11-server.changes 2011-04-26 18:28:14.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 26 16:22:17 UTC 2011 - mhopf(a)novell.com + +- bnc #605015 + - Enable use of all keyboard layouts, independent of remotely set layout + - xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff + This should basically already enable the use of other keyboards, if the + remote keyboard stays at US. + - xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff + This patch fixes keycode lookup (not using any static keyboard layout any + more) and ISO-Level3-Shift handling (enabling the use of keyboard layouts + that use AltGr for reaching certain characters). + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.fYLx3h/_old 2011-04-28 01:24:16.000000000 +0200 +++ /var/tmp/diff_new_pack.fYLx3h/_new 2011-04-28 01:24:16.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xorg-x11-server (Version 7.5_1.8.0) +# spec file for package xorg-x11-server # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.5_%{dirsuffix} -Release: 10.<RELEASE3> +Release: 10.<RELEASE5> License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -77,6 +77,8 @@ Patch47: xorg-server-xf4vnc-clientTimeout.diff Patch48: xorg-server-xf4vnc-fix.diff Patch49: xorg-server-xf4vnc-fixes_1_8.diff +Patch51: xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff +Patch52: xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff %endif Patch45: bug-197858_dpms.diff Patch67: xorg-docs.diff @@ -200,6 +202,8 @@ %patch47 -p1 %patch48 -p1 %patch49 -p0 +%patch51 -p1 +%patch52 -p1 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch45 -p0 ++++++ xorg-server-xf4vnc-bug605015-fix-keyboard-handling-xinput.diff ++++++ This patch fixes keyboard handling for XInput enabled servers. W/o this patch the wrong keyboard was used for adding new KeyCodes. This should basically already enable the use of other keyboards, if the remote keyboard stays at US. mhopf - 21/04/2011 Index: xorg-server-1.9.3/hw/vnc/kbdptr.c =================================================================== --- xorg-server-1.9.3.orig/hw/vnc/kbdptr.c +++ xorg-server-1.9.3/hw/vnc/kbdptr.c @@ -46,19 +46,17 @@ #endif #define KEY_IS_PRESSED(keycode) \ - (kbdDevice->key->down[(keycode) >> 3] & (1 << ((keycode) & 7))) + (inputInfo.keyboard->key->down[(keycode) >> 3] & (1 << ((keycode) & 7))) static void vncXConvertCase(KeySym sym, KeySym *lower, KeySym *upper); -static DeviceIntPtr ptrDevice = NULL, kbdDevice = NULL; +static DeviceIntPtr ptrDevice = NULL; void vncSetKeyboardDevice(DeviceIntPtr kbd) { - if (kbdDevice && kbd) - return; /* set once */ - kbdDevice = kbd; + // obsoleted by inputInfo } @@ -145,10 +143,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf Bool shiftMustBeReleased = FALSE; Bool shiftMustBePressed = FALSE; - if (!kbdDevice) - return; - - keySyms = XkbGetCoreMap(kbdDevice); + keySyms = XkbGetCoreMap(inputInfo.keyboard); #ifdef CORBA if (cl) { @@ -259,40 +254,40 @@ KbdAddEvent(Bool down, KeySym keySym, rf shiftMustBePressed = TRUE; } - XkbApplyMappingChange(kbdDevice, keySyms, keyCode, 1, NULL, serverClient); + XkbApplyMappingChange(inputInfo.keyboard, keySyms, keyCode, 1, NULL, serverClient); ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n", (int)keySym, keyCode); } - xkb = &kbdDevice->key->xkbInfo->state; + xkb = &inputInfo.keyboard->key->xkbInfo->state; if (down) { if (shiftMustBePressed && !(XkbStateFieldFromRec(xkb) & ShiftMask)) { fakeShiftPress = TRUE; - EnqueueKey(kbdDevice, KeyPress, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_L_KEY_CODE); } if (shiftMustBeReleased && (XkbStateFieldFromRec(xkb) & ShiftMask)) { if (KEY_IS_PRESSED(SHIFT_L_KEY_CODE)) { fakeShiftLRelease = TRUE; - EnqueueKey(kbdDevice, KeyRelease, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyRelease, SHIFT_L_KEY_CODE); } if (KEY_IS_PRESSED(SHIFT_R_KEY_CODE)) { fakeShiftRRelease = TRUE; - EnqueueKey(kbdDevice, KeyRelease, SHIFT_R_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyRelease, SHIFT_R_KEY_CODE); } } } - EnqueueKey(kbdDevice, type, keyCode); + EnqueueKey(inputInfo.keyboard, type, keyCode); if (fakeShiftPress) { - EnqueueKey(kbdDevice, KeyRelease, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyRelease, SHIFT_L_KEY_CODE); } if (fakeShiftLRelease) { - EnqueueKey(kbdDevice, KeyPress, SHIFT_L_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_L_KEY_CODE); } if (fakeShiftRRelease) { - EnqueueKey(kbdDevice, KeyPress, SHIFT_R_KEY_CODE); + EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_R_KEY_CODE); } } @@ -343,15 +338,15 @@ KbdReleaseAllKeys(void) { int i, j; - if (!kbdDevice) + if (!inputInfo.keyboard) return; for (i = 0; i < DOWN_LENGTH; i++) { - if (kbdDevice->key->down[i] != 0) { + if (inputInfo.keyboard->key->down[i] != 0) { for (j = 0; j < 8; j++) { - if (kbdDevice->key->down[i] & (1 << j)) { + if (inputInfo.keyboard->key->down[i] & (1 << j)) { int detail = (i << 3) | j; - EnqueueKey(kbdDevice, KeyRelease, detail); + EnqueueKey(inputInfo.keyboard, KeyRelease, detail); } } } ++++++ xorg-server-xf4vnc-bug605015-fix-keycode-lookup-and-isolevel3shift.diff ++++++ This patch fixes keycode lookup (not using any static keyboard layout any more) and ISO-Level3-Shift handling (enabling the use of keyboard layouts that use AltGr for reaching certain characters). Note that the implementation is still imperfect. Keyboard layouts that use a different key than AltGr for ISO-Level3-Shift will show some weird behavior. Mode_Switch is also not supported, so keyboard switching via Mode_Switch might not work as intended either. Suggesting the use of input methods in these cases (they will hopefully work). mhopf - 21/04/2011 Index: xorg-server-1.9.3/hw/vnc/kbdptr.c =================================================================== --- xorg-server-1.9.3.orig/hw/vnc/kbdptr.c +++ xorg-server-1.9.3/hw/vnc/kbdptr.c @@ -142,6 +142,10 @@ KbdAddEvent(Bool down, KeySym keySym, rf Bool fakeShiftRRelease = FALSE; Bool shiftMustBeReleased = FALSE; Bool shiftMustBePressed = FALSE; + Bool fakeLevel3Press = FALSE; + Bool fakeLevel3Release = FALSE; + Bool level3MustBeReleased = FALSE; + Bool level3MustBePressed = FALSE; keySyms = XkbGetCoreMap(inputInfo.keyboard); @@ -161,6 +165,12 @@ KbdAddEvent(Bool down, KeySym keySym, rf * * Alan. */ + /* Never use predefined keys. + * This is inherently incapable of dealing with changing + * keyboard layouts. Not being able to work with non-local xmodmaps + * is a nuisance at worst, and probably even preferred. + * 2011-04-15 mhopf(a)suse.de */ +#if 0 #if !XFREE86VNC /* First check if it's one of our predefined keys. If so then we can make some attempt at allowing an xmodmap inside a VNC desktop behave @@ -187,6 +197,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf } } #endif +#endif if (!keyCode) { @@ -201,18 +212,27 @@ KbdAddEvent(Bool down, KeySym keySym, rf for (i = 0; i < NO_OF_KEYS * keySyms->mapWidth; i++) { if (keySym == keySyms->map[i]) { + int j, numSyms = 0; keyCode = MIN_KEY_CODE + i / keySyms->mapWidth; - if (keySyms->map[(i / keySyms->mapWidth) - * keySyms->mapWidth + 1] != NoSymbol) { - + for (j = 0; j < keySyms->mapWidth; j++) + if (keySyms->map[(i / keySyms->mapWidth) + * keySyms->mapWidth + j] != NoSymbol) + numSyms++; + if (numSyms > 1) { /* this keycode has more than one symbol associated with - it, so shift state is important */ + it, so shift/Level3_shift state is important */ - if ((i % keySyms->mapWidth) == 0) + if (((i % keySyms->mapWidth) & 1) == 0) shiftMustBeReleased = TRUE; else shiftMustBePressed = TRUE; + /* Does NOT consider Mode_shift (entries 2-3) */ + if (((i % keySyms->mapWidth) & 4) == 0) + level3MustBeReleased = TRUE; + else { + level3MustBePressed = TRUE; + } } break; } @@ -252,6 +272,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf shiftMustBeReleased = TRUE; else shiftMustBePressed = TRUE; + level3MustBeReleased = TRUE; } XkbApplyMappingChange(inputInfo.keyboard, keySyms, keyCode, 1, NULL, serverClient); @@ -262,6 +283,16 @@ KbdAddEvent(Bool down, KeySym keySym, rf xkb = &inputInfo.keyboard->key->xkbInfo->state; if (down) { + // TODO: would require to check which keycodes are actually + // bound to ISO_Level3_Shift and/or Shift_L + if (level3MustBePressed && !KEY_IS_PRESSED(ISO_LEVEL3_KEY_CODE)) { + fakeLevel3Press = TRUE; + EnqueueKey(inputInfo.keyboard, KeyPress, ISO_LEVEL3_KEY_CODE); + } + if (level3MustBeReleased && KEY_IS_PRESSED(ISO_LEVEL3_KEY_CODE)) { + fakeLevel3Release = TRUE; + EnqueueKey(inputInfo.keyboard, KeyRelease, ISO_LEVEL3_KEY_CODE); + } if (shiftMustBePressed && !(XkbStateFieldFromRec(xkb) & ShiftMask)) { fakeShiftPress = TRUE; EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_L_KEY_CODE); @@ -289,6 +320,12 @@ KbdAddEvent(Bool down, KeySym keySym, rf if (fakeShiftRRelease) { EnqueueKey(inputInfo.keyboard, KeyPress, SHIFT_R_KEY_CODE); } + if (fakeLevel3Press) { + EnqueueKey(inputInfo.keyboard, KeyRelease, ISO_LEVEL3_KEY_CODE); + } + if (fakeLevel3Release) { + EnqueueKey(inputInfo.keyboard, KeyPress, ISO_LEVEL3_KEY_CODE); + } } Index: xorg-server-1.9.3/hw/vnc/keyboard.h =================================================================== --- xorg-server-1.9.3.orig/hw/vnc/keyboard.h +++ xorg-server-1.9.3/hw/vnc/keyboard.h @@ -32,6 +32,7 @@ #define META_R_KEY_CODE (MIN_KEY_CODE + 108) #define ALT_L_KEY_CODE (MIN_KEY_CODE + 56) #define ALT_R_KEY_CODE (MIN_KEY_CODE + 105) +#define ISO_LEVEL3_KEY_CODE ALT_R_KEY_CODE static KeySym map[MAX_KEY_CODE * GLYPHS_PER_KEY] = { /* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-feedparser for openSUSE:11.4
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package python-feedparser for openSUSE:11.4 checked in at Wed Apr 27 17:49:34 CEST 2011. -------- --- old-versions/11.4/UPDATES/all/python-feedparser/python-feedparser.changes 2011-03-17 02:35:42.000000000 +0100 +++ 11.4/python-feedparser/python-feedparser.changes 2011-04-20 20:18:08.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 20 11:14:19 UTC 2011 - jfunk(a)funktronics.ca + +- Fix bnc#688878 - "global name 'keymap' is not defined" + + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- feedparser-bnc688878.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-feedparser.spec ++++++ --- /var/tmp/diff_new_pack.rGhcI5/_old 2011-04-27 17:49:19.000000000 +0200 +++ /var/tmp/diff_new_pack.rGhcI5/_new 2011-04-27 17:49:19.000000000 +0200 @@ -20,7 +20,7 @@ Name: python-feedparser Version: 4.1 -Release: 9.<RELEASE10> +Release: 9.<RELEASE12> Summary: Universal Feed Parser Module for Python Url: http://sourceforge.net/projects/feedparser/ License: BSD @@ -30,6 +30,7 @@ Patch1: feedparser-issue255-CVE-2011-1158.patch Patch2: feedparser-issue254-CVE-2011-1157.patch Patch3: feedparser-issue91-CVE-2011-1156.patch +Patch4: feedparser-bnc688878.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} BuildRequires: python-devel python-setuptools @@ -52,6 +53,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 chmod 0644 README %build ++++++ feedparser-bnc688878.diff ++++++ Index: feedparser.py =================================================================== --- feedparser.py.orig +++ feedparser.py @@ -65,6 +65,22 @@ TIDY_MARKUP = 0 # if TIDY_MARKUP = 1 PREFERRED_TIDY_INTERFACES = ["uTidy", "mxTidy"] +# If you want feedparser to allow all URL schemes, set this to () +# List culled from Python's urlparse documentation at: +# http://docs.python.org/library/urlparse.html +# as well as from "URI scheme" at Wikipedia: +# https://secure.wikimedia.org/wikipedia/en/wiki/URI_scheme +# Many more will likely need to be added! +ACCEPTABLE_URI_SCHEMES = ( + 'file', 'ftp', 'gopher', 'h323', 'hdl', 'http', 'https', 'imap', 'mailto', + 'mms', 'news', 'nntp', 'prospero', 'rsync', 'rtsp', 'rtspu', 'sftp', + 'shttp', 'sip', 'sips', 'snews', 'svn', 'svn+ssh', 'telnet', 'wais', + # Additional common-but-unofficial schemes + 'aim', 'callto', 'cvs', 'facetime', 'feed', 'git', 'gtalk', 'irc', 'ircs', + 'irc6', 'itms', 'mms', 'msnim', 'skype', 'ssh', 'smb', 'svn', 'ymsg', +) +#ACCEPTABLE_URI_SCHEMES = () + # ---------- required modules (should come with any Python distribution) ---------- import sgmllib, re, sys, copy, urlparse, time, rfc822, types, cgi, urllib, urllib2 try: @@ -1602,6 +1618,22 @@ def _resolveRelativeURIs(htmlSource, bas p.feed(htmlSource) return p.output() +def _makeSafeAbsoluteURI(base, rel=None): + # bail if ACCEPTABLE_URI_SCHEMES is empty + if not ACCEPTABLE_URI_SCHEMES: + return _urljoin(base, rel or u'') + if not base: + return rel or u'' + if not rel: + scheme = urlparse.urlparse(base)[0] + if not scheme or scheme in ACCEPTABLE_URI_SCHEMES: + return base + return u'' + uri = _urljoin(base, rel) + if uri.strip().split(':', 1)[0] not in ACCEPTABLE_URI_SCHEMES: + return u'' + return uri + class _HTMLSanitizer(_BaseHTMLProcessor): acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b', 'big', 'blockquote', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col', @@ -1635,6 +1667,7 @@ class _HTMLSanitizer(_BaseHTMLProcessor) self.unacceptablestack += 1 return + keymap = {} clean_attrs = [] for key, value in self.normalize_attrs(attrs): if key in self.acceptable_attributes: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 varnish for openSUSE:11.4
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package varnish for openSUSE:11.4 checked in at Wed Apr 27 17:49:12 CEST 2011. -------- --- old-versions/11.4/all/varnish/varnish.changes 2010-08-17 11:31:58.000000000 +0200 +++ 11.4/varnish/varnish.changes 2011-04-15 10:09:02.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Apr 3 23:38:24 UTC 2011 - jengelh(a)medozas.de + +- Fix security-problematic ownership of /etc/varnish files + (bnc#678811) +- Run spec-beautifier over it +- Replace default shipped vcl.conf by something working +- Run as varnish user +- Start varnishlog together with varnishd +- Properly use PID files in init script + +------------------------------------------------------------------- +Sat Oct 9 04:31:06 UTC 2010 - jengelh(a)medozas.de + +- Create and package /var/log/varnish + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/varnish Destination is old-versions/11.4/UPDATES/all/varnish calling whatdependson for 11.4-i586 Old: ---- upstream-config.tar.bz2 New: ---- varnish.logrotate vcl.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ varnish.spec ++++++ --- /var/tmp/diff_new_pack.VCjNH7/_old 2011-04-27 17:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.VCjNH7/_new 2011-04-27 17:48:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package varnish (Version 2.1.3) +# spec file for package varnish # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,29 +20,28 @@ Name: varnish Version: 2.1.3 -Release: 1 +Release: 3.<RELEASE4> # License: BSD Group: Productivity/Networking/Web/Proxy # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libxslt ncurses-devel pcre-devel pkg-config -Prereq(post): /usr/sbin/useradd /usr/sbin/groupadd +Prereq(post): %_sbindir/useradd %_sbindir/groupadd %if 0%{?suse_version} Recommends: logrotate %endif -%define _bindir %{_sbindir} -%define pkg_home %{_var}/lib/%{name} -%define pkg_logdir %{_var}/log/%{name} -%define pkg_cachedir %{_var}/cache/%{name} -%define pkg_name %{name} +%define pkg_home %_localstatedir/lib/%name +%define pkg_logdir %_localstatedir/log/%name +%define pkg_cachedir %_localstatedir/cache/%name # Url: http://www.varnish-cache.org/ -Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz -# http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.bz2 -Source1: upstream-config.tar.bz2 +Source0: http://downloads.sourceforge.net/varnish/varnish-%version.tar.gz +# http://downloads.sourceforge.net/varnish/varnish-%version.tar.bz2 Source2: varnish.init Source3: varnish.sysconfig +Source4: vcl.conf +Source5: varnish.logrotate # Summary: Varnish is a high-performance HTTP accelerator @@ -63,13 +62,13 @@ %define library_name libvarnish1 -%package -n %{library_name} +%package -n %library_name Group: Productivity/Networking/Web/Proxy # Summary: Shared libraries for Varnish -%description -n %{library_name} +%description -n %library_name Varnish is an HTTP accelerator. An HTTP accelerator (often called Reverse Proxy) is an application that stores (caches) documents that have been requested over the HTTP protocol. @@ -91,7 +90,7 @@ %package devel License: BSD Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %name = %version # Summary: Development files for Varnish @@ -115,91 +114,82 @@ %prep -%setup -qa1 -#sed -e ' s/8080/80/g ' etc/vcl.conf > redhat/vcl.conf +%setup -q %build %if 0%{?suse_version} > 1000 -export CFLAGS="%{optflags} -fstack-protector" +export CFLAGS="%optflags -fstack-protector" %endif -%configure --disable-static --localstatedir=%{_var}/cache/ \ +%configure --disable-static --localstatedir=%_localstatedir/cache/ \ --enable-debugging-symbols \ --enable-developer-warnings -%{__make} +make %{?_smp_mflags} %install %makeinstall -find %{buildroot} -ls +find %buildroot -ls +# There is no use for them to normal users +mv %buildroot/%_bindir/* %buildroot/%_sbindir/ # # remove unneeded files # libvarnish.la has -lrt as dependency lib -#%{__rm} -fv %{buildroot}%{_libdir}/*.la +#rm -fv %buildroot%_libdir/*.la # ##missing directories -%{__install} -d -m 0755 %{buildroot}{%{pkg_logdir},%{pkg_home}} -%{__install} -D -m 0644 redhat/varnish.logrotate %{buildroot}/etc/logrotate.d/varnish -%if 0%{?suse_version} -# -##init scripts -%{__install} -D -m 0644 %{S:3} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} -%{__install} -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/%{name} -%{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} -# -##config files -%{__install} -D -m 0644 etc/vcl.conf %{buildroot}%{_sysconfdir}/%{name}/vcl.conf -%{__install} -D -m 0644 etc/vcl.conf %{buildroot}%{_sysconfdir}/%{name}/vcl.conf.example -%else +install -d -m 0755 %buildroot{%pkg_logdir,%pkg_home} +install -D -m 0644 %{S:5} %buildroot%_sysconfdir/logrotate.d/varnish # ##init scripts -%{__install} -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name} -%{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_sysconfdir}/init.d/%{name} +install -D -m 0644 %{S:3} %buildroot/var/adm/fillup-templates/sysconfig.%name +install -D -m 0755 %{S:2} %buildroot%_sysconfdir/init.d/%name +ln -s -f %_sysconfdir/init.d/%name %buildroot%_sbindir/rc%name # ##config files -%{__install} -D -m 0644 redhat/vcl.conf %{buildroot}%{_sysconfdir}/%{name}/vcl.conf -%{__install} -D -m 0644 redhat/vcl.conf %{buildroot}%{_sysconfdir}/%{name}/vcl.conf.example -%endif +install -D -m 0644 %{S:4} %buildroot%_sysconfdir/%name/vcl.conf +install -D -m 0644 %{S:4} %buildroot%_sysconfdir/%name/vcl.conf.example find "%buildroot" -type f -name "*.la" -delete - -%clean -%{__rm} -rf %{buildroot} +mkdir -p "%buildroot/%_localstatedir/log/varnish" %pre -/usr/sbin/groupadd -r %{pkg_name} 2>/dev/null || : -/usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "user for %{pkg_name}" -d %{pkg_home} %{pkg_name} 2>/dev/null || : +%_bindir/getent group varnish >/dev/null || \ + %_sbindir/groupadd -r varnish || : +%_bindir/getent passwd varnish >/dev/null || \ + %_sbindir/useradd -g varnish -s /bin/false -r -c "user for Varnish" \ + -d %pkg_home varnish || : %if 0%{?suse_version} %post -%fillup_and_insserv %{pkg_name} +%fillup_and_insserv %name %preun -%stop_on_removal %{pkg_name} +%stop_on_removal %name %postun -%restart_on_update %{pkg_name} -%{insserv_cleanup} +%restart_on_update %name +%insserv_cleanup %else # how to do the same for RH/mandriva? %endif -%post -n %{library_name} -p /sbin/ldconfig +%post -n %library_name -p /sbin/ldconfig -%postun -n %{library_name} -p /sbin/ldconfig +%postun -n %library_name -p /sbin/ldconfig %files %defattr(-,root,root,-) %if 0%{?suse_version} -%{_sbindir}/rc%{name} -/var/adm/fillup-templates/sysconfig.%{name} +%_sbindir/rc%name +/var/adm/fillup-templates/sysconfig.%name %else -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%config(noreplace) %_sysconfdir/sysconfig/%name %endif -%config(noreplace) %{_sysconfdir}/init.d/%{name} +%config(noreplace) %_sysconfdir/init.d/%name # -%dir %attr(750,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/ -%config(noreplace) %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/vcl.conf -%config %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/vcl.conf.example -%config(noreplace) %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/default.vcl +%dir %attr(750,root,varnish) %_sysconfdir/%name/ +%config(noreplace) %attr(640,root,varnish) %_sysconfdir/%name/vcl.conf +%config %attr(640,root,varnish) %_sysconfdir/%name/vcl.conf.example +%config(noreplace) %attr(640,root,varnish) %_sysconfdir/%name/default.vcl # %_sbindir/* %doc %_mandir/*/* @@ -207,18 +197,19 @@ %if ! 0%{?suse_version} %doc redhat/README.redhat %endif -%dir %attr(750,%{pkg_name},%{pkg_name}) %{pkg_home} -%dir %attr(750,%{pkg_name},%{pkg_name}) %{pkg_cachedir} -%config(noreplace) /etc/logrotate.d/varnish +%dir %attr(750,varnish,varnish) %pkg_home +%dir %attr(750,varnish,varnish) %pkg_cachedir +%config(noreplace) %_sysconfdir/logrotate.d/varnish +%dir %attr(750,varnish,varnish) %_localstatedir/log/varnish -%files -n %{library_name} +%files -n %library_name %defattr(-,root,root,-) %_libdir/*.so.* %files devel %defattr(-,root,root,-) -%{_includedir}/varnish/ -%{_libdir}/pkgconfig/* -%{_libdir}/*.so +%_includedir/varnish/ +%_libdir/pkgconfig/* +%_libdir/*.so %changelog ++++++ varnish.init ++++++ --- /var/tmp/diff_new_pack.VCjNH7/_old 2011-04-27 17:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.VCjNH7/_new 2011-04-27 17:48:28.000000000 +0200 @@ -1,16 +1,5 @@ #!/bin/sh # -# /etc/init.d/varnish -# and its symbolic link -# /(usr/)sbin/rcvarnish -# -# Note: This template uses functions rc_XXX defined in /etc/rc.status on -# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB -# compliant Linux distributions, you either have to provide the rc.status -# functions from UL or change the script to work without them. -# See skeleton.compat for a template that works with other distros as well. -# ### BEGIN INIT INFO # Provides: varnish # Required-Start: $syslog $remote_fs @@ -22,73 +11,6 @@ # Short-Description: varnish HTTP accelerator # Description: varnish HTTP accelerator ### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. -# -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. - # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance @@ -103,6 +25,11 @@ if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } +VARNISHD_BIN="$VARNISH_BIN" +VARNISHD_PID=/var/run/varnishd.pid +VARNISHLOG_BIN=/usr/sbin/varnishncsa +VARNISHLOG_PID=/var/run/varnishlog.pid + # Read config . $VARNISH_CONFIG @@ -152,20 +79,25 @@ echo -n "Starting varnish " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - /sbin/startproc $VARNISH_BIN ${VARNISHD_PARAMS:--f /etc/varnish/vcl.conf -T127.0.0.1:6082 -s file,/var/cache/varnish} + /sbin/startproc "$VARNISHD_BIN" -P "$VARNISHD_PID" ${VARNISHD_PARAMS:--f /etc/varnish/vcl.conf -T:6082 -s file,/var/cache/varnish,524288 -u varnish} # Remember status and be verbose rc_status -v + echo -n "Starting varnishlog " + /sbin/startproc "$VARNISHLOG_BIN" -P "$VARNISHLOG_PID" ${VARNISHLOG_PARAMS:--a -w /var/log/varnish/varnish.log} + rc_status -v ;; stop) echo -n "Shutting down varnish " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - /sbin/killproc -TERM $VARNISH_BIN + /sbin/killproc -p "$VARNISHD_PID" "$VARNISHD_BIN" # Remember status and be verbose rc_status -v + echo -n "Shutting down varnishlog " + /sbin/killproc -p "$VARNISHLOG_PID" "$VARNISHLOG_BIN" ;; try-restart|condrestart) ## Do a restart only if the service was active before. @@ -214,9 +146,11 @@ # If it supports signaling: echo -n "Reload service varnish " - /sbin/killproc -HUP $VARNISH_BIN + /sbin/killproc -p "$VARNISHD_PID" -HUP "$VARNISHD_BIN" #touch /var/run/varnish.pid rc_status -v + echo -n "Reload service varnishlog " + /sbin/killproc -p "$VARNISHLOG_PID" -HUP "$VARNISHLOG_BIN" ## Otherwise if it does not support reload: #rc_failed 3 @@ -236,17 +170,22 @@ # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc $VARNISH_BIN + /sbin/checkproc -p "$VARNISHD_PID" "$VARNISHD_BIN" # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v + echo -n "Checking for service varnishlog " + /sbin/checkproc -p "$VARNISHLOG_PID" "$VARNISHLOG_BIN" + rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, print out the ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) - test /etc/sysconfig/varnish -nt /var/run/varnish.pid && test -f /etc/varnish/default.vcl.net -nt /var/run/varnish.pid && echo reload + test /etc/sysconfig/varnish -nt "$VARNISHD_PID" && \ + test -f /etc/varnish/default.vcl.net -nt "$VARNISHD_PID" && \ + echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" ++++++ varnish.logrotate ++++++ /var/log/varnish/*.log { missingok notifempty sharedscripts delaycompress postrotate /etc/init.d/varnish reload endscript } ++++++ varnish.sysconfig ++++++ --- /var/tmp/diff_new_pack.VCjNH7/_old 2011-04-27 17:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.VCjNH7/_new 2011-04-27 17:48:28.000000000 +0200 @@ -10,4 +10,16 @@ # # You might want to keep "/var/cache/varnish" when using the file backend. # -VARNISHD_PARAMS="-f /etc/varnish/vcl.conf -T127.0.0.1:6082 -s file,/var/cache/varnish,524288" +VARNISHD_PARAMS="-f /etc/varnish/vcl.conf -T:6082 -s file,/var/cache/varnish,524288 -u varnish" + +## Path: Network/WWW/Varnishd +## Description: Start parameters for varnishlog +## Type: string +## Default: "-a -w /var/log/varnish.log" +## Config: varnishd +# +# start parameters for varnishlog/varnishncsa +# +# see man 1 varnishlog for more +# +VARNISHLOG_PARAMS="-a -w /var/log/varnish/varnish.log" ++++++ vcl.conf ++++++ # # This is a basic VCL configuration file for varnish. See the vcl(7) # man page for details on VCL syntax and semantics. # # $Id: vcl.conf 1200 2006-10-19 09:21:42Z des $ # backend default { .host = "127.0.0.1"; .port = "8080"; } sub vcl_recv { # pass mode can't handle POST (yet) if (req.request == "POST") { return(pipe); } # don't bother caching large files if(req.url ~ "\.(pdf|mp3|flv|mov|mp4|mpg|mpeg|avi|dmg)") { return(pipe); } # force lookup even when cookies are present if (req.request == "GET" && req.http.cookie) { return(lookup); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-feedparser for openSUSE:11.3
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package python-feedparser for openSUSE:11.3 checked in at Wed Apr 27 17:48:04 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/python-feedparser/python-feedparser.changes 2011-03-17 02:35:42.000000000 +0100 +++ 11.3/python-feedparser/python-feedparser.changes 2011-04-20 20:17:51.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 20 11:14:19 UTC 2011 - jfunk(a)funktronics.ca + +- Fix bnc#688878 - "global name 'keymap' is not defined" + + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- feedparser-bnc688878.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-feedparser.spec ++++++ --- /var/tmp/diff_new_pack.igy8SC/_old 2011-04-27 17:47:33.000000000 +0200 +++ /var/tmp/diff_new_pack.igy8SC/_new 2011-04-27 17:47:33.000000000 +0200 @@ -20,7 +20,7 @@ Name: python-feedparser Version: 4.1 -Release: 6.<RELEASE2> +Release: 6.<RELEASE5> Summary: Universal Feed Parser Module for Python Url: http://sourceforge.net/projects/feedparser/ License: BSD @@ -30,6 +30,7 @@ Patch1: feedparser-issue255-CVE-2011-1158.patch Patch2: feedparser-issue254-CVE-2011-1157.patch Patch3: feedparser-issue91-CVE-2011-1156.patch +Patch4: feedparser-bnc688878.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} BuildRequires: python-devel python-setuptools @@ -52,6 +53,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 chmod 0644 README %build ++++++ feedparser-bnc688878.diff ++++++ Index: feedparser.py =================================================================== --- feedparser.py.orig +++ feedparser.py @@ -65,6 +65,22 @@ TIDY_MARKUP = 0 # if TIDY_MARKUP = 1 PREFERRED_TIDY_INTERFACES = ["uTidy", "mxTidy"] +# If you want feedparser to allow all URL schemes, set this to () +# List culled from Python's urlparse documentation at: +# http://docs.python.org/library/urlparse.html +# as well as from "URI scheme" at Wikipedia: +# https://secure.wikimedia.org/wikipedia/en/wiki/URI_scheme +# Many more will likely need to be added! +ACCEPTABLE_URI_SCHEMES = ( + 'file', 'ftp', 'gopher', 'h323', 'hdl', 'http', 'https', 'imap', 'mailto', + 'mms', 'news', 'nntp', 'prospero', 'rsync', 'rtsp', 'rtspu', 'sftp', + 'shttp', 'sip', 'sips', 'snews', 'svn', 'svn+ssh', 'telnet', 'wais', + # Additional common-but-unofficial schemes + 'aim', 'callto', 'cvs', 'facetime', 'feed', 'git', 'gtalk', 'irc', 'ircs', + 'irc6', 'itms', 'mms', 'msnim', 'skype', 'ssh', 'smb', 'svn', 'ymsg', +) +#ACCEPTABLE_URI_SCHEMES = () + # ---------- required modules (should come with any Python distribution) ---------- import sgmllib, re, sys, copy, urlparse, time, rfc822, types, cgi, urllib, urllib2 try: @@ -1602,6 +1618,22 @@ def _resolveRelativeURIs(htmlSource, bas p.feed(htmlSource) return p.output() +def _makeSafeAbsoluteURI(base, rel=None): + # bail if ACCEPTABLE_URI_SCHEMES is empty + if not ACCEPTABLE_URI_SCHEMES: + return _urljoin(base, rel or u'') + if not base: + return rel or u'' + if not rel: + scheme = urlparse.urlparse(base)[0] + if not scheme or scheme in ACCEPTABLE_URI_SCHEMES: + return base + return u'' + uri = _urljoin(base, rel) + if uri.strip().split(':', 1)[0] not in ACCEPTABLE_URI_SCHEMES: + return u'' + return uri + class _HTMLSanitizer(_BaseHTMLProcessor): acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b', 'big', 'blockquote', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col', @@ -1635,6 +1667,7 @@ class _HTMLSanitizer(_BaseHTMLProcessor) self.unacceptablestack += 1 return + keymap = {} clean_attrs = [] for key, value in self.normalize_attrs(attrs): if key in self.acceptable_attributes: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 udisks for openSUSE:11.3
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package udisks for openSUSE:11.3 checked in at Wed Apr 27 17:46:58 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/udisks/udisks.changes 2010-07-15 14:39:40.000000000 +0200 +++ 11.3/udisks/udisks.changes 2011-04-27 13:45:29.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 27 13:42:45 CEST 2011 - kay.sievers(a)novell.com + +- Fix: Arbitrary LKMs from /lib/modules can be loaded + CVE-2010-4661 (bnc#653900) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- udisks-kernel-module-load-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udisks.spec ++++++ --- /var/tmp/diff_new_pack.2o3PtQ/_old 2011-04-27 17:46:37.000000000 +0200 +++ /var/tmp/diff_new_pack.2o3PtQ/_new 2011-04-27 17:46:37.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package udisks (Version 1.0.1) +# spec file for package udisks # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: udisks Version: 1.0.1 -Release: 2.<RELEASE1> +Release: 2.<RELEASE3> License: GPLv2+ Summary: Disk Management Service Url: http://cgit.freedesktop.org/udisks/ @@ -47,6 +47,8 @@ #BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch10: udisks-kernel-module-load-fix.patch + %description udisks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. @@ -66,6 +68,7 @@ %prep %setup -q +%patch10 -p1 %build export V=1 ++++++ udisks-kernel-module-load-fix.patch ++++++ >From c933a929f07421ec747cebb24d5e620fc2b97037 Mon Sep 17 00:00:00 2001 From: David Zeuthen <davidz(a)redhat.com> Date: Tue, 15 Mar 2011 13:20:44 +0000 Subject: Bug 32232 – CVE-2010-4661: Arbitrary kernel module load Validate what is passed to the mount(8) command. In particular, only allow either well-known filesystems, filesystems already loaded or filesystem explicitly allowed by the administrator via the /etc/filesystems file. See https://bugs.freedesktop.org/show_bug.cgi?id=32232 for details. Signed-off-by: David Zeuthen <davidz(a)redhat.com> --- diff --git a/src/device.c b/src/device.c index 21d9530..d6595b8 100644 --- a/src/device.c +++ b/src/device.c @@ -5891,6 +5891,27 @@ static const FSMountOptions fs_mount_options[] = { "udf", udf_defaults, udf_allow, udf_allow_uid_self, udf_allow_gid_self }, }; +static const gchar *well_known_filesystems[] = +{ + "btrfs", + "ext2", + "ext3", + "ext4", + "udf", + "iso9660", + "xfs", + "jfs", + "nilfs", + "reiserfs", + "reiser4", + "msdos", + "umsdos", + "vfat", + "exfat" + "ntfs", + NULL, +}; + /* ------------------------------------------------ */ static int num_fs_mount_options = sizeof(fs_mount_options) / sizeof(FSMountOptions); @@ -6225,6 +6246,86 @@ filesystem_mount_completed_cb (DBusGMethodInvocation *context, } } +static gboolean +is_in_filesystem_file (const gchar *filesystems_file, + const gchar *fstype) +{ + gchar *filesystems; + GError *error; + gboolean ret; + gchar **lines; + guint n; + + ret = FALSE; + filesystems = NULL; + lines = NULL; + + error = NULL; + if (!g_file_get_contents (filesystems_file, + &filesystems, + NULL, /* gsize *out_length */ + &error)) + { + g_warning ("Error reading /etc/filesystems: %s (%s %d)", + error->message, + g_quark_to_string (error->domain), + error->code); + g_error_free (error); + goto out; + } + + lines = g_strsplit (filesystems, "\n", -1); + for (n = 0; lines != NULL && lines[n] != NULL && !ret; n++) + { + gchar **tokens; + gint num_tokens; + g_strdelimit (lines[n], " \t", ' '); + g_strstrip (lines[n]); + tokens = g_strsplit (lines[n], " ", -1); + num_tokens = g_strv_length (tokens); + if (num_tokens == 1 && g_strcmp0 (tokens[0], fstype) == 0) + { + ret = TRUE; + } + g_strfreev (tokens); + } + + out: + g_strfreev (lines); + g_free (filesystems); + return ret; +} + +static gboolean +is_well_known_filesystem (const gchar *fstype) +{ + gboolean ret; + guint n; + + ret = FALSE; + for (n = 0; well_known_filesystems[n] != NULL; n++) + { + if (g_strcmp0 (well_known_filesystems[n], fstype) == 0) + { + ret = TRUE; + goto out; + } + } + out: + return ret; +} + +/* this is not a very efficient implementation but it's very rarely + * called so no real point in optimizing it... + */ +static gboolean +is_allowed_filesystem (const gchar *fstype) +{ + return is_well_known_filesystem (fstype) || + is_in_filesystem_file ("/proc/filesystems", fstype) || + is_in_filesystem_file ("/etc/filesystems", fstype); +} + static void device_filesystem_mount_authorized_cb (Daemon *daemon, Device *device, @@ -6255,6 +6356,35 @@ device_filesystem_mount_authorized_cb (Daemon *daemon, remove_dir_on_unmount = FALSE; error = NULL; + /* If the user requests the filesystem type, error out unless the + * filesystem type is + * + * - well-known [1]; or + * - in the /etc/filesystems file; or + * - in the /proc/filesystems file + * + * We do this because mount(8) on Linux allows loading any arbitrary + * kernel module (when invoked as root) by passing something appropriate + * to the -t option. So we have to validate whatever we pass. + * + * See https://bugs.freedesktop.org/show_bug.cgi?id=32232 for more + * details. + * + * [1] : since /etc/filesystems may be horribly out of date and not + * contain e.g. ext4 + */ + if (filesystem_type != NULL && strlen (filesystem_type) > 0 && + g_strcmp0 (filesystem_type, "auto") != 0) + { + if (!is_allowed_filesystem (filesystem_type)) + { + throw_error (context, ERROR_FAILED, + "Requested filesystem type is neither well-known nor " + "in /proc/filesystems nor in /etc/filesystems"); + goto out; + } + } + daemon_local_get_uid (device->priv->daemon, &caller_uid, context); if (device->priv->id_usage == NULL || strcmp (device->priv->id_usage, "filesystem") != 0) -- cgit v0.8.3-6-g21f6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-feedparser for openSUSE:11.2
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package python-feedparser for openSUSE:11.2 checked in at Wed Apr 27 17:46:06 CEST 2011. -------- --- old-versions/11.2/UPDATES/all/python-feedparser/python-feedparser.changes 2011-03-17 02:35:42.000000000 +0100 +++ 11.2/python-feedparser/python-feedparser.changes 2011-04-20 20:17:37.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 20 11:14:19 UTC 2011 - jfunk(a)funktronics.ca + +- Fix bnc#688878 - "global name 'keymap' is not defined" + + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 New: ---- feedparser-bnc688878.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-feedparser.spec ++++++ --- /var/tmp/diff_new_pack.o6ri4x/_old 2011-04-27 17:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.o6ri4x/_new 2011-04-27 17:45:00.000000000 +0200 @@ -20,7 +20,7 @@ Name: python-feedparser Version: 4.1 -Release: 2.<RELEASE3> +Release: 2.<RELEASE5> Summary: Universal Feed Parser Module for Python Url: http://sourceforge.net/projects/feedparser/ License: BSD @@ -30,6 +30,7 @@ Patch1: feedparser-issue255-CVE-2011-1158.patch Patch2: feedparser-issue254-CVE-2011-1157.patch Patch3: feedparser-issue91-CVE-2011-1156.patch +Patch4: feedparser-bnc688878.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} BuildRequires: python-devel python-setuptools @@ -52,6 +53,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 chmod 0644 README %build ++++++ feedparser-bnc688878.diff ++++++ Index: feedparser.py =================================================================== --- feedparser.py.orig +++ feedparser.py @@ -65,6 +65,22 @@ TIDY_MARKUP = 0 # if TIDY_MARKUP = 1 PREFERRED_TIDY_INTERFACES = ["uTidy", "mxTidy"] +# If you want feedparser to allow all URL schemes, set this to () +# List culled from Python's urlparse documentation at: +# http://docs.python.org/library/urlparse.html +# as well as from "URI scheme" at Wikipedia: +# https://secure.wikimedia.org/wikipedia/en/wiki/URI_scheme +# Many more will likely need to be added! +ACCEPTABLE_URI_SCHEMES = ( + 'file', 'ftp', 'gopher', 'h323', 'hdl', 'http', 'https', 'imap', 'mailto', + 'mms', 'news', 'nntp', 'prospero', 'rsync', 'rtsp', 'rtspu', 'sftp', + 'shttp', 'sip', 'sips', 'snews', 'svn', 'svn+ssh', 'telnet', 'wais', + # Additional common-but-unofficial schemes + 'aim', 'callto', 'cvs', 'facetime', 'feed', 'git', 'gtalk', 'irc', 'ircs', + 'irc6', 'itms', 'mms', 'msnim', 'skype', 'ssh', 'smb', 'svn', 'ymsg', +) +#ACCEPTABLE_URI_SCHEMES = () + # ---------- required modules (should come with any Python distribution) ---------- import sgmllib, re, sys, copy, urlparse, time, rfc822, types, cgi, urllib, urllib2 try: @@ -1602,6 +1618,22 @@ def _resolveRelativeURIs(htmlSource, bas p.feed(htmlSource) return p.output() +def _makeSafeAbsoluteURI(base, rel=None): + # bail if ACCEPTABLE_URI_SCHEMES is empty + if not ACCEPTABLE_URI_SCHEMES: + return _urljoin(base, rel or u'') + if not base: + return rel or u'' + if not rel: + scheme = urlparse.urlparse(base)[0] + if not scheme or scheme in ACCEPTABLE_URI_SCHEMES: + return base + return u'' + uri = _urljoin(base, rel) + if uri.strip().split(':', 1)[0] not in ACCEPTABLE_URI_SCHEMES: + return u'' + return uri + class _HTMLSanitizer(_BaseHTMLProcessor): acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b', 'big', 'blockquote', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col', @@ -1635,6 +1667,7 @@ class _HTMLSanitizer(_BaseHTMLProcessor) self.unacceptablestack += 1 return + keymap = {} clean_attrs = [] for key, value in self.normalize_attrs(attrs): if key in self.acceptable_attributes: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 syslinux for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at Wed Apr 27 15:16:26 CEST 2011. -------- --- syslinux/syslinux.changes 2010-04-27 18:00:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2011-04-20 11:28:59.000000000 +0200 @@ -1,0 +2,179 @@ +Wed Apr 20 11:27:23 CEST 2011 - snwint(a)suse.de + +- adrian: mboot: replicate BOOTIF option for all modules + +------------------------------------------------------------------- +Tue Apr 19 15:29:10 CEST 2011 - snwint(a)suse.de + +- handle case where a separate initrd config line is used instead of an + initrd= kernel option + +------------------------------------------------------------------- +Tue Apr 19 10:48:40 CEST 2011 - snwint(a)suse.de + +- update to version 4.04 + * PXELINUX: Fix handling of unqualified DNS names. + * PXELINUX: Fix timer bug when PXELINUX might be unloaded + (Gene Cumm). + * core/writedec.inc: Fix duplicate declaration and overflow + (Gene Cumm). + * GCC 4.5 fixes. + * sample directory: Fix Makefile include (Gene Cumm). + * ver.com: New universal DOS/COMBOOT application to display + version information (includes DRMK) (Gene Cumm). + * rosh.c32: updated; Using getopt() for internal commands to aid + parsing options; Fix bugs in ls; add warm reboot and echo + (Gene Cumm). + * com32: fix a file descriptor leak. + * gfxboot.c32: handle TEXT..ENDTEXT; error out on no LABELs + found (Sebastian Herbszt). + * Fix booting on non-partitioned devices. + * MBR, isohybrid: Workaround for a BIOS issue on Acer + Travelmate and possibly other machines. + * COM32: Adding ACPI parsing libary + * HDT: Release 0.4.1 to support ACPI parsing, + improved mutli-core/cpu reporting + * LUA: Updating to 5.1.4-2 + * SYSLINUX: core/diskstart.inc: Reset DS after checksum in case + it isn't 0 (Gene Cumm). + * win64: Script update for additional mingw compiler names + (Gene Cumm). + * diag: New directory for diagnostic-related tools. Add a + handoff MBR/VBR and geometry display images (Gene Cumm). + * MEMDISK: use "mem=" parameter to mark available memory above + this point as reserved (core already does alignment) (Gene Cumm). + * MEMDISK: Additional disk probe checks and debug output + (Shao Miller, Gene Cumm). + * gpxe: add gpxelinuxk.0, based off of undionly.kpxe + new + script (Gene Cumm). + * isohybrid: install the isohdpfx*.bin/isohdppx*.bin files to + make isohybrid images in one step with GNU xorriso. + * PXELINUX: disable a hack that would make localboot work on + some machines, but break just about as many. Some machines + which worked with "localboot 0" in previous versions may + need "localboot -1" in this one. If you have a machine + which requires "localboot -1", a copy of the dmidecode + or sysdump output would be appreciated. + * Include a set of diagnostics by Gene Cumm. + * Fixes for gcc 4.6 and binutils 2.21.51. + * chain.c32: Allow "uuid" as a synonym to "guid". + * Handle directory names starting with .. for vfat and + iso9660. + * New MENU HIDDENKEY command to provide a one-keystroke way to + activate a boot option from a hidden menu intro screen. + + +------------------------------------------------------------------- +Mon Apr 18 17:35:01 CEST 2011 - snwint(a)suse.de + +- update to version 4.03 + * Major code base changes; all filesystem rewritten in C. + This work was done primarily by Liu Aleaxander (Yuanhan Liu). + * Better support for booting from MBRs which don't pass + handover information. + * EXTLINUX: Try to be smarter about finding the partition + offset. + * chain.c32: support chainloading Dell Real Mode Kernel (Gene + Cumm). + * chain.c32: fix booting in CHS mode. + * Fix the -s option to the syslinux/extlinux installer (Arwin + Vosselman). + * isohybrid: fix padding of large images (PJ Pandit). + * SYSLINUX: correctly handle the case where the -d option is + specified with a non-absolute path, i.e. "syslinux -d + syslinux" instead of "syslinux -d /syslinux". + * ISOLINUX: recognize the directory names /boot/syslinux and + /syslinux, and the filename syslinux.cfg in addition to the + isolinux-specific names. Thus, "syslinux.cfg" is now a + generic name, whereas "isolinux.cfg" or "extlinux.conf" is + specific to different derivative. + * chain.c32: support setting alternate config filename for + stage2 of GRUB Legacy (Gert Hulselmans). + * whichsys.c32: execute specific command, based on Syslinux + bootloader variant (Gert Hulselmans). + * lua.c32: a lot of new bindings added to the "syslinux" + namespace: VESA, PCI, DMI, kernel loading (Marcel Ritter). + * btrfs: print a comprehensive error message if compressed or + encrypted files are encountered (neither is currently + supported.) + * SYSLINUX: mtools installer: honor TMPDIR, error out on disk + full. + * Handle fallbacks from EDD to CHS, to deal with systems which + announce EDD support but don't actually have it. + * SYSLINUX: the mtools, DOS and win32 installers now use the new + command line options. + * PXELINUX: fix the use of IP addresses in TFTP :: or tftp:// + host syntax. + * SYSLINUX: experimental Win64 installer (syslinux64.exe). + * ISOLINUX: fix initialization on systems which don't zero + low memory. + * SYSLINUX/EXTLINUX: fix handing of disk read retries in + EDD mode. + * ISOLINUX: change the initialization sequence to avoid + problems with certain (old) BIOSes. Special thanks to + Helmut Hullen for invaluable debugging support. + * ifplop.c32: new module which detects if the PLoP Boot Loader + already has booted a CDROM or USB drive (Gert Hulselmans). + * Correct a severe memory overwrite bug, triggered primarily + when selecting a very long command line in the menu system. + * lua.c32: Lua script interpreter, currently experimental + (Alexey Zaytsev, Marcel Ritter, Geert Stappers). + * PXELINUX: new option IPAPPEND 4 to append the system UUID to + the kernel command line. + * PXELINUX: display BOOTIF and SYSUUID at startup time, and + when Ctrl-N is pressed on the command line. + * EXTLINUX: btrfs and ext4 support. btrfs support was done by + Alek Du of Intel. + * EXTLINUX is no longer a separate derivative; extlinux and + syslinux both install the same loader (ldlinux.sys); for the + Linux-based installers the extlinux binary is used for a + mounted filesystem; the syslinux binary for an unmounted + filesystem. + * When loading a new configuration file with the CONFIG + command, one can now also specify a new current directory + with an APPEND statement. + * Full ADV support for Syslinux, to boot-once and MENU SAVE + works. + * Full support of GPT-partitioned disks, including disks + and/or parititions larger than 2 TiB (if supported by BIOS.) + * The GPT handover protocol adjusted to the current T13 + committee draft; see doc/gpt.txt. + * HDT: code cleanup, small bugfixes + * The "linux" syslinux installer (syslinux-nomtools) now has a + command-line syntax closer to the extlinux installer. The + mtools, dos and win32 installers will get this new syntax + eventually, but it is not implemented yet. + * chain.c32: support booting GPT partitions by index, GUID, label. + * chain.c32: support booting the Syslinux partition with "fs". + * chain.c32: implement gpt.txt hand-over protocol. + * chain.c32: support for chainloading Grub stage 2. + * PXELINUX: TFTP URL syntax (tftp://) supported even when not + running gPXE/gpxelinux. + * New ls.c32 module to display the contents of the disk from + the command line, and pwd.c32 to display the current + directory. + * rosh.c32 (read only shell) updated and hopefully usable. + * PXELINUX: Support "localboot -1", just like the other + derivatives. + * gfxboot.com removed in favor of gfxboot.c32. + * New MENU HELP statement to display fullscreen help text as a + result of a menu selection. + * memdiskfind utility that can be used with the phram driver + in the Linux kernel to mount a memdisk. + * ifcpu.c32: Adding usage when no parameters are given, + adding PAE support. + * ifcpu.c32, ifcpu64.c32: handle more than one argument per + target. + * isohybrid: C version which does not require Perl. + * New command MENU IMMEDIATE to permit hotkeys to activate + immediately without needing Enter. + * mdiskchk.com supports a --no-sequential (or -n) option to + suppress the classic all-drive-probing heuristic. Useful + on BIOSes who crash/hang when certain drive numbers are + probed. + * ElTorito.Sys DOS driver now scans drive numbers upwards + instead of downwards, in order to avoid a fairly common + bug on some BIOSes where probing drive 0xFF causes a + failure. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- syslinux-3.86-com32.diff syslinux-3.86-compat.diff syslinux-3.86-gfxboot.diff syslinux-3.86-suse.diff syslinux-3.86.tar.bz2 New: ---- syslinux-4.04-cwd.diff syslinux-4.04-iso9660.diff syslinux-4.04-mboot_bootif.diff syslinux-4.04-noinitrd.diff syslinux-4.04.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslinux.spec ++++++ --- /var/tmp/diff_new_pack.su9ocp/_old 2011-04-27 15:15:25.000000000 +0200 +++ /var/tmp/diff_new_pack.su9ocp/_new 2011-04-27 15:15:25.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package syslinux (Version 3.86) +# spec file for package syslinux # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,22 +19,22 @@ Name: syslinux ExclusiveArch: %ix86 x86_64 -BuildRequires: libpng-devel nasm netpbm python +BuildRequires: libpng-devel nasm netpbm python xz Url: http://syslinux.zytor.com/ License: GPLv2+ Group: System/Boot Requires: mtools AutoReqProv: on Summary: Boot Loader for Linux -Version: 3.86 -Release: 4 +Version: 4.04 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: isolinux-config Source2: README.gfxboot -Patch0: %{name}-%{version}-gfxboot.diff -Patch1: %{name}-%{version}-suse.diff -Patch2: %{name}-%{version}-compat.diff -Patch3: %{name}-%{version}-com32.diff +Patch0: %{name}-%{version}-iso9660.diff +Patch1: %{name}-%{version}-cwd.diff +Patch2: %{name}-%{version}-noinitrd.diff +Patch3: %{name}-%{version}-mboot_bootif.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,8 +59,6 @@ %build cp %{SOURCE2} . export CFLAGS="$RPM_OPT_FLAGS" -chmod +x core/add_crc -rm -f modules/gfxboot.com make spotless make ++++++ isolinux-config ++++++ --- /var/tmp/diff_new_pack.su9ocp/_old 2011-04-27 15:15:25.000000000 +0200 +++ /var/tmp/diff_new_pack.su9ocp/_new 2011-04-27 15:15:25.000000000 +0200 @@ -26,14 +26,21 @@ sysread F, $file_buf, -s($file); close F; -die "$file: is not isolinux\n" unless (length $file_buf > (8 << 10)) && ($file_buf =~ m#(/boot(/[\x20-\xff]*)\x00*)\x00isolinux.cfg\x00#s); +if((length $file_buf > (8 << 10)) && ($file_buf =~ m#(/boot(/[\x20-\xff]*)\x00*)\x00isolinux.cfg\x00#s)) { + $format = 1; +} +elsif((length $file_buf > (8 << 10)) && ($file_buf =~ m#(/boot(/[\x20-\xff]*)\x00*)\x00/boot/syslinux\x00#s)) { + $format = 2; +} + +die "$file: is not isolinux\n" unless $format; $start = length $`; $base_buf = $1; $old_base = $2; if(defined $opt_base) { - ($base = $opt_base) =~ s#^/*##;; + ($base = $opt_base) =~ s#^/*##; $base = "/boot/$base"; die "$opt_base: file name too long\n" if length($base) > length($base_buf); ++++++ syslinux-4.04-cwd.diff ++++++ diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c index 9a39e79..35d180a 100644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c @@ -102,6 +102,8 @@ typedef struct __attribute__ ((packed)) { // 0: GFX_CB_MENU_INIT accepts 32 bit addresses // 1: knows about xmem_start, xmem_end uint16_t reserved_1; // 62: + uint32_t gfxboot_cwd; // 64: if set, points to current gfxboot working directory relative + // to syslinux working directory } gfx_config_t; @@ -181,6 +183,7 @@ int main(int argc, char **argv) { int menu_index; const union syslinux_derivative_info *sdi; + char working_dir[256]; openconsole(&dev_stdcon_r, &dev_stdcon_w); @@ -224,6 +227,10 @@ int main(int argc, char **argv) return 0; } + if(getcwd(working_dir, sizeof working_dir)) { + gfx_config.gfxboot_cwd = (uint32_t) working_dir; + } + if(gfx_init(argv[1])) { printf("Error setting up gfxboot\n"); if(argc > 2) show_message(argv[2]); @@ -806,6 +813,12 @@ void boot(int index) int i, label_len; unsigned ipapp; const struct syslinux_ipappend_strings *ipappend; + char *gfxboot_cwd = (char *) gfx_config.gfxboot_cwd; + + if(gfxboot_cwd) { + chdir(gfxboot_cwd); + gfx_config.gfxboot_cwd = 0; + } for(menu_ptr = menu; menu_ptr; menu_ptr = menu_ptr->next, index--) { if(!index) break; ++++++ syslinux-4.04-iso9660.diff ++++++ diff --git a/core/fs/iso9660/iso9660.c b/core/fs/iso9660/iso9660.c index 3cd3ac4..9bbc299 100644 --- a/core/fs/iso9660/iso9660.c +++ b/core/fs/iso9660/iso9660.c @@ -228,14 +228,25 @@ static int iso_readdir(struct file *file, struct dirent *dirent) /* Load the config file, return 1 if failed, or 0 */ static int iso_load_config(void) { - static const char *search_directories[] = { - "/boot/isolinux", - "/isolinux", - "/boot/syslinux", - "/syslinux", - "/", - NULL - }; + /* + * Put search_directories[] to different section so it + * won't be compressed (and we can patch it later). + */ + __asm__( + ".section .data16\n" + ".s1: .ascii \"/boot\"\n" + ".s2: .string \"/isolinux\"\n" + ".fill 64, 1, 0\n" + ".s3: .ascii \"/boot\"\n" + ".s4: .string \"/syslinux\"\n" + ".s5: .string \"/\"\n" + ".align 4\n" + "search_directories:\n" + ".long .s1, .s2, .s3, .s4, .s5, 0\n" + ".text\n" + ); + extern const char *search_directories[]; + static const char *filenames[] = { "isolinux.cfg", "syslinux.cfg", ++++++ syslinux-4.04-mboot_bootif.diff ++++++ diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c index 35450e0..a124a21 100644 --- a/com32/mboot/mboot.c +++ b/com32/mboot/mboot.c @@ -97,9 +97,14 @@ static int get_modules(char **argv, struct module_data **mdp) int arglen; const char module_separator[] = "---"; + char *bootif = 0; for (argp = argv; *argp; argp++) { if (!strcmp(*argp, module_separator)) module_count++; + /* BOOTIF= gets only appended for last group by syslinux, but it may be needed also + for other modules. So let's copy it. Esp. needed for XEN booting, Dom0 kernel needs it */ + if (!strncmp(*argp, "BOOTIF=", 7)) + bootif = *argp; } *mdp = mp = malloc(module_count * sizeof(struct module_data)); @@ -133,11 +138,19 @@ static int get_modules(char **argv, struct module_data **mdp) mp->cmdline = strdup(""); } else { char *p; + if (bootif) { + arglen += strlen(bootif) + 1; + } + mp->cmdline = p = malloc(arglen); for (; *argp && strcmp(*argp, module_separator); argp++) { p = stpcpy(p, *argp); *p++ = ' '; } + if (bootif) { + p = stpcpy(p, bootif); + *p++ = ' '; + } *--p = '\0'; } mp++; ++++++ syslinux-4.04-noinitrd.diff ++++++ diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c index 3749920..9a39e79 100644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c @@ -922,11 +922,15 @@ void boot_entry(menu_t *menu_ptr, char *arg) *skip_nonspaces(s) = 0; initrd_arg = s; } + else if(initrd_arg) { + free(s0); + initrd_arg = s0 = strdup(initrd_arg); + } if(initrd_arg) { initrd = initramfs_init(); - while((t = strsep(&s, ","))) { + while((t = strsep(&initrd_arg, ","))) { initrd_buf = load_one(t, &initrd_size); if(!initrd_buf) { ++++++ syslinux-3.86.tar.bz2 -> syslinux-4.04.tar.bz2 ++++++ ++++ 161732 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 armadillo for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at Wed Apr 27 15:15:00 CEST 2011. -------- --- armadillo/armadillo.changes 2011-03-23 17:31:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/armadillo/armadillo.changes 2011-04-18 14:06:27.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Apr 18 12:08:06 UTC 2011 - badshah400(a)gmail.com + +- Update to version 1.2.0 + + Added ability to use Blas & Lapack libraries with capitalised + function names + + Reduction of pedantic compiler warnings + +------------------------------------------------------------------- +Fri Apr 1 22:51:28 CEST 2011 - badshah400(a)gmail.com + +- Update to version 1.1.92: + + Bugfix in function cor() + + Automatic installation now requires CMake >= 2.6 +- Add licenses to libarmadillo package + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- armadillo-1.1.90.tar.bz2 New: ---- armadillo-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.D37edC/_old 2011-04-27 15:14:36.000000000 +0200 +++ /var/tmp/diff_new_pack.D37edC/_new 2011-04-27 15:14:36.000000000 +0200 @@ -18,7 +18,7 @@ Name: armadillo -Version: 1.1.90 +Version: 1.2.0 Release: 1 License: LGPLv3+ Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS @@ -127,6 +127,7 @@ %files -n libarmadillo1 %defattr(-,root,root) %{_libdir}/*.so.* +%doc LICENSE.txt licenses %files devel %defattr(-,root,root) @@ -134,6 +135,7 @@ %{_includedir}/armadillo %{_includedir}/armadillo_bits/ %{_includedir}/armadillo_itpp -%doc LICENSE.txt licenses README.txt index.html examples/ docs/ +%{_datadir}/Armadillo/ +%doc README.txt index.html examples/ docs/ %changelog ++++++ armadillo-1.1.90.tar.bz2 -> armadillo-1.2.0.tar.bz2 ++++++ ++++ 2324 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 gnonlin for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package gnonlin for openSUSE:Factory checked in at Wed Apr 27 15:14:27 CEST 2011. -------- --- GNOME/gnonlin/gnonlin.changes 2011-02-05 02:55:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnonlin/gnonlin.changes 2011-04-24 19:52:13.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 24 12:59:34 UTC 2011 - toddrme2178(a)gmail.com + +- Add 32bit compatibility libraries + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnonlin.spec ++++++ --- /var/tmp/diff_new_pack.TafHKv/_old 2011-04-27 15:14:14.000000000 +0200 +++ /var/tmp/diff_new_pack.TafHKv/_new 2011-04-27 15:14:14.000000000 +0200 @@ -19,7 +19,7 @@ Name: gnonlin Version: 0.10.17 -Release: 1 +Release: 8 %define gst_branch 0.10 License: LGPLv2.1+ Summary: Non-liner audio and video support for GStreamer ++++++ baselibs.conf ++++++ gstreamer-0_10-plugin-gnonlin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gstreamer-0_10-plugins-gl for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-gl for openSUSE:Factory checked in at Wed Apr 27 15:14:00 CEST 2011. -------- --- GNOME/gstreamer-0_10-plugins-gl/gstreamer-0_10-plugins-gl.changes 2011-02-14 19:33:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-gl/gstreamer-0_10-plugins-gl.changes 2011-04-24 19:30:00.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 24 12:59:34 UTC 2011 - toddrme2178(a)gmail.com + +- Added 32bit compatibility libraries +- Added main package dependency to -devel pacakge (fix for RPMLINT warning) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-gl.spec ++++++ --- /var/tmp/diff_new_pack.a86zqR/_old 2011-04-27 15:13:36.000000000 +0200 +++ /var/tmp/diff_new_pack.a86zqR/_new 2011-04-27 15:13:36.000000000 +0200 @@ -21,7 +21,7 @@ Name: gstreamer-0_10-plugins-gl %define _name gst-plugins-gl Version: 0.10.2 -Release: 7 +Release: 8 %define gst_branch 0.10 License: LGPLv2.1+ Summary: GStreamer OpenGL Plug-Ins @@ -61,6 +61,7 @@ Summary: GStreamer OpenGL Plug-Ins - Development headers Group: Development/Libraries/Other Requires: libgstgl-0_10-1 = %{version} +Requires: gstreamer-0_10-plugins-gl = %{version} %description devel This package contains headers and libraries needed to develop based ++++++ baselibs.conf ++++++ gstreamer-0_10-plugins-gl libgstgl-0_10-1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vigra for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package vigra for openSUSE:Factory checked in at Wed Apr 27 15:11:31 CEST 2011. -------- --- vigra/vigra.changes 2010-12-09 15:22:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/vigra/vigra.changes 2011-04-24 20:40:50.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Apr 24 12:59:34 UTC 2011 - toddrme2178(a)gmail.com + +- Add 32bit compatibility libraries +- Remove test for obsolete openSUSE versions +- Made package no longer obsolete itself (fix for RPMLINT warning) +- More informative summaries (fix for RPMLINT warning) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vigra.spec ++++++ --- /var/tmp/diff_new_pack.ymmJJ0/_old 2011-04-27 15:10:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ymmJJ0/_new 2011-04-27 15:10:17.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package vigra (Version 1.6.0) +# spec file for package vigra # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,9 +23,9 @@ License: MIT Group: Development/Libraries/C and C++ AutoReqProv: on -Summary: VIGRA Library +Summary: Computer vision Library Version: 1.6.0 -Release: 15 +Release: 20 Source: %{name}%{version}.tar.bz2 Patch: vigra1.6.0-autoconf.patch Patch1: vigra1.6.0-libpng14.patch @@ -50,9 +50,9 @@ %package -n libvigraimpex2 License: MIT Group: Development/Libraries/C and C++ -Summary: VIGRA Library +Summary: Computer vision Library Provides: %{name} = %{version} -Obsoletes: %{name} <= %{version} +Obsoletes: %{name} < %{version} %description -n libvigraimpex2 VIGRA stands for "Vision with Generic Algorithms". It is a novel @@ -71,7 +71,7 @@ %package devel License: MIT Group: Development/Libraries/C and C++ -Summary: VIGRA Library +Summary: Development files for VIGRA Library Requires: libvigraimpex2 = %{version} Requires: glibc-devel Requires: libstdc++-devel ++++++ baselibs.conf ++++++ libvigraimpex2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gstreamer-0_10-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-bad for openSUSE:Factory checked in at Wed Apr 27 15:09:05 CEST 2011. -------- --- GNOME/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2011-02-01 01:38:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2011-04-24 00:19:35.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 23 22:17:44 UTC 2011 - reddwarf(a)opensuse.org + +- Add GME support +- Fix BUILD_ORIG build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.6pz2IT/_old 2011-04-27 15:07:43.000000000 +0200 +++ /var/tmp/diff_new_pack.6pz2IT/_new 2011-04-27 15:07:43.000000000 +0200 @@ -27,7 +27,7 @@ # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. %define _name gst-plugins-bad Version: 0.10.21 -Release: 1 +Release: 11 %define gst_branch 0.10 # Please remove me when slv2 and lv2core are in factory. %if %{with LV2} @@ -51,6 +51,7 @@ BuildRequires: libexempi-devel BuildRequires: libexif-devel BuildRequires: libglade2-devel +BuildRequires: libgme-devel BuildRequires: libgsm-devel BuildRequires: libiptcdata-devel BuildRequires: libjasper-devel @@ -66,9 +67,10 @@ BuildRequires: libtimidity-devel BuildRequires: libvdpau-devel BuildRequires: libvpx-devel -# FIXME: mpeg2enc: It should be built with mjpegtools-devel, but it isn't. BuildRequires: mjpegtools-devel BuildRequires: neon-devel +# OpenCV 2.2.0 is too new. Recheck to see if the plugin has been updated. +#BuildRequires: opencv-devel BuildRequires: openssl-devel BuildRequires: orc BuildRequires: python-devel @@ -80,7 +82,6 @@ BuildRequires: libmms-devel %endif # FIXME: flite: Not in openSUSE -# FIXME: gme: Not in openSUSE (but in multimedia:libs) # FIXME: lv2: standard for plugins and matching host applications, # FIXME: mimic: Requires libmimic. # FIXME: mythtvsrc: Requires gmyth. @@ -96,8 +97,11 @@ %if 0%{?BUILD_ORIG} BuildRequires: faac-devel BuildRequires: faad2-devel +BuildRequires: libamrwb-devel +BuildRequires: libaudio-devel BuildRequires: libdca-devel -BuildRequires: libmpeg2-devel +BuildRequires: libgmyth-devel +BuildRequires: librtmp-devel BuildRequires: libxvidcore-devel %ifarch %ix86 # binary only so make conditional @@ -332,7 +336,9 @@ # File not found: /usr/lib64/gstreamer-0.10/libgstvalve.so %defattr(-, root, root) %doc AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS +%if 0%{?suse_version} >= 1140 %{_datadir}/glib-2.0/schemas/org.freedesktop.gstreamer-0.10.default-elements.gschema.xml +%endif %{_libdir}/gstreamer-%{gst_branch}/libgstadpcmdec.so %{_libdir}/gstreamer-%{gst_branch}/libgstadpcmenc.so %{_libdir}/gstreamer-%{gst_branch}/libgstaiff.so @@ -366,7 +372,10 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstfrei0r.so %{_libdir}/gstreamer-%{gst_branch}/libgstgaudieffects.so %{_libdir}/gstreamer-%{gst_branch}/libgstgeometrictransform.so +%{_libdir}/gstreamer-%{gst_branch}/libgstgme.so +%if 0%{?suse_version} >= 1140 %{_libdir}/gstreamer-%{gst_branch}/libgstgsettingselements.so +%endif %{_libdir}/gstreamer-%{gst_branch}/libgstgsm.so %{_libdir}/gstreamer-%{gst_branch}/libgsth264parse.so %{_libdir}/gstreamer-%{gst_branch}/libgsthdvparse.so @@ -443,10 +452,16 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstdivxenc.so %endif %endif +%{_datadir}/gstreamer-%{gst_branch}/presets/GstAmrwbEnc.prs +%{_libdir}/gstreamer-%{gst_branch}/libgstamrwbenc.so %{_libdir}/gstreamer-%{gst_branch}/libgstdtsdec.so %{_libdir}/gstreamer-%{gst_branch}/libgstdvdspu.so %{_libdir}/gstreamer-%{gst_branch}/libgstfaac.so %{_libdir}/gstreamer-%{gst_branch}/libgstfaad.so +%{_libdir}/gstreamer-%{gst_branch}/libgstmpeg2enc.so +%{_libdir}/gstreamer-%{gst_branch}/libgstmythtvsrc.so +%{_libdir}/gstreamer-%{gst_branch}/libgstnassink.so +%{_libdir}/gstreamer-%{gst_branch}/libgstrtmp.so %{_libdir}/gstreamer-%{gst_branch}/libgstsiren.so %{_libdir}/gstreamer-%{gst_branch}/libgstxvid.so %if %{with libmms} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-ncurses for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package yast2-ncurses for openSUSE:Factory checked in at Wed Apr 27 15:06:12 CEST 2011. -------- --- yast2-ncurses/yast2-ncurses.changes 2011-04-18 15:17:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2011-04-26 11:14:00.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 26 11:05:41 CEST 2011 - gs(a)suse.de + +- NCTree: use default params for multi selection options +- V 2.21.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-2.21.1.tar.bz2 New: ---- yast2-ncurses-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.Kt9lya/_old 2011-04-27 15:05:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Kt9lya/_new 2011-04-27 15:05:56.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-ncurses -Version: 2.21.1 +Version: 2.21.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.21.1.tar.bz2 +Source0: yast2-ncurses-2.21.2.tar.bz2 Prefix: /usr @@ -56,7 +56,7 @@ component for YaST2. %prep -%setup -n yast2-ncurses-2.21.1 +%setup -n yast2-ncurses-2.21.2 %build %{prefix}/bin/y2tool y2autoconf @@ -97,5 +97,4 @@ %dir %{prefix}/include/YaST2 %{prefix}/include/YaST2/ncurses/ %doc %{prefix}/share/doc/packages/yast2-ncurses - %changelog ++++++ yast2-ncurses-2.21.1.tar.bz2 -> yast2-ncurses-2.21.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.21.1/VERSION new/yast2-ncurses-2.21.2/VERSION --- old/yast2-ncurses-2.21.1/VERSION 2011-04-18 15:13:20.000000000 +0200 +++ new/yast2-ncurses-2.21.2/VERSION 2011-04-26 11:05:32.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.21.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.21.1/configure new/yast2-ncurses-2.21.2/configure --- old/yast2-ncurses-2.21.1/configure 2011-04-18 15:16:28.000000000 +0200 +++ new/yast2-ncurses-2.21.2/configure 2011-04-26 11:07:10.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-ncurses 2.21.1. +# Generated by GNU Autoconf 2.68 for yast2-ncurses 2.21.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -709,8 +709,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.21.1' -PACKAGE_STRING='yast2-ncurses 2.21.1' +PACKAGE_VERSION='2.21.2' +PACKAGE_STRING='yast2-ncurses 2.21.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1488,7 +1488,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses 2.21.1 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.21.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1559,7 +1559,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.21.1:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.21.2:";; esac cat <<\_ACEOF @@ -1673,7 +1673,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.21.1 +yast2-ncurses configure 2.21.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2308,7 +2308,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses $as_me 2.21.1, which was +It was created by yast2-ncurses $as_me 2.21.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3238,7 +3238,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.21.1' + VERSION='2.21.2' cat >>confdefs.h <<_ACEOF @@ -3360,7 +3360,7 @@ -VERSION="2.21.1" +VERSION="2.21.2" RPMNAME="yast2-ncurses" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" @@ -16101,7 +16101,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses $as_me 2.21.1, which was +This file was extended by yast2-ncurses $as_me 2.21.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16167,7 +16167,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-ncurses config.status 2.21.1 +yast2-ncurses config.status 2.21.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.21.1/configure.in new/yast2-ncurses-2.21.2/configure.in --- old/yast2-ncurses-2.21.1/configure.in 2011-04-18 15:16:21.000000000 +0200 +++ new/yast2-ncurses-2.21.2/configure.in 2011-04-26 11:07:03.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.21.1, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.21.2, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.1" +VERSION="2.21.2" RPMNAME="yast2-ncurses" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.21.1/src/NCTree.h new/yast2-ncurses-2.21.2/src/NCTree.h --- old/yast2-ncurses-2.21.1/src/NCTree.h 2011-04-18 14:38:32.000000000 +0200 +++ new/yast2-ncurses-2.21.2/src/NCTree.h 2011-04-26 11:03:41.000000000 +0200 @@ -60,7 +60,7 @@ public: - NCTree( YWidget * parent, const string & label, bool multiselection, bool recursiveSelection ); + NCTree( YWidget * parent, const string & label, bool multiselection=false, bool recursiveselection=false ); virtual ~NCTree(); virtual int preferredWidth(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 exempi for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package exempi for openSUSE:Factory checked in at Wed Apr 27 15:05:48 CEST 2011. -------- --- GNOME/exempi/exempi.changes 2010-12-09 02:06:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/exempi/exempi.changes 2011-04-24 19:40:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 24 12:59:34 UTC 2011 - toddrme2178(a)gmail.com + +- Add 32bit compatibility libraries + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exempi.spec ++++++ --- /var/tmp/diff_new_pack.h5EiK2/_old 2011-04-27 15:05:34.000000000 +0200 +++ /var/tmp/diff_new_pack.h5EiK2/_new 2011-04-27 15:05:34.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package exempi (Version 2.1.1) +# spec file for package exempi # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: exempi Url: http://libopenraw.freedesktop.org/wiki/Exempi Version: 2.1.1 -Release: 9 +Release: 14 BuildRequires: boost-devel >= 1.33.0 BuildRequires: gcc-c++ BuildRequires: libexpat-devel ++++++ baselibs.conf ++++++ libexempi3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-gnome-extras for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package python-gnome-extras for openSUSE:Factory checked in at Wed Apr 27 11:43:06 CEST 2011. -------- --- python-gnome-extras/python-gnome-extras.changes 2011-01-17 23:43:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-gnome-extras/python-gnome-extras.changes 2011-04-27 00:02:53.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 26 23:52:57 CEST 2011 - vuntz(a)opensuse.org + +- Add build_gdl/build_gtkmozembed defines to decide whether to + build gdl and gtkmozembed bindings. +- Set build_gdl to 0 as gdl now has introspection support and the + bindings don't support the latest gdl. +- Set build_gtkmozembed to 0 as mozilla announced they're dropping + support for gtkmozembed. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gnome-extras.spec ++++++ --- /var/tmp/diff_new_pack.VscV7R/_old 2011-04-27 11:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.VscV7R/_new 2011-04-27 11:39:02.000000000 +0200 @@ -17,6 +17,9 @@ # norootforbuild +%define build_gdl 0 +%define build_gtkmozembed 0 + %if 0%{suse_version} > 1130 %define xulrunner_version 20 %else @@ -34,7 +37,7 @@ Name: python-gnome-extras %define _name gnome-python-extras Version: 2.25.3 -Release: 16 +Release: 22 Summary: Python bindings for GNOME License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/Python @@ -47,13 +50,17 @@ Patch1: python-gnome-extras-gdl.patch BuildRequires: fdupes BuildRequires: gcc-c++ +%if %{build_gdl} BuildRequires: gdl-devel +%endif BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: gtkspell-devel BuildRequires: libgda-4_0-devel BuildRequires: libgnomeui-devel +%if %{build_gtkmozembed} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +%endif BuildRequires: python-devel BuildRequires: python-gnome-devel %if %suse_version <= 1130 @@ -63,8 +70,12 @@ # Explicitly require all subpackages, so packages depending on # python-gnome-extras get all modules. Requires: python-egg +%if %{build_gdl} Requires: python-gdl +%endif +%if %{build_gtkmozembed} Requires: python-gtkmozembed +%endif Requires: python-gtkspell Requires: python-gda BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,6 +99,8 @@ Note that libegg use is generally not advised. +%if %{build_gdl} + %package -n python-gdl Summary: Python bindings for GDL License: LGPLv2.1+ @@ -97,6 +110,9 @@ %description -n python-gdl This package contains Python bindings for GDL. +%endif + +%if %{build_gtkmozembed} %package -n python-gtkmozembed Summary: Python bindings for GtkMozEmbed @@ -108,6 +124,7 @@ %description -n python-gtkmozembed This package contains Python bindings for GtkMozEmbed. +%endif %package -n python-gtkspell Summary: Python bindings for GtkSpell @@ -181,15 +198,21 @@ %{py_sitedir}/gtk-2.0/egg/recent.so %{py_sitedir}/gtk-2.0/egg/trayicon.so +%if %{build_gdl} + %files -n python-gdl %defattr(-, root, root) %doc COPYING.LGPL %{py_sitedir}/gtk-2.0/gdl.so +%endif + +%if %{build_gtkmozembed} %files -n python-gtkmozembed %defattr(-, root, root) %doc COPYING.LGPL %{py_sitedir}/gtk-2.0/gtkmozembed.so +%endif %files -n python-gtkspell %defattr(-, root, root) @@ -216,7 +239,9 @@ # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html +%if %{build_gtkmozembed} %{_datadir}/gtk-doc/html/pygtkmozembed/ +%endif %{_datadir}/gtk-doc/html/pygtkspell/ %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-ncurses-pkg for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory checked in at Wed Apr 27 11:42:37 CEST 2011. -------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2011-02-09 14:24:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2011-04-26 11:17:10.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 26 11:10:46 CEST 2011 - gs(a)suse.de + +- Adjust NCTree params, require latest libyui +- V 2.21.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-pkg-2.20.3.tar.bz2 New: ---- yast2-ncurses-pkg-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.Ly5PUn/_old 2011-04-27 11:42:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ly5PUn/_new 2011-04-27 11:42:09.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-ncurses-pkg -Version: 2.20.3 +Version: 2.21.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.20.3.tar.bz2 +Source0: yast2-ncurses-pkg-2.21.0.tar.bz2 Prefix: /usr @@ -37,11 +37,11 @@ Provides: yast2_ui_pkg Requires: glibc-locale BuildRequires: yast2-core-devel >= 2.16.33 -BuildRequires: yast2-libyui-devel >= 2.20.1 +BuildRequires: yast2-libyui-devel >= 2.21.1 BuildRequires: libzypp-devel >= 7.4.0 Requires: yast2-core >= 2.16.33 #ncurses6 library -Requires: yast2-ncurses >= 2.20.2 +Requires: yast2-ncurses >= 2.21.2 Requires: libzypp >= 7.4.0 %description @@ -49,7 +49,7 @@ package manager %prep -%setup -n yast2-ncurses-pkg-2.20.3 +%setup -n yast2-ncurses-pkg-2.21.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ncurses-pkg-2.20.3.tar.bz2 -> yast2-ncurses-pkg-2.21.0.tar.bz2 ++++++ ++++ 3106 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.20.3/VERSION new/yast2-ncurses-pkg-2.21.0/VERSION --- old/yast2-ncurses-pkg-2.20.3/VERSION 2011-02-09 14:22:00.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.0/VERSION 2011-04-26 11:08:50.000000000 +0200 @@ -1 +1 @@ -2.20.3 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.20.3/config.h.in new/yast2-ncurses-pkg-2.21.0/config.h.in --- old/yast2-ncurses-pkg-2.20.3/config.h.in 2011-02-09 14:23:43.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.0/config.h.in 2011-04-26 11:15:39.000000000 +0200 @@ -83,3 +83,6 @@ /* Version number of package */ #undef VERSION + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +#undef size_t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.20.3/configure.in new/yast2-ncurses-pkg-2.21.0/configure.in --- old/yast2-ncurses-pkg-2.20.3/configure.in 2011-02-09 14:23:35.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.0/configure.in 2011-04-26 11:15:32.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.20.3, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.21.0, http://bugs.opensuse.org/, yast2-ncurses-pkg) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.3" +VERSION="2.21.0" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.20.3/libtool.m4 new/yast2-ncurses-pkg-2.21.0/libtool.m4 --- old/yast2-ncurses-pkg-2.20.3/libtool.m4 2011-02-09 14:23:39.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.0/libtool.m4 2011-04-26 11:15:36.000000000 +0200 @@ -1020,7 +1020,7 @@ # to the aix ld manual. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +AC_LINK_IFELSE([AC_LANG_PROGRAM],[ lt_aix_libpath_sed=' /Import File Strings/,/^$/ { /^0/ { @@ -4825,9 +4825,18 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], [ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) + ]) LDFLAGS="$save_LDFLAGS" else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.20.3/ltversion.m4 new/yast2-ncurses-pkg-2.21.0/ltversion.m4 --- old/yast2-ncurses-pkg-2.20.3/ltversion.m4 2011-02-09 14:23:40.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.0/ltversion.m4 2011-04-26 11:15:36.000000000 +0200 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3017 ltversion.m4 +# serial 3018 ltversion.m4 # This file is part of GNU Libtool m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_REVISION], [1.3018]) AC_DEFUN([LTVERSION_VERSION], [macro_version='2.2.6b' -macro_revision='1.3017' +macro_revision='1.3018' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.20.3/src/NCPkgFilterRPMGroups.cc new/yast2-ncurses-pkg-2.21.0/src/NCPkgFilterRPMGroups.cc --- old/yast2-ncurses-pkg-2.20.3/src/NCPkgFilterRPMGroups.cc 2011-01-18 12:25:10.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.0/src/NCPkgFilterRPMGroups.cc 2011-04-26 10:52:10.000000000 +0200 @@ -79,7 +79,7 @@ // NCPkgFilterRPMGroups::NCPkgFilterRPMGroups( YWidget *parent, string label, NCPackageSelector * pkg ) - : NCTree( parent, label, false ) + : NCTree( parent, label ) , filterTree( this ) , packager ( pkg ) , _rpmGroupsTree (0) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 osc for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at Wed Apr 27 11:37:52 CEST 2011. -------- --- osc/osc.changes 2010-12-18 03:06:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/osc/osc.changes 2011-03-18 22:15:05.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 18 21:13:48 UTC 2011 - bwiedemann(a)novell.com + +- add Requires: rpm-python (bnc#680986) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.9HegQn/_old 2011-04-27 11:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9HegQn/_new 2011-04-27 11:28:09.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package osc (Version 0.130.1) +# spec file for package osc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: osc Version: 0.130.1 -Release: 1 +Release: 6 Group: Development/Tools/Other License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,6 +31,13 @@ BuildRequires: python-urlgrabber %endif BuildRequires: python-devel +%if 0%{?mandriva_version} +Requires: python-rpm +BuildRequires: python-rpm +%else +Requires: rpm-python +BuildRequires: rpm-python +%endif # %if 0%{?suse_version} %if %suse_version < 1020 ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.9HegQn/_old 2011-04-27 11:28:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9HegQn/_new 2011-04-27 11:28:09.000000000 +0200 @@ -1,3 +1,13 @@ +osc (0.130.1-1) unstable; urgency=low + - Update to 0.130.1 + + -- Marcus Huewe <suse-tux(a)gmx.de> Wed, 22 Dec 2010 14:40:01 +0200 + +osc (0.130-1) unstable; urgency=low + - Update to 0.130 + + -- Marcus Huewe <suse-tux(a)gmx.de> Wed, 22 Dec 2010 14:37:57 +0200 + osc (0.129-1) unstable; urgency=low - Update to 0.129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-qt for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package yast2-qt for openSUSE:Factory checked in at Wed Apr 27 11:28:01 CEST 2011. -------- --- yast2-qt/yast2-qt.changes 2011-04-18 16:28:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2011-04-21 11:08:11.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 21 11:05:49 CEST 2011 - tgoettlicher(a)suse.de + +- Cleaned-up fix for line breaks in LogView (bnc #684759) +- V 2.21.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-qt-2.21.1.tar.bz2 New: ---- yast2-qt-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.QoBjZd/_old 2011-04-27 11:25:41.000000000 +0200 +++ /var/tmp/diff_new_pack.QoBjZd/_new 2011-04-27 11:25:41.000000000 +0200 @@ -18,11 +18,11 @@ Name: yast2-qt -Version: 2.21.1 +Version: 2.21.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.21.1.tar.bz2 +Source0: yast2-qt-2.21.2.tar.bz2 Group: System/YaST License: GPLv2+ BuildRequires: docbook-xsl-stylesheets ++++++ yast2-qt-2.21.1.tar.bz2 -> yast2-qt-2.21.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.21.1/VERSION.cmake new/yast2-qt-2.21.2/VERSION.cmake --- old/yast2-qt-2.21.1/VERSION.cmake 2011-04-19 12:21:08.000000000 +0200 +++ new/yast2-qt-2.21.2/VERSION.cmake 2011-04-21 15:32:06.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.21.1/package/yast2-qt.changes new/yast2-qt-2.21.2/package/yast2-qt.changes --- old/yast2-qt-2.21.1/package/yast2-qt.changes 2011-04-19 12:21:09.000000000 +0200 +++ new/yast2-qt-2.21.2/package/yast2-qt.changes 2011-04-21 15:32:06.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 21 11:05:49 CEST 2011 - tgoettlicher(a)suse.de + +- Cleaned-up fix for line breaks in LogView (bnc #684759) +- V 2.21.2 + +------------------------------------------------------------------- Mon Apr 18 16:16:59 CEST 2011 - tgoettlicher(a)suse.de - Enable busy cursor for tree widget during time consuming diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.21.1/src/YQLogView.cc new/yast2-qt-2.21.2/src/YQLogView.cc --- old/yast2-qt-2.21.1/src/YQLogView.cc 2011-04-19 12:21:08.000000000 +0200 +++ new/yast2-qt-2.21.2/src/YQLogView.cc 2011-04-21 15:32:06.000000000 +0200 @@ -93,22 +93,32 @@ YQLogView::displayLogText( const string & text ) { QScrollBar *sb = _qt_text->verticalScrollBar(); - QString newString = fromUTF8( text ); - newString[ newString.length() ] = ' '; bool atEnd = sb->value() == sb->maximum(); - if (newString.startsWith(_lastText) && !_lastText.isEmpty() ) { - _qt_text->append(newString.mid(_lastText.length() + 1 )); - } else { + if (newString.startsWith(_lastText) && !_lastText.isEmpty() ) + { + int position = _lastText.length(); + + // prevent double line break caused by QTextEdit::append() + if ( newString.mid( _lastText.length(), 1 ) == QString('\n') ) + position++; + + _qt_text->append( newString.mid( position) ); + } + else + { _qt_text->setPlainText( newString ); } - if (atEnd) { + + if (atEnd) + { _qt_text->moveCursor( QTextCursor::End ); _qt_text->ensureCursorVisible(); } + _lastText = newString; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Class-Inner for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package perl-Class-Inner for openSUSE:Factory checked in at Wed Apr 27 11:25:28 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Class-Inner/perl-Class-Inner.changes 2011-04-26 19:45:43.000000000 +0200 @@ -0,0 +1,40 @@ +------------------------------------------------------------------- +Tue Apr 26 17:45:25 UTC 2011 - coolo(a)opensuse.org + +- changed license, README says "same as perl" + +------------------------------------------------------------------- +Mon Apr 4 08:29:58 UTC 2011 - coolo(a)novell.com + +- updated to 0.200001 + * Fixed + http://rt.cpan.org/Ticket/Display.html?id=43938 + http://rt.cpan.org/Ticket/Display.html?id=39140 + http://rt.cpan.org/Ticket/Display.html?id=33533 + Which are all really the same issue. + +------------------------------------------------------------------- +Wed Dec 1 13:31:00 UTC 2010 - coolo(a)novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- +Mon Nov 29 18:29:28 UTC 2010 - coolo(a)novell.com + +- remove /var/adm/perl-modules + +------------------------------------------------------------------- +Tue Oct 19 08:38:23 UTC 2010 - coolo(a)novell.com + +- add perl as explicit buildrequire + +------------------------------------------------------------------- +Sun Oct 26 00:00:00 UTC 2008 - gerrit.beine(a)gmx.de + +- turned off testing for openSUSE 11.x + +------------------------------------------------------------------- +Wed May 21 00:00:00 UTC 2008 - gerrit.beine(a)gmx.de + +- first release 0.1 + calling whatdependson for head-i586 New: ---- Class-Inner-0.200001.tar.gz perl-Class-Inner.changes perl-Class-Inner.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Inner.spec ++++++ # # spec file for package perl-Class-Inner # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: perl-Class-Inner Version: 0.200001 Release: 1 # MANUAL License: GPL+ or Artistic %define cpan_name Class-Inner Summary: A perlish implementation of Java like inner classes Url: http://search.cpan.org/dist/Class-Inner/ Group: Development/Libraries/Perl Source: http://www.cpan.org/authors/id/A/AR/ARUNBEAR/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(ExtUtils::MakeMaker) %{perl_requires} %description Yet another implementation of an anonymous class with per object overrideable methods, but with the added attraction of sort of working dispatch to the parent class's method. %prep %setup -q -n %{cpan_name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist %clean %{__rm} -rf %{buildroot} %files -f %{name}.files %defattr(-,root,root,755) %doc Changes README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 polkit for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package polkit for openSUSE:Factory checked in at Wed Apr 27 11:16:39 CEST 2011. -------- --- polkit/polkit.changes 2010-11-10 16:04:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/polkit/polkit.changes 2011-04-26 21:20:59.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Apr 26 21:19:32 CEST 2011 - kay.sievers(a)novell.com + +- use LGPLv2.1+ in spec file + +------------------------------------------------------------------- +Tue Apr 26 18:24:01 CEST 2011 - kay.sievers(a)novell.com + +- stat race condition (CVE-2011-1485) (bnc#688788) + +------------------------------------------------------------------- +Wed Apr 6 15:40:51 UTC 2011 - fcrozat(a)novell.com + +- Remove PolkitAgent-1.0.typelib from main package, it is in + library package. + +------------------------------------------------------------------- +Wed Mar 9 13:54:11 UTC 2011 - coolo(a)novell.com + +- update to 0.101: + * tons of bug fixes, see NEWS + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- polkit-0.99.tar.bz2 New: ---- _service _service:recompress:download_url:polkit-0.101.tar.bz2 polkit-0.101.tar.bz2 polkit-CVE-2011-1485-1.patch polkit-CVE-2011-1485-2.patch polkit-CVE-2011-1485-3.patch polkit-CVE-2011-1485-4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit.spec ++++++ --- /var/tmp/diff_new_pack.WlIaey/_old 2011-04-27 11:15:52.000000000 +0200 +++ /var/tmp/diff_new_pack.WlIaey/_new 2011-04-27 11:15:52.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package polkit (Version 0.99) +# spec file for package polkit # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,16 @@ Name: polkit Summary: PolicyKit Authorization Framework -Version: 0.99 -Release: 2 -License: LGPLv2+ +Version: 0.101 +Release: 1 +License: LGPLv2.1+ Url: http://www.freedesktop.org/wiki/Software/PolicyKit BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel +BuildRequires: glib2-devel >= 2.25.12 +BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libexpat-devel @@ -37,13 +37,23 @@ Requires: dbus-1 Requires: libpolkit0 = %{version}-%{release} +Patch10: polkit-CVE-2011-1485-1.patch +Patch11: polkit-CVE-2011-1485-2.patch +Patch12: polkit-CVE-2011-1485-3.patch +Patch13: polkit-CVE-2011-1485-4.patch + +# Upstream First - Policy: +# Never add any patches to this package without the upstream commit id +# in the patch. Any patches added here without a very good reason to make +# an exception will be silently removed with the next version update. + %description PolicyKit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged processes. %package devel -License: LGPLv2+ +License: LGPLv2.1+ Summary: Development files for PolicyKit Group: Development/Libraries/C and C++ Requires: %name = %{version}-%{release} @@ -54,7 +64,7 @@ Development files for PolicyKit Authorization Framework. %package doc -License: LGPLv2+ +License: LGPLv2.1+ Summary: Development documentation for PolicyKit Group: Development/Libraries/C and C++ %if 0%{?suse_version} >= 1120 @@ -65,7 +75,7 @@ Development documentation for PolicyKit Authorization Framework. %package -n libpolkit0 -License: LGPLv2+ +License: LGPLv2.1+ Summary: Libraries required for polkit Group: System/Libraries Requires: %{name} = %{version} @@ -79,6 +89,10 @@ %prep %setup -q +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build export V=1 @@ -118,6 +132,7 @@ %defattr(-,root,root,-) %{_libdir}/lib*.so.* %{_libdir}/girepository-1.0/Polkit-1.0.typelib +%{_libdir}/girepository-1.0/PolkitAgent-1.0.typelib %files -f polkit-1.lang %defattr(-,root,root,-) @@ -164,6 +179,7 @@ %files doc %defattr(-,root,root,-) +%doc NEWS %{_datadir}/gtk-doc/html/* %changelog ++++++ _service ++++++ <services> <service name="download_url"> <param name="protocol">http</param> <param name="host">hal.freedesktop.org</param> <param name="path">/releases/polkit-0.101.tar.gz</param> </service> <service name="verify_file"> <param name="file">_service:download_url:polkit-0.101.tar.gz</param> <param name="verifier">sha256</param> <param name="checksum">927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b</param> </service> <service name="recompress"> <param name="file">*.tar.gz</param> <param name="compression">bz2</param> </service> </services> ++++++ polkit-0.99.tar.bz2 -> polkit-0.101.tar.bz2 ++++++ ++++ 31897 lines of diff (skipped) ++++++ polkit-CVE-2011-1485-1.patch ++++++ >From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001 From: David Zeuthen <davidz(a)redhat.com> Date: Thu, 31 Mar 2011 16:59:09 +0000 Subject: PolkitUnixProcess: Clarify that the real uid is returned, not the effective one On Linux, also switch to parsing /proc/<pid>/status instead of relying on the st_uid returned by stat(2) to be the uid we want. This was pointed out by Neel Mehta <nmehta(a)google.com>. Thanks! Signed-off-by: David Zeuthen <davidz(a)redhat.com> --- diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c index d95a1d4..876da69 100644 --- a/src/polkit/polkitunixprocess.c +++ b/src/polkit/polkitunixprocess.c @@ -24,9 +24,7 @@ #endif #include <sys/types.h> -#ifndef HAVE_FREEBSD -#include <sys/stat.h> -#else +#ifdef HAVE_FREEBSD #include <sys/param.h> #include <sys/sysctl.h> #include <sys/user.h> @@ -34,6 +32,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <stdio.h> #include "polkitunixprocess.h" #include "polkitsubject.h" @@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process) * * Gets the uid of the owner of @process. * + * Note that this returns the real user-id (not the effective user-id) of @process. + * * Returns: The UNIX user id of the owner for @process or 0 if @error is set. **/ gint @@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, GError **error) { gint result; + gchar *contents; + gchar **lines; #ifdef HAVE_FREEBSD struct kinfo_proc p; #else - struct stat statbuf; - char procbuf[32]; + gchar filename[64]; + guint n; #endif g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); g_return_val_if_fail (error == NULL || *error == NULL, 0); result = 0; + lines = NULL; + contents = NULL; #ifdef HAVE_FREEBSD if (get_kinfo_proc (process->pid, &p) == 0) @@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, result = p.ki_uid; #else - g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid); - if (stat (procbuf, &statbuf) != 0) + + /* see 'man proc' for layout of the status file + * + * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). + */ + g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); + if (!g_file_get_contents (filename, + &contents, + NULL, + error)) { - g_set_error (error, - POLKIT_ERROR, - POLKIT_ERROR_FAILED, - "stat() failed for /proc/%d: %s", - process->pid, - g_strerror (errno)); goto out; } + lines = g_strsplit (contents, "\n", -1); + for (n = 0; lines != NULL && lines[n] != NULL; n++) + { + gint real_uid, effective_uid; + if (!g_str_has_prefix (lines[n], "Uid:")) + continue; + if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) + { + g_set_error (error, + POLKIT_ERROR, + POLKIT_ERROR_FAILED, + "Unexpected line `%s' in file %s", + lines[n], + filename); + goto out; + } + else + { + result = real_uid; + goto out; + } + } - result = statbuf.st_uid; + g_set_error (error, + POLKIT_ERROR, + POLKIT_ERROR_FAILED, + "Didn't find any line starting with `Uid:' in file %s", + filename); #endif - out: - +out: + g_strfreev (lines); + g_free (contents); return result; } -- cgit v0.8.3-6-g21f6 ++++++ polkit-CVE-2011-1485-2.patch ++++++ ++++ 615 lines (skipped) ++++++ polkit-CVE-2011-1485-3.patch ++++++ >From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001 From: David Zeuthen <davidz(a)redhat.com> Date: Fri, 01 Apr 2011 16:12:27 +0000 Subject: Use polkit_unix_process_get_uid() to get the owner of a process This avoids a TOCTTOU problem. Signed-off-by: David Zeuthen <davidz(a)redhat.com> --- diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c index 495f752..9c331b6 100644 --- a/src/polkitbackend/polkitbackendsessionmonitor.c +++ b/src/polkitbackend/polkitbackendsessionmonitor.c @@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor if (POLKIT_IS_UNIX_PROCESS (subject)) { - local_error = NULL; - uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error); - if (local_error != NULL) + uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)); + if ((gint) uid == -1) { - g_propagate_prefixed_error (error, local_error, "Error getting user for process: "); + g_set_error (error, + POLKIT_ERROR, + POLKIT_ERROR_FAILED, + "Unix process subject does not have uid set"); goto out; } - ret = polkit_unix_user_new (uid); } else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) -- cgit v0.8.3-6-g21f6 ++++++ polkit-CVE-2011-1485-4.patch ++++++ >From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001 From: David Zeuthen <davidz(a)redhat.com> Date: Fri, 01 Apr 2011 16:13:15 +0000 Subject: pkexec: Avoid TOCTTOU problems with parent process In a nutshell, the parent process may change its uid (either real- or effective uid) after launching pkexec. It can do this by exec()'ing e.g. a setuid root program. To avoid this problem, just use the uid the parent process had when it executed pkexec. This happens to be the same uid of the pkexec process itself. Additionally, remove some dubious code that allowed pkexec to continue when the parent process died as there is no reason to support something like that. Also ensure that the pkexec process is killed if the parent process dies. This problem was pointed out by Neel Mehta <nmehta(a)google.com>. Signed-off-by: David Zeuthen <davidz(a)redhat.com> --- diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c index 9217954..3e656be 100644 --- a/src/programs/pkexec.c +++ b/src/programs/pkexec.c @@ -35,6 +35,10 @@ #include <pwd.h> #include <errno.h> +#ifdef __linux__ +#include <sys/prctl.h> +#endif + #include <glib/gi18n.h> #ifdef POLKIT_AUTHFW_PAM @@ -423,7 +427,6 @@ main (int argc, char *argv[]) GPtrArray *saved_env; gchar *opt_user; pid_t pid_of_caller; - uid_t uid_of_caller; gpointer local_agent_handle; ret = 127; @@ -598,40 +601,49 @@ main (int argc, char *argv[]) */ g_type_init (); - /* now check if the program that invoked us is authorized */ + /* make sure we are nuked if the parent process dies */ +#ifdef __linux__ + if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0) + { + g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno)); + goto out; + } +#else +#warning "Please add OS specific code to catch when the parent dies" +#endif + + /* Figure out the parent process */ pid_of_caller = getppid (); if (pid_of_caller == 1) { /* getppid() can return 1 if the parent died (meaning that we are reaped - * by /sbin/init); get process group leader instead - for example, this - * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit'). + * by /sbin/init); In that case we simpy bail. */ - pid_of_caller = getpgrp (); - } - - subject = polkit_unix_process_new (pid_of_caller); - if (subject == NULL) - { - g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message); - g_error_free (error); + g_printerr ("Refusing to render service to dead parents.\n"); goto out; } - /* paranoia: check that the uid of pid_of_caller matches getuid() */ - error = NULL; - uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), - &error); - if (error != NULL) - { - g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message); - g_error_free (error); - goto out; - } - if (uid_of_caller != getuid ()) - { - g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ()); - goto out; - } + /* This process we want to check an authorization for is the process + * that launched us - our parent process. + * + * At the time the parent process fork()'ed and exec()'ed us, the + * process had the same real-uid that we have now. So we use this + * real-uid instead of of looking it up to avoid TOCTTOU issues + * (consider the parent process exec()'ing a setuid helper). + * + * On the other hand, the monotonic process start-time is guaranteed + * to never change so it's safe to look that up given only the PID + * since we are guaranteed to be nuked if the parent goes away + * (cf. the prctl(2) call above). + */ + subject = polkit_unix_process_new_for_owner (pid_of_caller, + 0, /* 0 means "look up start-time in /proc" */ + getuid ()); + /* really double-check the invariants guaranteed by the PolkitUnixProcess class */ + g_assert (subject != NULL); + g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller); + g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0); + g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0); error = NULL; authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error); -- cgit v0.8.3-6-g21f6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bluez-hcidump for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package bluez-hcidump for openSUSE:Factory checked in at Wed Apr 27 11:14:59 CEST 2011. -------- --- bluez-hcidump/bluez-hcidump.changes 2011-01-28 14:58:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/bluez-hcidump/bluez-hcidump.changes 2011-04-22 11:31:17.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 22 09:26:52 UTC 2011 - seife+obs(a)b1-systems.com + +- fix build against latest bluez by cherry-picking b888b106a9 from + git, but still retaining compatibility with opensuse 11.4 +- buildrequire bluez-devel >= 4.70, when d13ea8a6 in bluez.git + addes several constants which are needed by bluez-hcidump + probably even a newer version is needed... + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-Fix-compilation-against-latest-BlueZ.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-hcidump.spec ++++++ --- /var/tmp/diff_new_pack.klpyuc/_old 2011-04-27 11:13:43.000000000 +0200 +++ /var/tmp/diff_new_pack.klpyuc/_new 2011-04-27 11:13:43.000000000 +0200 @@ -20,16 +20,18 @@ Name: bluez-hcidump -BuildRequires: bluez bluez-devel pkgconfig +BuildRequires: bluez pkgconfig +BuildRequires: bluez-devel >= 4.70 Url: http://www.bluez.org Version: 2.0 -Release: 1 +Release: 6 Summary: HCI Dumper for Debugging Bluetooth Connections License: GPLv2+ PreReq: %insserv_prereq Group: Development/Tools/Debuggers AutoReqProv: on Source: http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-2.0.tar.bz2 +Patch: 0001-Fix-compilation-against-latest-BlueZ.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # not sure if we really need a specific bluez version, or if we need bluez at all # maybe libbluetooth is enough @@ -48,6 +50,10 @@ %prep %setup +%if 0%{?suse_version} > 1140 +# actually it's 'bluez-devel > 4.90' +%patch -p1 +%endif %build CFLAGS="$RPM_OPT_FLAGS" ./configure \ ++++++ 0001-Fix-compilation-against-latest-BlueZ.patch ++++++ >From 95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Mon Sep 17 00:00:00 2001 From: Anderson Lizardo <anderson.lizardo(a)openbossa.org> Date: Fri, 18 Mar 2011 15:10:19 -0400 Subject: [PATCH] Fix compilation against latest BlueZ BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the hcidump local copy is not necessary. --- src/hcidump.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/src/hcidump.c b/src/hcidump.c index af086c7..2023130 100644 --- a/src/hcidump.c +++ b/src/hcidump.c @@ -50,22 +50,6 @@ #include "parser/parser.h" #include "parser/sdp.h" -#if __BYTE_ORDER == __LITTLE_ENDIAN -static inline uint64_t ntoh64(uint64_t n) -{ - uint64_t h; - uint64_t tmp = ntohl(n & 0x00000000ffffffff); - h = ntohl(n >> 32); - h |= tmp << 32; - return h; -} -#elif __BYTE_ORDER == __BIG_ENDIAN -#define ntoh64(x) (x) -#else -#error "Unknown byte order" -#endif -#define hton64(x) ntoh64(x) - #define SNAP_LEN HCI_MAX_FRAME_SIZE #define DEFAULT_PORT "10839"; -- 1.7.4.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 calibre for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at Wed Apr 27 11:13:35 CEST 2011. -------- --- calibre/calibre.changes 2011-04-10 14:26:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/calibre/calibre.changes 2011-04-23 13:17:43.000000000 +0200 @@ -1,0 +2,73 @@ +Sat Apr 23 11:12:55 UTC 2011 - saigkill(a)opensuse.org + +- updated to version 0.7.57 +- New Features + o Launch worker processes on demand instead of keeping a pool of them in + memory. Reduces memory footprint. + o Use the visual formatting of the Table of Contents to try to + automatically create a multi-level TOC when converting/viewing MOBI + files. + o Add a new function booksize() to the template language to get the + value of the size column in calibre. + o Add support for using metadata plugboards with the content server + (only with the epub format) + o Change default algorithm for automatically computing author sort to be + more intelligent and handle the case when the author name has a comma + in it + o Show cover size in the tooltips of the book details panel and book + details popup window +- Bug Fixes + o Dragging and dropping a cover onto the book details panel did not + change the cover size + o Fix non-escaped '|' when searching for commas in authors using + REGEXP_MATCH + o Fix ratings in templates being multiplied by 2 + o Fix adding a comma to custom series values when using completion. + o CHM Input: Another workaround for a Microsoft mess. + o Fix job count in the spinner not always being updated when a job + completes + o Changing case only of a title does not update title sort + +------------------------------------------------------------------- +Wed Apr 20 07:04:40 UTC 2011 - toms(a)suse.de + +- Updated to version 0.7.56 +- New Features + o This is primarily a bug fix release that fixes a bug in 0.7.55 + that caused calibre to rescan the files on the device every + time the device is connected. If you updated to 0.7.55 it is + highly recommended you update to 0.7.56 + o Device driver for Coby Kyros + o Remove the quick access to search options from next to the + search bar, as we now have a separate search highlights toggle + button + o MOBI Output: Ensure that MOBI files always have 8KB worth of + null bytes at the end of record 0. This appears to be necessary + for Amazon to be able to add DRM to calibre generated MOBI files + sent to their publishing service. + o Add a tool to inspect MOBI files. To use: calibre-debug -m file.mobi + +- Bug Fixes + o Fixed regression taht caused calibre to rescan files on the device + on every reconnect + o Fix donate button causing the toolbar to be too large on OS X + o MOBI Input: Fix detection of Table of Contents for MOBI files that + have a page break between the location designated as the Table of + Contents and the actual table of contents. + => Closes tickets: 763504 [External link] + o Comic Input: Fix handling of some CBZ files that have wrongly encoded + non ASCII filenames on windows. + => Closes tickets: 763280 [External link] + o PML Input: Fix multi-line chapter title causing a spurious page break + => Closes tickets: 763238 [External link] + o EPUB Input: Speed up processing of files with very large manifest/spines + Fix regression that broke cover:False searches in 0.7.55 + +- Improved news sources + Suedduetsche Zeitung + Irish Times + Big Oven + NSPM + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- calibre-0.7.54-nofonts.tar.bz2 New: ---- calibre-0.7.57-nofonts.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.QmOtcM/_old 2011-04-27 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.QmOtcM/_new 2011-04-27 11:08:30.000000000 +0200 @@ -19,7 +19,7 @@ Summary: EBook Management Application Name: calibre -Version: 0.7.54 +Version: 0.7.57 Release: 1 Url: http://calibre-ebook.com Group: Productivity/Other ++++++ calibre-0.7.54-nofonts.tar.bz2 -> calibre-0.7.57-nofonts.tar.bz2 ++++++ calibre/calibre-0.7.54-nofonts.tar.bz2 /mounts/work_src_done/STABLE/calibre/calibre-0.7.57-nofonts.tar.bz2 differ: char 11, line 1 ++++++ calibre-cssutils.diff ++++++ --- /var/tmp/diff_new_pack.QmOtcM/_old 2011-04-27 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.QmOtcM/_new 2011-04-27 11:08:30.000000000 +0200 @@ -1,18 +1,20 @@ ---- src/calibre/ebooks/oeb/stylizer.py 2011-01-12 10:26:25.108920983 +0100 -+++ src/calibre/ebooks/oeb/stylizer.py_new 2011-01-12 10:40:56.797983394 +0100 -@@ -17,7 +17,14 @@ +Index: src/calibre/ebooks/oeb/stylizer.py +=================================================================== +--- src/calibre/ebooks/oeb/stylizer.py.orig ++++ src/calibre/ebooks/oeb/stylizer.py +@@ -13,7 +13,14 @@ from weakref import WeakKeyDictionary from xml.dom import SyntaxErr as CSSSyntaxError import cssutils - from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \ -- CSSValueList, CSSFontFaceRule, cssproperties -+ CSSFontFaceRule, cssproperties + from cssutils.css import (CSSStyleRule, CSSPageRule, CSSStyleDeclaration, +- CSSValueList, CSSFontFaceRule, cssproperties) ++ CSSFontFaceRule, cssproperties) +# -+# In python-cssutils >= 0.9.8 no CSSValueList is replaced with PropertyValue -+# ++# In python-cssutils >= 0.9.8 no CSSValueList is replaced with ++# Property Value +try: -+ from cssutils.css import CSSValueList ++ from cssutils.css import CSSValueList +except ImportError: -+ from cssutils.css import PropertyValue as CSSValueList ++ from cssutils.css import PropertyValue as CSSValueList from cssutils import profile as cssprofiles from lxml import etree from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdepim4 for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '11

27 Apr '11

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at Wed Apr 27 11:02:39 CEST 2011. -------- --- KDE/kdepim4/kdepim4.changes 2011-04-09 20:39:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2011-04-21 22:20:48.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 21 20:19:41 UTC 2011 - javier(a)opensuse.org + +- Update to 4.4.11.1 + * Bugfixes over 4.4.10 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepim-4.4.10.tar.bz2 New: ---- kdepim-4.4.11.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.vJbmxp/_old 2011-04-27 11:01:54.000000000 +0200 +++ /var/tmp/diff_new_pack.vJbmxp/_new 2011-04-27 11:01:54.000000000 +0200 @@ -26,10 +26,10 @@ Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 4.4.10 -Release: 6 +Version: 4.4.11.1 +Release: 1 Source0: kdepim-%version.tar.bz2 -Patch: 4_4_BRANCH.diff +#Patch: 4_4_BRANCH.diff Patch1: akregator-useragent.diff Patch4: desktop-files.diff Patch7: knode-kontact-default.diff @@ -55,7 +55,7 @@ %prep %setup -q -n kdepim-%version -%patch -p1 +#%patch -p1 %patch1 %patch4 %patch7 ++++++ 4_4_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.vJbmxp/_old 2011-04-27 11:01:54.000000000 +0200 +++ /var/tmp/diff_new_pack.vJbmxp/_new 2011-04-27 11:01:54.000000000 +0200 @@ -1,576 +0,0 @@ -diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp -index 4c8ca42..200f8ec 100644 ---- a/kaddressbook/main.cpp -+++ b/kaddressbook/main.cpp -@@ -49,11 +49,13 @@ int main( int argc, char **argv ) - MainWindow *window = new MainWindow; - window->show(); - -+#if !KDE_IS_VERSION(4,6,0) - if ( !Akonadi::Control::start( window ) ) { - //TODO: add message box after string freeze - kWarning() << "Unable to start Akonadi server, exit application"; - return 1; - } -+#endif - - return app.exec(); - } -diff --git a/kalarm/Changelog b/kalarm/Changelog -index 813130d..e1ffb6b 100644 ---- a/kalarm/Changelog -+++ b/kalarm/Changelog -@@ -1,6 +1,10 @@ - KAlarm Change Log - --=== Version 2.4.10 --- 2 December 2010 === -+=== Version 2.4.11 --- 10 February 2011 === -+- Fix bad borders round left hand buttons of time spinboxes in Oxygen style. -+- Fix initialisation of library global statics. -+ -+=== Version 2.4.10 (KDEPIM 4.4.8) --- 2 December 2010 === - - Fix KAlarm showing in system tray at login when configured not to show in tray. - - Fix working-time-only alarms not triggering if KAlarm is started up outside - working hours, after the last trigger time during working hours was missed. -diff --git a/kalarm/cal/kaeventdata.cpp b/kalarm/cal/kaeventdata.cpp -index 103e244..e0c5f1a 100644 ---- a/kalarm/cal/kaeventdata.cpp -+++ b/kalarm/cal/kaeventdata.cpp -@@ -47,58 +47,58 @@ QByteArray KAEventData::icalProductId() - // Note that all custom property names are prefixed with X-KDE-KALARM- in the calendar file. - - // Event properties --static const QByteArray FLAGS_PROPERTY("FLAGS"); // X-KDE-KALARM-FLAGS property --static const QString DATE_ONLY_FLAG = QLatin1String("DATE"); --static const QString EMAIL_BCC_FLAG = QLatin1String("BCC"); --static const QString CONFIRM_ACK_FLAG = QLatin1String("ACKCONF"); --static const QString KORGANIZER_FLAG = QLatin1String("KORG"); --static const QString EXCLUDE_HOLIDAYS_FLAG = QLatin1String("EXHOLIDAYS"); --static const QString WORK_TIME_ONLY_FLAG = QLatin1String("WORKTIME"); --static const QString DEFER_FLAG = QLatin1String("DEFER"); // default defer interval for this alarm --static const QString LATE_CANCEL_FLAG = QLatin1String("LATECANCEL"); --static const QString AUTO_CLOSE_FLAG = QLatin1String("LATECLOSE"); --static const QString TEMPL_AFTER_TIME_FLAG = QLatin1String("TMPLAFTTIME"); --static const QString KMAIL_SERNUM_FLAG = QLatin1String("KMAIL"); -- --static const QByteArray NEXT_RECUR_PROPERTY("NEXTRECUR"); // X-KDE-KALARM-NEXTRECUR property --static const QByteArray REPEAT_PROPERTY("REPEAT"); // X-KDE-KALARM-REPEAT property --static const QByteArray ARCHIVE_PROPERTY("ARCHIVE"); // X-KDE-KALARM-ARCHIVE property --static const QString ARCHIVE_REMINDER_ONCE_TYPE = QLatin1String("ONCE"); --static const QByteArray LOG_PROPERTY("LOG"); // X-KDE-KALARM-LOG property --static const QString xtermURL = QLatin1String("xterm:"); --static const QString displayURL = QLatin1String("display:"); -+const QByteArray KAEventData::FLAGS_PROPERTY("FLAGS"); // X-KDE-KALARM-FLAGS property -+const QString KAEventData::DATE_ONLY_FLAG = QLatin1String("DATE"); -+const QString KAEventData::EMAIL_BCC_FLAG = QLatin1String("BCC"); -+const QString KAEventData::CONFIRM_ACK_FLAG = QLatin1String("ACKCONF"); -+const QString KAEventData::KORGANIZER_FLAG = QLatin1String("KORG"); -+const QString KAEventData::EXCLUDE_HOLIDAYS_FLAG = QLatin1String("EXHOLIDAYS"); -+const QString KAEventData::WORK_TIME_ONLY_FLAG = QLatin1String("WORKTIME"); -+const QString KAEventData::DEFER_FLAG = QLatin1String("DEFER"); // default defer interval for this alarm -+const QString KAEventData::LATE_CANCEL_FLAG = QLatin1String("LATECANCEL"); -+const QString KAEventData::AUTO_CLOSE_FLAG = QLatin1String("LATECLOSE"); -+const QString KAEventData::TEMPL_AFTER_TIME_FLAG = QLatin1String("TMPLAFTTIME"); -+const QString KAEventData::KMAIL_SERNUM_FLAG = QLatin1String("KMAIL"); -+ -+const QByteArray KAEventData::NEXT_RECUR_PROPERTY("NEXTRECUR"); // X-KDE-KALARM-NEXTRECUR property -+const QByteArray KAEventData::REPEAT_PROPERTY("REPEAT"); // X-KDE-KALARM-REPEAT property -+const QByteArray KAEventData::ARCHIVE_PROPERTY("ARCHIVE"); // X-KDE-KALARM-ARCHIVE property -+const QString KAEventData::ARCHIVE_REMINDER_ONCE_TYPE = QLatin1String("ONCE"); -+const QByteArray KAEventData::LOG_PROPERTY("LOG"); // X-KDE-KALARM-LOG property -+const QString KAEventData::xtermURL = QLatin1String("xterm:"); -+const QString KAEventData::displayURL = QLatin1String("display:"); - - // - General alarm properties --static const QByteArray TYPE_PROPERTY("TYPE"); // X-KDE-KALARM-TYPE property --static const QString FILE_TYPE = QLatin1String("FILE"); --static const QString AT_LOGIN_TYPE = QLatin1String("LOGIN"); --static const QString REMINDER_TYPE = QLatin1String("REMINDER"); --static const QString REMINDER_ONCE_TYPE = QLatin1String("REMINDER_ONCE"); --static const QString TIME_DEFERRAL_TYPE = QLatin1String("DEFERRAL"); --static const QString DATE_DEFERRAL_TYPE = QLatin1String("DATE_DEFERRAL"); --static const QString DISPLAYING_TYPE = QLatin1String("DISPLAYING"); // used only in displaying calendar --static const QString PRE_ACTION_TYPE = QLatin1String("PRE"); --static const QString POST_ACTION_TYPE = QLatin1String("POST"); --static const QString SOUND_REPEAT_TYPE = QLatin1String("SOUNDREPEAT"); --static const QByteArray NEXT_REPEAT_PROPERTY("NEXTREPEAT"); // X-KDE-KALARM-NEXTREPEAT property -+const QByteArray KAEventData::TYPE_PROPERTY("TYPE"); // X-KDE-KALARM-TYPE property -+const QString KAEventData::FILE_TYPE = QLatin1String("FILE"); -+const QString KAEventData::AT_LOGIN_TYPE = QLatin1String("LOGIN"); -+const QString KAEventData::REMINDER_TYPE = QLatin1String("REMINDER"); -+const QString KAEventData::REMINDER_ONCE_TYPE = QLatin1String("REMINDER_ONCE"); -+const QString KAEventData::TIME_DEFERRAL_TYPE = QLatin1String("DEFERRAL"); -+const QString KAEventData::DATE_DEFERRAL_TYPE = QLatin1String("DATE_DEFERRAL"); -+const QString KAEventData::DISPLAYING_TYPE = QLatin1String("DISPLAYING"); // used only in displaying calendar -+const QString KAEventData::PRE_ACTION_TYPE = QLatin1String("PRE"); -+const QString KAEventData::POST_ACTION_TYPE = QLatin1String("POST"); -+const QString KAEventData::SOUND_REPEAT_TYPE = QLatin1String("SOUNDREPEAT"); -+const QByteArray KAEventData::NEXT_REPEAT_PROPERTY("NEXTREPEAT"); // X-KDE-KALARM-NEXTREPEAT property - // - Display alarm properties --static const QByteArray FONT_COLOUR_PROPERTY("FONTCOLOR"); // X-KDE-KALARM-FONTCOLOR property -+const QByteArray KAEventData::FONT_COLOUR_PROPERTY("FONTCOLOR"); // X-KDE-KALARM-FONTCOLOR property - // - Email alarm properties --static const QByteArray EMAIL_ID_PROPERTY("EMAILID"); // X-KDE-KALARM-EMAILID property -+const QByteArray KAEventData::EMAIL_ID_PROPERTY("EMAILID"); // X-KDE-KALARM-EMAILID property - // - Audio alarm properties --static const QByteArray VOLUME_PROPERTY("VOLUME"); // X-KDE-KALARM-VOLUME property --static const QByteArray SPEAK_PROPERTY("SPEAK"); // X-KDE-KALARM-SPEAK property -+const QByteArray KAEventData::VOLUME_PROPERTY("VOLUME"); // X-KDE-KALARM-VOLUME property -+const QByteArray KAEventData::SPEAK_PROPERTY("SPEAK"); // X-KDE-KALARM-SPEAK property - // - Command alarm properties --static const QByteArray CANCEL_ON_ERROR_PROPERTY("ERRCANCEL");// X-KDE-KALARM-ERRCANCEL property -+const QByteArray KAEventData::CANCEL_ON_ERROR_PROPERTY("ERRCANCEL");// X-KDE-KALARM-ERRCANCEL property - - // Event status strings --static const QString DISABLED_STATUS = QLatin1String("DISABLED"); -+const QString KAEventData::DISABLED_STATUS = QLatin1String("DISABLED"); - - // Displaying event ID identifier --static const QString DISP_DEFER = QLatin1String("DEFER"); --static const QString DISP_EDIT = QLatin1String("EDIT"); -+const QString KAEventData::DISP_DEFER = QLatin1String("DEFER"); -+const QString KAEventData::DISP_EDIT = QLatin1String("EDIT"); - --static const QString SC = QLatin1String(";"); -+const QString KAEventData::SC = QLatin1String(";"); - - struct AlarmData - { -diff --git a/kalarm/cal/kaeventdata.h b/kalarm/cal/kaeventdata.h -index 04c4a48..8604822 100644 ---- a/kalarm/cal/kaeventdata.h -+++ b/kalarm/cal/kaeventdata.h -@@ -1,7 +1,7 @@ - /* - * kaeventdata.h - represents calendar alarm and event data - * Program: kalarm -- * Copyright © 2001-2010 by David Jarvie <djarvie(a)kde.org> -+ * Copyright © 2001-2011 by David Jarvie <djarvie(a)kde.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -518,6 +518,47 @@ public: - bool mDisplayingEdit; // show Edit button (applies to displaying calendar only) - bool mEnabled; // false if event is disabled - mutable bool mUpdated; // event has been updated but not written to calendar file -+ -+ static const QByteArray FLAGS_PROPERTY; -+ static const QString DATE_ONLY_FLAG; -+ static const QString EMAIL_BCC_FLAG; -+ static const QString CONFIRM_ACK_FLAG; -+ static const QString KORGANIZER_FLAG; -+ static const QString EXCLUDE_HOLIDAYS_FLAG; -+ static const QString WORK_TIME_ONLY_FLAG; -+ static const QString DEFER_FLAG; -+ static const QString LATE_CANCEL_FLAG; -+ static const QString AUTO_CLOSE_FLAG; -+ static const QString TEMPL_AFTER_TIME_FLAG; -+ static const QString KMAIL_SERNUM_FLAG; -+ static const QByteArray NEXT_RECUR_PROPERTY; -+ static const QByteArray REPEAT_PROPERTY; -+ static const QByteArray ARCHIVE_PROPERTY; -+ static const QString ARCHIVE_REMINDER_ONCE_TYPE; -+ static const QByteArray LOG_PROPERTY; -+ static const QString xtermURL; -+ static const QString displayURL; -+ static const QByteArray TYPE_PROPERTY; -+ static const QString FILE_TYPE; -+ static const QString AT_LOGIN_TYPE; -+ static const QString REMINDER_TYPE; -+ static const QString REMINDER_ONCE_TYPE; -+ static const QString TIME_DEFERRAL_TYPE; -+ static const QString DATE_DEFERRAL_TYPE; -+ static const QString DISPLAYING_TYPE; -+ static const QString PRE_ACTION_TYPE; -+ static const QString POST_ACTION_TYPE; -+ static const QString SOUND_REPEAT_TYPE; -+ static const QByteArray NEXT_REPEAT_PROPERTY; -+ static const QByteArray FONT_COLOUR_PROPERTY; -+ static const QByteArray EMAIL_ID_PROPERTY; -+ static const QByteArray VOLUME_PROPERTY; -+ static const QByteArray SPEAK_PROPERTY; -+ static const QByteArray CANCEL_ON_ERROR_PROPERTY; -+ static const QString DISABLED_STATUS; -+ static const QString DISP_DEFER; -+ static const QString DISP_EDIT; -+ static const QString SC; - }; - - #endif // KAEVENTDATA_H -diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h -index 7790770..63333b2 100644 ---- a/kalarm/kalarm.h -+++ b/kalarm/kalarm.h -@@ -1,7 +1,7 @@ - /* - * kalarm.h - global header file - * Program: kalarm -- * Copyright © 2001-2010 by David Jarvie <djarvie(a)kde.org> -+ * Copyright © 2001-2011 by David Jarvie <djarvie(a)kde.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -23,7 +23,7 @@ - - #undef QT3_SUPPORT - --#define KALARM_VERSION "2.4.10" -+#define KALARM_VERSION "2.4.11" - #define KALARM_NAME "KAlarm" - #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application - -diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp -index 7c85291..cc10882 100644 ---- a/kalarm/lib/spinbox2.cpp -+++ b/kalarm/lib/spinbox2.cpp -@@ -20,11 +20,15 @@ - - #include "kalarm.h" - --#include <stdlib.h> -+#include "spinbox2.moc" -+#include "spinbox2_p.moc" -+ -+#include <kdebug.h> - - #include <QMouseEvent> - #include <QStyleOptionSpinBox> - #include <QGraphicsPixmapItem> -+#include <QPaintEngine> - #include <QTimer> - #include <QFrame> - #include <QBrush> -@@ -34,10 +38,7 @@ - #include <QPixmap> - #include <QMatrix> - --#include <kdebug.h> -- --#include "spinbox2.moc" --#include "spinbox2_p.moc" -+#include <stdlib.h> - - /* List of styles which look better using spin buttons mirrored left-to-right. - * This is needed for some styles which use rounded corners. -@@ -47,6 +48,8 @@ static const char* mirrorStyles[] = { - 0 // list terminator - }; - static bool isMirrorStyle(const QStyle*); -+static bool isOxygenStyle(const QWidget*); -+static QRect spinBoxEditFieldRect(const QWidget*, const QStyleOptionSpinBox&); - - static inline QPixmap grabWidget(QWidget* w, QRect r = QRect()) - { -@@ -402,9 +405,9 @@ void SpinBox2::getMetrics() const - | udStyle->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxDown); - if (style()->inherits("PlastikStyle")) - butRect.setLeft(butRect.left() - 1); // Plastik excludes left border from spin widget rectangle -- QRect r = mSpinbox->style()->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxEditField); -+ QRect r = spinBoxEditFieldRect(mSpinbox, option); - wSpinboxHide = mRightToLeft ? mSpinbox->style()->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxFrame).right() - r.right() : r.left(); -- QRect edRect = udStyle->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxEditField); -+ QRect edRect = spinBoxEditFieldRect(mUpdown2, option); - int butx; - if (isMirrorStyle(udStyle)) - { -@@ -565,7 +568,7 @@ void SpinMirror::setFrame() - QGraphicsScene* c = scene(); - QStyleOptionSpinBox option; - option.initFrom(mMainSpinbox); -- QRect r = mMainSpinbox->style()->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxEditField); -+ QRect r = spinBoxEditFieldRect(mMainSpinbox, option); - bool rtl = QApplication::isRightToLeft(); - QPixmap p; - if (mMirrored) -@@ -575,17 +578,30 @@ void SpinMirror::setFrame() - } - else - { -- int x = rtl ? r.right() - 2 : r.left() + 2; -- p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height())).scaled(size()); -+ // Grab a single pixel wide vertical slice through the main spinbox, between the -+ // frame and edit field. -+ bool oxygen = mMainSpinbox->style()->inherits("Oxygen::Style"); // KDE >= 4.4 Oxygen style -+ bool oxygen1 = mMainSpinbox->style()->inherits("OxygenStyle"); // KDE <= 4.3 Oxygen style -+ int editOffsetY = oxygen ? 5 : oxygen1 ? 6 : 2; // offset to edit field -+ int editOffsetX = (oxygen || oxygen1) ? (KDE::version() >= KDE_MAKE_VERSION(4,6,0) ? 4 : 2) : 2; // offset to edit field -+ int x = rtl ? r.right() - editOffsetX : r.left() + editOffsetX; -+ p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height())); -+ // Blot out edit field stuff from the middle of the slice -+ QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1)); -+ QPaintEngine* pe = p.paintEngine(); -+ pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0)); -+ // Horizontally fill the mirror widget with the vertical slice -+ p = p.scaled(size()); -+ // Grab the left hand border of the main spinbox, and draw it into the mirror widget. - QRect endr = rect(); - if (rtl) - { - int mr = mMainSpinbox->width() - 1; -- endr.setWidth(mr - r.right() + 2); -+ endr.setWidth(mr - r.right() + editOffsetX); - endr.moveRight(mr); - } - else -- endr.setWidth(r.left() + 2); -+ endr.setWidth(r.left() + editOffsetX); - x = rtl ? width() - endr.width() : 0; - mMainSpinbox->render(&p, QPoint(x, 0), endr, QWidget::DrawWindowBackground | QWidget::DrawChildren | QWidget::IgnoreMask); - } -@@ -599,8 +615,8 @@ void SpinMirror::setButtons() - mSpinbox->initStyleOption(option); - QStyle* st = mSpinbox->style(); - QRect r = st->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxUp) -- | st->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxDown); -- if (st->inherits("OxygenStyle")) -+ | st->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxDown); -+ if (isOxygenStyle(mSpinbox)) - { - // They don't use all their height, so shorten them to - // allow frame highlighting to work properly. -@@ -617,7 +633,7 @@ void SpinMirror::setButtonPos(const QPoint& pos) - //kDebug()<<pos; - int x = pos.x(); - int y = pos.y(); -- if (style()->inherits("OxygenStyle")) -+ if (isOxygenStyle(this)) - { - // Oxygen spin buttons don't use all their height. Prevent - // the top overlapping the frame highlighting. Their height -@@ -745,3 +761,18 @@ static bool isMirrorStyle(const QStyle* style) - return false; - } - -+static bool isOxygenStyle(const QWidget* w) -+{ -+ return w->style()->inherits("Oxygen::Style") || w->style()->inherits("OxygenStyle"); -+} -+ -+static QRect spinBoxEditFieldRect(const QWidget* w, const QStyleOptionSpinBox& option) -+{ -+ QRect r = w->style()->subControlRect(QStyle::CC_SpinBox, &option, QStyle::SC_SpinBoxEditField); -+ if (isOxygenStyle(w)) -+ { -+ int xadjust = (KDE::version() >= KDE_MAKE_VERSION(4,6,0)) ? 3 : 2; -+ r.adjust(xadjust, 2, -xadjust, -2); -+ } -+ return r; -+} -diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp -index ab486b7..f6f221f 100644 ---- a/kmail/customtemplates.cpp -+++ b/kmail/customtemplates.cpp -@@ -233,7 +233,7 @@ void CustomTemplates::load() - }; - } - -- mRemove->setEnabled( mList->topLevelItemCount() > 0 ); -+ mRemove->setEnabled( mList->topLevelItemCount() > 0 && mList->currentItem() ); - } - - void CustomTemplates::save() -@@ -330,6 +330,7 @@ void CustomTemplates::slotListSelectionChanged() - QTreeWidgetItem *item = mList->currentItem(); - if ( item ) { - mEditFrame->setEnabled( true ); -+ mRemove->setEnabled( true ); - CustomTemplateItem *vitem = mItemList[ mList->currentItem()->text( 1 ) ]; - if ( vitem ) { - -diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp -index a31973a..10b14e4 100644 ---- a/kmail/kmmainwidget.cpp -+++ b/kmail/kmmainwidget.cpp -@@ -165,6 +165,9 @@ using KMail::TemplateParser; - - #include <errno.h> // ugh - -+#include <akonadi/control.h> -+#include <akonadi/servermanager.h> -+ - #include "kmmainwidget.moc" - - K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList ) -@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient, - mVacationIndicatorActive( false ), - mGoToFirstUnreadMessageInSelectedFolder( false ) - { -+#if KDE_IS_VERSION(4,6,0) -+ Akonadi::Control::widgetNeedsAkonadi(this); -+ Akonadi::ServerManager::start(); -+#endif - // must be the first line of the constructor: - mStartupDone = false; - mWasEverShown = false; -diff --git a/kmail/main.cpp b/kmail/main.cpp -index f39ca5f..c2dd1c3 100644 ---- a/kmail/main.cpp -+++ b/kmail/main.cpp -@@ -145,12 +145,14 @@ int main(int argc, char *argv[]) - app.setEventLoopReached(); - app.delayedInstanceCreation(); - -+#if !KDE_IS_VERSION(4,6,0) - // Start Akonadi - if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) { - //TODO: add message box after string freeze - kWarning() << "Unable to start Akonadi server, exit application"; - return 1; - } -+#endif - - // Go! - int ret = qApp->exec(); -diff --git a/kmail/messagelistview/pane.cpp b/kmail/messagelistview/pane.cpp -index f79b896..afd2f24 100644 ---- a/kmail/messagelistview/pane.cpp -+++ b/kmail/messagelistview/pane.cpp -@@ -169,6 +169,28 @@ bool Pane::isFolderOpen( KMFolder * fld ) const - return messageListViewWidgetWithFolder( fld ) != 0; - } - -+void Pane::changeFolderName( KMFolder *fld, Core::Widget *w ) -+{ -+ if ( w && fld ) -+ { -+ setTabText( indexOf( w ), fld->label() ); -+ } -+} -+ -+void Pane::changeFolderIcon( KMFolder *fld, Core::Widget *w ) -+{ -+ if ( w && fld ) -+ { -+ QIcon icon; -+ FolderViewItem * fvi = mMainWidget->mainFolderView()->findItemByFolder( fld ); -+ if ( fvi ) -+ icon = SmallIcon( fvi->normalIcon() ); -+ else -+ icon = QIcon(); // FIXME: find a nicer empty icon -+ setTabIcon( indexOf(w), icon ); -+ } -+} -+ - void Pane::setCurrentFolder( KMFolder *fld, bool preferEmptyTab, Core::PreSelectionMode preSelectionMode, const QString &overrideLabel ) - { - // This function is quite critical, mainly because of the "appearance" -diff --git a/kmail/messagelistview/pane.h b/kmail/messagelistview/pane.h -index fe2efba..fa09a32 100644 ---- a/kmail/messagelistview/pane.h -+++ b/kmail/messagelistview/pane.h -@@ -25,6 +25,7 @@ - #include <QList> - - #include <messagelist/core/enums.h> -+#include <messagelist/core/widgetbase.h> - - class KMMessage; - class KMMsgBase; -@@ -91,6 +92,8 @@ protected: - QToolButton * mNewTabButton; ///< The "New Tab" button in the top left corner - QToolButton * mCloseTabButton; ///< The "Close Tab" button in the top right corner - public: -+ void changeFolderName( KMFolder *fld, MessageList::Core::Widget *w ); -+ void changeFolderIcon( KMFolder *fld, MessageList::Core::Widget *w ); - - /** - * Returns the KMMainWidget this Pane is currently bound to -diff --git a/kmail/messagelistview/widget.cpp b/kmail/messagelistview/widget.cpp -index 5fefb07..22526d7 100644 ---- a/kmail/messagelistview/widget.cpp -+++ b/kmail/messagelistview/widget.cpp -@@ -114,6 +114,19 @@ void Widget::setFolder( KMFolder * fld, const QIcon &icon, Core::PreSelectionMod - // Set the storage _after_ setting the icon so it can be overridden - // from inside setStorageModel(). - setStorageModel( fld ? new StorageModel( fld ) : 0, preSelectionMode ); -+ connect(fld, SIGNAL( nameChanged() ), this, SLOT( slotNameChanged() ) ); -+ connect(fld, SIGNAL( iconsChanged() ), this, SLOT( slotIconsChanged() ) ); -+ -+} -+ -+void Widget::slotIconsChanged() -+{ -+ mPane->changeFolderIcon( folder(), this ); -+} -+ -+void Widget::slotNameChanged() -+{ -+ mPane->changeFolderName( folder(), this ); - } - - KMFolder * Widget::folder() const -diff --git a/kmail/messagelistview/widget.h b/kmail/messagelistview/widget.h -index 795c5eb..c8ff188 100644 ---- a/kmail/messagelistview/widget.h -+++ b/kmail/messagelistview/widget.h -@@ -417,6 +417,8 @@ private: - - private slots: - void animateIcon(); -+ void slotNameChanged(); -+ void slotIconsChanged(); - - }; - -diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp -index 191b39d..8a03ece 100644 ---- a/kmail/popaccount.cpp -+++ b/kmail/popaccount.cpp -@@ -959,11 +959,13 @@ void PopAccount::slotData( KIO::Job* job, const QByteArray &data) - .subs( numBytesToRead/1024 ).subs( mLogin ).subs( mHost ) - .toString(); - } -- mMailCheckProgressItem->setStatus( msg ); -- mMailCheckProgressItem->setProgress( -- (numBytesToRead <= 100) ? 50 // We never know what the server tells us -- // This way of dividing is required for > 21MB of mail -- : (numBytesRead / (numBytesToRead / 100)) ); -+ if( mMailCheckProgressItem ) { -+ mMailCheckProgressItem->setStatus( msg ); -+ mMailCheckProgressItem->setProgress( -+ (numBytesToRead <= 100) ? 50 // We never know what the server tells us -+ // This way of dividing is required for > 21MB of mail -+ : (numBytesRead / (numBytesToRead / 100)) ); -+ } - } - return; - } -diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp -index 356aa57..cb4a235 100644 ---- a/kontact/src/main.cpp -+++ b/kontact/src/main.cpp -@@ -199,9 +199,11 @@ int main( int argc, char **argv ) - - KontactApp app; - -+#if !KDE_IS_VERSION(4,6,0) - // KDE 4.4: do akonadi startup before creating any window, since creating - // the window loads kmail. In 4.5 we'll do this startup async instead. - Akonadi::Control::start( 0 ); -+#endif - - // Qt doesn't treat the system tray as a window, and therefore Qt would quit - // the event loop when an error message is clicked away while Kontact is in the -diff --git a/messageviewer/vcardviewer.cpp b/messageviewer/vcardviewer.cpp -index b0e8e3b..9ccd1e4 100644 ---- a/messageviewer/vcardviewer.cpp -+++ b/messageviewer/vcardviewer.cpp -@@ -56,13 +56,14 @@ VCardViewer::VCardViewer(QWidget *parent, const QByteArray& vCard) - if ( mAddresseeList.size() <= 1 ) { - showButton(User2, false); - showButton(User3, false); -- } -- else -+ } else { - enableButton(User3, false); -- } -- else { -+ } -+ } else { - mAddresseeView->setPlainText(i18n("Failed to parse vCard.")); - enableButton(User1, false); -+ showButton(User2, false); -+ showButton(User3, false); - } - connect( this, SIGNAL( user1clicked() ), SLOT( slotUser1() ) ); - connect( this, SIGNAL( user2clicked() ), SLOT( slotUser2() ) ); ++++++ kdepim-4.4.10.tar.bz2 -> kdepim-4.4.11.1.tar.bz2 ++++++ KDE/kdepim4/kdepim-4.4.10.tar.bz2 /mounts/work_src_done/STABLE/kdepim4/kdepim-4.4.11.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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