March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit x11-input-fujitsu for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package x11-input-fujitsu for openSUSE:Factory checked in at Tue Mar 3 18:14:06 CET 2009. -------- --- x11-input-fujitsu/x11-input-fujitsu.changes 2008-07-10 12:56:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/x11-input-fujitsu/x11-input-fujitsu.changes 2009-03-03 04:56:30.493941232 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 04:56:22 CET 2009 - sndirsch(a)suse.de + +- fixed build against xorg-server 1.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xorg-server-1.6.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-fujitsu.spec ++++++ --- /var/tmp/diff_new_pack.eZ1641/_old 2009-03-03 18:13:37.000000000 +0100 +++ /var/tmp/diff_new_pack.eZ1641/_new 2009-03-03 18:13:37.000000000 +0100 @@ -1,10 +1,17 @@ # # spec file for package x11-input-fujitsu (Version 0.6.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# 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/ # @@ -15,7 +22,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://stz-softwaretechnik.com/~ke/touchscreen/p-series.html Version: 0.6.5 -Release: 1 +Release: 27 License: GPL v2 or later; Other uncritical OpenSource License BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -23,6 +30,7 @@ ExclusiveArch: %ix86 x86_64 Source: xf86-input-fujitouch-%{version}.tar.bz2 Patch0: fujitsu-fix-includes.diff +Patch1: xorg-server-1.6.diff %description This package contains the X.Org fujitsu input drivers for Fujitsu @@ -37,6 +45,9 @@ %prep %setup -n xf86-input-fujitouch-%{version} -q %patch0 -p0 +%if %suse_version > 1110 +%patch1 +%endif %build autoreconf -fi @@ -59,6 +70,8 @@ /usr/%{_lib}/xorg/modules/input/ %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- fixed build against xorg-server 1.6 * Thu Jul 10 2008 dkukawka(a)suse.de - added patch to fix problems with including xf86_ansic.h * Sun Nov 04 2007 dkukawka(a)suse.de ++++++ xorg-server-1.6.diff ++++++ diff -x '*.o' -x '*.so' -x '*.lai' -x '*.lo' -x '*.la' -x .deps -u -r -p -N ../xf86-input-fujitouch-0.6.5.old//fujitsu.c ./fujitsu.c --- ../xf86-input-fujitouch-0.6.5.old//fujitsu.c 2009-03-03 03:50:26.000000000 +0000 +++ ./fujitsu.c 2009-03-03 03:53:06.000000000 +0000 @@ -29,8 +29,8 @@ #define _fujitsu_C_ -#include <xf86Version.h> -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +#include <xorgVersion.h> +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0) #define XFREE86_V4 #endif @@ -137,7 +137,7 @@ static XF86ModuleVersionInfo VersionRec "Kenan Esau", MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 0, 6, 5, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, @@ -330,7 +330,10 @@ DeviceInit (DeviceIntPtr dev) * Device reports motions on 2 axes in absolute coordinates. * Axes min and max values are reported in raw coordinates. */ - if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, + if (InitValuatorClassDeviceStruct(dev, 2, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif local->history_size, Absolute) == FALSE) { ErrorF ("Unable to allocate Fuji touchscreen ValuatorClassDeviceStruct\n"); diff -x '*.o' -x '*.so' -x '*.lai' -x '*.lo' -x '*.la' -x .deps -u -r -p -N ../xf86-input-fujitouch-0.6.5.old//xf86OSmouse.h ./xf86OSmouse.h --- ../xf86-input-fujitouch-0.6.5.old//xf86OSmouse.h 1970-01-01 00:00:00.000000000 +0000 +++ ./xf86OSmouse.h 2009-03-03 03:51:09.000000000 +0000 @@ -0,0 +1,298 @@ +/* + * Copyright (c) 1999-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ + +/* Public interface to OS-specific mouse support. */ + +#ifndef _XF86OSMOUSE_H_ +#define _XF86OSMOUSE_H_ + +#include "xf86Xinput.h" + +/* Mouse interface classes */ +#define MSE_NONE 0x00 +#define MSE_SERIAL 0x01 /* serial port */ +#define MSE_BUS 0x02 /* old bus mouse */ +#define MSE_PS2 0x04 /* standard read-only PS/2 */ +#define MSE_XPS2 0x08 /* extended PS/2 */ +#define MSE_AUTO 0x10 /* auto-detect (PnP) */ +#define MSE_MISC 0x20 /* The OS layer will identify the + * specific protocol names that are + * supported for this class. */ + +/* Mouse Protocol IDs. */ +typedef enum { + PROT_UNKNOWN = -2, + PROT_UNSUP = -1, /* protocol is not supported */ + PROT_MS = 0, + PROT_MSC, + PROT_MM, + PROT_LOGI, + PROT_LOGIMAN, + PROT_MMHIT, + PROT_GLIDE, + PROT_IMSERIAL, + PROT_THINKING, + PROT_ACECAD, + PROT_VALUMOUSESCROLL, + PROT_PS2, + PROT_GENPS2, + PROT_IMPS2, + PROT_EXPPS2, + PROT_THINKPS2, + PROT_MMPS2, + PROT_GLIDEPS2, + PROT_NETPS2, + PROT_NETSCPS2, + PROT_BM, + PROT_AUTO, + PROT_SYSMOUSE, + PROT_NUMPROTOS /* This must always be last. */ +} MouseProtocolID; + +struct _MouseDevRec; + +typedef int (*GetInterfaceTypesProc)(void); +typedef const char **(*BuiltinNamesProc)(void); +typedef Bool (*CheckProtocolProc)(const char *protocol); +typedef Bool (*BuiltinPreInitProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*DefaultProtocolProc)(void); +typedef const char *(*SetupAutoProc)(InputInfoPtr pInfo, int *protoPara); +typedef void (*SetResProc)(InputInfoPtr pInfo, const char* protocol, int rate, + int res); +typedef const char *(*FindDeviceProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*GuessProtocolProc)(InputInfoPtr pInfo, int flags); + +/* + * OSMouseInfoRec is used to pass information from the OSMouse layer to the + * OS-independent mouse driver. + */ +typedef struct { + GetInterfaceTypesProc SupportedInterfaces; + BuiltinNamesProc BuiltinNames; + CheckProtocolProc CheckProtocol; + BuiltinPreInitProc PreInit; + DefaultProtocolProc DefaultProtocol; + SetupAutoProc SetupAuto; + SetResProc SetPS2Res; + SetResProc SetBMRes; + SetResProc SetMiscRes; + FindDeviceProc FindDevice; + GuessProtocolProc GuessProtocol; +} OSMouseInfoRec, *OSMouseInfoPtr; + +/* + * SupportedInterfaces: Returns the mouse interface types that the OS support. + * If MSE_MISC is returned, then the BuiltinNames and + * CheckProtocol should be set. + * + * BuiltinNames: Returns the names of the protocols that are fully handled + * in the OS-specific code. These are names that don't appear + * directly in the main "mouse" driver. + * + * CheckProtocol: Checks if the protocol name given is supported by the + * OS. It should return TRUE for both "builtin" protocols and + * protocols of type MSE_MISC that are supported by the OS. + * + * PreInit: The PreInit function for protocols that are builtin. This + * function is passed the protocol name. + * + * DefaultProtocol: Returns the name of a default protocol that should be used + * for the OS when none has been supplied in the config file. + * This should only be set when there is a reasonable default. + * + * SetupAuto: This function can be used to do OS-specific protocol + * auto-detection. It returns the name of the detected protocol, + * or NULL when detection fails. It may also adjust one or more + * of the "protoPara" values for the detected protocol by setting + * then to something other than -1. SetupAuto gets called in two + * ways. The first is before any devices have been opened. This + * can be used when the protocol "Auto" always maps to a single + * protocol type. The second is with the device open, allowing + * OS-specific probing to be done. + * + * SetPS2Res: Set the resolution and sample rate for MSE_PS2 and MSE_XPS2 + * protocol types. + * + * SetBMRes: Set the resolution and sample rate for MSE_BM protocol types. + * + * SetMiscRes: Set the resolution and sample rate for MSE_MISC protocol types. + * + * FindDevice: This function gets called when no Device has been specified + * in the config file. OS-specific methods may be used to guess + * which input device to use. This function is called after the + * pre-open attempts at protocol discovery are done, but before + * the device is open. I.e., after the first SetupAuto() call, + * after the DefaultProtocol() call, but before the PreInit() + * call. Available protocol information may be used in locating + * the default input device. + * + * GuessProtocol: A last resort attempt at guessing the mouse protocol by + * whatever OS-specific means might be available. OS-independent + * things should be in the mouse driver. This function gets + * called after the mouse driver's OS-independent methods have + * failed. + */ + +extern OSMouseInfoPtr xf86OSMouseInit(int flags); + +/* Adjust this when the mouse interface changes. */ + +/* + * History: + * + * 1.0.0 - Everything up to when versioning was started. + * 1.1.0 - FindDevice and GuessProtocol added to OSMouseInfoRec + * 1.2.0 - xisbscale added to MouseDevRec + * + */ + +#define OS_MOUSE_VERSION_MAJOR 1 +#define OS_MOUSE_VERSION_MINOR 2 +#define OS_MOUSE_VERSION_PATCH 0 + +#define OS_MOUSE_VERSION_CURRENT \ + BUILTIN_INTERFACE_VERSION_NUMERIC(OS_MOUSE_VERSION_MAJOR, \ + OS_MOUSE_VERSION_MINOR, \ + OS_MOUSE_VERSION_PATCH) + +#define HAVE_GUESS_PROTOCOL \ + (xf86GetBuiltinInterfaceVersion(BUILTIN_IF_OSMOUSE, 0) >= \ + BUILTIN_INTERFACE_VERSION_NUMERIC(1, 1, 0)) + +#define HAVE_FIND_DEVICE \ + (xf86GetBuiltinInterfaceVersion(BUILTIN_IF_OSMOUSE, 0) >= \ + BUILTIN_INTERFACE_VERSION_NUMERIC(1, 1, 0)) + +/* Z axis mapping */ +#define MSE_NOZMAP 0 +#define MSE_MAPTOX -1 +#define MSE_MAPTOY -2 +#define MSE_MAPTOZ -3 +#define MSE_MAPTOW -4 + +/* Generalize for other axes. */ +#define MSE_NOAXISMAP MSE_NOZMAP + +#define MSE_MAXBUTTONS 24 +#define MSE_DFLTBUTTONS 3 + +/* + * Mouse device record. This is shared by the mouse driver and the OSMouse + * layer. + */ + +typedef void (*checkMovementsProc)(InputInfoPtr,int, int); +typedef void (*autoProbeProc)(InputInfoPtr, Bool, Bool); +typedef Bool (*collectDataProc)(struct _MouseDevRec *, unsigned char); +typedef Bool (*dataGoodProc)(struct _MouseDevRec *); + +typedef void (*PostMseEventProc)(InputInfoPtr pInfo, int buttons, + int dx, int dy, int dz, int dw); +typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo); + +#define MOUSE_MAGIC 15031995 + +typedef struct _MouseDevRec { + unsigned long magic; + int size; + PtrCtrlProcPtr Ctrl; + PostMseEventProc PostEvent; + MouseCommonOptProc CommonOptions; + DeviceIntPtr device; + const char * mseDevice; + const char * protocol; + MouseProtocolID protocolID; + MouseProtocolID oldProtocolID; /* hack */ + int class; + int mseModel; + int baudRate; + int oldBaudRate; + int sampleRate; + int lastButtons; + int threshold; /* acceleration */ + int num; + int den; + int buttons; /* # of buttons */ + int emulateState; /* automata state for 2 button mode */ + Bool emulate3Buttons; + Bool emulate3ButtonsSoft; + int emulate3Timeout;/* Timeout for 3 button emulation */ + Bool chordMiddle; + Bool flipXY; + int invX; + int invY; + int mouseFlags; /* Flags to Clear after opening + * mouse dev */ + int truebuttons; /* (not used) + * Arg to maintain before + * emulate3buttons timer callback */ + int resolution; + int negativeZ; /* button mask */ + int positiveZ; /* button mask */ + int negativeW; /* button mask */ + int positiveW; /* button mask */ + pointer buffer; /* usually an XISBuffer* */ + int protoBufTail; + unsigned char protoBuf[8]; + unsigned char protoPara[8]; + unsigned char inSync; /* driver in sync with datastream */ + pointer mousePriv; /* private area */ + InputInfoPtr pInfo; + int origProtocolID; + const char * origProtocol; + Bool emulate3Pending;/* timer waiting */ + CARD32 emulate3Expires;/* time to fire emulation code */ + Bool emulateWheel; + int wheelInertia; + int wheelButton; + int negativeX; /* Button values. Unlike the Z and */ + int positiveX; /* W equivalents, these are button */ + int negativeY; /* values rather than button masks. */ + int positiveY; + int wheelYDistance; + int wheelXDistance; + Bool autoProbe; + checkMovementsProc checkMovements; + autoProbeProc autoProbeMouse; + collectDataProc collectData; + dataGoodProc dataGood; + int angleOffset; + pointer pDragLock; /* drag lock area */ + int xisbscale; /* buffer size for 1 event */ + int wheelButtonTimeout;/* Timeout for the wheel button emulation */ + CARD32 wheelButtonExpires; + int doubleClickSourceButtonMask; + int doubleClickTargetButton; + int doubleClickTargetButtonMask; + int doubleClickOldSourceState; + int lastMappedButtons; + int buttonMap[MSE_MAXBUTTONS]; +} MouseDevRec, *MouseDevPtr; + +#endif /* _XF86OSMOUSE_H_ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit x11-input-evtouch for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package x11-input-evtouch for openSUSE:Factory checked in at Tue Mar 3 18:13:28 CET 2009. -------- --- x11-input-evtouch/x11-input-evtouch.changes 2009-01-25 20:14:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/x11-input-evtouch/x11-input-evtouch.changes 2009-03-03 04:44:46.334545466 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 04:44:26 CET 2009 - sndirsch(a)suse.de + +- fixed build against xorg-server 1.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xorg-server-1.6.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-evtouch.spec ++++++ --- /var/tmp/diff_new_pack.MYp922/_old 2009-03-03 18:13:22.000000000 +0100 +++ /var/tmp/diff_new_pack.MYp922/_new 2009-03-03 18:13:22.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html Version: 0.8.7 -Release: 6 +Release: 7 License: LGPL v2.1 only BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -36,6 +36,7 @@ Patch4: evtouch-20080901-add_another_Panjit_touchset_device.diff Patch5: evtouch-20081023-fix-compiler_warning.diff Patch6: evtouch-20090125-memset.diff +Patch7: xorg-server-1.6.diff %description This package contains the X.Org evtouch input drivers. @@ -55,6 +56,9 @@ %patch4 -p0 %patch5 -p1 %patch6 -p1 +%if %suse_version > 1110 +%patch7 -p0 +%endif %build ./configure \ @@ -89,6 +93,8 @@ %{_sysconfdir}/udev/rules.d/* %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- fixed build against xorg-server 1.6 * Sun Jan 25 2009 dkukawka(a)suse.de - added new patch: - evtouch-20090125-memset.diff: fix for bnc#463421 ++++++ xorg-server-1.6.diff ++++++ diff -x ev_calibrate -x '*.loT' -x '*.o' -x '*.lo' -x evtouch_drv.la -x .libs -x .deps -u -p -r -N ../xf86-input-evtouch-0.8.7.old//evtouch.c ./evtouch.c --- ../xf86-input-evtouch-0.8.7.old//evtouch.c 2009-03-03 03:32:20.000000000 +0000 +++ ./evtouch.c 2009-03-03 03:37:13.000000000 +0000 @@ -30,8 +30,8 @@ #define _evdev_touch_C_ -#include <xf86Version.h> -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +#include <xorgVersion.h> +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0) #define XFREE86_V4 #endif @@ -134,7 +134,7 @@ static XF86ModuleVersionInfo VersionRec "Kenan Esau", MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 0, 8, 7, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, @@ -619,7 +619,10 @@ DeviceInit (DeviceIntPtr dev) * Device reports motions on 2 axes in absolute coordinates. * Axes min and max values are reported in raw coordinates. */ - if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, + if (InitValuatorClassDeviceStruct(dev, 2, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif local->history_size, Absolute) == FALSE) { ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); diff -x ev_calibrate -x '*.loT' -x '*.o' -x '*.lo' -x evtouch_drv.la -x .libs -x .deps -u -p -r -N ../xf86-input-evtouch-0.8.7.old//xf86OSmouse.h ./xf86OSmouse.h --- ../xf86-input-evtouch-0.8.7.old//xf86OSmouse.h 1970-01-01 00:00:00.000000000 +0000 +++ ./xf86OSmouse.h 2009-03-03 03:32:41.000000000 +0000 @@ -0,0 +1,298 @@ +/* + * Copyright (c) 1999-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ + +/* Public interface to OS-specific mouse support. */ + +#ifndef _XF86OSMOUSE_H_ +#define _XF86OSMOUSE_H_ + +#include "xf86Xinput.h" + +/* Mouse interface classes */ +#define MSE_NONE 0x00 +#define MSE_SERIAL 0x01 /* serial port */ +#define MSE_BUS 0x02 /* old bus mouse */ +#define MSE_PS2 0x04 /* standard read-only PS/2 */ +#define MSE_XPS2 0x08 /* extended PS/2 */ +#define MSE_AUTO 0x10 /* auto-detect (PnP) */ +#define MSE_MISC 0x20 /* The OS layer will identify the + * specific protocol names that are + * supported for this class. */ + +/* Mouse Protocol IDs. */ +typedef enum { + PROT_UNKNOWN = -2, + PROT_UNSUP = -1, /* protocol is not supported */ + PROT_MS = 0, + PROT_MSC, + PROT_MM, + PROT_LOGI, + PROT_LOGIMAN, + PROT_MMHIT, + PROT_GLIDE, + PROT_IMSERIAL, + PROT_THINKING, + PROT_ACECAD, + PROT_VALUMOUSESCROLL, + PROT_PS2, + PROT_GENPS2, + PROT_IMPS2, + PROT_EXPPS2, + PROT_THINKPS2, + PROT_MMPS2, + PROT_GLIDEPS2, + PROT_NETPS2, + PROT_NETSCPS2, + PROT_BM, + PROT_AUTO, + PROT_SYSMOUSE, + PROT_NUMPROTOS /* This must always be last. */ +} MouseProtocolID; + +struct _MouseDevRec; + +typedef int (*GetInterfaceTypesProc)(void); +typedef const char **(*BuiltinNamesProc)(void); +typedef Bool (*CheckProtocolProc)(const char *protocol); +typedef Bool (*BuiltinPreInitProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*DefaultProtocolProc)(void); +typedef const char *(*SetupAutoProc)(InputInfoPtr pInfo, int *protoPara); +typedef void (*SetResProc)(InputInfoPtr pInfo, const char* protocol, int rate, + int res); +typedef const char *(*FindDeviceProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*GuessProtocolProc)(InputInfoPtr pInfo, int flags); + +/* + * OSMouseInfoRec is used to pass information from the OSMouse layer to the + * OS-independent mouse driver. + */ +typedef struct { + GetInterfaceTypesProc SupportedInterfaces; + BuiltinNamesProc BuiltinNames; + CheckProtocolProc CheckProtocol; + BuiltinPreInitProc PreInit; + DefaultProtocolProc DefaultProtocol; + SetupAutoProc SetupAuto; + SetResProc SetPS2Res; + SetResProc SetBMRes; + SetResProc SetMiscRes; + FindDeviceProc FindDevice; + GuessProtocolProc GuessProtocol; +} OSMouseInfoRec, *OSMouseInfoPtr; + +/* + * SupportedInterfaces: Returns the mouse interface types that the OS support. + * If MSE_MISC is returned, then the BuiltinNames and + * CheckProtocol should be set. + * + * BuiltinNames: Returns the names of the protocols that are fully handled + * in the OS-specific code. These are names that don't appear + * directly in the main "mouse" driver. + * + * CheckProtocol: Checks if the protocol name given is supported by the + * OS. It should return TRUE for both "builtin" protocols and + * protocols of type MSE_MISC that are supported by the OS. + * + * PreInit: The PreInit function for protocols that are builtin. This + * function is passed the protocol name. + * + * DefaultProtocol: Returns the name of a default protocol that should be used + * for the OS when none has been supplied in the config file. + * This should only be set when there is a reasonable default. + * + * SetupAuto: This function can be used to do OS-specific protocol + * auto-detection. It returns the name of the detected protocol, + * or NULL when detection fails. It may also adjust one or more + * of the "protoPara" values for the detected protocol by setting + * then to something other than -1. SetupAuto gets called in two + * ways. The first is before any devices have been opened. This + * can be used when the protocol "Auto" always maps to a single + * protocol type. The second is with the device open, allowing + * OS-specific probing to be done. + * + * SetPS2Res: Set the resolution and sample rate for MSE_PS2 and MSE_XPS2 + * protocol types. + * + * SetBMRes: Set the resolution and sample rate for MSE_BM protocol types. + * + * SetMiscRes: Set the resolution and sample rate for MSE_MISC protocol types. + * + * FindDevice: This function gets called when no Device has been specified + * in the config file. OS-specific methods may be used to guess + * which input device to use. This function is called after the + * pre-open attempts at protocol discovery are done, but before + * the device is open. I.e., after the first SetupAuto() call, + * after the DefaultProtocol() call, but before the PreInit() + * call. Available protocol information may be used in locating + * the default input device. + * + * GuessProtocol: A last resort attempt at guessing the mouse protocol by + * whatever OS-specific means might be available. OS-independent + * things should be in the mouse driver. This function gets + * called after the mouse driver's OS-independent methods have + * failed. + */ + +extern OSMouseInfoPtr xf86OSMouseInit(int flags); + +/* Adjust this when the mouse interface changes. */ + +/* + * History: + * + * 1.0.0 - Everything up to when versioning was started. + * 1.1.0 - FindDevice and GuessProtocol added to OSMouseInfoRec + * 1.2.0 - xisbscale added to MouseDevRec + * + */ + +#define OS_MOUSE_VERSION_MAJOR 1 +#define OS_MOUSE_VERSION_MINOR 2 +#define OS_MOUSE_VERSION_PATCH 0 + +#define OS_MOUSE_VERSION_CURRENT \ + BUILTIN_INTERFACE_VERSION_NUMERIC(OS_MOUSE_VERSION_MAJOR, \ + OS_MOUSE_VERSION_MINOR, \ + OS_MOUSE_VERSION_PATCH) + +#define HAVE_GUESS_PROTOCOL \ + (xf86GetBuiltinInterfaceVersion(BUILTIN_IF_OSMOUSE, 0) >= \ + BUILTIN_INTERFACE_VERSION_NUMERIC(1, 1, 0)) + +#define HAVE_FIND_DEVICE \ + (xf86GetBuiltinInterfaceVersion(BUILTIN_IF_OSMOUSE, 0) >= \ + BUILTIN_INTERFACE_VERSION_NUMERIC(1, 1, 0)) + +/* Z axis mapping */ +#define MSE_NOZMAP 0 +#define MSE_MAPTOX -1 +#define MSE_MAPTOY -2 +#define MSE_MAPTOZ -3 +#define MSE_MAPTOW -4 + +/* Generalize for other axes. */ +#define MSE_NOAXISMAP MSE_NOZMAP + +#define MSE_MAXBUTTONS 24 +#define MSE_DFLTBUTTONS 3 + +/* + * Mouse device record. This is shared by the mouse driver and the OSMouse + * layer. + */ + +typedef void (*checkMovementsProc)(InputInfoPtr,int, int); +typedef void (*autoProbeProc)(InputInfoPtr, Bool, Bool); +typedef Bool (*collectDataProc)(struct _MouseDevRec *, unsigned char); +typedef Bool (*dataGoodProc)(struct _MouseDevRec *); + +typedef void (*PostMseEventProc)(InputInfoPtr pInfo, int buttons, + int dx, int dy, int dz, int dw); +typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo); + +#define MOUSE_MAGIC 15031995 + +typedef struct _MouseDevRec { + unsigned long magic; + int size; + PtrCtrlProcPtr Ctrl; + PostMseEventProc PostEvent; + MouseCommonOptProc CommonOptions; + DeviceIntPtr device; + const char * mseDevice; + const char * protocol; + MouseProtocolID protocolID; + MouseProtocolID oldProtocolID; /* hack */ + int class; + int mseModel; + int baudRate; + int oldBaudRate; + int sampleRate; + int lastButtons; + int threshold; /* acceleration */ + int num; + int den; + int buttons; /* # of buttons */ + int emulateState; /* automata state for 2 button mode */ + Bool emulate3Buttons; + Bool emulate3ButtonsSoft; + int emulate3Timeout;/* Timeout for 3 button emulation */ + Bool chordMiddle; + Bool flipXY; + int invX; + int invY; + int mouseFlags; /* Flags to Clear after opening + * mouse dev */ + int truebuttons; /* (not used) + * Arg to maintain before + * emulate3buttons timer callback */ + int resolution; + int negativeZ; /* button mask */ + int positiveZ; /* button mask */ + int negativeW; /* button mask */ + int positiveW; /* button mask */ + pointer buffer; /* usually an XISBuffer* */ + int protoBufTail; + unsigned char protoBuf[8]; + unsigned char protoPara[8]; + unsigned char inSync; /* driver in sync with datastream */ + pointer mousePriv; /* private area */ + InputInfoPtr pInfo; + int origProtocolID; + const char * origProtocol; + Bool emulate3Pending;/* timer waiting */ + CARD32 emulate3Expires;/* time to fire emulation code */ + Bool emulateWheel; + int wheelInertia; + int wheelButton; + int negativeX; /* Button values. Unlike the Z and */ + int positiveX; /* W equivalents, these are button */ + int negativeY; /* values rather than button masks. */ + int positiveY; + int wheelYDistance; + int wheelXDistance; + Bool autoProbe; + checkMovementsProc checkMovements; + autoProbeProc autoProbeMouse; + collectDataProc collectData; + dataGoodProc dataGood; + int angleOffset; + pointer pDragLock; /* drag lock area */ + int xisbscale; /* buffer size for 1 event */ + int wheelButtonTimeout;/* Timeout for the wheel button emulation */ + CARD32 wheelButtonExpires; + int doubleClickSourceButtonMask; + int doubleClickTargetButton; + int doubleClickTargetButtonMask; + int doubleClickOldSourceState; + int lastMappedButtons; + int buttonMap[MSE_MAXBUTTONS]; +} MouseDevRec, *MouseDevPtr; + +#endif /* _XF86OSMOUSE_H_ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreadline5 for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package libreadline5 for openSUSE:Factory checked in at Tue Mar 3 18:13:12 CET 2009. -------- New Changes file: --- /dev/null 2008-04-22 03:09:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/libreadline5/libreadline5.changes 2009-03-03 00:38:19.990539000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Tue Mar 3 00:38:02 CET 2009 - ro(a)suse.de + +- create package as temporary compat package for libreadline5 + calling whatdependson for head-i586 New: ---- baselibs.conf libreadline5.changes libreadline5.spec readline-4.3-input.dif readline-5.1-destdir.patch readline-5.2-conf.patch readline-5.2.dif readline-5.2-patches.tar.bz2 readline-5.2.tar.bz2 readline-5.2-wrap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreadline5.spec ++++++ # # spec file for package libreadline5 (Version 5.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # 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: libreadline5 BuildRequires: bison fdupes ncurses-devel License: GPL v2 or later Group: System/Libraries %define rl_vers 5.2 AutoReqProv: on Provides: bash:/%{_lib}/libreadline.so.5 Version: 5.2 Release: 109 Summary: The Readline Library Url: http://www.gnu.org/software/bash/bash.html Source0: readline-%{rl_vers}.tar.bz2 Source1: readline-%{rl_vers}-patches.tar.bz2 Patch20: readline-%{rl_vers}.dif Patch21: readline-4.3-input.dif Patch22: readline-5.2-wrap.patch Patch23: readline-5.2-conf.patch Patch30: readline-5.1-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _incdir %{_includedir} %description The readline library is used by the Bourne Again Shell (bash, the standard command interpreter) for easy editing of command lines. This includes history and search functionality. Authors: -------- Brian Fox <bfox(a)gnu.org> Chet Ramey <chet(a)ins.cwru.edu> %package -n readline5-devel License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 5.2 Release: 2 Requires: libreadline5 = %{version} Requires: ncurses-devel AutoReqProv: on %description -n readline5-devel This package contains all necessary include files and libraries needed to develop applications that require these. Authors: -------- Brian Fox <bfox(a)gnu.org> Chet Ramey <chet(a)ins.cwru.edu> %prep %setup -q -n readline-%{rl_vers} for p in ../readline-%{rl_vers}-patches/*; do test -e $p || break echo Patch $p patch -s -p0 < $p done %patch21 -p2 -b .zerotty %patch22 -p2 -b .wrap %patch23 -p2 -b .conf %patch30 -p0 -b .destdir %patch20 -p0 %build %{?suse_update_config:%{suse_update_config -f support}} autoconf cflags () { local flag=$1; shift case "${RPM_OPT_FLAGS}" in *${flag}*) return esac if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then local var=$1; shift eval $var=\${$var:+\$$var\ }$flag fi } echo 'int main () { return !(sizeof(void*) >= 8); }' | gcc -x c -o test64 - if ./test64 ; then LARGEFILE="" else LARGEFILE="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" fi rm -f ./test64 CFLAGS="$RPM_OPT_FLAGS $LARGEFILE -D_GNU_SOURCE -DRECYCLES_PIDS -Wall -g" LDFLAGS="" cflags -std=gnu89 CFLAGS cflags -Wuninitialized CFLAGS cflags -Wextra CFLAGS cflags -Wno-unprototyped-calls CFLAGS cflags -Wno-switch-enum CFLAGS cflags -ftree-loop-linear CFLAGS cflags -pipe CFLAGS cflags -Wl,--as-needed LDFLAGS cflags -Wl,-O,2 LDFLAGS CC=gcc CC_FOR_BUILD="$CC" CFLAGS_FOR_BUILD="$CFLAGS" LDFLAGS_FOR_BUILD="$LDFLAGS" export CC_FOR_BUILD CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD CFLAGS LDFLAGS CC ./configure --build=%{_target_cpu}-suse-linux \ --prefix=%{_prefix} \ --with-curses \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libdir=%{_libdir} make make documentation ln -sf shlib/libreadline.so.%{rl_vers} libreadline.so ln -sf shlib/libreadline.so.%{rl_vers} libreadline.so.5 ln -sf shlib/libhistory.so.%{rl_vers} libhistory.so ln -sf shlib/libhistory.so.%{rl_vers} libhistory.so.5 %install make install htmldir=%{_defaultdocdir}/readline DESTDIR=%{buildroot} make install-shared libdir=/%{_lib} linkagedir=%{_libdir} DESTDIR=%{buildroot} rm -rf %{buildroot}%{_defaultdocdir}/bash rm -rf %{buildroot}%{_defaultdocdir}/readline chmod 0755 %{buildroot}/%{_lib}/libhistory.so.%{rl_vers} chmod 0755 %{buildroot}/%{_lib}/libreadline.so.%{rl_vers} rm -f %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}*old rm -f %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}*old # remove unpackaged files rm -fv %{buildroot}%{_libdir}/libhistory.so.* rm -fv %{buildroot}%{_libdir}/libreadline.so.* rm -fv %{buildroot}%{_mandir}/man3/history.3* rm -fv %{buildroot}%{_infodir}/*.info* %post -n libreadline5 -p /sbin/ldconfig %postun -n libreadline5 -p /sbin/ldconfig %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root) /%{_lib}/libhistory.so.5 /%{_lib}/libhistory.so.%{rl_vers} /%{_lib}/libreadline.so.5 /%{_lib}/libreadline.so.%{rl_vers} %files -n readline5-devel %defattr(-,root,root) %{_incdir}/readline/ %{_libdir}/libhistory.a %{_libdir}/libhistory.so %{_libdir}/libreadline.a %{_libdir}/libreadline.so %doc %{_mandir}/man3/readline.3.gz %changelog * Tue Mar 03 2009 ro(a)suse.de - create package as temporary compat package for libreadline5 ++++++ readline-4.3-input.dif ++++++ --- lib/readline/input.c +++ lib/readline/input.c Mon Mar 17 19:03:51 2003 @@ -415,6 +415,8 @@ return (c); } +extern int _rl_read_zero_char_from_tty; + int rl_getc (stream) FILE *stream; @@ -432,7 +434,10 @@ /* If zero characters are returned, then the file that we are reading from is empty! Return EOF in that case. */ if (result == 0) - return (EOF); + { + _rl_read_zero_char_from_tty = 1; + return (EOF); + } #if defined (__BEOS__) if (errno == EINTR) --- lib/readline/readline.c +++ lib/readline/readline.c Mon Mar 17 19:02:52 2003 @@ -387,6 +387,9 @@ return (eof ? (char *)NULL : savestring (the_line)); } +/* Catch EOF from tty, do not return command line */ +int _rl_read_zero_char_from_tty = 0; + STATIC_CALLBACK int #if defined (READLINE_CALLBACKS) readline_internal_char () @@ -421,6 +424,10 @@ RL_SETSTATE(RL_STATE_READCMD); c = rl_read_key (); RL_UNSETSTATE(RL_STATE_READCMD); + + /* Return here if terminal is closed */ + if (c == EOF && _rl_read_zero_char_from_tty) + return (rl_done = 1); /* EOF typed to a non-blank line is a <NL>. */ if (c == EOF && rl_end) ++++++ readline-5.1-destdir.patch ++++++ --- shlib/Makefile.in +++ shlib/Makefile.in 2005-12-09 17:00:46.000000000 +0100 @@ -57,6 +57,7 @@ libdir = @libdir@ datadir = @datadir@ localedir = $(datadir)/locale +linkagedir = $(libdir) # Support an alternate destination root directory for package building DESTDIR = @@ -181,13 +182,13 @@ -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir) install: installdirs $(SHLIB_STATUS) - $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY) - $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE) + $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY) + $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE) @echo install: you may need to run ldconfig uninstall: - $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY) - $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE) + $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -U $(SHARED_HISTORY) + $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -U $(SHARED_READLINE) @echo uninstall: you may need to run ldconfig clean mostlyclean: force --- support/shlib-install +++ support/shlib-install 2005-12-09 17:05:28.000000000 +0100 @@ -3,7 +3,7 @@ # shlib-install - install a shared library and do any necessary host-specific # post-installation configuration (like ldconfig) # -# usage: shlib-install [-D] -O host_os -d installation-dir [-b bin-dir] -i install-prog [-U] library +# usage: shlib-install [-D] -O host_os -d installation-dir [-l linkage-dir] [-b bin-dir] -i install-prog [-U] library # # Chet Ramey # chet(a)po.cwru.edu @@ -12,10 +12,12 @@ # defaults # INSTALLDIR=/usr/local/lib +LINKAGEDIR= LDCONFIG=ldconfig +DESTDIR= PROGNAME=`basename $0` -USAGE="$PROGNAME [-D] -O host_os -d installation-dir [-b bin-dir] -i install-prog [-U] library" +USAGE="$PROGNAME [-D] -O host_os -d installation-dir [-l linkage-dir] [-b bin-dir] -i install-prog [-U] library" # process options @@ -23,14 +25,19 @@ case "$1" in -O) shift; host_os="$1"; shift ;; -d) shift; INSTALLDIR="$1"; shift ;; + -dd) shift; DESTDIR=$1; shift ;; -b) shift; BINDIR="$1" ; shift ;; -i) shift; INSTALLPROG="$1" ; shift ;; + -l) shift; LINKAGEDIR="$1" ; shift ;; -D) echo=echo ; shift ;; -U) uninstall=true ; shift ;; -*) echo "$USAGE" >&2 ; exit 2;; *) break ;; esac done +if [ -z "$LINKAGEDIR" ]; then + LINKAGEDIR="$INSTALLDIR" +fi # set install target name LIBNAME="$1" @@ -48,18 +55,18 @@ # pre-install if [ -z "$uninstall" ]; then - ${echo} $RM ${INSTALLDIR}/${LIBNAME}.${OLDSUFF} - if [ -f "$INSTALLDIR/$LIBNAME" ]; then - ${echo} $MV $INSTALLDIR/$LIBNAME ${INSTALLDIR}/${LIBNAME}.${OLDSUFF} + ${echo} $RM ${DESTDIR}${INSTALLDIR}/${LIBNAME}.${OLDSUFF} + if [ -f "${DESTDIR}$INSTALLDIR/$LIBNAME" ]; then + ${echo} $MV ${DESTDIR}$INSTALLDIR/$LIBNAME ${DESTDIR}${INSTALLDIR}/${LIBNAME}.${OLDSUFF} fi fi # install/uninstall if [ -z "$uninstall" ] ; then - ${echo} eval ${INSTALLPROG} $LIBNAME ${INSTALLDIR}/${LIBNAME} + ${echo} eval ${INSTALLPROG} $LIBNAME ${DESTDIR}${INSTALLDIR}/${LIBNAME} else - ${echo} ${RM} ${INSTALLDIR}/${LIBNAME} + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/${LIBNAME} fi # post-install/uninstall @@ -70,7 +77,7 @@ case "$host_os" in hpux*|darwin*|macosx*) if [ -z "$uninstall" ]; then - chmod 555 ${INSTALLDIR}/${LIBNAME} + chmod 555 ${DESTDIR}${INSTALLDIR}/${LIBNAME} fi ;; cygwin*) IMPLIBNAME=`echo ${LIBNAME} \ @@ -108,8 +115,8 @@ LINK1=`echo $LIBNAME | sed 's:$.*$\.[0-9]\.[0-9]:\1:'` # libname.dylib esac -INSTALL_LINK1='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK1' -INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2' +INSTALL_LINK1='${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK1' +INSTALL_LINK2='${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2' # # Create symlinks to the installed library. This section is incomplete. @@ -117,27 +124,27 @@ case "$host_os" in *linux*) # libname.so.M -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK2 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2 if [ -z "$uninstall" ]; then eval $INSTALL_LINK2 fi # libname.so -> libname.so.M - ${echo} ${RM} ${INSTALLDIR}/$LINK1 + ${echo} ${RM} ${DESTDIR}${LINKAGEDIR}/$LINK1 if [ -z "$uninstall" ]; then - ${echo} cd $INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1 + ${echo} ln -s ${INSTALLDIR}/$LIBNAME ${DESTDIR}${LINKAGEDIR}/$LINK1 fi ;; bsdi4*|*gnu*|darwin*|macosx*|k*bsd*-gnu) # libname.so.M -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK2 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2 if [ -z "$uninstall" ]; then eval $INSTALL_LINK2 fi # libname.so -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK1 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi @@ -145,7 +152,7 @@ solaris2*|aix4.[2-9]*|osf*|irix[56]*|sysv[45]*|dgux*) # libname.so -> libname.so.M - ${echo} ${RM} ${INSTALLDIR}/$LINK1 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi @@ -156,19 +163,19 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*) if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then # libname.so -> libname.so.M - ${echo} ${RM} ${INSTALLDIR}/$LINK1 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi else # libname.so.M -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK2 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2 if [ -z "$uninstall" ]; then eval $INSTALL_LINK2 fi # libname.so -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK1 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi @@ -177,7 +184,7 @@ hpux1*) # libname.sl -> libname.M - ${echo} ${RM} ${INSTALLDIR}/$LINK1.sl + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1.sl if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi ++++++ readline-5.2-conf.patch ++++++ --- lib/readline/bind.c +++ lib/readline/bind.c 2006-11-13 17:20:23.000000000 +0100 @@ -752,6 +752,9 @@ rl_function_of_keyseq (keyseq, map, type /* The last key bindings file read. */ static char *last_readline_init_file = (char *)NULL; +/* Flag to read system init file */ +static int read_system_init_file = 0; + /* The file we're currently reading key bindings from. */ static const char *current_readline_init_file; static int current_readline_init_include_level; @@ -815,11 +818,14 @@ rl_re_read_init_file (count, ignore) return r; } +/* Forward declarations */ +static int sv_bell_style PARAMS((const char *)); + /* Do key bindings from a file. If FILENAME is NULL it defaults to the first non-null filename from this list: 1. the filename used for the previous call 2. the value of the shell variable `INPUTRC' - 3. ~/.inputrc + 3. /etc/inputrc and ~/.inputrc 4. /etc/inputrc If the file existed and could be opened and read, 0 is returned, otherwise errno is returned. */ @@ -831,16 +837,37 @@ rl_read_init_file (filename) if (filename == 0) filename = last_readline_init_file; if (filename == 0) - filename = sh_get_env_value ("INPUTRC"); + { + filename = sh_get_env_value ("INPUTRC"); + if (filename && !strncmp(SYS_INPUTRC, filename, strlen(SYS_INPUTRC))) + { + struct stat st; + char *default_inputrc = tilde_expand(DEFAULT_INPUTRC); + + if ((stat(default_inputrc, &st) == 0)) + { + filename = DEFAULT_INPUTRC; + read_system_init_file = 1; + } + else + read_system_init_file = 0; + + free(default_inputrc); + } + else + read_system_init_file = 1; + } if (filename == 0 || *filename == 0) { filename = DEFAULT_INPUTRC; - /* Try to read DEFAULT_INPUTRC; fall back to SYS_INPUTRC on failure */ - if (_rl_read_init_file (filename, 0) == 0) - return 0; - filename = SYS_INPUTRC; + read_system_init_file = 1; } + sv_bell_style(sh_get_env_value("DEFAULT_BELL_STYLE")); + + if (read_system_init_file) + _rl_read_init_file (SYS_INPUTRC, 1); + #if defined (__MSDOS__) if (_rl_read_init_file (filename, 0) == 0) return 0; @@ -1350,7 +1377,14 @@ rl_parse_and_bind (string) rl_macro_bind (seq, &funname[1], _rl_keymap); } else - rl_bind_keyseq (seq, rl_named_function (funname)); + { +#if defined (PREFIX_META_HACK) + if (_rl_stricmp (funname, "prefix-meta") == 0) + rl_generic_bind (ISKMAP, seq, (char *)emacs_meta_keymap, _rl_keymap); + else +#endif + rl_bind_keyseq (seq, rl_named_function (funname)); + } free (seq); return 0; @@ -1487,7 +1521,6 @@ typedef int _rl_sv_func_t PARAMS((const #define V_INT 2 /* Forward declarations */ -static int sv_bell_style PARAMS((const char *)); static int sv_combegin PARAMS((const char *)); static int sv_compquery PARAMS((const char *)); static int sv_editmode PARAMS((const char *)); --- lib/readline/rlconf.h +++ lib/readline/rlconf.h 2006-11-13 17:21:26.000000000 +0100 @@ -35,7 +35,7 @@ #define HANDLE_SIGNALS /* Ugly but working hack for binding prefix meta. */ -#define PREFIX_META_HACK +#undef PREFIX_META_HACK /* The next-to-last-ditch effort file name for a user-specific init file. */ #define DEFAULT_INPUTRC "~/.inputrc" --- lib/readline/doc/rluser.texi +++ lib/readline/doc/rluser.texi 2006-11-13 17:23:56.000000000 +0100 @@ -338,7 +338,8 @@ file is taken from the value of the envi @end ifclear that variable is unset, the default is @file{~/.inputrc}. If that file does not exist or cannot be read, the ultimate default is -@file{/etc/inputrc}. +@file{/etc/inputrc}. If both @file{~/.inputrc} and @file{/etc/inputrc} +exist Readline will read first @file{/etc/inputrc} and then @file{~/.inputrc}. When a program which uses the Readline library starts up, the init file is read, and the key bindings are set. ++++++ readline-5.2.dif ++++++ --- .pkgextract +++ .pkgextract 2005-12-09 17:09:26.000000000 +0100 @@ -0,0 +1,5 @@ +tar Oxfj ../readline-5.2-patches.tar.bz2 | patch -p0 -s +patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif +patch -p2 -s --suffix=".wrap" < ../readline-5.2-wrap.patch +patch -p2 -s --suffix=".conf" < ../readline-5.2-conf.patch +patch -p0 -s --suffix=".destdir" < ../readline-5.1-destdir.patch --- Makefile.in +++ Makefile.in 2005-12-09 17:09:26.000000000 +0100 @@ -220,10 +220,8 @@ maybe-uninstall-headers: uninstall-heade install: $(INSTALL_TARGETS) install-static: installdirs $(STATIC_LIBS) install-headers install-doc - -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old $(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a - -$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old $(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a @@ -246,7 +244,7 @@ uninstall-shared: maybe-uninstall-header install-doc: installdirs -( if test -d doc ; then \ cd doc && \ - ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ + ${MAKE} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ fi ) uninstall-doc: --- complete.c +++ complete.c 2005-12-09 17:11:19.000000000 +0100 @@ -883,7 +883,7 @@ _rl_find_completion_word (fp, dp) /* We didn't find an unclosed quoted substring upon which to do completion, so use the word break characters to find the substring on which to complete. */ - while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)) + while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))) { scan = rl_line_buffer[rl_point]; @@ -1802,7 +1802,7 @@ rl_completion_matches (text, entry_funct match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *)); match_list[1] = (char *)NULL; - while (string = (*entry_function) (text, matches)) + while ((string = (*entry_function) (text, matches))) { if (matches + 1 == match_list_size) match_list = (char **)xrealloc @@ -1853,7 +1853,7 @@ rl_username_completion_function (text, s } #if defined (HAVE_GETPWENT) - while (entry = getpwent ()) + while ((entry = getpwent ())) { /* Null usernames should result in all users as possible completions. */ if (namelen == 0 || (STREQN (username, entry->pw_name, namelen))) --- readline.c +++ readline.c 2005-12-09 17:09:26.000000000 +0100 @@ -735,7 +735,11 @@ _rl_dispatch_subseq (key, map, got_subse { /* Special case rl_do_lowercase_version (). */ if (func == rl_do_lowercase_version) - return (_rl_dispatch (_rl_to_lower (key), map)); + { + if (key == ANYOTHERKEY) + return -1; + return (_rl_dispatch (_rl_to_lower (key), map)); + } rl_executing_keymap = map; --- readline.h +++ readline.h 2005-12-09 17:09:26.000000000 +0100 @@ -445,7 +445,7 @@ extern char *rl_filename_completion_func extern int rl_completion_mode PARAMS((rl_command_func_t *)); -#if 0 +#ifdef OLD_READLINE /* Backwards compatibility (compat.c). These will go away sometime. */ extern void free_undo_list PARAMS((void)); extern int maybe_save_line PARAMS((void)); --- doc/Makefile.in +++ doc/Makefile.in 2005-12-09 17:09:26.000000000 +0100 @@ -96,7 +96,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ $(RM) $@ -${DVIPDF} $< -all: info dvi html ps text +all: info html nodvi: info html text info: $(INFOOBJ) --- doc/readline.3 +++ doc/readline.3 2006-11-13 17:33:27.000000000 +0100 @@ -118,6 +118,14 @@ environment variable. If that variable .IR ~/.inputrc . If that file does not exist or cannot be read, the ultimate default is .IR /etc/inputrc . +If both files +.I ~/.inputrc +and +.I /etc/inputrc +exist readline will read first +.I /etc/inputrc +and then +.IR ~/.inputrc . When a program which uses the readline library starts up, the init file is read, and the key bindings and variables are set. There are only a few basic constructs allowed in the @@ -1270,6 +1278,9 @@ VI Command Mode functions .TP .FN ~/.inputrc Individual \fBreadline\fP initialization file +.TP +.FN /etc/inputrc +System \fBreadline\fP initialization file .PD .SH AUTHORS Brian Fox, Free Software Foundation --- support/shobj-conf +++ support/shobj-conf 2006-09-22 16:17:48.000000000 +0200 @@ -108,10 +108,11 @@ sunos5*|solaris2*) linux*-*|gnu*-*|k*bsd*-gnu-*) SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + SHOBJ_LDFLAGS='-shared' - SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' + SHLIB_LIBS=-lncurses ;; freebsd2* | netbsd*) ++++++ readline-5.2-wrap.patch ++++++ --- lib/readline/display.c +++ lib/readline/display.c 2006-11-13 16:55:24.000000000 +0100 @@ -665,7 +665,10 @@ inv_lbreaks[++newlines] = temp; #if defined (HANDLE_MULTIBYTE) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) - lpos -= _rl_col_width (local_prompt, n0, num); + { + if (local_prompt_len > 0) + lpos -= _rl_col_width (local_prompt, n0, num); + } else #endif lpos -= _rl_screenwidth; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bash for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at Tue Mar 3 18:12:49 CET 2009. -------- --- bash/bash.changes 2009-02-18 16:43:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2009-02-27 17:39:15.312001216 +0100 @@ -1,0 +2,6 @@ +Fri Feb 27 17:39:08 CET 2009 - werner(a)suse.de + +- Update bash 4.0 to patch level 0 +- Update readline 6.0 to patch level 0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bash-2.05a-security.patch bash-3.1-extended_quote.patch bash-3.1-loadables.dif bash-3.1-random.patch bash-3.2-complete.dif bash-3.2.dif bash-3.2-patches.tar.bz2 bash-3.2-setlocale.dif bash-3.2.tar.bz2 command-not-found.patch readline-5.1-destdir.patch readline-5.2.dif readline-5.2-patches.tar.bz2 readline-5.2.tar.bz2 readline-5.2-wrap.patch New: ---- bash-4.0.dif bash-4.0-extended_quote.patch bash-4.0-loadables.dif bash-4.0-patches.tar.bz2 bash-4.0-security.patch bash-4.0-setlocale.dif bash-4.0.tar.bz2 readline-6.0-destdir.patch readline-6.0.dif readline-6.0-patches.tar.bz2 readline-6.0.tar.bz2 readline-6.0-wrap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.z30944/_old 2009-03-03 18:12:30.000000000 +0100 +++ /var/tmp/diff_new_pack.z30944/_new 2009-03-03 18:12:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bash (Version 3.2) +# spec file for package bash (Version 4.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,17 +21,17 @@ BuildRequires: bison fdupes ncurses-devel License: GPL v2 or later Group: System/Shells -%define bash_vers 3.2 -%define rl_vers 5.2 +%define bash_vers 4.0 +%define rl_vers 6.0 Recommends: bash-doc = %bash_vers Suggests: command-not-found AutoReqProv: on -Version: 3.2 -Release: 148 +Version: 4.0 +Release: 2 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html -Source0: bash-%{bash_vers}.tar.bz2 -Source1: readline-%{rl_vers}.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 +Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{rl_vers}.tar.bz2 Source2: bash-%{bash_vers}-patches.tar.bz2 Source3: readline-%{rl_vers}-patches.tar.bz2 Source4: run-tests @@ -40,30 +40,28 @@ Source7: bash-rpmlintrc Patch0: bash-%{bash_vers}.dif Patch1: bash-2.03-manual.patch -Patch2: bash-2.05a-security.patch +Patch2: bash-4.0-security.patch Patch3: bash-3.2-2.4.4.patch Patch4: bash-3.0-evalexp.patch Patch5: bash-3.0-warn-locale.patch Patch6: bash-3.0-nfs_redir.patch Patch7: bash-3.0-decl.patch -Patch8: bash-3.1-random.patch -Patch9: bash-3.1-extended_quote.patch +Patch9: bash-4.0-extended_quote.patch Patch10: bash-3.2-printf.patch -Patch11: bash-3.1-loadables.dif +Patch11: bash-4.0-loadables.dif Patch14: bash-3.2-sigrestart.patch Patch15: bash-3.2-longjmp.dif -Patch16: bash-3.2-setlocale.dif -Patch17: bash-3.2-complete.dif +Patch16: bash-4.0-setlocale.dif Patch20: readline-%{rl_vers}.dif Patch21: readline-4.3-input.dif -Patch22: readline-5.2-wrap.patch +Patch22: readline-6.0-wrap.patch Patch23: readline-5.2-conf.patch -Patch30: readline-5.1-destdir.patch -Patch40: command-not-found.patch +Patch30: readline-6.0-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _incdir %{_includedir} %global _minsh 0 +%{expand: %%global rl_major %(echo %{rl_vers} | sed -r 's/.[0-9]+//g')} %description Bash is an sh-compatible command interpreter that executes commands @@ -85,8 +83,8 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq -Version: 3.2 -Release: 107 +Version: 4.0 +Release: 2 AutoReqProv: on %description -n bash-doc @@ -100,24 +98,24 @@ Brian Fox <bfox(a)gnu.org> Chet Ramey <chet(a)ins.cwru.edu> -%package -n libreadline5 +%package -n libreadline6 License: GPL v2 or later Summary: The Readline Library Group: System/Libraries -Provides: bash:/%{_lib}/libreadline.so.5 -Version: 5.2 -Release: 107 +Provides: bash:/%{_lib}/libreadline.so.%{rl_major} +Version: 6.0 +Release: 2 Recommends: readline-doc = %{version} # bug437293 %ifarch ppc64 Obsoletes: readline-64bit %endif # -Provides: readline = 5.2 -Obsoletes: readline <= 5.2 +Provides: readline = 6.0 +Obsoletes: readline <= 6.0 AutoReqProv: on -%description -n libreadline5 +%description -n libreadline6 The readline library is used by the Bourne Again Shell (bash, the standard command interpreter) for easy editing of command lines. This includes history and search functionality. @@ -134,9 +132,9 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a -Version: 5.2 -Release: 148 -Requires: libreadline5 = %{version} +Version: 6.0 +Release: 2 +Requires: libreadline6 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} AutoReqProv: on @@ -163,8 +161,8 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq -Version: 5.2 -Release: 107 +Version: 6.0 +Release: 2 AutoReqProv: on %description -n readline-doc @@ -193,18 +191,15 @@ %patch5 -p0 -b .warnlc %patch6 -p0 -b .nfs_redir %patch7 -p0 -b .decl -%patch8 -p1 -b .random2 %patch9 -p0 -b .extended_quote %patch10 -p0 -b .printf %patch11 -p0 -b .plugins %patch14 -p0 -b .sigrestart %patch15 -p0 -b .longjmp %patch16 -p0 -b .setlocale -%patch17 -p0 -b .complete %patch21 -p0 -b .zerotty %patch22 -p0 -b .wrap %patch23 -p0 -b .conf -%patch40 -p0 -b .cmdnotfnd %patch0 -p0 cd ../readline-%{rl_vers} for p in ../readline-%{rl_vers}-patches/*; do @@ -254,6 +249,8 @@ cflags -Wextra CFLAGS cflags -Wno-unprototyped-calls CFLAGS cflags -Wno-switch-enum CFLAGS + cflags -Wno-unused-variable CFLAGS + cflags -Wno-unused-parameter CFLAGS cflags -ftree-loop-linear CFLAGS cflags -pipe CFLAGS cflags -Wl,--as-needed LDFLAGS @@ -272,9 +269,9 @@ make make documentation ln -sf shlib/libreadline.so.%{rl_vers} libreadline.so - ln -sf shlib/libreadline.so.%{rl_vers} libreadline.so.5 + ln -sf shlib/libreadline.so.%{rl_vers} libreadline.so.%{rl_major} ln -sf shlib/libhistory.so.%{rl_vers} libhistory.so - ln -sf shlib/libhistory.so.%{rl_vers} libhistory.so.5 + ln -sf shlib/libhistory.so.%{rl_vers} libhistory.so.%{rl_major} cd ../bash-%{bash_vers} # /proc is required for correct configuration test -d /dev/fd || { echo "/proc is not mounted!" >&2; exit 1; } @@ -291,9 +288,6 @@ # cflags -fno-stack-protector CFLAGS # cflags -fno-unwind-tables CFLAGS # cflags -fno-asynchronous-unwind-tables CFLAGS -%else - cflags -fPIE CFLAGS - cflags -pie LDFLAGS %endif CC_FOR_BUILD="$CC" CFLAGS_FOR_BUILD="$CFLAGS" @@ -305,6 +299,7 @@ # SYSMALLOC=" --without-gnu-malloc + --without-bash-malloc " # # System readline library (comment out it not to be used) @@ -324,8 +319,12 @@ --enable-arith-for-command \ --enable-array-variables \ --enable-brace-expansion \ + --enable-casemod-attributes \ + --enable-casemod-expansion \ + --enable-command-timing \ --enable-cond-command \ --enable-cond-regexp \ + --enable-coprocesses \ --enable-directory-stack \ --enable-dparen-arithmetic \ --enable-extended-glob \ @@ -362,21 +361,17 @@ --disable-strict-posix-default \ --enable-separate-helpfiles=%{_datadir}/bash/helpfiles \ $READLINE -%if %do_profiling - make CFLAGS="$CFLAGS "%cflags_profile_generate bash printenv recho zecho - env -i TERM=$TERM make TESTSCRIPT=%{SOURCE4} check - make clean - make CFLAGS="$CFLAGS "%cflags_profile_feedback -%else - make all printenv recho zecho - env -i TERM=$TERM make TESTSCRIPT=%{SOURCE4} check -%endif + make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_generate"} \ + all printenv recho zecho xcase + env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_LIBRARY_PATH make TESTSCRIPT=%{SOURCE4} check + make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_feedback" clean} all make -C examples/loadables/ make documentation %install cd ../readline-%{rl_vers} - make install htmldir=%{_defaultdocdir}/readline DESTDIR=%{buildroot} + make install htmldir=%{_defaultdocdir}/readline \ + installdir=%{_defaultdocdir}/readline/examples DESTDIR=%{buildroot} make install-shared libdir=/%{_lib} linkagedir=%{_libdir} DESTDIR=%{buildroot} rm -rf %{buildroot}%{_defaultdocdir}/bash mkdir -p %{buildroot}%{_defaultdocdir}/bash @@ -384,6 +379,8 @@ chmod 0755 %{buildroot}/%{_lib}/libreadline.so.%{rl_vers} rm -f %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}*old rm -f %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}*old + rm -f %{buildroot}/%{_lib}/libhistory.so + rm -f %{buildroot}/%{_lib}/libreadline.so cd ../bash-%{bash_vers} make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/bin @@ -442,9 +439,9 @@ %postun -n bash-doc %install_info_delete --info-dir=%{_infodir} %{_infodir}/bash.info.gz -%post -n libreadline5 -p /sbin/ldconfig +%post -n libreadline6 -p /sbin/ldconfig -%postun -n libreadline5 -p /sbin/ldconfig +%postun -n libreadline6 -p /sbin/ldconfig %post -n readline-doc %install_info --info-dir=%{_infodir} %{_infodir}/history.info.gz @@ -483,11 +480,11 @@ %doc %{_mandir}/man1/rbash.1.gz %doc %{_defaultdocdir}/bash/ -%files -n libreadline5 +%files -n libreadline6 %defattr(-,root,root) -/%{_lib}/libhistory.so.5 +/%{_lib}/libhistory.so.%{rl_major} /%{_lib}/libhistory.so.%{rl_vers} -/%{_lib}/libreadline.so.5 +/%{_lib}/libreadline.so.%{rl_major} /%{_lib}/libreadline.so.%{rl_vers} %files -n readline-devel @@ -506,6 +503,9 @@ %doc %{_defaultdocdir}/readline/ %changelog +* Fri Feb 27 2009 werner(a)suse.de +- Update bash 4.0 to patch level 0 +- Update readline 6.0 to patch level 0 * Wed Feb 18 2009 werner(a)suse.de - Add readline patch 13 * Fri Jan 30 2009 werner(a)suse.de ++++++ baselibs.conf ++++++ --- bash/baselibs.conf 2008-05-17 19:24:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/baselibs.conf 2009-02-27 17:32:36.508001132 +0100 @@ -1,4 +1,4 @@ -libreadline5 +libreadline6 obsoletes "readline-<targettype> <= <version>" provides "readline-<targettype> = <version>" targettype x86 package bash @@ -7,4 +7,4 @@ prereq -glibc-x86 readline-devel requires -readline-<targettype> - requires "libreadline5-<targettype> = <version>" + requires "libreadline6-<targettype> = <version>" ++++++ bash-2.03-manual.patch ++++++ --- /var/tmp/diff_new_pack.z30944/_old 2009-03-03 18:12:31.000000000 +0100 +++ /var/tmp/diff_new_pack.z30944/_new 2009-03-03 18:12:31.000000000 +0100 @@ -13,15 +13,6 @@ .B \-D A list of all double-quoted strings preceded by \fB$\fP is printed on the standard ouput. -@@ -2539,7 +2539,7 @@ The \fIpattern\fP is expanded to produce - pathname expansion. - \fIParameter\fP is expanded and the longest match of \fIpattern\fP - against its value is replaced with \fIstring\fP. --If \Ipattern\fP begins with \fB/\fP, all matches of \fIpattern\fP are -+If \fIpattern\fP begins with \fB/\fP, all matches of \fIpattern\fP are - replaced with \fIstring\fP. Normally only the first match is replaced. - If \fIpattern\fP begins with \fB#\fP, it must match at the beginning - of the expanded value of \fIparameter\fP. @@ -5799,6 +5805,11 @@ .SH "SHELL BUILTIN COMMANDS" .\" start of bash_builtins ++++++ bash-3.1-loadables.dif -> bash-4.0.dif ++++++ ++++ 934 lines (skipped) ++++ between bash/bash-3.1-loadables.dif ++++ and /mounts/work_src_done/STABLE/bash/bash-4.0.dif ++++++ bash-3.1-extended_quote.patch -> bash-4.0-extended_quote.patch ++++++ --- bash/bash-3.1-extended_quote.patch 2006-01-10 12:42:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash-4.0-extended_quote.patch 2009-02-27 16:09:43.504003008 +0100 @@ -1,19 +1,20 @@ -*** parse.y ---- parse.y Tue Jan 10 11:36:59 2006 -*************** -*** 2842,2848 **** - ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen); - xfree (nestret); - -! if ((rflags & P_DQUOTE) == 0) - { - nestret = sh_single_quote (ttrans); - free (ttrans); ---- 2842,2848 ---- - ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen); - xfree (nestret); - -! if (extended_quote || (rflags & P_DQUOTE) == 0) - { - nestret = sh_single_quote (ttrans); - free (ttrans); +--- parse.y ++++ parse.y 2009-02-27 16:09:21.720002034 +0100 +@@ -3101,7 +3101,7 @@ parse_matched_pair (qc, open, close, len + ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen); + xfree (nestret); + +- if ((rflags & P_DQUOTE) == 0) ++ if (extended_quote || (rflags & P_DQUOTE) == 0) + { + nestret = sh_single_quote (ttrans); + free (ttrans); +@@ -3470,7 +3470,7 @@ eof_error: + ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen); + xfree (nestret); + +- if ((rflags & P_DQUOTE) == 0) ++ if (extended_quote || (rflags & P_DQUOTE) == 0) + { + nestret = sh_single_quote (ttrans); + free (ttrans); ++++++ bash-3.1-loadables.dif -> bash-4.0-loadables.dif ++++++ ++++ 602 lines (skipped) ++++ between bash/bash-3.1-loadables.dif ++++ and /mounts/work_src_done/STABLE/bash/bash-4.0-loadables.dif ++++++ bash-3.2-patches.tar.bz2 -> bash-4.0-patches.tar.bz2 ++++++ ++++ 4883 lines of diff (skipped) ++++++ bash-2.05a-security.patch -> bash-4.0-security.patch ++++++ --- bash/bash-2.05a-security.patch 2005-12-09 14:44:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash-4.0-security.patch 2009-02-27 17:45:50.396502508 +0100 @@ -1,6 +1,6 @@ --- variables.c -+++ variables.c Wed Aug 21 12:14:18 2002 -@@ -1035,6 +1035,7 @@ ++++ variables.c 2009-02-27 17:44:46.626430014 +0100 +@@ -1203,6 +1203,7 @@ init_seconds_var () return v; } @@ -8,8 +8,8 @@ /* The random number seed. You can change this by setting RANDOM. */ static unsigned long rseed = 1; static int last_random_value; -@@ -1060,6 +1061,21 @@ - last_random_value = 0; +@@ -1256,6 +1257,24 @@ seedrand () + sbrand (tv.tv_sec ^ tv.tv_usec ^ getpid ()); } +#else @@ -25,20 +25,34 @@ +{ + srandom(seed); +} ++ ++static void ++seedrand () {} +#endif + static SHELL_VAR * - assign_random (self, value, unused) + assign_random (self, value, unused, key) SHELL_VAR *self; -@@ -1075,6 +1091,7 @@ +@@ -1264,8 +1283,10 @@ assign_random (self, value, unused, key) + char *key; + { + sbrand (strtoul (value, (char **)NULL, 10)); ++#if !defined(linux) + if (subshell_environment) + seeded_subshell = getpid (); ++#endif + return (self); + } + +@@ -1274,6 +1295,7 @@ get_random_number () { - int rv; + int rv, pid; +#if !defined(linux) /* Reset for command and process substitution. */ - if (subshell_environment) - sbrand (rseed + getpid() + NOW); -@@ -1082,6 +1099,18 @@ + pid = getpid (); + if (subshell_environment && seeded_subshell != pid) +@@ -1285,6 +1307,18 @@ get_random_number () do rv = brand (); while (rv == last_random_value); @@ -57,7 +71,7 @@ return rv; } -@@ -1093,7 +1122,9 @@ +@@ -1296,7 +1330,9 @@ get_random (var) char *p; rv = get_random_number (); ++++++ bash-3.2-setlocale.dif -> bash-4.0-setlocale.dif ++++++ --- bash/bash-3.2-setlocale.dif 2008-11-25 14:28:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash-4.0-setlocale.dif 2009-02-27 16:41:43.952502373 +0100 @@ -1,6 +1,6 @@ --- locale.c -+++ locale.c 2008-11-25 13:26:15.482501498 +0000 -@@ -42,6 +42,7 @@ extern int dump_translatable_strings, du ++++ locale.c 2009-02-27 16:40:50.576066695 +0100 +@@ -47,6 +47,7 @@ extern int dump_translatable_strings, du /* The current locale when the program begins */ static char *default_locale; @@ -8,26 +8,30 @@ /* The current domain for textdomain(3). */ static char *default_domain; -@@ -294,7 +295,21 @@ get_locale_var (var) +@@ -314,11 +315,21 @@ get_locale_var (var) if (locale == 0 || *locale == 0) locale = lang; if (locale == 0 || *locale == 0) +-#if 0 - locale = default_locale; /* system-dependent; not really portable. should it be "C"? */ +-#else +- locale = ""; +-#endif + { + char *ptr; + if (default_locale && *default_locale && (ptr = strstr(default_locale, var)) && (ptr = strchr(ptr, '=')) && ++ptr) + { + memset (fallback, 0, sizeof(fallback)); + strncpy(fallback, ptr, sizeof(fallback)-1); -+ ++ + if ((ptr = strchr(fallback, ';'))) + *ptr = '\0'; -+ ++ + locale = fallback; + } + else + locale = default_locale; /* system-dependent; not really portable. should it be "C"? */ + } - return (locale); } + ++++++ bash-3.2-patches.tar.bz2 -> bash-4.0.tar.bz2 ++++++ ++++ 552995 lines of diff (skipped) ++++++ readline-5.1-destdir.patch -> readline-6.0-destdir.patch ++++++ --- bash/readline-5.1-destdir.patch 2005-12-09 17:07:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/readline-6.0-destdir.patch 2009-02-27 17:23:18.632003077 +0100 @@ -1,14 +1,14 @@ --- shlib/Makefile.in -+++ shlib/Makefile.in 2005-12-09 17:00:46.000000000 +0100 -@@ -57,6 +57,7 @@ ++++ shlib/Makefile.in 2009-02-27 17:21:24.428797577 +0100 +@@ -58,6 +58,7 @@ bindir = @bindir@ libdir = @libdir@ datadir = @datadir@ - localedir = $(datadir)/locale + localedir = @localedir@ +linkagedir = $(libdir) # Support an alternate destination root directory for package building DESTDIR = -@@ -181,13 +182,13 @@ +@@ -182,13 +183,13 @@ installdirs: $(topdir)/support/mkdirs -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir) install: installdirs $(SHLIB_STATUS) @@ -27,7 +27,7 @@ clean mostlyclean: force --- support/shlib-install -+++ support/shlib-install 2005-12-09 17:05:28.000000000 +0100 ++++ support/shlib-install 2009-02-27 17:22:54.688001513 +0100 @@ -3,7 +3,7 @@ # shlib-install - install a shared library and do any necessary host-specific # post-installation configuration (like ldconfig) @@ -51,7 +51,7 @@ # process options -@@ -23,14 +25,19 @@ +@@ -23,14 +25,19 @@ while [ $# -gt 0 ]; do case "$1" in -O) shift; host_os="$1"; shift ;; -d) shift; INSTALLDIR="$1"; shift ;; @@ -71,7 +71,7 @@ # set install target name LIBNAME="$1" -@@ -48,18 +55,18 @@ +@@ -48,18 +55,18 @@ LN="ln -s" # pre-install if [ -z "$uninstall" ]; then @@ -95,16 +95,16 @@ fi # post-install/uninstall -@@ -70,7 +77,7 @@ +@@ -71,7 +78,7 @@ fi case "$host_os" in - hpux*|darwin*|macosx*) + hpux*|darwin*|macosx*|linux*) if [ -z "$uninstall" ]; then - chmod 555 ${INSTALLDIR}/${LIBNAME} + chmod 555 ${DESTDIR}${INSTALLDIR}/${LIBNAME} fi ;; - cygwin*) + cygwin*|mingw*) IMPLIBNAME=`echo ${LIBNAME} \ -@@ -108,8 +115,8 @@ +@@ -109,8 +116,8 @@ case "$LIBNAME" in LINK1=`echo $LIBNAME | sed 's:$.*$\.[0-9]\.[0-9]:\1:'` # libname.dylib esac @@ -115,7 +115,7 @@ # # Create symlinks to the installed library. This section is incomplete. -@@ -117,27 +124,27 @@ +@@ -118,27 +125,27 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && case "$host_os" in *linux*) # libname.so.M -> libname.so.M.N @@ -127,14 +127,14 @@ # libname.so -> libname.so.M - ${echo} ${RM} ${INSTALLDIR}/$LINK1 -+ ${echo} ${RM} ${DESTDIR}${LINKAGEDIR}/$LINK1 ++ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then - ${echo} cd $INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1 -+ ${echo} ln -s ${INSTALLDIR}/$LIBNAME ${DESTDIR}${LINKAGEDIR}/$LINK1 ++ ${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1 fi ;; - bsdi4*|*gnu*|darwin*|macosx*|k*bsd*-gnu) + bsdi4*|*gnu*|darwin*|macosx*|k*bsd*-gnu|netbsd*) # libname.so.M -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK2 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2 @@ -148,16 +148,16 @@ if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi -@@ -145,7 +152,7 @@ +@@ -146,7 +153,7 @@ bsdi4*|*gnu*|darwin*|macosx*|k*bsd*-gnu| - solaris2*|aix4.[2-9]*|osf*|irix[56]*|sysv[45]*|dgux*) + solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|irix[56]*|sysv[45]*|dgux*|interix*) # libname.so -> libname.so.M - ${echo} ${RM} ${INSTALLDIR}/$LINK1 + ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi -@@ -156,19 +163,19 @@ +@@ -157,19 +164,19 @@ solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|iri freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*) if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then # libname.so -> libname.so.M @@ -180,7 +180,7 @@ if [ -z "$uninstall" ]; then eval $INSTALL_LINK1 fi -@@ -177,7 +184,7 @@ +@@ -178,7 +185,7 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao hpux1*) # libname.sl -> libname.M ++++++ readline-5.2.dif -> readline-6.0.dif ++++++ --- bash/readline-5.2.dif 2009-02-18 17:02:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/readline-6.0.dif 2009-02-27 17:28:08.328000473 +0100 @@ -1,17 +1,17 @@ --- .pkgextract +++ .pkgextract 2005-12-09 17:09:26.000000000 +0100 @@ -0,0 +1,5 @@ -+tar Oxfj ../readline-5.2-patches.tar.bz2 | patch -p0 -s ++tar Oxfj ../readline-6.0-patches.tar.bz2 | patch -p0 -s +patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif -+patch -p2 -s --suffix=".wrap" < ../readline-5.2-wrap.patch ++patch -p2 -s --suffix=".wrap" < ../readline-6.0-wrap.patch +patch -p2 -s --suffix=".conf" < ../readline-5.2-conf.patch -+patch -p0 -s --suffix=".destdir" < ../readline-5.1-destdir.patch ++patch -p0 -s --suffix=".destdir" < ../readline-6.0-destdir.patch --- Makefile.in -+++ Makefile.in 2005-12-09 17:09:26.000000000 +0100 -@@ -220,10 +220,8 @@ maybe-uninstall-headers: uninstall-heade - install: $(INSTALL_TARGETS) ++++ Makefile.in 2009-02-27 17:25:01.076001005 +0100 +@@ -222,10 +222,8 @@ uninstall-headers: + maybe-uninstall-headers: uninstall-headers - install-static: installdirs $(STATIC_LIBS) install-headers install-doc + install-static: installdirs $(STATIC_LIBS) install-headers install-doc install-examples - -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old $(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a @@ -19,7 +19,7 @@ $(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a -@@ -246,7 +244,7 @@ uninstall-shared: maybe-uninstall-header +@@ -254,7 +252,7 @@ uninstall-examples: maybe-uninstall-head install-doc: installdirs -( if test -d doc ; then \ cd doc && \ @@ -29,8 +29,8 @@ uninstall-doc: --- complete.c -+++ complete.c 2005-12-09 17:11:19.000000000 +0100 -@@ -883,7 +883,7 @@ _rl_find_completion_word (fp, dp) ++++ complete.c 2009-02-27 17:25:26.616935393 +0100 +@@ -942,7 +942,7 @@ _rl_find_completion_word (fp, dp) /* We didn't find an unclosed quoted substring upon which to do completion, so use the word break characters to find the substring on which to complete. */ @@ -39,16 +39,16 @@ { scan = rl_line_buffer[rl_point]; -@@ -1802,7 +1802,7 @@ rl_completion_matches (text, entry_funct - match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *)); +@@ -1884,7 +1884,7 @@ rl_completion_matches (text, entry_funct match_list[1] = (char *)NULL; + _rl_interrupt_immediately++; - while (string = (*entry_function) (text, matches)) + while ((string = (*entry_function) (text, matches))) { if (matches + 1 == match_list_size) match_list = (char **)xrealloc -@@ -1853,7 +1853,7 @@ rl_username_completion_function (text, s +@@ -1936,7 +1936,7 @@ rl_username_completion_function (text, s } #if defined (HAVE_GETPWENT) @@ -59,7 +59,7 @@ if (namelen == 0 || (STREQN (username, entry->pw_name, namelen))) --- readline.c +++ readline.c 2005-12-09 17:09:26.000000000 +0100 -@@ -735,7 +735,11 @@ _rl_dispatch_subseq (key, map, got_subse +@@ -767,7 +767,11 @@ _rl_dispatch_subseq (key, map, got_subse { /* Special case rl_do_lowercase_version (). */ if (func == rl_do_lowercase_version) @@ -74,7 +74,7 @@ --- readline.h +++ readline.h 2005-12-09 17:09:26.000000000 +0100 -@@ -445,7 +445,7 @@ extern char *rl_filename_completion_func +@@ -448,7 +448,7 @@ extern char *rl_filename_completion_func extern int rl_completion_mode PARAMS((rl_command_func_t *)); @@ -84,19 +84,19 @@ extern void free_undo_list PARAMS((void)); extern int maybe_save_line PARAMS((void)); --- doc/Makefile.in -+++ doc/Makefile.in 2005-12-09 17:09:26.000000000 +0100 -@@ -96,7 +96,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ ++++ doc/Makefile.in 2009-02-27 17:27:31.104001597 +0100 +@@ -98,7 +98,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ $(RM) $@ -${DVIPDF} $< --all: info dvi html ps text +-all: info dvi html ps text pdf +all: info html nodvi: info html text - info: $(INFOOBJ) + xdist: $(DIST_DOCS) --- doc/readline.3 +++ doc/readline.3 2006-11-13 17:33:27.000000000 +0100 -@@ -118,6 +118,14 @@ environment variable. If that variable +@@ -118,6 +118,14 @@ environment variable. If that variable .IR ~/.inputrc . If that file does not exist or cannot be read, the ultimate default is .IR /etc/inputrc . @@ -111,7 +111,7 @@ When a program which uses the readline library starts up, the init file is read, and the key bindings and variables are set. There are only a few basic constructs allowed in the -@@ -1270,6 +1278,9 @@ VI Command Mode functions +@@ -1286,6 +1294,9 @@ VI Command Mode functions .TP .FN ~/.inputrc Individual \fBreadline\fP initialization file @@ -123,7 +123,7 @@ Brian Fox, Free Software Foundation --- support/shobj-conf +++ support/shobj-conf 2006-09-22 16:17:48.000000000 +0200 -@@ -108,10 +108,11 @@ sunos5*|solaris2*) +@@ -112,10 +112,11 @@ sunos5*|solaris2*) linux*-*|gnu*-*|k*bsd*-gnu-*) SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' @@ -136,4 +136,4 @@ + SHLIB_LIBS=-lncurses ;; - freebsd2* | netbsd*) + freebsd2*) ++++++ readline-5.2-patches.tar.bz2 -> readline-6.0-patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-001 new/readline-6.0-patches/readline52-001 --- old/readline-5.2-patches/readline52-001 2006-12-12 21:25:00.000000000 +0100 +++ new/readline-6.0-patches/readline52-001 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-001 - -Bug-Reported-by: ebb9(a)byu.net -Bug-Reference-ID: <45540862.9030900(a)byu.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html - http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html - -Bug-Description: - -In some cases, code that is intended to be used in the presence of multibyte -characters is called when no such characters are present, leading to incorrect -display position calculations and incorrect redisplay. - -Patch: - -*** ../readline-5.2/display.c Thu Sep 14 14:20:12 2006 ---- display.c Mon Nov 13 17:55:57 2006 -*************** -*** 2381,2384 **** ---- 2409,2414 ---- - if (end <= start) - return 0; -+ if (MB_CUR_MAX == 1 || rl_byte_oriented) -+ return (end - start); - - memset (&ps, 0, sizeof (mbstate_t)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-002 new/readline-6.0-patches/readline52-002 --- old/readline-5.2-patches/readline52-002 2007-03-21 19:45:47.000000000 +0100 +++ new/readline-6.0-patches/readline52-002 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-002 - -Bug-Reported-by: Magnus Svensson <msvensson(a)mysql.com> -Bug-Reference-ID: <45BDC44D.80609(a)mysql.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html - -Bug-Description: - -Readline neglects to reallocate the array it uses to keep track of wrapped -screen lines when increasing its size. This will eventually result in -segmentation faults when given sufficiently long input. - -Patch: - -*** ../readline-5.2-patched/display.c Thu Sep 14 14:20:12 2006 ---- display.c Fri Feb 2 20:23:17 2007 -*************** -*** 561,574 **** ---- 561,586 ---- - wrap_offset = prompt_invis_chars_first_line = 0; - } - -+ #if defined (HANDLE_MULTIBYTE) - #define CHECK_INV_LBREAKS() \ - do { \ - if (newlines >= (inv_lbsize - 2)) \ - { \ - inv_lbsize *= 2; \ - inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ -+ _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \ - } \ - } while (0) -+ #else -+ #define CHECK_INV_LBREAKS() \ -+ do { \ -+ if (newlines >= (inv_lbsize - 2)) \ -+ { \ -+ inv_lbsize *= 2; \ -+ inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ -+ } \ -+ } while (0) -+ #endif /* HANDLE_MULTIBYTE */ - - #if defined (HANDLE_MULTIBYTE) - #define CHECK_LPOS() \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-003 new/readline-6.0-patches/readline52-003 --- old/readline-5.2-patches/readline52-003 2007-04-25 17:42:57.000000000 +0200 +++ new/readline-6.0-patches/readline52-003 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-003 - -Bug-Reported-by: Peter Volkov <torre_cremata(a)mail.ru> -Bug-Reference-ID: <1171795523.8021.18.camel@localhost> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html - -Bug-Description: - -When moving the cursor, bash sometimes misplaces the cursor when the prompt -contains two or more multibyte characters. The particular circumstance that -uncovered the problem was having the (multibyte) current directory name in -the prompt string. - -Patch: - -*** ../readline-5.2.2/display.c Fri Jan 19 13:34:50 2007 ---- display.c Sat Mar 10 17:25:44 2007 -*************** -*** 1745,1749 **** - { - dpos = _rl_col_width (data, 0, new); -! if (dpos > prompt_last_invisible) /* XXX - don't use woff here */ - { - dpos -= woff; ---- 1745,1752 ---- - { - dpos = _rl_col_width (data, 0, new); -! /* Use NEW when comparing against the last invisible character in the -! prompt string, since they're both buffer indices and DPOS is a -! desired display position. */ -! if (new > prompt_last_invisible) /* XXX - don't use woff here */ - { - dpos -= woff; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-004 new/readline-6.0-patches/readline52-004 --- old/readline-5.2-patches/readline52-004 2007-04-25 17:43:02.000000000 +0200 +++ new/readline-6.0-patches/readline52-004 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-004 - -Bug-Reported-by: Peter Volkov <torre_cremata(a)mail.ru> -Bug-Reference-ID: <1173636022.7039.36.camel@localhost> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00039.html - -Bug-Description: - -When restoring the original prompt after finishing an incremental search, -bash sometimes places the cursor incorrectly if the primary prompt contains -invisible characters. - -Patch: - -*** ../readline-5.2.3/display.c Fri Apr 20 13:30:16 2007 ---- display.c Fri Apr 20 15:17:01 2007 -*************** -*** 1599,1604 **** - if (temp > 0) - { - _rl_output_some_chars (nfd, temp); -! _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; - } - } ---- 1599,1618 ---- - if (temp > 0) - { -+ /* If nfd begins at the prompt, or before the invisible -+ characters in the prompt, we need to adjust _rl_last_c_pos -+ in a multibyte locale to account for the wrap offset and -+ set cpos_adjusted accordingly. */ - _rl_output_some_chars (nfd, temp); -! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -! { -! _rl_last_c_pos += _rl_col_width (nfd, 0, temp); -! if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) -! { -! _rl_last_c_pos -= wrap_offset; -! cpos_adjusted = 1; -! } -! } -! else -! _rl_last_c_pos += temp; - } - } -*************** -*** 1608,1613 **** ---- 1622,1639 ---- - if (temp > 0) - { -+ /* If nfd begins at the prompt, or before the invisible -+ characters in the prompt, we need to adjust _rl_last_c_pos -+ in a multibyte locale to account for the wrap offset and -+ set cpos_adjusted accordingly. */ - _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += col_temp; /* XXX */ -+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -+ { -+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) -+ { -+ _rl_last_c_pos -= wrap_offset; -+ cpos_adjusted = 1; -+ } -+ } - } - lendiff = (oe - old) - (ne - new); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-005 new/readline-6.0-patches/readline52-005 --- old/readline-5.2-patches/readline52-005 2007-08-22 15:07:26.000000000 +0200 +++ new/readline-6.0-patches/readline52-005 1970-01-01 01:00:00.000000000 +0100 @@ -1,328 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-005 - -Bug-Reported-by: Thomas Loeber <ifp(a)loeber1.de> -Bug-Reference-ID: <200703082223.08919.ifp(a)loeber1.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html - -Bug-Description: - -When rl_read_key returns -1, indicating that readline's controlling terminal -has been invalidated for some reason (e.g., receiving a SIGHUP), the error -status was not reported correctly to the caller. This could cause input -loops. - -Patch: - -*** ../readline-5.2/complete.c Fri Jul 28 11:35:49 2006 ---- complete.c Tue Mar 13 08:50:16 2007 -*************** -*** 429,433 **** - if (c == 'n' || c == 'N' || c == RUBOUT) - return (0); -! if (c == ABORT_CHAR) - _rl_abort_internal (); - if (for_pager && (c == NEWLINE || c == RETURN)) ---- 440,444 ---- - if (c == 'n' || c == 'N' || c == RUBOUT) - return (0); -! if (c == ABORT_CHAR || c < 0) - _rl_abort_internal (); - if (for_pager && (c == NEWLINE || c == RETURN)) -*** ../readline-5.2/input.c Wed Aug 16 15:15:16 2006 ---- input.c Wed May 2 16:07:59 2007 -*************** -*** 514,518 **** - int size; - { -! int mb_len = 0; - size_t mbchar_bytes_length; - wchar_t wc; ---- 522,526 ---- - int size; - { -! int mb_len, c; - size_t mbchar_bytes_length; - wchar_t wc; -*************** -*** 521,531 **** - memset(&ps, 0, sizeof (mbstate_t)); - memset(&ps_back, 0, sizeof (mbstate_t)); -! - while (mb_len < size) - { - RL_SETSTATE(RL_STATE_MOREINPUT); -! mbchar[mb_len++] = rl_read_key (); - RL_UNSETSTATE(RL_STATE_MOREINPUT); - - mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps); - if (mbchar_bytes_length == (size_t)(-1)) ---- 529,545 ---- - memset(&ps, 0, sizeof (mbstate_t)); - memset(&ps_back, 0, sizeof (mbstate_t)); -! -! mb_len = 0; - while (mb_len < size) - { - RL_SETSTATE(RL_STATE_MOREINPUT); -! c = rl_read_key (); - RL_UNSETSTATE(RL_STATE_MOREINPUT); - -+ if (c < 0) -+ break; -+ -+ mbchar[mb_len++] = c; -+ - mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps); - if (mbchar_bytes_length == (size_t)(-1)) -*************** -*** 565,569 **** - c = first; - memset (mb, 0, mlen); -! for (i = 0; i < mlen; i++) - { - mb[i] = (char)c; ---- 579,583 ---- - c = first; - memset (mb, 0, mlen); -! for (i = 0; c >= 0 && i < mlen; i++) - { - mb[i] = (char)c; -*** ../readline-5.2/isearch.c Mon Dec 26 17:18:53 2005 ---- isearch.c Fri Mar 9 14:30:59 2007 -*************** -*** 328,333 **** - - f = (rl_command_func_t *)NULL; -! -! /* Translate the keys we do something with to opcodes. */ - if (c >= 0 && _rl_keymap[c].type == ISFUNC) - { ---- 328,340 ---- - - f = (rl_command_func_t *)NULL; -! -! if (c < 0) -! { -! cxt->sflags |= SF_FAILED; -! cxt->history_pos = cxt->last_found_line; -! return -1; -! } -! -! /* Translate the keys we do something with to opcodes. */ - if (c >= 0 && _rl_keymap[c].type == ISFUNC) - { -*** ../readline-5.2/misc.c Mon Dec 26 17:20:46 2005 ---- misc.c Fri Mar 9 14:44:11 2007 -*************** -*** 147,150 **** ---- 147,152 ---- - rl_clear_message (); - RL_UNSETSTATE(RL_STATE_NUMERICARG); -+ if (key < 0) -+ return -1; - return (_rl_dispatch (key, _rl_keymap)); - } -*** ../readline-5.2/readline.c Wed Aug 16 15:00:36 2006 ---- readline.c Fri Mar 9 14:47:24 2007 -*************** -*** 646,649 **** ---- 669,677 ---- - { - nkey = _rl_subseq_getchar (cxt->okey); -+ if (nkey < 0) -+ { -+ _rl_abort_internal (); -+ return -1; -+ } - r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg); - cxt->flags |= KSEQ_DISPATCHED; -*** ../readline-5.2/text.c Fri Jul 28 11:55:27 2006 ---- text.c Sun Mar 25 13:41:38 2007 -*************** -*** 858,861 **** ---- 864,870 ---- - RL_UNSETSTATE(RL_STATE_MOREINPUT); - -+ if (c < 0) -+ return -1; -+ - #if defined (HANDLE_SIGNALS) - if (RL_ISSTATE (RL_STATE_CALLBACK) == 0) -*************** -*** 1521,1524 **** ---- 1530,1536 ---- - mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX); - -+ if (mb_len <= 0) -+ return -1; -+ - if (count < 0) - return (_rl_char_search_internal (-count, bdir, mbchar, mb_len)); -*************** -*** 1537,1540 **** ---- 1549,1555 ---- - RL_UNSETSTATE(RL_STATE_MOREINPUT); - -+ if (c < 0) -+ return -1; -+ - if (count < 0) - return (_rl_char_search_internal (-count, bdir, c)); -*** ../readline-5.2/vi_mode.c Sat Jul 29 16:42:28 2006 ---- vi_mode.c Fri Mar 9 15:02:11 2007 -*************** -*** 887,890 **** ---- 887,897 ---- - c = rl_read_key (); - RL_UNSETSTATE(RL_STATE_MOREINPUT); -+ -+ if (c < 0) -+ { -+ *nextkey = 0; -+ return -1; -+ } -+ - *nextkey = c; - -*************** -*** 903,906 **** ---- 910,918 ---- - c = rl_read_key (); /* real command */ - RL_UNSETSTATE(RL_STATE_MOREINPUT); -+ if (c < 0) -+ { -+ *nextkey = 0; -+ return -1; -+ } - *nextkey = c; - } -*************** -*** 1225,1236 **** - _rl_callback_generic_arg *data; - { - #if defined (HANDLE_MULTIBYTE) -! _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); - #else - RL_SETSTATE(RL_STATE_MOREINPUT); -! _rl_vi_last_search_char = rl_read_key (); - RL_UNSETSTATE(RL_STATE_MOREINPUT); - #endif - - _rl_callback_func = 0; - _rl_want_redisplay = 1; ---- 1243,1262 ---- - _rl_callback_generic_arg *data; - { -+ int c; - #if defined (HANDLE_MULTIBYTE) -! c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); - #else - RL_SETSTATE(RL_STATE_MOREINPUT); -! c = rl_read_key (); - RL_UNSETSTATE(RL_STATE_MOREINPUT); - #endif - -+ if (c <= 0) -+ return -1; -+ -+ #if !defined (HANDLE_MULTIBYTE) -+ _rl_vi_last_search_char = c; -+ #endif -+ - _rl_callback_func = 0; - _rl_want_redisplay = 1; -*************** -*** 1248,1251 **** ---- 1274,1278 ---- - int count, key; - { -+ int c; - #if defined (HANDLE_MULTIBYTE) - static char *target; -*************** -*** 1294,1302 **** - { - #if defined (HANDLE_MULTIBYTE) -! _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); - #else - RL_SETSTATE(RL_STATE_MOREINPUT); -! _rl_vi_last_search_char = rl_read_key (); - RL_UNSETSTATE(RL_STATE_MOREINPUT); - #endif - } ---- 1321,1335 ---- - { - #if defined (HANDLE_MULTIBYTE) -! c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); -! if (c <= 0) -! return -1; -! _rl_vi_last_search_mblen = c; - #else - RL_SETSTATE(RL_STATE_MOREINPUT); -! c = rl_read_key (); - RL_UNSETSTATE(RL_STATE_MOREINPUT); -+ if (c < 0) -+ return -1; -+ _rl_vi_last_search_char = c; - #endif - } -*************** -*** 1468,1471 **** ---- 1501,1507 ---- - RL_UNSETSTATE(RL_STATE_MOREINPUT); - -+ if (c < 0) -+ return -1; -+ - #if defined (HANDLE_MULTIBYTE) - if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -*************** -*** 1486,1489 **** ---- 1522,1528 ---- - _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); - -+ if (c < 0) -+ return -1; -+ - _rl_callback_func = 0; - _rl_want_redisplay = 1; -*************** -*** 1517,1520 **** ---- 1556,1562 ---- - _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); - -+ if (c < 0) -+ return -1; -+ - return (_rl_vi_change_char (count, c, mb)); - } -*************** -*** 1651,1655 **** - RL_UNSETSTATE(RL_STATE_MOREINPUT); - -! if (ch < 'a' || ch > 'z') - { - rl_ding (); ---- 1693,1697 ---- - RL_UNSETSTATE(RL_STATE_MOREINPUT); - -! if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ - { - rl_ding (); -*************** -*** 1703,1707 **** - return 0; - } -! else if (ch < 'a' || ch > 'z') - { - rl_ding (); ---- 1745,1749 ---- - return 0; - } -! else if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ - { - rl_ding (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-006 new/readline-6.0-patches/readline52-006 --- old/readline-5.2-patches/readline52-006 2007-08-22 15:07:26.000000000 +0200 +++ new/readline-6.0-patches/readline52-006 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-006 - -Bug-Reported-by: Peter Volkov <torre_cremata(a)mail.ru> -Bug-Reference-ID: <1178376645.9063.25.camel@localhost> -Bug-Reference-URL: http://bugs.gentoo.org/177095 - -Bug-Description: - -The readline display code miscalculated the screen position when performing -a redisplay in which the new text occupies more screen space that the old, -but takes fewer bytes to do so (e.g., when replacing a shorter string -containing multibyte characters with a longer one containing only ASCII). - -Patch: - -*** ../readline-5.2/display.c Thu Apr 26 11:38:22 2007 ---- display.c Thu Jul 12 23:10:10 2007 -*************** -*** 1519,1527 **** - /* Non-zero if we're increasing the number of lines. */ - int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; - /* Sometimes it is cheaper to print the characters rather than - use the terminal's capabilities. If we're growing the number - of lines, make sure we actually cause the new line to wrap - around on auto-wrapping terminals. */ -! if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) - { - /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and ---- 1568,1596 ---- - /* Non-zero if we're increasing the number of lines. */ - int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; -+ /* If col_lendiff is > 0, implying that the new string takes up more -+ screen real estate than the old, but lendiff is < 0, meaning that it -+ takes fewer bytes, we need to just output the characters starting -+ from the first difference. These will overwrite what is on the -+ display, so there's no reason to do a smart update. This can really -+ only happen in a multibyte environment. */ -+ if (lendiff < 0) -+ { -+ _rl_output_some_chars (nfd, temp); -+ _rl_last_c_pos += _rl_col_width (nfd, 0, temp); -+ /* If nfd begins before any invisible characters in the prompt, -+ adjust _rl_last_c_pos to account for wrap_offset and set -+ cpos_adjusted to let the caller know. */ -+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) -+ { -+ _rl_last_c_pos -= wrap_offset; -+ cpos_adjusted = 1; -+ } -+ return; -+ } - /* Sometimes it is cheaper to print the characters rather than - use the terminal's capabilities. If we're growing the number - of lines, make sure we actually cause the new line to wrap - around on auto-wrapping terminals. */ -! else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) - { - /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-007 new/readline-6.0-patches/readline52-007 --- old/readline-5.2-patches/readline52-007 2007-08-22 15:07:26.000000000 +0200 +++ new/readline-6.0-patches/readline52-007 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-007 - -Bug-Reported-by: Tom Bjorkholm <tom.bjorkholm(a)ericsson.com> -Bug-Reference-ID: <AEA1A32F001C6B4F98614B5B80D7647D01C075E9(a)esealmw115.eemea.ericsson.se> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html - - -Bug-Description: - -An off-by-one error in readline's input buffering caused readline to drop -each 511th character of buffered input (e.g., when pasting a large amount -of data into a terminal window). - -Patch: - -*** ../readline-5.2/input.c Wed Aug 16 15:15:16 2006 ---- input.c Tue Jul 17 09:24:21 2007 -*************** -*** 134,139 **** - - *key = ibuffer[pop_index++]; -! - if (pop_index >= ibuffer_len) - pop_index = 0; - ---- 134,142 ---- - - *key = ibuffer[pop_index++]; -! #if 0 - if (pop_index >= ibuffer_len) -+ #else -+ if (pop_index > ibuffer_len) -+ #endif - pop_index = 0; - -*************** -*** 251,255 **** - { - k = (*rl_getc_function) (rl_instream); -! rl_stuff_char (k); - if (k == NEWLINE || k == RETURN) - break; ---- 254,259 ---- - { - k = (*rl_getc_function) (rl_instream); -! if (rl_stuff_char (k) == 0) -! break; /* some problem; no more room */ - if (k == NEWLINE || k == RETURN) - break; -*************** -*** 374,378 **** ---- 378,386 ---- - } - ibuffer[push_index++] = key; -+ #if 0 - if (push_index >= ibuffer_len) -+ #else -+ if (push_index > ibuffer_len) -+ #endif - push_index = 0; - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-008 new/readline-6.0-patches/readline52-008 --- old/readline-5.2-patches/readline52-008 2007-12-15 03:35:54.000000000 +0100 +++ new/readline-6.0-patches/readline52-008 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-008 - -Bug-Reported-by: dAniel hAhler <ubuntu(a)thequod.de> -Bug-Reference-ID: <4702ED8A.5000503(a)thequod.de> -Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938 - -Bug-Description: - -When updating the display after displaying, for instance, a list of possible -completions, readline will place the cursor at the wrong position if the -prompt contains invisible characters and a newline. - -Patch: - -*** ../readline-5.2-patched/display.c Mon Aug 6 14:26:29 2007 ---- display.c Wed Oct 10 22:43:58 2007 -*************** -*** 1049,1053 **** - else - tx = nleft; -! if (_rl_last_c_pos > tx) - { - _rl_backspace (_rl_last_c_pos - tx); /* XXX */ ---- 1049,1053 ---- - else - tx = nleft; -! if (tx >= 0 && _rl_last_c_pos > tx) - { - _rl_backspace (_rl_last_c_pos - tx); /* XXX */ -*************** -*** 1205,1209 **** - { - register char *ofd, *ols, *oe, *nfd, *nls, *ne; -! int temp, lendiff, wsatend, od, nd; - int current_invis_chars; - int col_lendiff, col_temp; ---- 1205,1209 ---- - { - register char *ofd, *ols, *oe, *nfd, *nls, *ne; -! int temp, lendiff, wsatend, od, nd, o_cpos; - int current_invis_chars; - int col_lendiff, col_temp; -*************** -*** 1466,1469 **** ---- 1466,1471 ---- - } - -+ o_cpos = _rl_last_c_pos; -+ - /* When this function returns, _rl_last_c_pos is correct, and an absolute - cursor postion in multibyte mode, but a buffer index when not in a -*************** -*** 1475,1479 **** - invisible characters in the prompt string. Let's see if setting this when - we make sure we're at the end of the drawn prompt string works. */ -! if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars) - cpos_adjusted = 1; - #endif ---- 1477,1483 ---- - invisible characters in the prompt string. Let's see if setting this when - we make sure we're at the end of the drawn prompt string works. */ -! if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && -! (_rl_last_c_pos > 0 || o_cpos > 0) && -! _rl_last_c_pos == prompt_physical_chars) - cpos_adjusted = 1; - #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-009 new/readline-6.0-patches/readline52-009 --- old/readline-5.2-patches/readline52-009 2007-12-15 03:35:54.000000000 +0100 +++ new/readline-6.0-patches/readline52-009 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-009 - -Bug-Reported-by: dAniel hAhler <ubuntu(a)thequod.de> -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -Under some circumstances, readline will incorrectly display a prompt string -containing invisible characters after the final newline. - -Patch: - -*** ../readline-5.2-patched/display.c 2007-08-25 13:47:08.000000000 -0400 ---- display.c 2007-11-10 17:51:29.000000000 -0500 -*************** -*** 392,396 **** - local_prompt = expand_prompt (p, &prompt_visible_length, - &prompt_last_invisible, -! (int *)NULL, - &prompt_physical_chars); - c = *t; *t = '\0'; ---- 420,424 ---- - local_prompt = expand_prompt (p, &prompt_visible_length, - &prompt_last_invisible, -! &prompt_invis_chars_first_line, - &prompt_physical_chars); - c = *t; *t = '\0'; -*************** -*** 399,403 **** - local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length, - (int *)NULL, -! &prompt_invis_chars_first_line, - (int *)NULL); - *t = c; ---- 427,431 ---- - local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length, - (int *)NULL, -! (int *)NULL, - (int *)NULL); - *t = c; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-010 new/readline-6.0-patches/readline52-010 --- old/readline-5.2-patches/readline52-010 2007-12-15 03:35:54.000000000 +0100 +++ new/readline-6.0-patches/readline52-010 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-010 - -Bug-Reported-by: Miroslav Lichvar <mlichvar(a)redhat.com> -Bug-Reference-ID: Fri, 02 Nov 2007 14:07:45 +0100 -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html - -Bug-Description: - -In certain cases when outputting characters at the end of the line, -e.g., when displaying the prompt string, readline positions the cursor -incorrectly if the prompt string contains invisible characters and the -text being drawn begins before the last invisible character in the line. - -Patch: - -*** ../readline-5.2-patched/display.c 2007-08-25 13:47:08.000000000 -0400 ---- display.c 2007-11-10 17:51:29.000000000 -0500 -*************** -*** 1566,1574 **** - else - { -- /* We have horizontal scrolling and we are not inserting at -- the end. We have invisible characters in this line. This -- is a dumb update. */ - _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += col_temp; - return; - } ---- 1619,1632 ---- - else - { - _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += col_temp; -+ /* If nfd begins before any invisible characters in the prompt, -+ adjust _rl_last_c_pos to account for wrap_offset and set -+ cpos_adjusted to let the caller know. */ -+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) -+ { -+ _rl_last_c_pos -= wrap_offset; -+ cpos_adjusted = 1; -+ } - return; - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-011 new/readline-6.0-patches/readline52-011 --- old/readline-5.2-patches/readline52-011 2007-12-15 03:35:54.000000000 +0100 +++ new/readline-6.0-patches/readline52-011 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-011 - -Bug-Reported-by: Uwe Doering <gemini(a)geminix.org> -Bug-Reference-ID: <46F3DD72.2090801(a)geminix.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html - -Bug-Description: - -There is an off-by-one error in the code that buffers characters received -very quickly in succession, causing characters to be dropped. - -Patch: - -*** ../readline-5.2-patched/input.c 2007-08-25 13:47:10.000000000 -0400 ---- input.c 2007-10-12 22:55:25.000000000 -0400 -*************** -*** 155,159 **** - pop_index--; - if (pop_index < 0) -! pop_index = ibuffer_len - 1; - ibuffer[pop_index] = key; - return (1); ---- 155,159 ---- - pop_index--; - if (pop_index < 0) -! pop_index = ibuffer_len; - ibuffer[pop_index] = key; - return (1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-012 new/readline-6.0-patches/readline52-012 --- old/readline-5.2-patches/readline52-012 2007-12-15 03:35:54.000000000 +0100 +++ new/readline-6.0-patches/readline52-012 1970-01-01 01:00:00.000000000 +0100 @@ -1,150 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-012 - -Bug-Reported-by: Chet Ramey <chet.ramey(a)case.edu> -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -This updates the options required to create shared libraries on several -systems, including Mac OS X 10.5 (darwin9.x), FreeBSD, NetBSD, OpenBSD, -AIX, and HP/UX. - -Patch: - -*** ../readline-5.2-patched/support/shobj-conf 2006-04-11 09:15:43.000000000 -0400 ---- support/shobj-conf 2007-12-06 23:46:41.000000000 -0500 -*************** -*** 11,15 **** - # chet(a)po.cwru.edu - -! # Copyright (C) 1996-2002 Free Software Foundation, Inc. - # - # This program is free software; you can redistribute it and/or modify ---- 11,15 ---- - # chet(a)po.cwru.edu - -! # Copyright (C) 1996-2007 Free Software Foundation, Inc. - # - # This program is free software; you can redistribute it and/or modify -*************** -*** 115,119 **** - ;; - -! freebsd2* | netbsd*) - SHOBJ_CFLAGS=-fpic - SHOBJ_LD=ld ---- 115,119 ---- - ;; - -! freebsd2*) - SHOBJ_CFLAGS=-fpic - SHOBJ_LD=ld -*************** -*** 126,130 **** - # FreeBSD-3.x ELF - freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*) -! SHOBJ_CFLAGS=-fpic - SHOBJ_LD='${CC}' - ---- 126,130 ---- - # FreeBSD-3.x ELF - freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*) -! SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' - -*************** -*** 143,147 **** - - # Darwin/MacOS X -! darwin8*) - SHOBJ_STATUS=supported - SHLIB_STATUS=supported ---- 143,147 ---- - - # Darwin/MacOS X -! darwin[89]*) - SHOBJ_STATUS=supported - SHLIB_STATUS=supported -*************** -*** 154,158 **** - SHLIB_LIBSUFF='dylib' - -! SHOBJ_LDFLAGS='-undefined dynamic_lookup' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ---- 154,158 ---- - SHLIB_LIBSUFF='dylib' - -! SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - -*************** -*** 172,176 **** - - case "${host_os}" in -! darwin[78]*) SHOBJ_LDFLAGS='' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; ---- 172,176 ---- - - case "${host_os}" in -! darwin[789]*) SHOBJ_LDFLAGS='' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; -*************** -*** 183,187 **** - ;; - -! openbsd*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' ---- 183,187 ---- - ;; - -! openbsd*|netbsd*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' -*************** -*** 248,252 **** - ;; - -! aix4.[2-9]*-*gcc*) # lightly tested by jik(a)cisco.com - SHOBJ_CFLAGS=-fpic - SHOBJ_LD='ld' ---- 248,252 ---- - ;; - -! aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*) # lightly tested by jik(a)cisco.com - SHOBJ_CFLAGS=-fpic - SHOBJ_LD='ld' -*************** -*** 259,263 **** - ;; - -! aix4.[2-9]*) - SHOBJ_CFLAGS=-K - SHOBJ_LD='ld' ---- 259,263 ---- - ;; - -! aix4.[2-9]*|aix[5-9].*) - SHOBJ_CFLAGS=-K - SHOBJ_LD='ld' -*************** -*** 330,334 **** - # if you have problems linking here, moving the `-Wl,+h,$@' from - # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work -! SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s' - - SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)' ---- 330,334 ---- - # if you have problems linking here, moving the `-Wl,+h,$@' from - # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work -! SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s' - - SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.2-patches/readline52-013 new/readline-6.0-patches/readline52-013 --- old/readline-5.2-patches/readline52-013 2008-11-18 17:19:22.000000000 +0100 +++ new/readline-6.0-patches/readline52-013 1970-01-01 01:00:00.000000000 +0100 @@ -1,135 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.2 -Patch-ID: readline52-013 - -Bug-Reported-by: slinkp <stuff(a)slinkp.com> -Bug-Reference-ID: <da52a26a-9f38-4861-a918-14d3482b539d(a)c65g2000hsa.googlegroups.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2008-05/msg00085.html - -Bug-Description: - -The presence of invisible characters in a prompt longer than the screenwidth -with invisible characters on the first and last prompt lines caused readline -to place the cursor in the wrong physical location. - -Patch: - -*** ../readline-5.2-patched/display.c 2007-12-14 21:12:40.000000000 -0500 ---- display.c 2008-10-23 09:39:46.000000000 -0400 -*************** -*** 911,914 **** ---- 944,951 ---- - OFFSET (which has already been calculated above). */ - -+ #define INVIS_FIRST() (prompt_physical_chars > _rl_screenwidth ? prompt_invis_chars_first_line : wrap_offset) -+ #define WRAP_OFFSET(line, offset) ((line == 0) \ -+ ? (offset ? INVIS_FIRST() : 0) \ -+ : ((line == prompt_last_screen_line) ? wrap_offset-prompt_invis_chars_first_line : 0)) - #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0) - #define VIS_LLEN(l) ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l])) -*************** -*** 945,949 **** - _rl_last_c_pos > wrap_offset && - o_cpos < prompt_last_invisible) -! _rl_last_c_pos -= wrap_offset; - - /* If this is the line with the prompt, we might need to ---- 982,992 ---- - _rl_last_c_pos > wrap_offset && - o_cpos < prompt_last_invisible) -! _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */ -! else if (linenum == prompt_last_screen_line && prompt_physical_chars > _rl_screenwidth && -! (MB_CUR_MAX > 1 && rl_byte_oriented == 0) && -! cpos_adjusted == 0 && -! _rl_last_c_pos != o_cpos && -! _rl_last_c_pos > (prompt_last_invisible - _rl_screenwidth - prompt_invis_chars_first_line)) -! _rl_last_c_pos -= (wrap_offset-prompt_invis_chars_first_line); - - /* If this is the line with the prompt, we might need to -*************** -*** 1205,1209 **** - { - register char *ofd, *ols, *oe, *nfd, *nls, *ne; -! int temp, lendiff, wsatend, od, nd, o_cpos; - int current_invis_chars; - int col_lendiff, col_temp; ---- 1264,1268 ---- - { - register char *ofd, *ols, *oe, *nfd, *nls, *ne; -! int temp, lendiff, wsatend, od, nd, twidth, o_cpos; - int current_invis_chars; - int col_lendiff, col_temp; -*************** -*** 1221,1225 **** - temp = _rl_last_c_pos; - else -! temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset); - if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode - && _rl_last_v_pos == current_line - 1) ---- 1280,1284 ---- - temp = _rl_last_c_pos; - else -! temp = _rl_last_c_pos - WRAP_OFFSET (_rl_last_v_pos, visible_wrap_offset); - if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode - && _rl_last_v_pos == current_line - 1) -*************** -*** 1587,1599 **** - { - _rl_output_some_chars (nfd + lendiff, temp - lendiff); -- #if 1 - /* XXX -- this bears closer inspection. Fixes a redisplay bug - reported against bash-3.0-alpha by Andreas Schwab involving - multibyte characters and prompt strings with invisible - characters, but was previously disabled. */ -! _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff); -! #else -! _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff); -! #endif - } - } ---- 1648,1660 ---- - { - _rl_output_some_chars (nfd + lendiff, temp - lendiff); - /* XXX -- this bears closer inspection. Fixes a redisplay bug - reported against bash-3.0-alpha by Andreas Schwab involving - multibyte characters and prompt strings with invisible - characters, but was previously disabled. */ -! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -! twidth = _rl_col_width (nfd+lendiff, 0, temp-col_lendiff); -! else -! twidth = temp - lendiff; -! _rl_last_c_pos += twidth; - } - } -*************** -*** 1789,1793 **** - int cpos, dpos; /* current and desired cursor positions */ - -! woff = W_OFFSET (_rl_last_v_pos, wrap_offset); - cpos = _rl_last_c_pos; - #if defined (HANDLE_MULTIBYTE) ---- 1850,1854 ---- - int cpos, dpos; /* current and desired cursor positions */ - -! woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); - cpos = _rl_last_c_pos; - #if defined (HANDLE_MULTIBYTE) -*************** -*** 1803,1807 **** - prompt string, since they're both buffer indices and DPOS is a - desired display position. */ -! if (new > prompt_last_invisible) /* XXX - don't use woff here */ - { - dpos -= woff; ---- 1864,1872 ---- - prompt string, since they're both buffer indices and DPOS is a - desired display position. */ -! if ((new > prompt_last_invisible) || /* XXX - don't use woff here */ -! (prompt_physical_chars > _rl_screenwidth && -! _rl_last_v_pos == prompt_last_screen_line && -! wrap_offset != woff && -! new > (prompt_last_invisible-_rl_screenwidth-wrap_offset))) - { - dpos -= woff; ++++++ readline-5.2-patches.tar.bz2 -> readline-6.0.tar.bz2 ++++++ ++++ 140362 lines of diff (skipped) ++++++ readline-5.2-wrap.patch -> readline-6.0-wrap.patch ++++++ --- bash/readline-5.2-wrap.patch 2006-11-13 17:29:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/readline-6.0-wrap.patch 2009-02-27 16:58:53.716001771 +0100 @@ -1,9 +1,9 @@ --- lib/readline/display.c -+++ lib/readline/display.c 2006-11-13 16:55:24.000000000 +0100 -@@ -665,7 +665,10 @@ ++++ lib/readline/display.c 2009-02-27 16:57:28.988001786 +0100 +@@ -713,7 +713,10 @@ rl_redisplay () inv_lbreaks[++newlines] = temp; #if defined (HANDLE_MULTIBYTE) - if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0 && prompt_multibyte_chars > 0) - lpos -= _rl_col_width (local_prompt, n0, num); + { + if (local_prompt_len > 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 totem for openSUSE:Factory
by root＠Hilbert.suse.de 02 Mar '09

02 Mar '09

Hello community, here is the log from the commit of package totem for openSUSE:Factory checked in at Tue Mar 3 00:52:54 CET 2009. -------- --- GNOME/totem/totem.changes 2009-02-06 01:05:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/totem/totem.changes 2009-03-03 00:34:04.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Mar 3 00:33:42 CET 2009 - vuntz(a)novell.com + +- Review changes. + +------------------------------------------------------------------- +Tue Feb 17 19:48:06 WET 2009 - lmedinas(a)gmail.com + +- Update to version 2.25.91: + + Document internal API for plugin writers + + Fix a few focus problems + + Accept human-friendly inputs in the "Skip To" dialogue + + Add a huge number of languages to the subtitle downloader plugin + + Make looping smoother when only one file is being played in repeat + + Make the gallery creation progress window work as expected + + Many build fixes + + Make Totem more robust when Python fails to initialise +- Add devel package for Totem developer documentation + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- totem-2.25.90.tar.bz2 New: ---- totem-2.25.91.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.B16246/_old 2009-03-03 00:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.B16246/_new 2009-03-03 00:52:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package totem (Version 2.25.90) +# spec file for package totem (Version 2.25.91) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -46,7 +46,7 @@ %endif License: GPL v2 or later; LGPL v2.1 or later Group: Productivity/Multimedia/Video/Players -Version: 2.25.90 +Version: 2.25.91 Release: 1 Source0: %{name}-%{version}.tar.bz2 Url: http://www.gnome.org/projects/totem/ @@ -120,6 +120,25 @@ Bastien Nocera <hadess(a)hadess.net> Julien Moutte <julien(a)moutte.net> +%package devel +License: GPL v2 or later; LGPL v2.1 or later +Summary: Developer Documentation for Totem Movie Player +Group: Productivity/Multimedia/Video/Players +Requires: %{name} = %{version} + +%description devel +Totem is movie player for the Gnome desktop based on GStreamer (or +xine). + +This package contains developer documentation. + + + +Authors: +-------- + Bastien Nocera <hadess(a)hadess.net> + Julien Moutte <julien(a)moutte.net> + %lang_package %prep %setup -q @@ -198,7 +217,27 @@ %defattr(-, root, root) %{_libdir}/browser-plugins/*.so +%files devel +%defattr(-, root, root) +%{_datadir}/gtk-doc/html/totem +# Own these repositories to not depend on gtk-doc while building: +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html + %changelog +* Tue Mar 03 2009 vuntz(a)novell.com +- Review changes. +* Tue Feb 17 2009 lmedinas(a)gmail.com +- Update to version 2.25.91: + + Document internal API for plugin writers + + Fix a few focus problems + + Accept human-friendly inputs in the "Skip To" dialogue + + Add a huge number of languages to the subtitle downloader plugin + + Make looping smoother when only one file is being played in repeat + + Make the gallery creation progress window work as expected + + Many build fixes + + Make Totem more robust when Python fails to initialise +- Add devel package for Totem developer documentation * Fri Feb 06 2009 vuntz(a)novell.com - Remove docbook_4 BuildRequires. - Create a plugins package for the totem plugins. ++++++ totem-2.25.90.tar.bz2 -> totem-2.25.91.tar.bz2 ++++++ ++++ 65865 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 OpenIPMI for openSUSE:Factory
by root＠Hilbert.suse.de 02 Mar '09

02 Mar '09

Hello community, here is the log from the commit of package OpenIPMI for openSUSE:Factory checked in at Tue Mar 3 00:51:27 CET 2009. -------- --- OpenIPMI/OpenIPMI.changes 2008-09-13 07:12:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenIPMI/OpenIPMI.changes 2009-03-02 15:28:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 2 15:28:27 CET 2009 - crrodriguez(a)suse.de + +- save 3MB by removing static libraries and "la" files + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenIPMI.spec ++++++ --- /var/tmp/diff_new_pack.G32640/_old 2009-03-03 00:51:17.000000000 +0100 +++ /var/tmp/diff_new_pack.G32640/_new 2009-03-03 00:51:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package OpenIPMI (Version 2.0.14) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ License: LGPL v2.1 or later Group: System/Monitoring Version: 2.0.14 -Release: 1 +Release: 2 Source0: %{name}-%{version}.tar.bz2 Source1: sysconfig.ipmi Source2: openipmi.initscript @@ -64,7 +64,7 @@ Summary: OpenIPMI - Development libraries Group: Development/Libraries/Other Provides: libIPMIlanserv libOpenIPMI libOpenIPMIui -Requires: OpenIPMI = %{version} openssl-devel ncurses-devel +Requires: OpenIPMI = %{version} glibc-devel AutoReqProv: on %description devel @@ -89,14 +89,11 @@ %build autoreconf --install --force -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ +%configure --disable-static --with-pic \ --with-openssl=yes \ --with-tcl=yes \ --with-tcllibs=-ltcl8.5 +# parallel make does not work make %install @@ -107,9 +104,10 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/ipmi ln -sf ../etc/init.d/ipmi $RPM_BUILD_ROOT/sbin/rcipmi +%{__rm} -f %{buildroot}%{_libdir}/*.la %clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -170,14 +168,14 @@ %files devel %defattr(644,root,root,755) %{_prefix}/include/* -%{_prefix}/%{_lib}/*.a -%{_prefix}/%{_lib}/*.la %{_prefix}/%{_lib}/*.so %{_prefix}/%{_lib}/pkgconfig/*.pc %doc doc/IPMI.pdf ################################################### %changelog +* Mon Mar 02 2009 crrodriguez(a)suse.de +- save 3MB by removing static libraries and "la" files * Thu Sep 11 2008 kukuk(a)suse.de - Update to 2.0.14 [fate#304439] - fix at least the worst bugs in init script @@ -261,7 +259,7 @@ - Update to version 1.3.16 * Thu Oct 28 2004 nashif(a)suse.de - Updated to version 1.3.11 -* Wed Aug 11 2004 nashif(a)suse.de +* Tue Aug 10 2004 nashif(a)suse.de - Updated to version 1.3.9 * Tue Jun 08 2004 nashif(a)suse.de - Updated to version 1.3.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk2 for openSUSE:Factory
by root＠Hilbert.suse.de 02 Mar '09

02 Mar '09

Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at Tue Mar 3 00:51:05 CET 2009. -------- --- GNOME/gtk2/gtk2.changes 2009-02-18 03:35:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk2/gtk2.changes 2009-02-25 11:24:02.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 24 16:35:19 CET 2009 - sbrabec(a)suse.cz + +- Fixed relative path vulnerability in gtk-path-local.patch + (bnc479076). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.u30895/_old 2009-03-03 00:50:48.000000000 +0100 +++ /var/tmp/diff_new_pack.u30895/_new 2009-03-03 00:50:48.000000000 +0100 @@ -39,7 +39,7 @@ # PreReq: /usr/bin/touch /bin/rm /bin/rmdir Version: 2.15.4 -Release: 1 +Release: 2 Summary: Library for Creation of Graphical User Interfaces (version 2) Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar… Source1: SuSEconfig.gtk2 @@ -385,6 +385,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Feb 24 2009 sbrabec(a)suse.cz +- Fixed relative path vulnerability in gtk-path-local.patch + (bnc479076). * Wed Feb 18 2009 mboman(a)suse.de - Update to version 2.15.4: + GtkAction: ++++++ gtk-path-local.patch ++++++ --- /var/tmp/diff_new_pack.u30895/_old 2009-03-03 00:50:49.000000000 +0100 +++ /var/tmp/diff_new_pack.u30895/_new 2009-03-03 00:50:49.000000000 +0100 @@ -41,12 +41,12 @@ if (exe_prefix) + { default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL); -+ local_dir = g_build_filename ("usr", "local", "lib", "gtk-2.0", NULL); ++ local_dir = g_build_filename ("/usr/local", "lib", "gtk-2.0", NULL); + } else + { default_dir = g_build_filename (GTK_LIBDIR, "gtk-2.0", NULL); -+ local_dir = g_build_filename ("usr", "local", LIB, "gtk-2.0", NULL); ++ local_dir = g_build_filename ("/usr/local", LIB, "gtk-2.0", NULL); + } if (module_path_env && home_gtk_dir) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xen for openSUSE:Factory
by root＠Hilbert.suse.de 02 Mar '09

02 Mar '09

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Tue Mar 3 00:46:45 CET 2009. -------- --- xen/xen.changes 2009-02-24 20:53:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2009-03-02 18:22:00.878595000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 27 18:32:01 MST 2009 - carnold(a)novell.com + +- bnc#480164 - Default network proposal in fully virtualized + SLES 11 VM is invalid. + xen_pvdrivers + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- kmp_filelist xen_pvdrivers ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.BF9409/_old 2009-03-03 00:46:18.000000000 +0100 +++ /var/tmp/diff_new_pack.BF9409/_new 2009-03-03 00:46:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 3.3.1_18546_10) +# spec file for package xen (Version 3.3.1_18546_12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,7 +37,7 @@ %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 3.3.1_18546_10 +Version: 3.3.1_18546_12 Release: 2 License: GPL v2 only Group: System/Kernel @@ -60,6 +60,10 @@ Source16: xmclone.sh Source17: xend-relocation.sh Source18: init.xen_loop +%if %{?with_kmp}0 +Source19: xen_pvdrivers +Source20: kmp_filelist +%endif # Xen API remote authentication sources Source23: etc_pam.d_xen-api Source24: xenapiusers @@ -254,7 +258,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") %if %{?with_kmp}0 -%suse_kernel_module_package -n xen um xen +%suse_kernel_module_package -n xen um xen -f kmp_filelist %endif %description @@ -850,6 +854,8 @@ make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ M=$PWD/obj/$flavor done +mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d +install -m644 %SOURCE19 $RPM_BUILD_ROOT/etc/modprobe.d/xen_pvdrivers %endif # docs make -C docs install \ @@ -1102,6 +1108,10 @@ /sbin/ldconfig %changelog +* Fri Feb 27 2009 carnold(a)novell.com +- bnc#480164 - Default network proposal in fully virtualized + SLES 11 VM is invalid. + xen_pvdrivers * Tue Feb 24 2009 ksrinivasan(a)novell.com - bnc#470238 - SLE11 32FV guest is hanging during certification tests. @@ -1280,7 +1290,7 @@ vcpus > VCPUs_max on running domain. * Tue Oct 21 2008 carnold(a)novell.com - Update to changeset 18455. -* Fri Oct 17 2008 olh(a)suse.de +* Thu Oct 16 2008 olh(a)suse.de - add ExclusiveArch x86 x86_64 * Wed Oct 15 2008 jfehlig(a)novell.com - bnc#433722 - Fix handling of default bridge in qemu-ifup. @@ -1557,7 +1567,7 @@ - #298176: Do not enable NX if CPU/BIOS does not support it - #289569: Modify network-bridge to handle vlan - #297295: Fix bridge setup: stop using getcfg -* Tue Aug 07 2007 olh(a)suse.de +* Mon Aug 06 2007 olh(a)suse.de - remove inclusion of linux/compiler.h and linux/string.h remove ExclusiveArch and fix prep section for quilt setup *.spec * Thu Aug 02 2007 jfehlig(a)novell.com @@ -2836,7 +2846,7 @@ - tgif not needed any more. * Tue Mar 01 2005 garloff(a)suse.de - Include serial-split from Charles Coffing. -* Tue Mar 01 2005 garloff(a)suse.de +* Mon Feb 28 2005 garloff(a)suse.de - Update xen to latest snapshot. * Mon Feb 21 2005 garloff(a)suse.de - Update README.SuSE. ++++++ kmp_filelist ++++++ %defattr (-,root,root) /lib/modules/%2-%1 /etc/modprobe.d/xen_pvdrivers ++++++ xen_pvdrivers ++++++ # Install the paravirtualized drivers install libata /sbin/modprobe xen-vbd 2>&1 |:; /sbin/modprobe --ignore-install libata install 8139cp /sbin/modprobe xen-vnif 2>&1 |:; /sbin/modprobe --ignore-install 8139cp install 8139too /sbin/modprobe xen-vnif 2>&1 |:; /sbin/modprobe --ignore-install 8139too ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xbsql for openSUSE:Factory
by root＠Hilbert.suse.de 02 Mar '09

02 Mar '09

Hello community, here is the log from the commit of package xbsql for openSUSE:Factory checked in at Tue Mar 3 00:46:06 CET 2009. -------- --- xbsql/xbsql.changes 2009-01-16 20:28:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/xbsql/xbsql.changes 2009-03-02 23:28:00.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 2 23:27:19 CET 2009 - crrodriguez(a)suse.de + +- fix build with current compilers, buffer overflow due to + use of strncat.. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xbsql-0.11-bufferoverflowstrncat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xbsql.spec ++++++ --- /var/tmp/diff_new_pack.nq6819/_old 2009-03-03 00:45:54.000000000 +0100 +++ /var/tmp/diff_new_pack.nq6819/_new 2009-03-03 00:45:54.000000000 +0100 @@ -25,9 +25,10 @@ Summary: SQL Wrapper for the XBase Library Url: http://www.quaking.demon.co.uk/xbsql.html Version: 0.11 -Release: 233 +Release: 234 Source0: %name-%version.tar.bz2 Patch0: %name.diff +Patch1: xbsql-0.11-bufferoverflowstrncat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,6 +45,7 @@ %prep %setup -q %patch +%patch1 %build autoreconf -ifv @@ -80,6 +82,9 @@ %_libdir/libxbsql* %changelog +* Mon Mar 02 2009 crrodriguez(a)suse.de +- fix build with current compilers, buffer overflow due to + use of strncat.. * Fri Jan 16 2009 crrodriguez(a)suse.de - disable static libraries * Fri Feb 29 2008 coolo(a)suse.de ++++++ xbsql-0.11-bufferoverflowstrncat.patch ++++++ Index: xbsql/xbsql.cpp =================================================================== --- xbsql/xbsql.cpp.orig 2009-03-02 23:16:12.000000000 +0100 +++ xbsql/xbsql.cpp 2009-03-02 23:23:12.000000000 +0100 @@ -468,7 +468,7 @@ XBSQLTable *XBaseSQL::openTable char name[256]; strncpy (name, table, sizeof(name)) ; - strncat (name, "_", sizeof(name)) ; + strncat (name, "_", sizeof(name) -strlen(name) -1) ; strncat (name, fSet.getFieldName (idx), sizeof(name) - strlen(table) - 1) ; path = getPath (name, "ndx") ; @@ -874,10 +874,10 @@ bool XBaseSQL::renameTable const char *fname = fSet.getFieldName (idx) ; strncpy (_oldName, oldName, sizeof(_oldName)) ; - strncat (_oldName, "_", sizeof(_oldName)) ; + strncat (_oldName, "_", sizeof(_oldName)- strlen(_oldName) -1) ; strncat (_oldName, fname, sizeof(_oldName) - strlen(oldName) - 1) ; strncpy (_newName, newName, sizeof(_newName)) ; - strncat (_newName, "_", sizeof(_newName)) ; + strncat (_newName, "_", sizeof(_newName) - strlen(newName) - 1) ; strncat (_newName, fname, sizeof(_newName) - strlen(newName) - 1) ; oldAnon = getPath (_oldName, "ndx") ; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wt for openSUSE:Factory
by root＠Hilbert.suse.de 02 Mar '09

02 Mar '09

Hello community, here is the log from the commit of package wt for openSUSE:Factory checked in at Tue Mar 3 00:45:45 CET 2009. -------- --- wt/wt.changes 2009-01-27 09:09:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/wt/wt.changes 2009-03-02 18:42:36.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 2 18:42:25 CET 2009 - crrodriguez(a)suse.de + +- fix build with GCC 4.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- wt-2.2.3-gcc44.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wt.spec ++++++ --- /var/tmp/diff_new_pack.J10598/_old 2009-03-03 00:41:47.000000000 +0100 +++ /var/tmp/diff_new_pack.J10598/_new 2009-03-03 00:41:47.000000000 +0100 @@ -24,11 +24,12 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: 2.2.3 -Release: 1 +Release: 2 Summary: Web Toolkit Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-2.1.5-cmake_config.patch Patch2: fix-include-condition-hpp.patch +Patch3: wt-2.2.3-gcc44.patch Requires: FastCGI openssl Xerces-c Requires: mxml >= 2.3 BuildRequires: gcc-c++ @@ -86,6 +87,7 @@ %setup -q %patch1 -p1 %patch2 +%patch3 %build %define WTSRVDIR /srv/wt @@ -153,6 +155,8 @@ %{_datadir}/cmake/Modules/* %changelog +* Mon Mar 02 2009 crrodriguez(a)suse.de +- fix build with GCC 4.4 * Tue Jan 27 2009 puzel(a)suse.cz - update to 2.2.3 (maintenance release) - delete wt-2.2.2-fix-CMakeLists.patch (fixed upstream) ++++++ wt-2.2.3-gcc44.patch ++++++ Index: src/Wt/WAbstractItemModel.C =================================================================== --- src/Wt/WAbstractItemModel.C.orig 2009-01-23 22:16:23.000000000 +0100 +++ src/Wt/WAbstractItemModel.C 2009-03-02 18:05:44.000000000 +0100 @@ -4,6 +4,7 @@ * See the LICENSE file for terms of use. */ +#include <cstdio> #include <boost/lexical_cast.hpp> #include <boost/algorithm/string/predicate.hpp> Index: src/Wt/Ext/Widget.C =================================================================== --- src/Wt/Ext/Widget.C.orig 2009-01-05 11:25:10.000000000 +0100 +++ src/Wt/Ext/Widget.C 2009-03-02 18:24:49.000000000 +0100 @@ -11,7 +11,7 @@ #include "Wt/WApplication" #include "Wt/WEnvironment" #include "DomElement.h" - +#include <cstdio> #include <iostream> #include <sstream> #include <cstring> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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