May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit grub for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package grub for openSUSE:Factory checked in at Thu May 28 04:03:35 CEST 2009. -------- --- grub/grub.changes 2009-02-19 15:02:41.000000000 +0100 +++ grub/grub.changes 2009-05-27 23:07:30.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 27 23:06:35 CEST 2009 - jeffm(a)suse.de + +- Fix bug in iso9660 handling that will allow it to operate + on non-CDROM devices. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- grub-iso-fixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.u30487/_old 2009-05-28 04:02:30.000000000 +0200 +++ /var/tmp/diff_new_pack.u30487/_new 2009-05-28 04:02:30.000000000 +0200 @@ -22,11 +22,13 @@ Name: grub %ifarch x86_64 BuildRequires: gcc-32bit glibc-devel-32bit libncurses5-32bit ncurses-devel-32bit +%else +BuildRequires: gcc glibc-devel libncurses5 ncurses-devel %endif License: GPL v2 or later Group: System/Boot Version: 0.97 -Release: 157 +Release: 159 Source0: %{name}-%{version}.tar.gz Source1: installgrub Source2: grubonce @@ -64,6 +66,7 @@ Patch30: remove-buildid.diff Patch31: string-ops-fix Patch39: document-grub-install.unsupported +Patch40: grub-iso-fixes Url: http://www.gnu.org/software/grub/grub.en.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Grand Unified Boot Loader @@ -135,6 +138,7 @@ %patch30 %patch31 -p1 %patch39 -p1 +%patch40 -p1 %build perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi @@ -232,6 +236,9 @@ exit 0 %changelog +* Wed May 27 2009 jeffm(a)suse.de +- Fix bug in iso9660 handling that will allow it to operate + on non-CDROM devices. * Thu Feb 19 2009 duwe(a)suse.de - fix high-priority documentation issue (bnc#339995) * Mon Dec 01 2008 duwe(a)suse.de @@ -334,7 +341,7 @@ * Fri Sep 02 2005 duwe(a)suse.de - Make grubonce work with the new 0.96 savedefault, (fixing bug #95082, and by coincidence 99185 along the way, too) -* Thu Jun 09 2005 ro(a)suse.de +* Fri Jun 10 2005 ro(a)suse.de - fix variable type in last change * Thu Jun 09 2005 ro(a)suse.de - fix gfx display (stackptr diff) (thanks to Steffen) @@ -460,7 +467,7 @@ no device.map at all any more. * Thu Oct 10 2002 kukuk(a)suse.de - remove requires from bootsplash -* Tue Sep 10 2002 adrian(a)suse.de +* Wed Sep 11 2002 adrian(a)suse.de - remove PreReq to itself * Tue Sep 10 2002 duwe(a)suse.de - added --disable-auto-linux-mem-opt to ./configure options. ++++++ grub-iso-fixes ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: [PATCH] grub: Fix iso sector/offset calculations This patch fixes iso9660 sector calculations when byte_offset is nonzero and the device sector size != file system sector. This is due to it accounting for the byte_offset before left-shifting the sector number instead of afterwards. For example, the old code would make the following translation for a device with 512 byte sectors: file system device sector 10, offset 512 sector 44, offset 0 10 * 2048 + 512 = 20992 44 * 512 = 22528 The correct translation is sector 41, offset 0: 41 * 512 = 20992 Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- stage2/fsys_iso9660.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/stage2/fsys_iso9660.c +++ b/stage2/fsys_iso9660.c @@ -81,12 +86,12 @@ iso9660_devread (int sector, int byte_of if (byte_len <= 0) return 1; - sector += (byte_offset >> sector_size_lg2); - byte_offset &= (buf_geom.sector_size - 1); asm volatile ("shl%L0 %1,%0" : "=r"(sector) : "Ic"((int8_t)(ISO_SECTOR_BITS - sector_size_lg2)), "0"(sector)); + sector += (byte_offset >> sector_size_lg2); + byte_offset &= (buf_geom.sector_size - 1); #if !defined(STAGE1_5) if (disk_read_hook && debug) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nautilus-open-terminal for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package nautilus-open-terminal for openSUSE:Factory checked in at Thu May 28 04:01:47 CEST 2009. -------- --- GNOME/nautilus-open-terminal/nautilus-open-terminal.changes 2009-05-20 14:03:10.000000000 +0200 +++ nautilus-open-terminal/nautilus-open-terminal.changes 2009-05-26 17:30:28.000000000 +0200 @@ -1,0 +2,14 @@ +Tue May 26 17:28:35 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.13: + + Features + - Only offer to open a local terminal for remote locations if + path back-mapping to ~/.gvfs is possible, i.e. if GVFS was + compiled with FUSE support. + + Fixes / Build + - Fix double-free when opening terminal on the desktop. + - Use custom SFTP URI parser, and get rid of GnomeVFS + dependency, lp#333462. +- Remove gnome-vfs2-devel BuildRequires. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nautilus-open-terminal-0.12.tar.bz2 New: ---- nautilus-open-terminal-0.13.tar.bz2 nautilus-open-terminal-gcc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-open-terminal.spec ++++++ --- /var/tmp/diff_new_pack.S17562/_old 2009-05-28 03:59:06.000000000 +0200 +++ /var/tmp/diff_new_pack.S17562/_new 2009-05-28 03:59:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package nautilus-open-terminal (Version 0.12) +# spec file for package nautilus-open-terminal (Version 0.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,11 @@ BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: gnome-desktop-devel -BuildRequires: gnome-vfs2-devel BuildRequires: intltool BuildRequires: nautilus-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -Version: 0.12 +Version: 0.13 Release: 1 Url: http://manny.cluecoder.org/packages/nautilus-open-terminal/ Group: System/GUI/GNOME @@ -36,6 +35,8 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM nautilus-open-terminal-eel.patch vuntz(a)novell.com -- Sent upstream by mail (2009/05/20) Patch0: nautilus-open-terminal-eel.patch +# PATCH-FIX-UPSTREAM nautilus-open-terminal-gcc.patch vuntz(a)novell.com -- Sent upstream by mail (2009/05/27) +Patch1: nautilus-open-terminal-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} %gconf_schemas_prereq @@ -55,6 +56,7 @@ %setup -q translation-update-upstream %patch0 -p1 +%patch1 -p1 %build %configure \ @@ -87,6 +89,17 @@ %files lang -f %{name}.lang %changelog +* Tue May 26 2009 vuntz(a)novell.com +- Update to version 0.13: + + Features + - Only offer to open a local terminal for remote locations if + path back-mapping to ~/.gvfs is possible, i.e. if GVFS was + compiled with FUSE support. + + Fixes / Build + - Fix double-free when opening terminal on the desktop. + - Use custom SFTP URI parser, and get rid of GnomeVFS + dependency, lp#333462. +- Remove gnome-vfs2-devel BuildRequires. * Mon May 18 2009 vuntz(a)novell.com - Update to version 0.12: + Remote SSH terminal: Work correctly with non-standard SSH ports ++++++ nautilus-open-terminal-0.12.tar.bz2 -> nautilus-open-terminal-0.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nautilus-open-terminal-0.12/configure new/nautilus-open-terminal-0.13/configure --- old/nautilus-open-terminal-0.12/configure 2009-05-17 12:34:33.000000000 +0200 +++ new/nautilus-open-terminal-0.13/configure 2009-05-23 11:16:32.000000000 +0200 @@ -878,8 +878,6 @@ GCONF_LIBS GNOMEDESKTOP_CFLAGS GNOMEDESKTOP_LIBS -GNOMEVFS_CFLAGS -GNOMEVFS_LIBS NAUTILUS_EXTENSION_DIR GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE @@ -952,9 +950,7 @@ GCONF_CFLAGS GCONF_LIBS GNOMEDESKTOP_CFLAGS -GNOMEDESKTOP_LIBS -GNOMEVFS_CFLAGS -GNOMEVFS_LIBS' +GNOMEDESKTOP_LIBS' # Initialize some variables set by options. @@ -1578,10 +1574,6 @@ C compiler flags for GNOMEDESKTOP, overriding pkg-config GNOMEDESKTOP_LIBS linker flags for GNOMEDESKTOP, overriding pkg-config - GNOMEVFS_CFLAGS - C compiler flags for GNOMEVFS, overriding pkg-config - GNOMEVFS_LIBS - linker flags for GNOMEVFS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2007,7 +1999,7 @@ PACKAGE=nautilus-open-terminal -VERSION=0.12 +VERSION=0.13 @@ -4398,7 +4390,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4401 "configure"' > conftest.$ac_ext + echo '#line 4393 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7450,11 +7442,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7453: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7445: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7457: \$? = $ac_status" >&5 + echo "$as_me:7449: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7740,11 +7732,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7743: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7735: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7747: \$? = $ac_status" >&5 + echo "$as_me:7739: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7844,11 +7836,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7847: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7839: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7851: \$? = $ac_status" >&5 + echo "$as_me:7843: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10221,7 +10213,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10224 "configure" +#line 10216 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10321,7 +10313,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10324 "configure" +#line 10316 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12722,11 +12714,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12725: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12717: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12729: \$? = $ac_status" >&5 + echo "$as_me:12721: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12826,11 +12818,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12829: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12821: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12833: \$? = $ac_status" >&5 + echo "$as_me:12825: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14424,11 +14416,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14427: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14419: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14431: \$? = $ac_status" >&5 + echo "$as_me:14423: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14528,11 +14520,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14531: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14523: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14535: \$? = $ac_status" >&5 + echo "$as_me:14527: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16748,11 +16740,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16743: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16755: \$? = $ac_status" >&5 + echo "$as_me:16747: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17038,11 +17030,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17041: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17033: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17045: \$? = $ac_status" >&5 + echo "$as_me:17037: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17142,11 +17134,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17145: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17137: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17149: \$? = $ac_status" >&5 + echo "$as_me:17141: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19927,7 +19919,6 @@ NAUTILUS_REQUIRED=2.21.2 LIBGNOME_DESKTOP_REQUIRED=2.9.91 GLIB_REQUIRED=2.16.0 -GNOMEVFS_REQUIRED=2.0 @@ -20433,117 +20424,6 @@ : fi -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GNOMEVFS" >&5 -echo $ECHO_N "checking for GNOMEVFS... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEVFS_CFLAGS"; then - pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOMEVFS_REQUIRED\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEVFS_LIBS"; then - pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= \$GNOMEVFS_REQUIRED\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED"` - else - GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GNOMEVFS_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED) were not met: - -$GNOMEVFS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GNOMEVFS_CFLAGS -and GNOMEVFS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED) were not met: - -$GNOMEVFS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GNOMEVFS_CFLAGS -and GNOMEVFS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GNOMEVFS_CFLAGS -and GNOMEVFS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GNOMEVFS_CFLAGS -and GNOMEVFS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS - GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - # Make dependency CFLAGS and LIBS available @@ -20557,9 +20437,6 @@ - - - # Get nautilus extensions directory NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` @@ -23615,8 +23492,6 @@ GCONF_LIBS!$GCONF_LIBS$ac_delim GNOMEDESKTOP_CFLAGS!$GNOMEDESKTOP_CFLAGS$ac_delim GNOMEDESKTOP_LIBS!$GNOMEDESKTOP_LIBS$ac_delim -GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim -GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim NAUTILUS_EXTENSION_DIR!$NAUTILUS_EXTENSION_DIR$ac_delim GCONFTOOL!$GCONFTOOL$ac_delim GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim @@ -23669,7 +23544,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nautilus-open-terminal-0.12/configure.in new/nautilus-open-terminal-0.13/configure.in --- old/nautilus-open-terminal-0.12/configure.in 2009-05-17 12:34:23.000000000 +0200 +++ new/nautilus-open-terminal-0.13/configure.in 2009-05-23 11:16:12.000000000 +0200 @@ -2,7 +2,7 @@ AC_INIT PACKAGE=nautilus-open-terminal -VERSION=0.12 +VERSION=0.13 AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -31,7 +31,6 @@ NAUTILUS_REQUIRED=2.21.2 LIBGNOME_DESKTOP_REQUIRED=2.9.91 GLIB_REQUIRED=2.16.0 -GNOMEVFS_REQUIRED=2.0 PKG_CHECK_MODULES(NAUTILUS, [ libnautilus-extension >= $NAUTILUS_REQUIRED @@ -41,7 +40,6 @@ ]) PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) -PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED) # Make dependency CFLAGS and LIBS available @@ -52,9 +50,6 @@ AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) -AC_SUBST(GNOMEVFS_CFLAGS) -AC_SUBST(GNOMEVFS_LIBS) - AC_SUBST(GNOMEDESKTOP_CFLAGS) AC_SUBST(GNOMEDESKTOP_LIBS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nautilus-open-terminal-0.12/Makefile.in new/nautilus-open-terminal-0.13/Makefile.in --- old/nautilus-open-terminal-0.12/Makefile.in 2009-05-17 12:34:34.000000000 +0200 +++ new/nautilus-open-terminal-0.13/Makefile.in 2009-05-23 11:16:31.000000000 +0200 @@ -123,8 +123,6 @@ GMSGFMT = @GMSGFMT@ GNOMEDESKTOP_CFLAGS = @GNOMEDESKTOP_CFLAGS@ GNOMEDESKTOP_LIBS = @GNOMEDESKTOP_LIBS@ -GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ -GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ GREP = @GREP@ HAVE_PKGCONFIG = @HAVE_PKGCONFIG@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nautilus-open-terminal-0.12/NEWS new/nautilus-open-terminal-0.13/NEWS --- old/nautilus-open-terminal-0.12/NEWS 2009-05-17 12:34:23.000000000 +0200 +++ new/nautilus-open-terminal-0.13/NEWS 2009-05-23 11:27:25.000000000 +0200 @@ -1,3 +1,21 @@ +nautilus-open-terminal 0.13 +=========================== +"Land of the Dead" + + * Dedicated to Grim Fandango, one of the most excellent computer games ever produced. + http://www.youtube.com/watch?v=3kVZ1sJZ9lo + + Features + + * Only offer to open a local terminal for remote locations if path back-mapping to ~/.gvfs is possible, + i.e. if GVFS was compiled with FUSE support. + + Fixes / Build + + * Fix double-free when opening terminal on the desktop. Thanks to Arthur Taylor <theycallhimart(a)gmail.com>. + * Use custom SFTP URI parser, and get rid of GnomeVFS dependency, Launchpad #333462. Thanks to Maxim Levitsky + and others. + nautilus-open-terminal 0.12 =========================== "El Pueblo Unido" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nautilus-open-terminal-0.12/src/Makefile.am new/nautilus-open-terminal-0.13/src/Makefile.am --- old/nautilus-open-terminal-0.12/src/Makefile.am 2009-05-17 12:34:23.000000000 +0200 +++ new/nautilus-open-terminal-0.13/src/Makefile.am 2009-05-23 11:16:00.000000000 +0200 @@ -9,7 +9,6 @@ $(DISABLE_DEPRECATED_CFLAGS) \ $(NAUTILUS_CFLAGS) \ $(GCONF_CFLAGS) \ - $(GNOMEVFS_CFLAGS) \ $(GNOMEDESKTOP_CFLAGS) nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR) @@ -25,4 +24,4 @@ open-terminal.c libnautilus_open_terminal_la_LDFLAGS = -module -avoid-version -libnautilus_open_terminal_la_LIBADD = $(NAUTILUS_LIBS) $(GNOMEVFS_LIBS) $(GCONF_LIBS) $(GNOMEDESKTOP_LIBS) +libnautilus_open_terminal_la_LIBADD = $(NAUTILUS_LIBS) $(GCONF_LIBS) $(GNOMEDESKTOP_LIBS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nautilus-open-terminal-0.12/src/Makefile.in new/nautilus-open-terminal-0.13/src/Makefile.in --- old/nautilus-open-terminal-0.12/src/Makefile.in 2009-05-17 12:34:34.000000000 +0200 +++ new/nautilus-open-terminal-0.13/src/Makefile.in 2009-05-23 11:16:31.000000000 +0200 @@ -52,8 +52,7 @@ LTLIBRARIES = $(nautilus_extension_LTLIBRARIES) am__DEPENDENCIES_1 = libnautilus_open_terminal_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libnautilus_open_terminal_la_OBJECTS = eel-gnome-extensions.lo \ nautilus-open-terminal.lo open-terminal.lo libnautilus_open_terminal_la_OBJECTS = \ @@ -121,8 +120,6 @@ GMSGFMT = @GMSGFMT@ GNOMEDESKTOP_CFLAGS = @GNOMEDESKTOP_CFLAGS@ GNOMEDESKTOP_LIBS = @GNOMEDESKTOP_LIBS@ -GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ -GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ GREP = @GREP@ HAVE_PKGCONFIG = @HAVE_PKGCONFIG@ INSTALL = @INSTALL@ @@ -254,7 +251,6 @@ $(DISABLE_DEPRECATED_CFLAGS) \ $(NAUTILUS_CFLAGS) \ $(GCONF_CFLAGS) \ - $(GNOMEVFS_CFLAGS) \ $(GNOMEDESKTOP_CFLAGS) nautilus_extensiondir = $(NAUTILUS_EXTENSION_DIR) @@ -268,7 +264,7 @@ open-terminal.c libnautilus_open_terminal_la_LDFLAGS = -module -avoid-version -libnautilus_open_terminal_la_LIBADD = $(NAUTILUS_LIBS) $(GNOMEVFS_LIBS) $(GCONF_LIBS) $(GNOMEDESKTOP_LIBS) +libnautilus_open_terminal_la_LIBADD = $(NAUTILUS_LIBS) $(GCONF_LIBS) $(GNOMEDESKTOP_LIBS) all: all-am .SUFFIXES: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nautilus-open-terminal-0.12/src/nautilus-open-terminal.c new/nautilus-open-terminal-0.13/src/nautilus-open-terminal.c --- old/nautilus-open-terminal-0.12/src/nautilus-open-terminal.c 2009-05-17 12:34:23.000000000 +0200 +++ new/nautilus-open-terminal-0.13/src/nautilus-open-terminal.c 2009-05-23 11:15:17.000000000 +0200 @@ -30,13 +30,13 @@ #include <libnautilus-extension/nautilus-menu-provider.h> +#include <glib.h> #include <glib/gi18n-lib.h> #include <gio/gio.h> #include <gtk/gtk.h> #include <gconf/gconf.h> #include <gconf/gconf-client.h> #include <libgnome/gnome-desktop-item.h> -#include <libgnomevfs/gnome-vfs.h> #include <errno.h> #include <fcntl.h> @@ -114,31 +114,85 @@ NULL); } +/* a very simple URI parsing routine from Launchpad #333462, until GLib supports URI parsing (GNOME #489862) */ +#define SFTP_PREFIX "sftp://" +static void +parse_sftp_uri (GFile *file, + char **user, + char **host, + unsigned int *port, + char **path) +{ + char *tmp, *save; + char *uri; + char *u, *h, *s, *p; + char *h_end; + + uri = g_file_get_uri (file); + g_assert (uri != NULL); + save = uri; + + *path = NULL; + *user = NULL; + *host = NULL; + *port = 0; + + /* skip intial 'sftp:// prefix */ + g_assert (!strncmp (uri, SFTP_PREFIX, strlen (SFTP_PREFIX))); + uri += strlen (SFTP_PREFIX); + + /* cut out the path */ + tmp = strchr (uri, '/'); + if (tmp != NULL) { + *path = g_uri_unescape_string (tmp, "/"); + *tmp = '\0'; + } + + /* read the username - it ends with @ */ + tmp = strchr (uri, '@'); + if (tmp != NULL) { + *tmp++ = '\0'; + + *user = strdup (uri); + if (strchr (*user, ':') != NULL) { + /* chop the password */ + *(strchr (*user, ':')) = '\0'; + } + + uri = tmp; + } + + /* now read the port, starts with : */ + tmp = strchr (uri, ':'); + if (tmp != NULL) { + *tmp++ = '\0'; + *port = atoi (tmp); /*FIXME: getservbyname*/ + } + + /* what is left is the host */ + *host = strdup (uri); + g_free (save); +} + static char * get_remote_ssh_command (const char *uri, const char *command_to_run) { - GnomeVFSURI *vfs_uri; - const char *host_name, *path, *user_name; + GFile *file; + + char *host_name, *path, *user_name; char *command, *user_host, *unescaped_path; char *port_str; guint host_port; g_assert (uri != NULL); - g_assert (strncmp (uri, "sftp", strlen ("sftp")) == 0 || - strncmp (uri, "ssh", strlen ("ssh")) == 0); - - gnome_vfs_init (); - vfs_uri = gnome_vfs_uri_new (uri); - g_assert (vfs_uri != NULL); + file = g_file_new_for_uri (uri); + parse_sftp_uri (file, &user_name, &host_name, &host_port, &path); + g_object_unref (file); - host_name = gnome_vfs_uri_get_host_name (vfs_uri); - host_port = gnome_vfs_uri_get_host_port (vfs_uri); - user_name = gnome_vfs_uri_get_user_name (vfs_uri); - path = gnome_vfs_uri_get_path (vfs_uri); /* FIXME to we have to consider the remote file encoding? */ - unescaped_path = gnome_vfs_unescape_string (path, NULL); + unescaped_path = g_uri_unescape_string (path, NULL); port_str = NULL; if (host_port != 0) { @@ -159,10 +213,13 @@ command = g_strdup_printf ("ssh %s%s -t \"cd \'%s\' && $SHELL -l\"", user_host, port_str, unescaped_path); } + g_free (user_name); + g_free (host_name); + g_free (path); + g_free (user_host); g_free (unescaped_path); g_free (port_str); - gnome_vfs_uri_unref (vfs_uri); return command; } @@ -206,7 +263,6 @@ } else { path = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)); } - g_free (path); break; case FILE_INFO_SFTP: @@ -395,6 +451,25 @@ NULL); } +/* used to determine for remote URIs whether GVFS is capable of mapping them to ~/.gvfs */ +static gboolean +uri_has_local_path (const char *uri) +{ + GFile *file; + char *path; + gboolean ret; + + file = g_file_new_for_uri (uri); + path = g_file_get_path (file); + + ret = (path != NULL); + + g_free (path); + g_object_unref (file); + + return ret; +} + static GList * nautilus_open_terminal_get_background_items (NautilusMenuProvider *provider, GtkWidget *window, @@ -413,24 +488,26 @@ uri = nautilus_file_info_get_activation_uri (file_info); terminal_file_info = get_terminal_file_info (uri); - g_free (uri); item = open_terminal_menu_item_new (file_info, terminal_file_info, gtk_widget_get_screen (window), NULL, terminal_file_info == FILE_INFO_SFTP, FALSE); items = g_list_append (items, item); - if (terminal_file_info == FILE_INFO_SFTP) { + if (terminal_file_info == FILE_INFO_SFTP && uri_has_local_path (uri)) { item = open_terminal_menu_item_new (file_info, terminal_file_info, gtk_widget_get_screen (window), NULL, FALSE, FALSE); items = g_list_append (items, item); } if (display_mc_item () && - g_find_program_in_path ("mc")) { + g_find_program_in_path ("mc") && + uri_has_local_path (uri)) { item = open_terminal_menu_item_new (file_info, terminal_file_info, gtk_widget_get_screen (window), "mc", FALSE, FALSE); items = g_list_append (items, item); } + g_free (uri); + return items; } @@ -459,7 +536,6 @@ uri = nautilus_file_info_get_activation_uri (files->data); terminal_file_info = get_terminal_file_info (uri); - g_free (uri); switch (terminal_file_info) { case FILE_INFO_LOCAL: @@ -469,13 +545,15 @@ NULL, terminal_file_info == FILE_INFO_SFTP, TRUE); items = g_list_append (items, item); - if (terminal_file_info == FILE_INFO_SFTP) { + if (terminal_file_info == FILE_INFO_SFTP && + uri_has_local_path (uri)) { item = open_terminal_menu_item_new (files->data, terminal_file_info, gtk_widget_get_screen (window), NULL, FALSE, TRUE); items = g_list_append (items, item); } if (display_mc_item () && - g_find_program_in_path ("mc")) { + g_find_program_in_path ("mc") && + uri_has_local_path (uri)) { item = open_terminal_menu_item_new (files->data, terminal_file_info, gtk_widget_get_screen (window), "mc", TRUE, FALSE); items = g_list_append (items, item); } @@ -488,6 +566,8 @@ g_assert_not_reached (); } + g_free (uri); + return items; } ++++++ nautilus-open-terminal-gcc.patch ++++++ Index: nautilus-open-terminal-0.13/src/nautilus-open-terminal.c =================================================================== --- nautilus-open-terminal-0.13.orig/src/nautilus-open-terminal.c +++ nautilus-open-terminal-0.13/src/nautilus-open-terminal.c @@ -40,6 +40,7 @@ #include <errno.h> #include <fcntl.h> +#include <stdlib.h> /* for atoi */ #include <string.h> /* for strcmp */ #include <unistd.h> /* for chdir */ #include <sys/stat.h> @@ -125,8 +126,6 @@ parse_sftp_uri (GFile *file, { char *tmp, *save; char *uri; - char *u, *h, *s, *p; - char *h_end; uri = g_file_get_uri (file); g_assert (uri != NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 orca for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package orca for openSUSE:Factory checked in at Thu May 28 03:58:54 CEST 2009. -------- --- GNOME/orca/orca.changes 2009-05-05 20:11:35.000000000 +0200 +++ orca/orca.changes 2009-05-27 22:28:59.000000000 +0200 @@ -1,0 +2,39 @@ +Wed May 27 14:48:17 CEST 2009 - vuntz(a)novell.com + +- Update to version 2.27.2: + + General: + - bgo#354471 - Text selection from braille input device. + - bgo#466841 - Orca doesn't announce items when Alt+Tabbing if + Compiz is enabled. + - bgo#511468 - Ekiga chat window accessibility problem. + - bgo#574221 - left-pane in Ekiga's preference box can't be + read at start-up. + - bgo#575614 - Please add speakable characters: → and ←. + - bgo#577977 - provide speech feedback for "repeat last find" + in Gedit. + - bgo#581372 - Move cursor routing and six dot key handling + from braille.py to script. With the cleanup from bug #581532 + to remove the custom brl module and move directly to the + brlapi module provided by BrlTTY/BrlAPI, we are now able to + handle BrlAPI commands much better. + - bgo#581532 - Remove brl module. Orca now uses the BrlAPI + python bindings. + - bgo#582028 - Character pronunciations are not used when + navigating by line. This provides a fallback to the chnames + dictionary. + - bgo#582684 - Arrowing left/right across tree tables causes + whole row to be spoken. + + OpenOffice: + - Work on bgo#574720 - Table Navigation Keys for OpenOffice + Writer. + + Firefox: + - bgo#530784 - whereAmI info for list items in web content + needs to be improved. + - bgo#577900 - Blank lines in Firefox text areas incorrectly + spoken. + + Updated translations. +- Disable orca-bgo550717-brld.patch since it needs to be rebased: + the code completely changed. Also remove the sbl Requires for + now. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- orca-2.27.1.tar.bz2 New: ---- orca-2.27.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orca.spec ++++++ --- /var/tmp/diff_new_pack.a14906/_old 2009-05-28 03:58:21.000000000 +0200 +++ /var/tmp/diff_new_pack.a14906/_new 2009-05-28 03:58:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package orca (Version 2.27.1) +# spec file for package orca (Version 2.27.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,17 +30,19 @@ BuildRequires: python-gnome-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files -Version: 2.27.1 +Version: 2.27.2 Release: 1 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: LGPL v2.1 or later Summary: Screen reader for GNOME Source: %{name}-%{version}.tar.bz2 +# PATCH-NEEDS-REBASE orca-bgo550717-brld.patch bgo550717 Patch: orca-bgo550717-brld.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: gnome-speech -Requires: sbl +# Needed only when orca-bgo550717-brld.patch is rebased +#Requires: sbl Requires: %{name}-lang = %{version} %py_requires @@ -65,7 +67,8 @@ %lang_package %prep %setup -%patch0 -p1 +# need rebase +#%patch0 -p1 %build autoreconf -f -i @@ -96,6 +99,42 @@ %files lang -f %{name}.lang %changelog +* Wed May 27 2009 vuntz(a)novell.com +- Update to version 2.27.2: + + General: + - bgo#354471 - Text selection from braille input device. + - bgo#466841 - Orca doesn't announce items when Alt+Tabbing if + Compiz is enabled. + - bgo#511468 - Ekiga chat window accessibility problem. + - bgo#574221 - left-pane in Ekiga's preference box can't be + read at start-up. + - bgo#575614 - Please add speakable characters: → and ←. + - bgo#577977 - provide speech feedback for "repeat last find" + in Gedit. + - bgo#581372 - Move cursor routing and six dot key handling + from braille.py to script. With the cleanup from bug #581532 + to remove the custom brl module and move directly to the + brlapi module provided by BrlTTY/BrlAPI, we are now able to + handle BrlAPI commands much better. + - bgo#581532 - Remove brl module. Orca now uses the BrlAPI + python bindings. + - bgo#582028 - Character pronunciations are not used when + navigating by line. This provides a fallback to the chnames + dictionary. + - bgo#582684 - Arrowing left/right across tree tables causes + whole row to be spoken. + + OpenOffice: + - Work on bgo#574720 - Table Navigation Keys for OpenOffice + Writer. + + Firefox: + - bgo#530784 - whereAmI info for list items in web content + needs to be improved. + - bgo#577900 - Blank lines in Firefox text areas incorrectly + spoken. + + Updated translations. +- Disable orca-bgo550717-brld.patch since it needs to be rebased: + the code completely changed. Also remove the sbl Requires for + now. * Tue May 05 2009 vuntz(a)novell.com - Update to version 2.27.1: + General: ++++++ orca-2.27.1.tar.bz2 -> orca-2.27.2.tar.bz2 ++++++ ++++ 9918 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 sblim-sfcc for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package sblim-sfcc for openSUSE:Factory checked in at Thu May 28 03:58:08 CEST 2009. -------- --- sblim-sfcc/sblim-sfcc.changes 2008-11-12 16:25:18.000000000 +0100 +++ sblim-sfcc/sblim-sfcc.changes 2009-03-05 21:03:37.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Mar 5 20:56:48 CET 2009 - mhrusecky(a)suse.cz + +- update to 2.2.0 + * Bugs: + - 2596921: v2test_ei test fails when using CIMXML interface + - 2431835: XML client library not found. + - 2270179: Missing includes and values in return statements + - 2158091: sfcb modules belong in private dir + - 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc + - 2102339: Missing ret values in sblim-sfcc + * Dropped merged patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sblim-sfcc-2.1.0-cimhostport.patch sblim-sfcc-2.1.0-includes.patch sblim-sfcc-2.1.0-retval.patch sblim-sfcc-2.1.0.tar.bz2 New: ---- sblim-sfcc-2.2.0-missing-includes.patch sblim-sfcc-2.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-sfcc.spec ++++++ --- /var/tmp/diff_new_pack.lB9099/_old 2009-05-28 03:56:09.000000000 +0200 +++ /var/tmp/diff_new_pack.lB9099/_new 2009-05-28 03:56:09.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sblim-sfcc (Version 2.1.0) +# spec file for package sblim-sfcc (Version 2.2.0) # -# 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 @@ -19,19 +19,23 @@ Name: sblim-sfcc -Version: 2.1.0 -Release: 6 +Version: 2.2.0 +Release: 1 Url: http://sblim.wiki.sourceforge.net/ -License: Other uncritical OpenSource License +License: Common Public License v1.0 Group: System/Management Summary: Small Footprint CIM Client Library Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-includes.patch -Patch1: %{name}-%{version}-retval.patch -Patch2: %{name}-%{version}-cimhostport.patch +# PATCH-FIX-UPSTREAM %{name}-2.2.0-missing-includes.patch [ upstream#2793377 ] mhrusecky(a)suse.cz -- add missing includes +# https://sourceforge.net/tracker/?func=detail&aid=2793377&group_id=128809&at… +Patch0: %{name}-2.2.0-missing-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ +%if 0%{?suse_version} > 1020 BuildRequires: libcurl-devel +%else +BuildRequires: curl-devel +%endif %description Small Footprint CIM Client Library (sfcc) Runtime Libraries @@ -43,10 +47,16 @@ SBLIM Project %package devel -License: Other uncritical OpenSource License -Group: System/Management +License: Other uncritical OpenSource License; Common Public License v1.0 Summary: Small Footprint CIM Client Library -Requires: %{name} = %{version} glibc-devel +Group: System/Management +Requires: %{name} = %{version} +Requires: glibc-devel +%if 0%{?suse_version} > 1020 +Requires: libcurl-devel +%else +Requires: curl-devel +%endif %description devel Small Footprint CIM Client Library (sfcc) Header Files and Link @@ -60,9 +70,7 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -92,6 +100,16 @@ %{_libdir}/*.so %changelog +* Thu Mar 05 2009 mhrusecky(a)suse.cz +- update to 2.2.0 + * Bugs: + - 2596921: v2test_ei test fails when using CIMXML interface + - 2431835: XML client library not found. + - 2270179: Missing includes and values in return statements + - 2158091: sfcb modules belong in private dir + - 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc + - 2102339: Missing ret values in sblim-sfcc + * Dropped merged patches * Wed Nov 12 2008 prusnak(a)suse.cz - added 5 more fixes to retval.patch - merged implicit-fortify-decl.patch and stdlib.patch into includes.patch ++++++ sblim-sfcc-2.2.0-missing-includes.patch ++++++ diff -Naru sblim-sfcc-2.2.0-bak/cimc/cimcclient.c sblim-sfcc-2.2.0/cimc/cimcclient.c --- sblim-sfcc-2.2.0-bak/cimc/cimcclient.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/cimc/cimcclient.c 2009-03-05 20:35:59.897492981 +0100 @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> #include <dlfcn.h> +#include <string.h> /* * Canonical CIM C API entry points diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_an_2.c sblim-sfcc-2.2.0/TEST/test_an_2.c --- sblim-sfcc-2.2.0-bak/TEST/test_an_2.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_an_2.c 2009-03-05 20:35:32.074162555 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_as.c sblim-sfcc-2.2.0/TEST/test_as.c --- sblim-sfcc-2.2.0-bak/TEST/test_as.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_as.c 2009-03-05 20:35:32.077493216 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_as_2.c sblim-sfcc-2.2.0/TEST/test_as_2.c --- sblim-sfcc-2.2.0-bak/TEST/test_as_2.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_as_2.c 2009-03-05 20:35:32.074162555 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ci.c sblim-sfcc-2.2.0/TEST/test_ci.c --- sblim-sfcc-2.2.0-bak/TEST/test_ci.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_ci.c 2009-03-05 20:35:32.077493216 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include <string.h> diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_di.c sblim-sfcc-2.2.0/TEST/test_di.c --- sblim-sfcc-2.2.0-bak/TEST/test_di.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_di.c 2009-03-05 20:35:32.077493216 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ec.c sblim-sfcc-2.2.0/TEST/test_ec.c --- sblim-sfcc-2.2.0-bak/TEST/test_ec.c 2009-03-05 20:35:03.697497925 +0100 +++ sblim-sfcc-2.2.0/TEST/test_ec.c 2009-03-05 20:35:32.077493216 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ecn.c sblim-sfcc-2.2.0/TEST/test_ecn.c --- sblim-sfcc-2.2.0-bak/TEST/test_ecn.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_ecn.c 2009-03-05 20:35:32.077493216 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ecn_ssl.c sblim-sfcc-2.2.0/TEST/test_ecn_ssl.c --- sblim-sfcc-2.2.0-bak/TEST/test_ecn_ssl.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_ecn_ssl.c 2009-03-05 20:35:32.080827229 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ei.c sblim-sfcc-2.2.0/TEST/test_ei.c --- sblim-sfcc-2.2.0-bak/TEST/test_ei.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_ei.c 2009-03-05 20:35:32.080827229 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ein.c sblim-sfcc-2.2.0/TEST/test_ein.c --- sblim-sfcc-2.2.0-bak/TEST/test_ein.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_ein.c 2009-03-05 20:35:32.080827229 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_gi.c sblim-sfcc-2.2.0/TEST/test_gi.c --- sblim-sfcc-2.2.0-bak/TEST/test_gi.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_gi.c 2009-03-05 20:35:32.087494138 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_gp.c sblim-sfcc-2.2.0/TEST/test_gp.c --- sblim-sfcc-2.2.0-bak/TEST/test_gp.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_gp.c 2009-03-05 20:35:32.087494138 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_imos.c sblim-sfcc-2.2.0/TEST/test_imos.c --- sblim-sfcc-2.2.0-bak/TEST/test_imos.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_imos.c 2009-03-05 20:35:32.090793650 +0100 @@ -21,6 +21,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im1.c sblim-sfcc-2.2.0/TEST/test_im1.c --- sblim-sfcc-2.2.0-bak/TEST/test_im1.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_im1.c 2009-03-05 20:35:32.087494138 +0100 @@ -21,6 +21,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im2.c sblim-sfcc-2.2.0/TEST/test_im2.c --- sblim-sfcc-2.2.0-bak/TEST/test_im2.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_im2.c 2009-03-05 20:35:32.087494138 +0100 @@ -21,6 +21,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im3.c sblim-sfcc-2.2.0/TEST/test_im3.c --- sblim-sfcc-2.2.0-bak/TEST/test_im3.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_im3.c 2009-03-05 20:35:32.090793650 +0100 @@ -21,6 +21,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im4.c sblim-sfcc-2.2.0/TEST/test_im4.c --- sblim-sfcc-2.2.0-bak/TEST/test_im4.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_im4.c 2009-03-05 20:35:32.090793650 +0100 @@ -21,6 +21,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_leak.c sblim-sfcc-2.2.0/TEST/test_leak.c --- sblim-sfcc-2.2.0-bak/TEST/test_leak.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_leak.c 2009-03-05 20:35:32.090793650 +0100 @@ -22,6 +22,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_qualifiers.c sblim-sfcc-2.2.0/TEST/test_qualifiers.c --- sblim-sfcc-2.2.0-bak/TEST/test_qualifiers.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_qualifiers.c 2009-03-05 20:35:32.090793650 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_qualifiers2.c sblim-sfcc-2.2.0/TEST/test_qualifiers2.c --- sblim-sfcc-2.2.0-bak/TEST/test_qualifiers2.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_qualifiers2.c 2009-03-05 20:35:32.090793650 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_rf.c sblim-sfcc-2.2.0/TEST/test_rf.c --- sblim-sfcc-2.2.0-bak/TEST/test_rf.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_rf.c 2009-03-05 20:35:32.094126685 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_rfn.c sblim-sfcc-2.2.0/TEST/test_rfn.c --- sblim-sfcc-2.2.0-bak/TEST/test_rfn.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_rfn.c 2009-03-05 20:35:32.094126685 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_si.c sblim-sfcc-2.2.0/TEST/test_si.c --- sblim-sfcc-2.2.0-bak/TEST/test_si.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_si.c 2009-03-05 20:35:32.094126685 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_sp.c sblim-sfcc-2.2.0/TEST/test_sp.c --- sblim-sfcc-2.2.0-bak/TEST/test_sp.c 2009-03-05 20:35:03.704162599 +0100 +++ sblim-sfcc-2.2.0/TEST/test_sp.c 2009-03-05 20:35:32.094126685 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_xq.c sblim-sfcc-2.2.0/TEST/test_xq.c --- sblim-sfcc-2.2.0-bak/TEST/test_xq.c 2009-03-05 20:35:03.700830890 +0100 +++ sblim-sfcc-2.2.0/TEST/test_xq.c 2009-03-05 20:35:32.097459790 +0100 @@ -19,6 +19,7 @@ */ #include <cmci.h> #include <native.h> +#include <stdlib.h> #include <unistd.h> #include <stdlib.h> #include "show.h" ++++++ sblim-sfcc-2.1.0.tar.bz2 -> sblim-sfcc-2.2.0.tar.bz2 ++++++ ++++ 25043 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/backend/cimxml/constClass.c new/sblim-sfcc-2.2.0/backend/cimxml/constClass.c --- old/sblim-sfcc-2.1.0/backend/cimxml/constClass.c 2007-02-07 15:25:02.000000000 +0100 +++ new/sblim-sfcc-2.2.0/backend/cimxml/constClass.c 2008-10-06 17:51:18.000000000 +0200 @@ -151,6 +151,9 @@ if (p) return qualifierFT.getDataQualifier ( p->qualifiers, qname, rc ); CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY ); + CMPIData ret; + ret.state = CMPI_nullValue; + return ret; } static CMPIData __ccft_getPropertyQualifierAt ( CMPIConstClass * ccls, @@ -164,6 +167,9 @@ if (p) return qualifierFT.getDataQualifierAt ( p->qualifiers, index, name, rc ); CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY ); + CMPIData ret; + ret.state = CMPI_nullValue; + return ret; } static unsigned int __ccft_getPropertyQualifierCount ( CMPIConstClass * ccls, @@ -175,6 +181,7 @@ if (p) return qualifierFT.getQualifierCount ( p->qualifiers, rc ); CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY ); + return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/backend/cimxml/indicationlistener.c new/sblim-sfcc-2.2.0/backend/cimxml/indicationlistener.c --- old/sblim-sfcc-2.1.0/backend/cimxml/indicationlistener.c 2008-01-21 11:15:41.000000000 +0100 +++ new/sblim-sfcc-2.2.0/backend/cimxml/indicationlistener.c 2008-11-12 18:22:54.000000000 +0100 @@ -28,6 +28,7 @@ #include <netinet/in.h> #include <fcntl.h> #include <errno.h> +#include <unistd.h> static int do_listen=1; @@ -458,6 +459,8 @@ close(connFd); } } + + return NULL; } static void* start_listen_thread(void *parms) @@ -465,6 +468,7 @@ struct native_indicationlistener* i; i = (struct native_indicationlistener*) parms; establish_listener(i->sslMode, i->port, i); + return NULL; } static CIMCStatus _ilft_release(CIMCIndicationListener* il) @@ -475,6 +479,10 @@ if(i) { free(i); } + CIMCStatus ret; + ret.rc = CIMC_RC_OK; + ret.msg = NULL; + return ret; } static CIMCIndicationListener* _ilft_clone(CIMCIndicationListener* il, @@ -483,6 +491,7 @@ /* not yet implemented. function is just here to comply with the default * function tables. it is questionable if a clone is needed for an * indication listener */ + return NULL; } static CIMCStatus _ilft_start(CIMCIndicationListener* il) @@ -495,11 +504,21 @@ do_listen = 1; pthread_create(&id, NULL, &start_listen_thread, i); + + CIMCStatus ret; + ret.rc = CIMC_RC_OK; + ret.msg = NULL; + return ret; } static CIMCStatus _ilft_stop(CIMCIndicationListener* il) { do_listen = 0; + + CIMCStatus ret; + ret.rc = CIMC_RC_OK; + ret.msg = NULL; + return ret; } CIMCIndicationListener *newCIMCIndicationListener(int sslMode, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/backend/cimxml/instance.c new/sblim-sfcc-2.2.0/backend/cimxml/instance.c --- old/sblim-sfcc-2.1.0/backend/cimxml/instance.c 2007-03-07 10:53:05.000000000 +0100 +++ new/sblim-sfcc-2.2.0/backend/cimxml/instance.c 2008-10-06 17:51:18.000000000 +0200 @@ -19,7 +19,7 @@ http://www.opensource.org/licenses/eclipse-1.0.php \author Frank Scheffler - $Revision: 1.2 $ + $Revision: 1.3 $ */ #include <stdio.h> @@ -186,6 +186,9 @@ if (p) return qualifierFT.getDataQualifier ( p->qualifiers, qname, rc ); CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY ); + CMPIData ret; + ret.state = CMPI_nullValue; + return ret; } static CMPIData __ift_getPropertyQualifierAt ( CMPIInstance * instance, @@ -199,6 +202,9 @@ if (p) return qualifierFT.getDataQualifierAt ( p->qualifiers, index, name, rc ); CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY ); + CMPIData ret; + ret.state = CMPI_nullValue; + return ret; } static unsigned int __ift_getPropertyQualifierCount ( CMPIInstance * instance, @@ -210,6 +216,7 @@ if (p) return qualifierFT.getQualifierCount ( p->qualifiers, rc ); CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY ); + return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/ChangeLog new/sblim-sfcc-2.2.0/ChangeLog --- old/sblim-sfcc-2.1.0/ChangeLog 2008-05-02 03:03:05.000000000 +0200 +++ new/sblim-sfcc-2.2.0/ChangeLog 2009-02-13 20:11:59.000000000 +0100 @@ -1,3 +1,51 @@ +2009-02-13 Chris Buccella <buccella(a)linux.vnet.ibm.com> + + * TEST/v2test_ei.c: + Fixed 2596921: v2test_ei test fails when using CIMXML interface + +2008-12-16 Michael Chase-Salerno <bratac(a)linux.vnet.ibm.com> + * cimc/cimclient.c: + Fixed 2431835: XML client library not found. + +2008-11-12 Chris Buccella <buccella(a)linux.vnet.ibm.com> + + * TEST/*.c, backend/cimxml/indicationlistener.c: + Fixed 2270179: Missing includes and values in return statements + (patch by Pavol Rusnak) + +2008-10-27 Michael Chase-Salerno <bratac(a)linux.vnet.ibm.com> + * Makefile.am + Updated 2158091: sfcb modules belong in private dir + use $libdir for default + +2008-10-23 Michael Chase-Salerno <bratac(a)linux.vnet.ibm.com> + * Makefile.am configure.ac cimc/cimcclient.c + Fixed 2158091: sfcb modules belong in private dir + +2008-09-06 Sean Swehla <smswehla(a)linux.vnet.ibm.com> + * TEST/v2_testein.c + Fixed 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc + (patch by Pavol Rusnak) + +2008-09-06 Sean Swehla <smswehla(a)linux.vnet.ibm.com> + * TEST/print-types.c, backend/cimxml/constClass.c, + backend/cimxml/indicationlistener.c, backend/cimxml/instance.c + Fixed 2102339: Missing ret values in sblim-sfcc + (patch by Pavol Rusnak) + +2008-06-16 Michael Chase-Salerno <bratac(a)linux.vnet.ibm.com> + * frontend/sfcc/sfcclient.c + Better handling of NULL values for slp. + +2008-05-16 Michael Chase-Salerno <bratac(a)linux.vnet.ibm.com> + + * cimc/cimcclient.c + Check for valid connection type and return rc=3 and a message + if incorrect. + + * TEST/v2test_gc.c + Test valid handling of above, and check rc on existing tests + 2008-05-01 Chris Buccella <buccella(a)linux.vnet.ibm.com> * backend/cimxml/client.c, backend/cimxml/property.c, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/cimc/cimcclient.c new/sblim-sfcc-2.2.0/cimc/cimcclient.c --- old/sblim-sfcc-2.1.0/cimc/cimcclient.c 2007-02-07 19:09:58.000000000 +0100 +++ new/sblim-sfcc-2.2.0/cimc/cimcclient.c 2008-12-16 00:54:25.000000000 +0100 @@ -1,6 +1,6 @@ /* - * $Id: cimcclient.c,v 1.2 2007/02/07 18:09:58 mihajlov Exp $ + * $Id: cimcclient.c,v 1.5 2008/12/15 23:54:25 mchasal Exp $ * * © Copyright IBM Corp. 2007 * @@ -42,30 +42,41 @@ InitCimcEnv init=NULL; CIMCEnv *rv=NULL; - libName[LIBLEN]=0; - entry[ENTLEN]=0; - snprintf(libName, LIBLEN, "libcimcClient%s.so",id); - - library = dlopen(libName, RTLD_NOW); - if (library==NULL) { - *msg=calloc(1,ERRLEN+1); - *rc=1; - snprintf(*msg,ERRLEN,"Unable to load %s library %s",libName,dlerror()); - } else { - snprintf(entry, ENTLEN,"_Create_%s_Env", id); - init = (InitCimcEnv)dlsym(library, entry); - if (init==NULL) { - *msg=calloc(1,ERRLEN+1); - *rc=2; - snprintf(*msg,ERRLEN,"Unable to locate entry %s in %s",entry,libName); - } else { - *rc=0; - *msg=NULL; - rv = init(id,options,rc,msg); - rv->hdl=library; - } - } - return rv; + libName[LIBLEN]=0; + entry[ENTLEN]=0; + + if ((strcmp(id, "XML") != 0) && (strcmp(id, "SfcbLocal") != 0)) { + *msg=calloc(1,ERRLEN+1); + *rc=3; + snprintf(*msg,ERRLEN,"Invalid connection type '%s'. Must be 'XML' or 'SfcbLocal'.",id); + } else { + if (strcmp(id, "SfcbLocal") == 0) { + snprintf(libName, LIBLEN, "%s/libcimcClient%s.so",SFCB_LIBDIR,id); + } else { + snprintf(libName, LIBLEN, "libcimcClient%s.so",id); + } + library = dlopen(libName, RTLD_NOW); + if (library==NULL) { + *msg=calloc(1,ERRLEN+1); + *rc=1; + snprintf(*msg,ERRLEN,"Unable to load %s library %s",libName,dlerror()); + } else { + snprintf(entry, ENTLEN,"_Create_%s_Env", id); + init = (InitCimcEnv)dlsym(library, entry); + if (init==NULL) { + *msg=calloc(1,ERRLEN+1); + *rc=2; + snprintf(*msg,ERRLEN,"Unable to locate entry %s in %s",entry,libName); + } else { + *rc=0; + *msg=NULL; + rv = init(id,options,rc,msg); + rv->hdl=library; + } + } + } + + return rv; } void ReleaseCIMCEnv(CIMCEnv *env) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/cimc/cimcft.h new/sblim-sfcc-2.2.0/cimc/cimcft.h --- old/sblim-sfcc-2.1.0/cimc/cimcft.h 2007-12-21 16:10:44.000000000 +0100 +++ new/sblim-sfcc-2.2.0/cimc/cimcft.h 2008-09-09 17:13:09.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: cimcft.h,v 1.5 2007/12/21 15:10:44 sschuetz Exp $ + * $Id: cimcft.h,v 1.6 2008/09/09 15:13:09 smswehla Exp $ * * © Copyright IBM Corp. 2007 * @@ -64,6 +64,7 @@ CIMCStatus * rc); CIMCCount (*getPropQualifierCount) (CIMCClass * cc, const char * prop, CIMCStatus * rc); + CIMCString *(*getSuperClassName) (CIMCClass * cc, CIMCStatus * rc); CIMCArray *(*getKeyList) (CIMCClass * cc); char *(*toString) (CIMCClass * cc); void (*relocate) (CIMCClass * cc); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/compile new/sblim-sfcc-2.2.0/compile --- old/sblim-sfcc-2.1.0/compile 2005-12-19 16:38:26.000000000 +0100 +++ new/sblim-sfcc-2.2.0/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake(a)gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/config.h.in new/sblim-sfcc-2.2.0/config.h.in --- old/sblim-sfcc-2.1.0/config.h.in 2008-05-02 03:02:05.000000000 +0200 +++ new/sblim-sfcc-2.2.0/config.h.in 2009-02-18 00:34:10.000000000 +0100 @@ -118,7 +118,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ @@ -151,5 +151,5 @@ /* Define to rpl_realloc if the replacement function should be used. */ #undef realloc -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/configure.ac new/sblim-sfcc-2.2.0/configure.ac --- old/sblim-sfcc-2.1.0/configure.ac 2008-05-02 02:58:26.000000000 +0200 +++ new/sblim-sfcc-2.2.0/configure.ac 2009-02-18 00:34:00.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(sblim-sfcc, 2.1.0, sblim-devel(a)lists.sourceforge.net) +AC_INIT(sblim-sfcc, 2.2.0, sblim-devel(a)lists.sourceforge.net) AC_CONFIG_SRCDIR([cimc/cimcclient.c]) AC_CONFIG_HEADER([config.h]) @@ -60,6 +60,14 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([gettimeofday localtime_r memset strcasecmp strdup strncasecmp strstr tzset]) +#SFCB Library location +# Set with "configure SFCB_LIBDIR=<dir> +AC_SUBST(SFCB_LIBDIR) +if test -z "$SFCB_LIBDIR" +then + SFCB_LIBDIR="$libdir/sfcb" +fi + # MELUNIT AM_CONDITIONAL(HAVE_MELUNIT_CXX,[test 0 = 1 ]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/frontend/sfcc/sfcclient.c new/sblim-sfcc-2.2.0/frontend/sfcc/sfcclient.c --- old/sblim-sfcc-2.1.0/frontend/sfcc/sfcclient.c 2008-04-24 17:43:45.000000000 +0200 +++ new/sblim-sfcc-2.2.0/frontend/sfcc/sfcclient.c 2008-06-16 23:52:06.000000000 +0200 @@ -241,7 +241,8 @@ case CMPI_booleanString: case CMPI_dateTimeString: case CMPI_classNameString: - return strdup(value->string ? (char*)value->string->hdl : "NULL"); + return strdup((value->string && value->string->hdl) ? + (char*)value->string->hdl : "NULL"); case CMPI_dateTime: if (value->dateTime) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/INSTALL new/sblim-sfcc-2.2.0/INSTALL --- old/sblim-sfcc-2.1.0/INSTALL 2005-12-19 16:38:26.000000000 +0100 +++ new/sblim-sfcc-2.2.0/INSTALL 2008-10-05 08:22:50.000000000 +0200 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,7 +10,10 @@ Basic Installation ================== -These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,6 +67,9 @@ all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== @@ -78,7 +81,7 @@ by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -87,17 +90,15 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== @@ -190,12 +191,12 @@ ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/Makefile.am new/sblim-sfcc-2.2.0/Makefile.am --- old/sblim-sfcc-2.1.0/Makefile.am 2008-05-02 02:57:27.000000000 +0200 +++ new/sblim-sfcc-2.2.0/Makefile.am 2008-10-24 17:38:59.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.17 2008/05/02 00:57:27 buccella Exp $ +# $Id: Makefile.am,v 1.18 2008/10/24 15:38:59 mchasal Exp $ docdir=$(datadir)/doc/sfcc-$(VERSION) @@ -109,6 +109,7 @@ -version-info $(Libcimcclient_CURRENT):$(Libcimcclient_REVISION):$(Libcimcclient_AGE) \ -Wl,--version-script,$(srcdir)/cimc/libcimcclient.Versions libcimcclient_la_LIBADD = -ldl +libcimcclient_la_CPPFLAGS = -DSFCB_LIBDIR=\"$(SFCB_LIBDIR)\" libcmpisfcc_la_CPPFLAGS = -I$(srcdir)/cimc -I$(srcdir)/backend/cimxml -I$(srcdir)/frontend/sfcc libcmpisfcc_la_LIBADD = -lcimcclient diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/missing new/sblim-sfcc-2.2.0/missing --- old/sblim-sfcc-2.1.0/missing 2005-12-19 16:38:26.000000000 +0100 +++ new/sblim-sfcc-2.2.0/missing 2008-10-05 08:22:50.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/NEWS new/sblim-sfcc-2.2.0/NEWS --- old/sblim-sfcc-2.1.0/NEWS 2008-04-23 23:41:34.000000000 +0200 +++ new/sblim-sfcc-2.2.0/NEWS 2009-02-13 20:11:59.000000000 +0100 @@ -1,5 +1,15 @@ Small Footprint CIM Client Library NEWS +Changes since 2.1 +================= +Bugs: +- 2102339: Missing ret values in sblim-sfcc +- 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc +- 2158091: sfcb modules belong in private dir +- 2270179: Missing includes and values in return statements +- 2431835: XML client library not found. +- 2596921: v2test_ei test fails when using CIMXML interface + Changes in 2.1 ============== New features: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/README new/sblim-sfcc-2.2.0/README --- old/sblim-sfcc-2.1.0/README 2008-04-22 15:24:36.000000000 +0200 +++ new/sblim-sfcc-2.2.0/README 2008-10-27 16:00:12.000000000 +0100 @@ -36,6 +36,11 @@ will use a library that is part of sfcb so the application must have the same authorization as the installer of sfcb. +If the sfcb libraries have not been installed to the default location +(<libdir>/sfcb), SFCC will need to be configured to find them. Use +"configure SFCB_LIBDIR=<dir>" to inform the SFCC build where to find the +libraries. + Applications using SFCC determine which method to use by calling the NewCIMCEnv library function which establishes the environment for using one of the above communication methods. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/sfcc.spec new/sblim-sfcc-2.2.0/sfcc.spec --- old/sblim-sfcc-2.1.0/sfcc.spec 2008-05-02 03:10:58.000000000 +0200 +++ new/sblim-sfcc-2.2.0/sfcc.spec 2009-02-18 00:35:03.000000000 +0100 @@ -8,7 +8,7 @@ Summary: Small Footprint CIM Client Library Name: sblim-sfcc -Version: 2.1.0 +Version: 2.2.0 Release: 0 Group: Systems Management/Base License: EPL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/print-types.c new/sblim-sfcc-2.2.0/TEST/print-types.c --- old/sblim-sfcc-2.1.0/TEST/print-types.c 2006-09-05 16:54:59.000000000 +0200 +++ new/sblim-sfcc-2.2.0/TEST/print-types.c 2008-10-06 17:51:18.000000000 +0200 @@ -94,4 +94,6 @@ PRINT_TYPE(CMPI_keyValue); PRINT_TYPE(CMPI_notFound); PRINT_TYPE(CMPI_badValue); + + return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ec.c new/sblim-sfcc-2.2.0/TEST/v2test_ec.c --- old/sblim-sfcc-2.1.0/TEST/v2test_ec.c 2008-04-22 15:22:29.000000000 +0200 +++ new/sblim-sfcc-2.2.0/TEST/v2test_ec.c 2008-11-12 18:22:54.000000000 +0100 @@ -61,7 +61,7 @@ if(ce == NULL) { printf(" local connect failed call to NewCIMCEnv rc = %d , message = [%s] \n",retc,msg) ; - return ; + return 1; } client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ecn.c new/sblim-sfcc-2.2.0/TEST/v2test_ecn.c --- old/sblim-sfcc-2.1.0/TEST/v2test_ecn.c 2008-04-22 15:22:29.000000000 +0200 +++ new/sblim-sfcc-2.2.0/TEST/v2test_ecn.c 2008-11-12 18:22:54.000000000 +0100 @@ -66,7 +66,7 @@ printf(" failed call to NewCIMCEnv \n") ; if(msg) printf(" NewCIMCEnv error message = [%s] \n",msg) ; - return ; + return 1; } client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ei.c new/sblim-sfcc-2.2.0/TEST/v2test_ei.c --- old/sblim-sfcc-2.1.0/TEST/v2test_ei.c 2008-04-24 17:50:34.000000000 +0200 +++ new/sblim-sfcc-2.2.0/TEST/v2test_ei.c 2009-02-13 20:11:58.000000000 +0100 @@ -59,10 +59,10 @@ if(ce == NULL) { printf(" local connect failed call to NewCIMCEnv message = [%s] \n",msg) ; - return ; + return 1; } - client = ce->ft->connect(ce, cim_host, cim_host_port, "5988", cim_host_userid, cim_host_passwd, &status); + client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status); if(client == NULL) { printf(" failed the call to connect \n") ; @@ -108,6 +108,8 @@ if(client) client->ft->release(client); if(ce) ce->ft->release(ce); if(status.msg) CMRelease(status.msg); + + return 0; } /* */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ein.c new/sblim-sfcc-2.2.0/TEST/v2test_ein.c --- old/sblim-sfcc-2.1.0/TEST/v2test_ein.c 2008-04-24 17:50:34.000000000 +0200 +++ new/sblim-sfcc-2.2.0/TEST/v2test_ein.c 2008-11-12 18:22:54.000000000 +0100 @@ -42,6 +42,7 @@ cim_host_passwd = getenv("CIM_HOST_PASSWD"); if (cim_host_passwd == NULL) cim_host_passwd = "password"; + cim_host_port = getenv("CIM_HOST_PORT"); if (cim_host_port == NULL) cim_host_port = "5988"; @@ -59,7 +60,7 @@ if(ce == NULL) { printf(" local connect failed call to NewCIMCEnv message = [%s] \n",msg) ; - return ; + return 1; } printf("do connect \n") ; client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status); @@ -109,6 +110,7 @@ if(ce) ce->ft->release(ce); if(status.msg) CMRelease(status.msg); + return 0; } /* */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_gc.c new/sblim-sfcc-2.2.0/TEST/v2test_gc.c --- old/sblim-sfcc-2.1.0/TEST/v2test_gc.c 2008-04-24 17:50:34.000000000 +0200 +++ new/sblim-sfcc-2.2.0/TEST/v2test_gc.c 2008-05-17 00:32:35.000000000 +0200 @@ -71,6 +71,15 @@ printf(" Testing getClass \n") ; + printf(" checking with bad input : host = %s userid = %s\n", + cim_host,cim_host_userid) ; + ce = NewCIMCEnv("bogus",0,&rc,&msg); + if (rc == 3) { + printf (" bad input caught OK,\n\tmsg = %s\n\n",msg); + } else { + printf (" bad input NOT caught.\n"); + } + #ifdef v2local printf(" using SfcbLocal interface : host = %s userid = %s\n", cim_host,cim_host_userid) ; @@ -80,27 +89,33 @@ cim_host,cim_host_userid,cim_host_port) ; ce = NewCIMCEnv("XML",0,&rc,&msg); #endif + + if (rc == 0 ) { - client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status); + client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status); - op = (CMPIObjectPath *)ce->ft->newObjectPath(ce, "root/cimv2", "CIM_ComputerSystem" , &status); - class =(CMPIConstClass *) client->ft->getClass(client,(CIMCObjectPath *) op, CMPI_FLAG_IncludeQualifiers, NULL, &status); + op = (CMPIObjectPath *)ce->ft->newObjectPath(ce, "root/cimv2", "CIM_ComputerSystem" , &status); + class =(CMPIConstClass *) client->ft->getClass(client,(CIMCObjectPath *) op, CMPI_FLAG_IncludeQualifiers, NULL, &status); - /* Print the results */ - printf( "getClass() rc=%d, msg=%s\n", + /* Print the results */ + printf( "getClass() rc=%d, msg=%s\n", status.rc, (status.msg)? (char *)status.msg->hdl : NULL); - if (!status.rc) { - printf("result:\n"); - showClass(class); - } - - if (class) class->ft->release((CMPIConstClass *)class); - if (op) op->ft->release(op); - - if (client) client->ft->release(client); - if(ce) ce->ft->release(ce); - if (status.msg) CMRelease(status.msg); + if (!status.rc) { + printf("result:\n"); + showClass(class); + } + + if (class) class->ft->release((CMPIConstClass *)class); + if (op) op->ft->release(op); + + if (client) client->ft->release(client); + if(ce) ce->ft->release(ce); + if (status.msg) CMRelease(status.msg); - return 0; + return 0; + } else { + printf ("Call to NewCIMCEnv failed, rc = %d\n\tmsg = %s\n",rc,msg); + return 1; + } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomboy for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package tomboy for openSUSE:Factory checked in at Thu May 28 03:54:55 CEST 2009. -------- --- GNOME/tomboy/tomboy.changes 2009-05-05 16:50:12.000000000 +0200 +++ tomboy/tomboy.changes 2009-05-26 17:44:30.000000000 +0200 @@ -1,0 +2,35 @@ +Tue May 26 17:31:46 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.15.1: + + New WebSync add-in syncs to any server that implements the + Tomboy Web REST API, such as Snowy + [http://live.gnome.org/Snowy] Baby-eating preview release. + + Require Mono 1.9.1 to *build* Tomboy (bgo#573923). + + Prevent PATH problems on Windows from breaking Tomboy + (bgo#558314). + + Search for phrases by quoting search text (bgo#551097). + + Fix drag&drop & middle-click paste of linked text (bgo#414029). + + Save width of notebook pane in Search window (bgo#563744). + + Disable sync menu items until backend configured (bgo#473335). + + Close note find bar on escape, even when not focused + (bgo#540822). + + Support FUSE being built-in to kernel (bgo#500524). + + Prevent crashes when reading unexpected note XML (bgo#581844). + + Change "Open New Note Template" LinkButton to Button to prevent + error (bgo#581582). + + Focus search field every time Search window summoned + (bgo#535131). + + Only show Start Here note on first run if not running as applet + (bnc#299810). + + HIG compliance in Sync preferences (bgo#574154). + + Use correct "info" icon in add-in info windows (bgo#508844). + + Use relative path to load help (bnc#326457). + + Cache frequently-used text tags in one place instead of five. + + Documentation updates. + + Updated translations. +- Drop tomboy-no-highlight.patch: upstream disagrees and we don't + want to diverge. +- Drop tomboy-disable-starthere.patch: fixed upstream. +- Drop tomboy-help-bundle.patch: fixed upstream. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tomboy-0.15.0.tar.bz2 tomboy-disable-starthere.patch tomboy-help-bundle.patch tomboy-no-highlight.patch New: ---- tomboy-0.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.Hd1289/_old 2009-05-28 03:54:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Hd1289/_new 2009-05-28 03:54:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tomboy (Version 0.15.0) +# spec file for package tomboy (Version 0.15.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -45,15 +45,11 @@ License: LGPL v2.1 or later Group: Productivity/Office/Other Requires: mono -Version: 0.15.0 +Version: 0.15.1 Release: 1 Summary: GNOME Note Taking Application Url: http://www.beatniksoftware.com/tomboy/ Source: %{name}-%{version}.tar.bz2 -Patch0: tomboy-no-highlight.patch -Patch2: tomboy-disable-starthere.patch -# PATCH-FIX-OPENSUSE tomboy-help-bundle.patch bnc326457 -Patch3: tomboy-help-bundle.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core Requires: dbus-1-x11 @@ -81,9 +77,6 @@ %lang_package %prep %setup -%patch0 -%patch2 -p1 -%patch3 -p1 %build #autoreconf -f -i @@ -133,6 +126,38 @@ %define __find_provides env sh -c 'filelist=($(grep -v -E "%{_libdir}/%{name}/addins|Mono.Addins")) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %changelog +* Tue May 26 2009 vuntz(a)novell.com +- Update to version 0.15.1: + + New WebSync add-in syncs to any server that implements the + Tomboy Web REST API, such as Snowy + [http://live.gnome.org/Snowy] Baby-eating preview release. + + Require Mono 1.9.1 to *build* Tomboy (bgo#573923). + + Prevent PATH problems on Windows from breaking Tomboy + (bgo#558314). + + Search for phrases by quoting search text (bgo#551097). + + Fix drag&drop & middle-click paste of linked text (bgo#414029). + + Save width of notebook pane in Search window (bgo#563744). + + Disable sync menu items until backend configured (bgo#473335). + + Close note find bar on escape, even when not focused + (bgo#540822). + + Support FUSE being built-in to kernel (bgo#500524). + + Prevent crashes when reading unexpected note XML (bgo#581844). + + Change "Open New Note Template" LinkButton to Button to prevent + error (bgo#581582). + + Focus search field every time Search window summoned + (bgo#535131). + + Only show Start Here note on first run if not running as applet + (bnc#299810). + + HIG compliance in Sync preferences (bgo#574154). + + Use correct "info" icon in add-in info windows (bgo#508844). + + Use relative path to load help (bnc#326457). + + Cache frequently-used text tags in one place instead of five. + + Documentation updates. + + Updated translations. +- Drop tomboy-no-highlight.patch: upstream disagrees and we don't + want to diverge. +- Drop tomboy-disable-starthere.patch: fixed upstream. +- Drop tomboy-help-bundle.patch: fixed upstream. * Tue May 05 2009 vuntz(a)novell.com - Update to version 0.15.0: + New NoteDirectoryWatcher add-in supports directly editing note ++++++ tomboy-0.15.0.tar.bz2 -> tomboy-0.15.1.tar.bz2 ++++++ ++++ 20661 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 gdl for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package gdl for openSUSE:Factory checked in at Thu May 28 03:54:05 CEST 2009. -------- --- GNOME/gdl/gdl.changes 2009-05-05 16:52:20.000000000 +0200 +++ gdl/gdl.changes 2009-05-27 12:35:28.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 27 12:20:49 CEST 2009 - vuntz(a)novell.com + +- Update to version 2.27.2: + + Fix out of source tree builds + + Hide private API + + Fix so name generation +- Rename package to libgdl-1-2, and Obsoletes libgdl-1-0. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gdl-2.27.1.tar.bz2 New: ---- gdl-2.27.2.tar.bz2 gdl-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdl.spec ++++++ --- /var/tmp/diff_new_pack.Hp7419/_old 2009-05-28 03:53:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Hp7419/_new 2009-05-28 03:53:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gdl (Version 2.27.1) +# spec file for package gdl (Version 2.27.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,10 +27,11 @@ BuildRequires: translation-update-upstream License: GPL v2 only Group: System/Libraries -Version: 2.27.1 +Version: 2.27.2 Release: 1 Summary: Gnome Devtool Libraries contains components and libraries Source: http://ftp.gnome.org/pub/GNOME/sources/gdl/2.24/%name-%version.tar.bz2 +Source1: %{name}-rpmlintrc Url: http://ftp.gnome.org/pub/GNOME/sources/gdl/0.7/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,15 +48,16 @@ Neil Hodgson <neilh at scintilla org> (Scintilla Widget) Gustavo Gir�ldez <gustavo giraldez at gmx net> (GdlDock) -%package -n libgdl-1-0 +%package -n libgdl-1-2 License: GPL v2 only Summary: Gnome Devtool Libraries contains components and libraries Group: System/Libraries Requires: %{name}-lang = %{version} Obsoletes: gdl <= %{version} Provides: gdl = %{version} +Obsoletes: libgdl-1-0 < 2.27.2 -%description -n libgdl-1-0 +%description -n libgdl-1-2 Gnome Devtool Libraries contains components and libraries that are intended to be shared between GNOME development tools, including gnome-debug, gnome-build, and anjuta2. @@ -72,7 +74,7 @@ License: GPL v2 only Summary: Gnome Devtool Libraries contains components and libraries Group: System/Libraries -Requires: libgdl-1-0 = %{version} +Requires: libgdl-1-2 = %{version} Requires: gtk2-devel libglade2-devel libxml2-devel Obsoletes: gdl-doc <= 2.24.0 Provides: gdl-doc = 2.24.0 @@ -105,14 +107,14 @@ %find_lang %{name}-1 %fdupes -s $RPM_BUILD_ROOT -%post -n libgdl-1-0 -p /sbin/ldconfig +%post -n libgdl-1-2 -p /sbin/ldconfig -%postun -n libgdl-1-0 -p /sbin/ldconfig +%postun -n libgdl-1-2 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files -n libgdl-1-0 +%files -n libgdl-1-2 %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_datadir}/gdl @@ -120,7 +122,7 @@ %files devel %defattr(-, root, root) -%{_includedir}/libgdl-1.0 +%{_includedir}/libgdl* %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so # Own these repositories to not depend on gtk-doc while building: @@ -131,6 +133,12 @@ %files lang -f %{name}-1.lang %changelog +* Wed May 27 2009 vuntz(a)novell.com +- Update to version 2.27.2: + + Fix out of source tree builds + + Hide private API + + Fix so name generation +- Rename package to libgdl-1-2, and Obsoletes libgdl-1-0. * Tue May 05 2009 vuntz(a)novell.com - Update to version 2.27.1: + Bugs fixed: ++++++ gdl-2.27.1.tar.bz2 -> gdl-2.27.2.tar.bz2 ++++++ ++++ 4412 lines of diff (skipped) ++++++ gdl-rpmlintrc ++++++ addFilter(".*obsolete-not-provided.*libgdl-1-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 gnome-session for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at Thu May 28 03:52:58 CEST 2009. -------- --- GNOME/gnome-session/gnome-session.changes 2009-04-14 21:17:03.000000000 +0200 +++ gnome-session/gnome-session.changes 2009-05-25 16:24:53.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 25 16:23:54 CEST 2009 - vuntz(a)novell.com + +- Update gnome-session-gnome-wm-compiz-manager.patch to enable + compiz only if the compiz-enabled file is newer than + /etc/X11/xorg.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.P21227/_old 2009-05-28 03:51:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P21227/_new 2009-05-28 03:51:52.000000000 +0200 @@ -33,7 +33,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.26.1 -Release: 1 +Release: 2 Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org Source: %{name}-%{version}.tar.bz2 @@ -183,6 +183,10 @@ ##%endif %changelog +* Mon May 25 2009 vuntz(a)novell.com +- Update gnome-session-gnome-wm-compiz-manager.patch to enable + compiz only if the compiz-enabled file is newer than + /etc/X11/xorg.conf * Tue Apr 14 2009 vuntz(a)novell.com - Update to version 2.26.1: + Fix inhibitor dialog not showing the right action button when ++++++ gnome-session-gnome-wm-compiz-manager.patch ++++++ --- /var/tmp/diff_new_pack.P21227/_old 2009-05-28 03:51:53.000000000 +0200 +++ /var/tmp/diff_new_pack.P21227/_new 2009-05-28 03:51:53.000000000 +0200 @@ -1,9 +1,10 @@ -diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-patched/gnome-session/gnome-wm ---- gnome-session-2.22.1.1/data/gnome-wm 2008-04-10 16:32:20.000000000 +0200 -+++ gnome-session-2.22.1.1-patched/data/gnome-wm 2008-05-13 09:15:37.539788000 +0200 -@@ -39,22 +39,33 @@ done - - # WINDOW_MANAGER overrides all +Index: gnome-session-2.26.1/data/gnome-wm +=================================================================== +--- gnome-session-2.26.1.orig/data/gnome-wm ++++ gnome-session-2.26.1/data/gnome-wm +@@ -51,22 +51,33 @@ if [ "x$WINDOW_MANAGER" = "xgnome-wm" ]; + WINDOW_MANAGER="" + fi +# Migrate compiz to compiz-manager +if [ "x$WINDOW_MANAGER" = "xcompiz" ]; then @@ -30,7 +31,7 @@ - KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" - if [ $IS_X_COMPOSITED -eq 0 ] ; then - KNOWN_WM="compiz beryl $KNOWN_WM" -+ if [ -f "$COMPIZ_ENABLED_FILE" ] ; then ++ if test -f "$COMPIZ_ENABLED_FILE" -a "$COMPIZ_ENABLED_FILE" -nt /etc/X11/xorg.conf; then + KNOWN_WM="compiz-manager $KNOWN_WM" fi - # metacity is still the default wm in GNOME @@ -42,7 +43,7 @@ for wm in $KNOWN_WM ; do IFS=":" for dir in $PATH ; do -@@ -65,6 +76,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then +@@ -77,6 +88,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then done IFS=$OLDIFS done @@ -50,7 +51,7 @@ else WINDOW_MANAGER=$DEFWM fi -@@ -104,11 +116,7 @@ if [ ! -z "$SMID" ] ; then +@@ -116,11 +128,7 @@ if [ ! -z "$SMID" ] ; then OPT1=-i OPT2=$SMID ;; @@ -63,7 +64,7 @@ OPT1=--sm-client-id OPT2=$SMID ;; -@@ -116,18 +124,6 @@ if [ ! -z "$SMID" ] ; then +@@ -128,18 +136,6 @@ if [ ! -z "$SMID" ] ; then esac fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-qt for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package python-qt for openSUSE:Factory checked in at Thu May 28 03:51:40 CEST 2009. -------- --- KDE/python-qt/python-qt.changes 2008-12-06 12:16:12.000000000 +0100 +++ python-qt/python-qt.changes 2009-05-26 21:17:11.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 26 21:15:01 CEST 2009 - dmueller(a)suse.de + +- update to 3.18-snapshot-20090323: + * Compatibility changes needed for SIP v4.8. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PyQt-x11-gpl-3.17.6.tar.bz2 New: ---- PyQt-x11-gpl-3.18-snapshot-20090323.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt.spec ++++++ --- /var/tmp/diff_new_pack.fQ2167/_old 2009-05-28 03:50:45.000000000 +0200 +++ /var/tmp/diff_new_pack.fQ2167/_new 2009-05-28 03:50:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-qt (Version 3.17.6) +# spec file for package python-qt (Version 3.17.6+3.18snapshot20090323) # -# 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 @@ -23,13 +23,14 @@ License: LGPL v2.1 or later Group: Development/Libraries/Python Summary: Python Bindings for Qt -Version: 3.17.6 +Version: 3.17.6+3.18snapshot20090323 Release: 1 +%define rversion 3.18-snapshot-20090323 Provides: PyQt = %{version} Requires: python-sip >= %( echo `rpm -q --queryformat '%{VERSION}' python-sip`) Url: http://www.riverbankcomputing.co.uk/software/pyqt/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: PyQt-x11-gpl-%{version}.tar.bz2 +Source0: PyQt-x11-gpl-%rversion.tar.bz2 %description Needed libraries for writing GUI applications using Qt in Python. @@ -41,7 +42,7 @@ The KDE Team <kde(a)kde.org> %prep -%setup -q -n PyQt-x11-gpl-%{version} +%setup -q -n PyQt-x11-gpl-%rversion %build export CXXFLAGS="$RPM_OPT_FLAGS" @@ -84,6 +85,9 @@ %endif %changelog +* Tue May 26 2009 dmueller(a)suse.de +- update to 3.18-snapshot-20090323: + * Compatibility changes needed for SIP v4.8. * Sat Dec 06 2008 dmueller(a)suse.de -update to 3.17.6: * Added the /Constrained/ argument annotations for enums needed by SIP v4.7.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 sysvinit for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Thu May 28 03:50:16 CEST 2009. -------- --- sysvinit/sysvinit.changes 2009-05-11 10:50:37.000000000 +0200 +++ sysvinit/sysvinit.changes 2009-05-28 03:49:05.629965000 +0200 @@ -1,0 +2,5 @@ +Wed May 27 13:26:50 CEST 2009 - werner(a)suse.de + +- Increase hash size for runtime linker of often used tools + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.w14027/_old 2009-05-28 03:49:18.000000000 +0200 +++ /var/tmp/diff_new_pack.w14027/_new 2009-05-28 03:49:18.000000000 +0200 @@ -30,7 +30,7 @@ PreReq: coreutils AutoReqProv: on Version: 2.86 -Release: 209 +Release: 210 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libselinux-devel libsepol-devel @@ -327,6 +327,8 @@ %doc %{_mandir}/man8/mkill.8.gz %changelog +* Wed May 27 2009 werner(a)suse.de +- Increase hash size for runtime linker of often used tools * Mon May 11 2009 werner(a)suse.de - Make it build * Thu May 07 2009 werner(a)suse.de ++++++ killproc-2.15.dif ++++++ --- /var/tmp/diff_new_pack.w14027/_old 2009-05-28 03:49:18.000000000 +0200 +++ /var/tmp/diff_new_pack.w14027/_new 2009-05-28 03:49:18.000000000 +0200 @@ -1,3 +1,30 @@ +--- Makefile ++++ Makefile 2009-05-27 12:05:43.117901008 +0200 +@@ -27,6 +27,7 @@ endif + # + # egcs used with -O2 includes -fno-force-mem which is/was buggy (1998/10/08) + # ++ LDFLAGS = -Wl,--as-needed,--hash-size=8599,-O2 + CFLAGS = $(RPM_OPT_FLAGS) $(COPTS) $(DEBUG) $(INC) -D_GNU_SOURCE -Wall -pipe + CLOOP = -funroll-loops + CC = gcc +@@ -80,13 +81,13 @@ sig.def: + done + + killproc: killproc.c libinit.o +- $(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS) ++ $(CC) $(CFLAGS) $(CLOOP) $(LDFLAGS) -o $@ $^ $(LIBS) + + startproc: startproc.c libinit.o +- $(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS) ++ $(CC) $(CFLAGS) $(CLOOP) $(LDFLAGS) -o $@ $^ $(LIBS) + + checkproc: checkproc.c libinit.o +- $(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS) ++ $(CC) $(CFLAGS) $(CLOOP) $(LDFLAGS) -o $@ $^ $(LIBS) + + usleep: usleep.c + $(CC) $(CFLAGS) -o $@ $^ --- mkill.c +++ mkill.c 2009-04-29 12:55:49.480409712 +0200 @@ -100,6 +100,7 @@ int main(int argc, char* argv[]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mkinitrd for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Thu May 28 03:48:10 CEST 2009. -------- --- mkinitrd/mkinitrd.changes 2009-05-19 21:37:44.000000000 +0200 +++ mkinitrd/mkinitrd.changes 2009-05-25 12:16:01.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 25 12:15:08 CEST 2009 - ro(a)suse.de + +- silence warning about rightfully non existing modprobe.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mkinitrd-silence.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.Q23665/_old 2009-05-28 03:46:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Q23665/_new 2009-05-28 03:46:21.000000000 +0200 @@ -26,7 +26,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.5.9 -Release: 5 +Release: 6 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -34,6 +34,7 @@ Source0: mkinitrd.tar.bz2 Patch0: mkinitrd-2.5.9.patch Patch1: mkinitrd-setup-udev-firmware-fix +Patch2: mkinitrd-silence.patch %description Mkinitrd creates file system images for use as initial RAM disk @@ -66,6 +67,7 @@ %setup %patch0 -p0 %patch1 -p1 +%patch2 %build gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c @@ -129,6 +131,8 @@ %doc %{_mandir}/man8/lsinitrd.8.gz %changelog +* Mon May 25 2009 ro(a)suse.de +- silence warning about rightfully non existing modprobe.conf * Tue May 19 2009 jeffm(a)suse.de - Added firmware rules to udev (bnc#494199) * Mon May 04 2009 werner(a)suse.de ++++++ mkinitrd-silence.patch ++++++ --- scripts/setup-prepare.sh 2009/05/25 10:09:53 1.1 +++ scripts/setup-prepare.sh 2009/05/25 10:11:43 @@ -146,8 +146,10 @@ # Add modprobe, modprobe.conf*, and a version of /bin/true: modprobe.conf # might use it. -cp -r $root_dir/etc/modprobe.conf $root_dir/etc/modprobe.conf.local \ - $root_dir/etc/modprobe.d $tmp_mnt/etc +for mod in $root_dir/etc/modprobe.conf $root_dir/etc/modprobe.conf.local \ + $root_dir/etc/modprobe.d ; do + test -e $mod && cp -r $mod $tmp_mnt/etc +done cat > $tmp_mnt/bin/true <<-EOF #! /bin/sh : ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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