March 2007 - openSUSE Commits - openSUSE Mailing Lists

commit libexif
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package libexif checked in at Thu Mar 1 20:39:39 CET 2007. -------- --- libexif/libexif.changes 2006-10-17 17:25:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/libexif/libexif.changes 2007-02-27 23:14:08.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 23:13:40 CET 2007 - dmueller(a)suse.de + +- split off devel package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libexif.spec ++++++ --- /var/tmp/diff_new_pack.zN3904/_old 2007-03-01 20:39:35.000000000 +0100 +++ /var/tmp/diff_new_pack.zN3904/_new 2007-03-01 20:39:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libexif (Version 0.6.14) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -17,7 +17,7 @@ Group: Development/Libraries/C and C++ Summary: An EXIF Tag Parsing Library for Digital Cameras Version: 0.6.14 -Release: 7 +Release: 25 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Patch0: libexif-fixpkgconfig.patch @@ -33,6 +33,21 @@ Lutz M�ller <lutz(a)users.sourceforge.net> Curtis Galloway <curtisg(a)users.sourceforge.net> +%package devel +Group: Development/Libraries/C and C++ +Summary: An EXIF Tag Parsing Library for Digital Cameras (Development files) + +%description devel +This library is used to parse EXIF information from JPEGs created by +digital cameras. + + + +Authors: +-------- + Lutz M�ller <lutz(a)users.sourceforge.net> + Curtis Galloway <curtisg(a)users.sourceforge.net> + %prep %setup -q %patch0 -p1 @@ -54,13 +69,20 @@ %files %defattr(-,root,root) -%doc %_defaultdocdir/%name -%{_libdir}/lib* +%{_libdir}/lib*.so.* /usr/share/locale/*/LC_MESSAGES/libexif*.mo + +%files devel +%defattr(-,root,root) +%doc %_defaultdocdir/%name +%{_libdir}/lib*.so +%{_libdir}/lib*.la /usr/include/* %{_libdir}/pkgconfig/* -%changelog -n libexif +%changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- split off devel package * Tue Oct 17 2006 - meissner(a)suse.de - Lots of Makernote enhancements, for both Canon and Nikon. - Updated german translation. @@ -68,8 +90,8 @@ - fixed compilation problem (min -> MIN, max -> MAX) * Wed Sep 27 2006 - meissner(a)suse.de - updgraded to current versions -- bugfixes -- some more Canon MakerNote entries added + - bugfixes + - some more Canon MakerNote entries added * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jan 19 2006 - meissner(a)suse.de @@ -80,8 +102,8 @@ - Upgraded to 0.6.13 final. * Mon Oct 10 2005 - meissner(a)suse.de - Updated to current CVS, dropped old patches. -- german translation mostly done (by myself) -- bugfix for crash in COPYRIGHT tag handling #118991 + - german translation mostly done (by myself) + - bugfix for crash in COPYRIGHT tag handling #118991 * Wed Aug 31 2005 - meissner(a)suse.de - Use RPM_OPT_FLAGS. - Merged fixes from HEAD CVS, almost only Canon Maker Note @@ -118,14 +140,14 @@ ABI changes which have not yet migrated to all the tools. * Mon Feb 23 2004 - meissner(a)suse.de - Upgraded to upstream 0.5.13: -- bugfixes and some new features. -- merged with libmnote + - bugfixes and some new features. + - merged with libmnote * Wed Oct 15 2003 - meissner(a)suse.de - don't build as root. * Wed Aug 06 2003 - meissner(a)suse.de - Upgreaded to upstream 0.5.12: -- fixed endless loops and crashes on invalid exif data. -- translation updates. + - fixed endless loops and crashes on invalid exif data. + - translation updates. * Mon Jul 21 2003 - meissner(a)suse.de - Upgraded to upstream 0.5.10. * Tue May 13 2003 - meissner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez-hcidump
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package bluez-hcidump checked in at Thu Mar 1 20:39:13 CET 2007. -------- --- bluez-hcidump/bluez-hcidump.changes 2006-10-31 12:24:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/bluez-hcidump/bluez-hcidump.changes 2007-02-27 19:51:45.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 27 19:51:14 CET 2007 - seife(a)suse.de + +- update to v1.34: + * Add reading support for MacOS X packet logger format. + * Add decoding for AFH host channel classification command. + * Add decoding for QoS setup command. + +------------------------------------------------------------------- Old: ---- bluez-hcidump-1.33.tar.gz New: ---- bluez-hcidump-1.34.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-hcidump.spec ++++++ --- /var/tmp/diff_new_pack.Fu3267/_old 2007-03-01 20:39:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Fu3267/_new 2007-03-01 20:39:05.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package bluez-hcidump (Version 1.33) +# spec file for package bluez-hcidump (Version 1.34) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,10 +13,10 @@ Name: bluez-hcidump BuildRequires: bluez-libs pkgconfig URL: http://bluez.sourceforge.net -Version: 1.33 +Version: 1.34 Release: 1 Summary: HCI Dumper for Debugging Bluetooth Connections -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) PreReq: %insserv_prereq Group: Development/Tools/Debuggers Autoreqprov: on @@ -65,7 +65,12 @@ %{_mandir}/man8/hcidump.8.gz %doc AUTHORS COPYING INSTALL ChangeLog NEWS README -%changelog -n bluez-hcidump +%changelog +* Tue Feb 27 2007 - seife(a)suse.de +- update to v1.34: + * Add reading support for MacOS X packet logger format. + * Add decoding for AFH host channel classification command. + * Add decoding for QoS setup command. * Tue Oct 31 2006 - seife(a)suse.de - update to v1.33: * Add support for IPv6 decoding. ++++++ bluez-hcidump-1.33.tar.gz -> bluez-hcidump-1.34.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/aclocal.m4 new/bluez-hcidump-1.34/aclocal.m4 --- old/bluez-hcidump-1.33/aclocal.m4 2006-10-21 15:50:31.000000000 +0200 +++ new/bluez-hcidump-1.34/aclocal.m4 2007-02-18 04:39:58.000000000 +0100 @@ -149,7 +149,8 @@ _PKG_TEXT ])], - [$4]) + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/ChangeLog new/bluez-hcidump-1.34/ChangeLog --- old/bluez-hcidump-1.33/ChangeLog 2006-10-21 15:50:14.000000000 +0200 +++ new/bluez-hcidump-1.34/ChangeLog 2007-02-18 04:39:02.000000000 +0100 @@ -1,3 +1,8 @@ +ver 1.34: + Add reading support for MacOS X packet logger format. + Add decoding for AFH host channel classification command. + Add decoding for QoS setup command. + ver 1.33: Add support for IPv6 decoding. Add IPv6 connection support. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/configure new/bluez-hcidump-1.34/configure --- old/bluez-hcidump-1.33/configure 2006-10-21 15:50:36.000000000 +0200 +++ new/bluez-hcidump-1.34/configure 2007-02-18 04:40:04.000000000 +0100 @@ -1582,7 +1582,7 @@ # Define the identity of the package. PACKAGE=bluez-hcidump - VERSION=1.33 + VERSION=1.34 cat >>confdefs.h <<_ACEOF @@ -3233,7 +3233,9 @@ # Put the nasty error message in config.log where it belongs echo "$BLUEZ_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Bluetooth library is required" >&5 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: Bluetooth library is required" >&5 echo "$as_me: error: Bluetooth library is required" >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/configure.in new/bluez-hcidump-1.34/configure.in --- old/bluez-hcidump-1.33/configure.in 2006-10-21 15:50:14.000000000 +0200 +++ new/bluez-hcidump-1.34/configure.in 2007-02-18 04:39:02.000000000 +0100 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT() -AM_INIT_AUTOMAKE(bluez-hcidump, 1.33) +AM_INIT_AUTOMAKE(bluez-hcidump, 1.34) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/avctp.c new/bluez-hcidump-1.34/parser/avctp.c --- old/bluez-hcidump-1.33/parser/avctp.c 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/avctp.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/avdtp.c new/bluez-hcidump-1.34/parser/avdtp.c --- old/bluez-hcidump-1.33/parser/avdtp.c 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/avdtp.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/bnep.c new/bluez-hcidump-1.34/parser/bnep.c --- old/bluez-hcidump-1.33/parser/bnep.c 2006-10-21 15:47:13.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/bnep.c 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2002-2003 Takashi Sasai <sasai(a)sm.sony.co.jp> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/bpa.c new/bluez-hcidump-1.34/parser/bpa.c --- old/bluez-hcidump-1.33/parser/bpa.c 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/bpa.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/capi.c new/bluez-hcidump-1.34/parser/capi.c --- old/bluez-hcidump-1.33/parser/capi.c 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/capi.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/cmtp.c new/bluez-hcidump-1.34/parser/cmtp.c --- old/bluez-hcidump-1.33/parser/cmtp.c 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/cmtp.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2002-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2002-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/csr.c new/bluez-hcidump-1.34/parser/csr.c --- old/bluez-hcidump-1.33/parser/csr.c 2006-02-13 12:56:03.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/csr.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/ericsson.c new/bluez-hcidump-1.34/parser/ericsson.c --- old/bluez-hcidump-1.33/parser/ericsson.c 2006-04-17 02:41:15.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/ericsson.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/hci.c new/bluez-hcidump-1.34/parser/hci.c --- old/bluez-hcidump-1.33/parser/hci.c 2006-08-22 06:22:07.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/hci.c 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky <maxk(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify @@ -728,6 +728,25 @@ btohs(cp->min_interval), btohs(cp->attempt), btohs(cp->timeout)); } +static inline void qos_setup_dump(int level, struct frame *frm) +{ + qos_setup_cp *cp = frm->ptr; + + p_indent(level, frm); + printf("handle %d flags 0x%2.2x\n", btohs(cp->handle), cp->flags); + + p_indent(level, frm); + printf("Service type: %d\n", cp->qos.service_type); + p_indent(level, frm); + printf("Token rate: %d\n", btohl(cp->qos.token_rate)); + p_indent(level, frm); + printf("Peak bandwith: %d\n", btohl(cp->qos.peak_bandwidth)); + p_indent(level, frm); + printf("Latency: %d\n", btohl(cp->qos.latency)); + p_indent(level, frm); + printf("Delay variation: %d\n", btohl(cp->qos.delay_variation)); +} + static inline void write_link_policy_dump(int level, struct frame *frm) { write_link_policy_cp *cp = frm->ptr; @@ -964,6 +983,18 @@ printf("mode %d\n", cp->mode); } +static inline void set_afh_classification_dump(int level, struct frame *frm) +{ + set_afh_classification_cp *cp = frm->ptr; + int i; + + p_indent(level, frm); + printf("map 0x"); + for (i = 0; i < 10; i++) + printf("%02x", cp->map[i]); + printf("\n"); +} + static inline void write_link_supervision_timeout_dump(int level, struct frame *frm) { write_link_supervision_timeout_cp *cp = frm->ptr; @@ -1157,6 +1188,9 @@ case OCF_SWITCH_ROLE: accept_conn_req_dump(level + 1, frm); return; + case OCF_QOS_SETUP: + qos_setup_dump(level + 1, frm); + return; case OCF_WRITE_LINK_POLICY: write_link_policy_dump(level + 1, frm); return; @@ -1220,6 +1254,9 @@ case OCF_WRITE_AFH_MODE: write_inquiry_mode_dump(level + 1, frm); return; + case OCF_SET_AFH_CLASSIFICATION: + set_afh_classification_dump(level + 1, frm); + return; case OCF_READ_TRANSMIT_POWER_LEVEL: request_transmit_power_level_dump(level + 1, frm); return; @@ -2479,6 +2516,7 @@ switch (manufacturer) { case 0: + case 37: case 48: frm->ptr += HCI_EVENT_HDR_SIZE; frm->len -= HCI_EVENT_HDR_SIZE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/hcrp.c new/bluez-hcidump-1.34/parser/hcrp.c --- old/bluez-hcidump-1.33/parser/hcrp.c 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/hcrp.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/hidp.c new/bluez-hcidump-1.34/parser/hidp.c --- old/bluez-hcidump-1.33/parser/hidp.c 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/hidp.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/l2cap.c new/bluez-hcidump-1.34/parser/l2cap.c --- old/bluez-hcidump-1.33/parser/l2cap.c 2006-02-09 17:04:25.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/l2cap.c 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky <maxk(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/lmp.c new/bluez-hcidump-1.34/parser/lmp.c --- old/bluez-hcidump-1.33/parser/lmp.c 2006-05-31 17:20:08.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/lmp.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/obex.c new/bluez-hcidump-1.34/parser/obex.c --- old/bluez-hcidump-1.33/parser/obex.c 2006-09-03 11:23:54.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/obex.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/parser.c new/bluez-hcidump-1.34/parser/parser.c --- old/bluez-hcidump-1.33/parser/parser.c 2006-01-17 19:28:55.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/parser.c 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky <maxk(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/parser.h new/bluez-hcidump-1.34/parser/parser.h --- old/bluez-hcidump-1.33/parser/parser.h 2006-04-17 01:22:36.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/parser.h 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky <maxk(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify @@ -60,7 +60,8 @@ #define DUMP_TSTAMP 0x0100 #define DUMP_VERBOSE 0x0200 #define DUMP_BTSNOOP 0x1000 -#define DUMP_NOVENDOR 0x2000 +#define DUMP_PKTLOG 0x2000 +#define DUMP_NOVENDOR 0x4000 #define DUMP_TYPE_MASK (DUMP_ASCII | DUMP_HEX | DUMP_EXT) /* Parser filter */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/ppp.c new/bluez-hcidump-1.34/parser/ppp.c --- old/bluez-hcidump-1.33/parser/ppp.c 2006-07-26 15:19:06.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/ppp.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/rfcomm.c new/bluez-hcidump-1.34/parser/rfcomm.c --- old/bluez-hcidump-1.33/parser/rfcomm.c 2006-01-17 18:18:48.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/rfcomm.c 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Wayne Lee <waynelee(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/rfcomm.h new/bluez-hcidump-1.34/parser/rfcomm.h --- old/bluez-hcidump-1.33/parser/rfcomm.h 2006-01-03 13:59:54.000000000 +0100 +++ new/bluez-hcidump-1.34/parser/rfcomm.h 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Wayne Lee <waynelee(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/sdp.c new/bluez-hcidump-1.34/parser/sdp.c --- old/bluez-hcidump-1.33/parser/sdp.c 2006-06-03 12:46:59.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/sdp.c 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Ricky Yuen <ryuen(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/sdp.h new/bluez-hcidump-1.34/parser/sdp.h --- old/bluez-hcidump-1.33/parser/sdp.h 2006-06-03 12:46:59.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/sdp.h 2007-02-18 04:39:02.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Ricky Yuen <ryuen(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/parser/tcpip.c new/bluez-hcidump-1.34/parser/tcpip.c --- old/bluez-hcidump-1.33/parser/tcpip.c 2006-10-21 15:50:14.000000000 +0200 +++ new/bluez-hcidump-1.34/parser/tcpip.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/README new/bluez-hcidump-1.34/README --- old/bluez-hcidump-1.33/README 2006-01-03 13:59:53.000000000 +0100 +++ new/bluez-hcidump-1.34/README 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ ****************************************** Copyright (C) 2000-2002 Maxim Krasnyansky <maxk(a)qualcomm.com> -Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> +Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> Bluetooth packet analyzer diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/src/bpasniff.c new/bluez-hcidump-1.34/src/bpasniff.c --- old/bluez-hcidump-1.33/src/bpasniff.c 2006-01-17 19:28:58.000000000 +0100 +++ new/bluez-hcidump-1.34/src/bpasniff.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/src/csrsniff.c new/bluez-hcidump-1.34/src/csrsniff.c --- old/bluez-hcidump-1.33/src/csrsniff.c 2006-06-17 13:16:16.000000000 +0200 +++ new/bluez-hcidump-1.34/src/csrsniff.c 2007-02-18 04:39:02.000000000 +0100 @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-hcidump-1.33/src/hcidump.c new/bluez-hcidump-1.34/src/hcidump.c --- old/bluez-hcidump-1.33/src/hcidump.c 2006-10-21 15:47:13.000000000 +0200 +++ new/bluez-hcidump-1.34/src/hcidump.c 2007-02-18 04:39:03.000000000 +0100 @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky <maxk(a)qualcomm.com> - * Copyright (C) 2003-2006 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (C) 2003-2007 Marcel Holtmann <marcel(a)holtmann.org> * * * This program is free software; you can redistribute it and/or modify @@ -127,6 +127,13 @@ static uint32_t btsnoop_version = 0; static uint32_t btsnoop_type = 0; +struct pktlog_hdr { + uint32_t len; + uint64_t ts; + uint8_t type; +} __attribute__ ((packed)); +#define PKTLOG_HDR_SIZE (sizeof(struct pktlog_hdr)) + static inline int read_n(int fd, char *buf, int len) { register int t = 0, w; @@ -282,6 +289,7 @@ { struct hcidump_hdr dh; struct btsnoop_pkt dp; + struct pktlog_hdr ph; struct frame frm; uint8_t pkt_type; int err; @@ -293,7 +301,9 @@ } while (1) { - if (parser.flags & DUMP_BTSNOOP) + if (parser.flags & DUMP_PKTLOG) + err = read_n(fd, (void *) &ph, PKTLOG_HDR_SIZE); + else if (parser.flags & DUMP_BTSNOOP) err = read_n(fd, (void *) &dp, BTSNOOP_PKT_SIZE); else err = read_n(fd, (void *) &dh, HCIDUMP_HDR_SIZE); @@ -303,7 +313,32 @@ if (!err) return; - if (parser.flags & DUMP_BTSNOOP) { + if (parser.flags & DUMP_PKTLOG) { + switch (ph.type) { + case 0x00: + ((uint8_t *) frm.data)[0] = HCI_COMMAND_PKT; + frm.in = 0; + break; + case 0x01: + ((uint8_t *) frm.data)[0] = HCI_EVENT_PKT; + frm.in = 1; + break; + case 0x02: + ((uint8_t *) frm.data)[0] = HCI_ACLDATA_PKT; + frm.in = 0; + break; + case 0x03: + ((uint8_t *) frm.data)[0] = HCI_ACLDATA_PKT; + frm.in = 1; + break; + default: + lseek(fd, ntohl(ph.len) - 9, SEEK_CUR); + continue; + } + + frm.data_len = ntohl(ph.len) - 8; + err = read_n(fd, frm.data + 1, frm.data_len - 1); + } else if (parser.flags & DUMP_BTSNOOP) { switch (btsnoop_type) { case 1001: if (ntohl(dp.flags) & 0x02) { @@ -338,12 +373,17 @@ frm.ptr = frm.data; frm.len = frm.data_len; - if (parser.flags & DUMP_BTSNOOP) { + if (parser.flags & DUMP_PKTLOG) { + uint64_t ts; + ts = ntoh64(ph.ts); + frm.ts.tv_sec = ts >> 32; + frm.ts.tv_usec = ts & 0xffffffff; + } else if (parser.flags & DUMP_BTSNOOP) { uint64_t ts; frm.in = ntohl(dp.flags) & 0x01; ts = ntoh64(dp.ts) - 0x00E03AB44A676000ll; frm.ts.tv_sec = (ts / 1000000ll) + 946684800ll; - frm.ts.tv_usec = ts % 1000000ll; + frm.ts.tv_usec = ts % 1000000ll; } else { frm.in = dh.in; frm.ts.tv_sec = btohl(dh.ts_sec); @@ -360,7 +400,8 @@ static int open_file(char *file, int mode, unsigned long flags) { - struct btsnoop_hdr hdr; + unsigned char buf[BTSNOOP_HDR_SIZE]; + struct btsnoop_hdr *hdr = (struct btsnoop_hdr *) buf; int fd, len, open_flags; if (mode == WRITE || mode == PPPDUMP || mode == AUDIO) { @@ -378,17 +419,17 @@ } if (mode == READ) { - len = read(fd, &hdr, BTSNOOP_HDR_SIZE); + len = read(fd, buf, BTSNOOP_HDR_SIZE); if (len != BTSNOOP_HDR_SIZE) { lseek(fd, 0, SEEK_SET); return fd; } - if (!memcmp(hdr.id, btsnoop_id, sizeof(btsnoop_id))) { + if (!memcmp(hdr->id, btsnoop_id, sizeof(btsnoop_id))) { parser.flags |= DUMP_BTSNOOP; - btsnoop_version = ntohl(hdr.version); - btsnoop_type = ntohl(hdr.type); + btsnoop_version = ntohl(hdr->version); + btsnoop_type = ntohl(hdr->type); printf("btsnoop version: %d datalink type: %d\n", btsnoop_version, btsnoop_type); @@ -403,6 +444,11 @@ exit(1); } } else { + if (buf[0] == 0x00 && buf[1] == 0x00) { + parser.flags |= DUMP_PKTLOG; + printf("packet logger data format\n"); + } + parser.flags &= ~DUMP_BTSNOOP; lseek(fd, 0, SEEK_SET); return fd; @@ -412,14 +458,14 @@ btsnoop_version = 1; btsnoop_type = 1002; - memcpy(hdr.id, btsnoop_id, sizeof(btsnoop_id)); - hdr.version = htonl(btsnoop_version); - hdr.type = htonl(btsnoop_type); + memcpy(hdr->id, btsnoop_id, sizeof(btsnoop_id)); + hdr->version = htonl(btsnoop_version); + hdr->type = htonl(btsnoop_type); printf("btsnoop version: %d datalink type: %d\n", btsnoop_version, btsnoop_type); - len = write(fd, &hdr, BTSNOOP_HDR_SIZE); + len = write(fd, buf, BTSNOOP_HDR_SIZE); if (len < 0) { perror("Can't create dump header"); exit(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 beagle
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package beagle checked in at Thu Mar 1 20:38:24 CET 2007. -------- --- GNOME/beagle/beagle.changes 2007-02-22 20:01:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/beagle/beagle.changes 2007-02-27 22:32:16.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 22:32:02 CET 2007 - dmueller(a)suse.de + +- adjust buildrequires: libexif -> libexif-devel + +------------------------------------------------------------------- libbeagle.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.YoU902/_old 2007-03-01 20:38:16.000000000 +0100 +++ /var/tmp/diff_new_pack.YoU902/_new 2007-03-01 20:38:16.000000000 +0100 @@ -11,14 +11,15 @@ # norootforbuild Name: beagle -BuildRequires: art-sharp2 desktop-data dos2unix epiphany epiphany-devel evolution-sharp gconf-sharp2 glade-sharp2 gmime-devel gnome-sharp2 gsf-sharp intltool libexif librsvg-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser shared-mime-info sqlite2-devel tango-icon-theme update-desktop-files wv-devel xorg-x11-devel xorg-x11-libs zip +BuildRequires: art-sharp2 desktop-data dos2unix epiphany epiphany-devel evolution-sharp gconf-sharp2 glade-sharp2 gmime-devel gnome-sharp2 gsf-sharp intltool librsvg-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser shared-mime-info sqlite2-devel tango-icon-theme update-desktop-files wv-devel xorg-x11-devel xorg-x11-libs zip +BuildRequires: libexif-devel %define prefix /usr %define sysconfdir /etc/ License: The Apache Software License, X11/MIT Group: Productivity/Other Autoreqprov: on Version: 0.2.16.2 -Release: 1 +Release: 3 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz @@ -432,6 +433,8 @@ %{prefix}/%_lib/beagle/Backends/ThunderbirdBackends.dll* %changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- adjust buildrequires: libexif -> libexif-devel * Thu Feb 22 2007 - joeshaw(a)suse.de - Update to 0.2.16.2: - Put some limits on the sizes of files extracted from ++++++ libbeagle.spec ++++++ --- /var/tmp/diff_new_pack.YoU902/_old 2007-03-01 20:38:16.000000000 +0100 +++ /var/tmp/diff_new_pack.YoU902/_new 2007-03-01 20:38:16.000000000 +0100 @@ -23,7 +23,7 @@ Group: Development/Libraries/GNOME Autoreqprov: on Version: 0.2.16.2 -Release: 1 +Release: 3 Summary: Beagle C interface Url: http://www.gnome.org/projects/beagle/ Source: beagle-%{version}.tar.gz @@ -105,6 +105,8 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- adjust buildrequires: libexif -> libexif-devel * Thu Feb 22 2007 - joeshaw(a)suse.de - Update to 0.2.16.2: - Put some limits on the sizes of files extracted from ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 basket
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package basket checked in at Thu Mar 1 20:38:06 CET 2007. -------- --- KDE/basket/basket.changes 2007-02-19 09:35:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/basket/basket.changes 2007-02-27 21:21:05.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 21:20:52 CET 2007 - dmueller(a)suse.de + +- add ldconfig post(un) (#249448) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ basket.spec ++++++ --- /var/tmp/diff_new_pack.v31033/_old 2007-03-01 20:37:33.000000000 +0100 +++ /var/tmp/diff_new_pack.v31033/_new 2007-03-01 20:37:33.000000000 +0100 @@ -22,7 +22,7 @@ Group: System/X11/Utilities Summary: Extended Clipboard Version: 1.0 -Release: 1 +Release: 3 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rversion 1.0 Source0: %name-%{rversion}.tar.gz @@ -49,6 +49,10 @@ ./configure $configkde --disable-final --without-arts do_make %{?jobs:-j %jobs} +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %install . /etc/opt/kde3/common_options iconv -f iso8859-1 -t utf8 src/basket.desktop > w && mv w src/basket.desktop @@ -95,6 +99,8 @@ %endif %changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- add ldconfig post(un) (#249448) * Mon Feb 19 2007 - stbinner(a)suse.de - update to version 1.0: * Export/import basket archives ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gimp-unstable
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package gimp-unstable checked in at Thu Mar 1 20:37:27 CET 2007. -------- --- GNOME/gimp-unstable/gimp-unstable.changes 2007-01-04 17:51:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/gimp-unstable/gimp-unstable.changes 2007-02-27 22:39:46.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 22:39:36 CET 2007 - dmueller(a)suse.de + +- adjust buildrequires: libexif -> libexif-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp-unstable.spec ++++++ --- /var/tmp/diff_new_pack.j30329/_old 2007-03-01 20:37:18.000000000 +0100 +++ /var/tmp/diff_new_pack.j30329/_new 2007-03-01 20:37:18.000000000 +0100 @@ -12,7 +12,7 @@ Name: gimp-unstable #!BuildIgnore: sendmail -BuildRequires: aalib-devel cups cups-devel gnome-common gnome-icon-theme gnutls-devel gtk-doc intltool libexif libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel librsvg-devel libtiff-devel libwmf-devel libwnck-devel mDNSResponder-devel perl-XML-Parser poppler-devel poppler-glib postfix python-devel slang-devel update-desktop-files +BuildRequires: aalib-devel cups cups-devel gnome-common gnome-icon-theme gnutls-devel gtk-doc intltool libexif-devel libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel librsvg-devel libtiff-devel libwmf-devel libwnck-devel mDNSResponder-devel perl-XML-Parser poppler-devel poppler-glib postfix python-devel slang-devel update-desktop-files %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: python-gtk-devel %else @@ -21,7 +21,7 @@ %define _name gimp URL: http://www.gimp.org/ Version: 2.3.11 -Release: 37 +Release: 43 License: GNU General Public License (GPL) Group: Productivity/Graphics/Bitmap Editors Requires: gnome-icon-theme glib2 >= 2.10.2 gtk2 >= 2.8.17 @@ -701,7 +701,9 @@ %defattr(-,root,root) %{_datadir}/gtk-doc/html/* -%changelog -n gimp-unstable +%changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- adjust buildrequires: libexif -> libexif-devel * Wed Jan 03 2007 - sbrabec(a)suse.cz - Prefix changed to /usr. - Spec file cleanup. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gimp
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package gimp checked in at Thu Mar 1 20:37:10 CET 2007. -------- --- GNOME/gimp/gimp.changes 2007-01-03 14:34:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/gimp/gimp.changes 2007-02-27 22:39:13.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 22:39:05 CET 2007 - dmueller(a)suse.de + +- adjust BuildRequires: libexif->libexif-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.a29571/_old 2007-03-01 20:36:59.000000000 +0100 +++ /var/tmp/diff_new_pack.a29571/_new 2007-03-01 20:36:59.000000000 +0100 @@ -12,7 +12,8 @@ Name: gimp #!BuildIgnore: sendmail -BuildRequires: aalib-devel alsa-devel cups cups-devel gcc-c++ gnome-common gtk-doc intltool libexif libgimpprint libgimpprint-devel libgtkhtml-devel libmng-devel librsvg-devel libtiff-devel libwmf-devel perl-XML-Parser postfix python-devel slang-devel update-desktop-files +BuildRequires: aalib-devel alsa-devel cups cups-devel gcc-c++ gnome-common gtk-doc intltool +BuildRequires: libexif-devel libgimpprint libgimpprint-devel libgtkhtml-devel libmng-devel librsvg-devel libtiff-devel libwmf-devel perl-XML-Parser postfix python-devel slang-devel update-desktop-files %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: python-gtk-devel %else @@ -20,7 +21,7 @@ %endif URL: http://www.gimp.org/ Version: 2.2.13 -Release: 40 +Release: 46 License: GNU General Public License (GPL) Group: Productivity/Graphics/Bitmap Editors Provides: gimp2 gimp-2.0 @@ -716,7 +717,9 @@ %defattr(-,root,root) %{_datadir}/gtk-doc/html/* -%changelog -n gimp +%changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- adjust BuildRequires: libexif->libexif-devel * Wed Jan 03 2007 - sbrabec(a)suse.cz - Spec file cleanup. * Fri Dec 22 2006 - maw(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bash
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package bash checked in at Thu Mar 1 20:36:51 CET 2007. -------- --- bash/bash.changes 2006-12-14 13:10:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2007-02-28 13:30:07.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 28 13:25:29 CET 2007 - werner(a)suse.de + +- Don't access buffer but resulting pointer for array element names + to avoid the not initialized area of the buffer. This also fixes + an inherent wrong calculation of the string length of the array + element names (bug #248717) + +------------------------------------------------------------------- New: ---- bash-3.2-valgrind.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.z27494/_old 2007-03-01 20:36:10.000000000 +0100 +++ /var/tmp/diff_new_pack.z27494/_new 2007-03-01 20:36:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bash (Version 3.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -16,7 +16,7 @@ Requires: readline >= 5.2 Autoreqprov: on Version: 3.2 -Release: 5 +Release: 12 %define bash_vers 3.2 %define rl_vers 5.2 Summary: The GNU Bourne-Again Shell @@ -38,6 +38,7 @@ Patch9: bash-3.1-extended_quote.patch Patch10: bash-3.2-printf.patch Patch11: bash-3.1-loadables.dif +Patch12: bash-3.2-valgrind.patch Patch20: readline-%{rl_vers}.dif Patch21: readline-4.3-input.dif Patch22: readline-5.2-wrap.patch @@ -64,7 +65,7 @@ Group: System/Libraries Provides: bash:/lib/libreadline.so.5 Version: 5.2 -Release: 5 +Release: 12 Autoreqprov: on %description -n readline @@ -84,7 +85,7 @@ Group: Development/Libraries/C and C++ Provides: bash:/usr/lib/libreadline.a Version: 5.2 -Release: 5 +Release: 12 Requires: readline = %{version}-%{release}, %{_libdir}/libncurses.so Autoreqprov: on @@ -118,6 +119,7 @@ %patch9 -p0 -b .extended_quote %patch10 -p0 -b .printf %patch11 -p0 -b .plugins +%patch12 -p0 -b .valgrind for p in ../readline-%{rl_vers}-patches/*; do test -e $p || break case "${p##*/}" in @@ -325,7 +327,12 @@ %{_libdir}/libreadline.so %doc %{_mandir}/man3/readline.3.gz -%changelog -n bash +%changelog +* Wed Feb 28 2007 - werner(a)suse.de +- Don't access buffer but resulting pointer for array element names + to avoid the not initialized area of the buffer. This also fixes + an inherent wrong calculation of the string length of the array + element names (bug #248717) * Thu Dec 14 2006 - werner(a)suse.de - Update to bash 3.2 patch level 9 * Wed Dec 06 2006 - schwab(a)suse.de ++++++ bash-3.2.dif ++++++ --- /var/tmp/diff_new_pack.z27494/_old 2007-03-01 20:36:10.000000000 +0100 +++ /var/tmp/diff_new_pack.z27494/_new 2007-03-01 20:36:10.000000000 +0100 @@ -1,6 +1,6 @@ --- .pkgextract +++ .pkgextract 2006-03-27 14:15:25.000000000 +0200 -@@ -0,0 +1,14 @@ +@@ -0,0 +1,15 @@ +tar Oxfj ../bash-3.2-patches.tar.bz2 | patch -p0 -s +patch -p0 -s --suffix=".manual" < ../bash-2.03-manual.patch +patch -p0 -s --suffix=".security" < ../bash-2.05a-security.patch @@ -13,6 +13,7 @@ +patch -p0 -s --suffix=".equote" < ../bash-3.1-extended_quote.patch +patch -p0 -s --suffix=".printf" < ../bash-3.2-printf.patch +patch -p0 -s --suffix=".plugins" < ../bash-3.1-loadables.dif ++patch -p0 -s --suffix=".valgrind" < ../bash-3.2-valgrind.patch +patch -p0 -s --suffix=".zerotty" < ../readline-4.3-input.dif +patch -p0 -s --suffix=".wrap" < ../readline-5.2-wrap.patch +patch -p0 -s --suffix=".conf" < ../readline-5.2-conf.patch ++++++ bash-3.2-valgrind.patch ++++++ --- array.c +++ array.c 2007-02-28 11:17:18.000000000 +0000 @@ -649,13 +649,14 @@ int quoted; result = (char *)xmalloc (rsize = 128); result[0] = '('; + indstr[0] = '\0'; rlen = 1; for (ae = element_forw(a->head); ae != a->head; ae = element_forw(ae)) { is = inttostr (element_index(ae), indstr, sizeof(indstr)); valstr = element_value (ae) ? sh_double_quote (element_value(ae)) : (char *)NULL; - elen = STRLEN (indstr) + 8 + STRLEN (valstr); + elen = STRLEN (is) + 3 + STRLEN (valstr); RESIZE_MALLOCED_BUFFER (result, rlen, (elen + 1), rsize, rsize); result[rlen++] = '['; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 koffice
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package koffice checked in at Thu Mar 1 20:36:02 CET 2007. -------- --- KDE/koffice/koffice.changes 2007-02-19 08:50:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/koffice/koffice.changes 2007-02-27 22:56:13.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 22:56:05 CET 2007 - dmueller(a)suse.de + +- adjust BuildRequires: libexif->libexif-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice.spec ++++++ --- /var/tmp/diff_new_pack.E26340/_old 2007-03-01 20:35:28.000000000 +0100 +++ /var/tmp/diff_new_pack.E26340/_new 2007-03-01 20:35:28.000000000 +0100 @@ -11,7 +11,7 @@ # norootforbuild Name: koffice -BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz kdebindings3-javascript kdelibs3-devel kdelibs3-devel-doc libexif libpqxx-devel mysql-devel postgresql-devel python-devel qt3-devel-doc readline-devel sqlite-devel wv2-devel +BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz kdebindings3-javascript kdelibs3-devel kdelibs3-devel-doc libexif-devel libpqxx-devel mysql-devel postgresql-devel python-devel qt3-devel-doc readline-devel sqlite-devel wv2-devel %if %suse_version > 1010 BuildRequires: GraphicsMagick-devel %endif @@ -29,7 +29,7 @@ Group: Productivity/Office/Suite Summary: Libraries and Base Files for the KDE Office Suite Version: 1.6.2 -Release: 1 +Release: 3 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: koffice-%{version}.tar.bz2 @@ -712,6 +712,8 @@ /opt/kde3/include/* %changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- adjust BuildRequires: libexif->libexif-devel * Mon Feb 19 2007 - stbinner(a)suse.de - update to KOffice 1.6.2 * Tue Jan 23 2007 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qv
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package qv checked in at Thu Mar 1 20:35:19 CET 2007. -------- --- qv/qv.changes 2006-12-19 17:16:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/qv/qv.changes 2007-02-27 23:11:47.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 23:11:33 CET 2007 - dmueller(a)suse.de + +- adjust buildrequires: libexif -> libexif-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qv.spec ++++++ --- /var/tmp/diff_new_pack.S12163/_old 2007-03-01 20:27:08.000000000 +0100 +++ /var/tmp/diff_new_pack.S12163/_new 2007-03-01 20:27:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qv (Version 0.6) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,9 +12,9 @@ Name: qv Summary: Quick Viewer for Pictures and Slideshows -BuildRequires: gtk2-devel libexif +BuildRequires: gtk2-devel libexif-devel Version: 0.6 -Release: 1 +Release: 11 License: GNU General Public License (GPL) Autoreqprov: on Prefix: %{_prefix} @@ -44,7 +44,9 @@ %defattr(-,root,root) %{_bindir}/qv -%changelog -n qv +%changelog +* Tue Feb 27 2007 - dmueller(a)suse.de +- adjust buildrequires: libexif -> libexif-devel * Tue Dec 19 2006 - kukuk(a)suse.de - Version 0.6 - Display GPS coordinates ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org
by root＠Hilbert.suse.de 01 Mar '07

01 Mar '07

Hello community, here is the log from the commit of package OpenOffice_org checked in at Thu Mar 1 20:22:02 CET 2007. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2007-02-16 12:05:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2007-03-01 14:28:28.000000000 +0100 @@ -1,0 +2,24 @@ +Wed Feb 28 19:43:05 CET 2007 - pmladek(a)suse.cz + +- updated ooo-build to 2.1.7: + * corruption when saving ppt files [n#229874] + * WordPerfect type detection [i#74194] + * missing en-GB strings [n#231678] + * searching for JREs [n#203830, n#222708] + * temporary prefer gij on x86_64 [n#219982] + * search also gij32 [n#222708] + * better Hungarian help font setting [n#244488] + * VBA bits: + * warn only about real macros [n#146994] + * access to hardcoded paths [n#245152] + * critical warnings on PPC [n#244339] + * another bridges cleanup for 64-bit +- fixed security issue with hyper links, CVE-2007-0239, n#241636 +- fixed critical vulnerability in OpenOffice StarCalc file format parser, + CVE-2007-0238, n#241652 +- removed obsolete stuff from /opt/gnome for openSUSE > 10.2 [n#246588] +- added extra localization source: Hungarian [n#243518] +- added support to simply use parallel build of modules; disable by default + now [n#244581] + +------------------------------------------------------------------- Old: ---- minmem ooo-build-2.1.6.tar.gz New: ---- ooo-build-2.1.6-hyperlinks-quotes.diff ooo-build-2.1.6-starcalc-file-format-parser-2.2.diff ooo-build-2.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.a19978/_old 2007-03-01 20:14:06.000000000 +0100 +++ /var/tmp/diff_new_pack.a19978/_new 2007-03-01 20:14:06.000000000 +0100 @@ -43,9 +43,14 @@ # test_build_SDK: 0 = no # 1 = yes (if possible, see below the definition of ooo_build_sdk) %define test_build_sdk 1 +# build_module_in_parallel 0 = no +# 1 = yes (the number is defined be the number of cpus) +# 2,3,4... = yes (force the number of modules to be built in parallel) +%define build_module_in_parallel 0 # prepare_build: 0 = no # 1 = yes (just build, install and create packages; without %%prep section and configure) %define prepare_build 1 +# %if %test_build_langs == 0 %define ooo_langs "en-US" %else @@ -82,14 +87,14 @@ %endif # %define ooo_prefix %_libdir -%define ooo_home ooo-2.1 +%define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.1.6 +%define ooo_build_version 2.1.7 %define ooo_build_tag ooe680-m6 License: Artistic License, BSD License and BSD-like Group: Productivity/Office/Suite Version: 2.1 -Release: 6 +Release: 8 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -179,7 +184,10 @@ Source600: OOo-wrapper %endif # FIXME: Reverted the only new feature in ooo-build trunk -Patch: ooo-build-2.1.1b-no-libwfs.diff +Patch0: ooo-build-2.1.1b-no-libwfs.diff +# sec. fixes +Patch1: ooo-build-2.1.6-hyperlinks-quotes.diff +Patch2: ooo-build-2.1.6-starcalc-file-format-parser-2.2.diff Patch100: extra_localizations_sources-about.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1140,7 +1148,9 @@ %setup -D -T -q -n ooo-build-%ooo_build_version %else %setup -q -n ooo-build-%ooo_build_version -%patch +%patch0 +%patch1 +%patch2 install -m 644 %{S:1} %{S:2} %{S:3} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} src/ %if %suse_version <= 930 # some more libraries for older distributions where the system versions are @@ -1167,6 +1177,13 @@ PARALLEL_BUILD="--with-gcc-speedup=icecream --with-icecream-max-jobs=%jobs" fi +# parallel build of modules; it makes sense on machines with more CPUs +if test "%build_module_in_parallel" = "1" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +fi +if test "%build_module_in_parallel" -gt "1" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +fi # # Distro settings ... %ifarch ppc @@ -1276,11 +1293,6 @@ install -m 755 -d $RPM_BUILD_ROOT/%{_prefix}/sbin ln -sf %ooo_prefix/%ooo_home/install-dict \ $RPM_BUILD_ROOT/%{_prefix}/sbin/ooinstdict -# a compat symlink; the old icon was accessed from a desktop file that was -# installed into the user HOME directory on NLD9 by default, n#173140 -install -m 755 -d $RPM_BUILD_ROOT/opt/gnome/share/pixmaps -ln -sf /usr/share/pixmaps/ooo-writer.png \ - $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/ximian-openoffice-writer.png %else # fix SUSE's desktop files for non-conflicting OOo2 package for desktop in base calc draw impress math template web writer ; do @@ -1301,6 +1313,28 @@ # # hacks needed when building for older products # +# gnome moved to /usr/lib in openSUSE-10.3, high time to remove the obsolete +# stuff, n#246588 +%if %suse_version <= 1020 +%if %name == OpenOffice_org +# a compat symlink; the old icon was accessed from a desktop file that was +# installed into the user HOME directory on NLD9 by default, n#173140 +# finally removed in openSUSE-10.3, n#246588 +install -m 755 -d $RPM_BUILD_ROOT/opt/gnome/share/pixmaps +ln -sf /usr/share/pixmaps/ooo-writer.png \ + $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/ximian-openoffice-writer.png +%endif +%else +# these files were really used only on NLD9 and SL < 9.3 +rm $RPM_BUILD_ROOT/opt/gnome/share/application-registry/openoffice*.applications +rm $RPM_BUILD_ROOT/opt/gnome/share/mime-info/openoffice*.keys +rm $RPM_BUILD_ROOT/opt/gnome/share/mime-info/openoffice*.mime +rmdir $RPM_BUILD_ROOT/opt/gnome/share/application-registry/ +rmdir $RPM_BUILD_ROOT/opt/gnome/share/mime-info/ +rmdir $RPM_BUILD_ROOT/opt/gnome/share/ +rmdir $RPM_BUILD_ROOT/opt/gnome/ +%endif +# # install obsolete wrappers, removed in openSUSE 10.2 %if %suse_version <= 1010 %if %name == OpenOffice_org @@ -1809,17 +1843,21 @@ /usr/share/mime/packages/* /usr/share/pixmaps/* /usr/share/icons/* +/opt/kde3/share/templates +# +# files needed when building for older products +# +# gnome moved to /usr/lib in openSUSE-10.3, high time to remove the obsolete +# stuff, n#246588 +%if %suse_version <= 1020 # extra old GNOME MIME info and application registry (especially necessary on NLD9) /opt/gnome/share/application-registry/* /opt/gnome/share/mime-info/* -/opt/kde3/share/templates %if %name == OpenOffice_org # a compat symlink with NLD9 /opt/gnome/share/pixmaps/ximian-openoffice-writer.png %endif -# -# files needed when building for older products -# +%endif # obsolete wrappers, removed in openSUSE 10.2 %if %suse_version <= 1010 %if %name == OpenOffice_org @@ -2078,7 +2116,28 @@ %defattr(-,root,root) %endif -%changelog -n OpenOffice_org +%changelog +* Wed Feb 28 2007 - pmladek(a)suse.cz +- updated ooo-build to 2.1.7: + * corruption when saving ppt files [n#229874] + * WordPerfect type detection [i#74194] + * missing en-GB strings [n#231678] + * searching for JREs [n#203830, n#222708] + * temporary prefer gij on x86_64 [n#219982] + * search also gij32 [n#222708] + * better Hungarian help font setting [n#244488] + * VBA bits: + * warn only about real macros [n#146994] + * access to hardcoded paths [n#245152] + * critical warnings on PPC [n#244339] + * another bridges cleanup for 64-bit +- fixed security issue with hyper links, CVE-2007-0239, n#241636 +- fixed critical vulnerability in OpenOffice StarCalc file format parser, + CVE-2007-0238, n#241652 +- removed obsolete stuff from /opt/gnome for openSUSE > 10.2 [n#246588] +- added extra localization source: Hungarian [n#243518] +- added support to simply use parallel build of modules; disable by default + now [n#244581] * Thu Feb 15 2007 - pmladek(a)suse.cz - updated ooo-build to 2.1.6: * crash when opening files up over sftp connection [n#243805] ++++++ extra_localizations_sources.tar.bz2 ++++++ arch/i386/OpenOffice_org/extra_localizations_sources.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/extra_localizations_sources.tar.bz2 differ: byte 15630098, line 66173 ++++++ ooo-build-2.1.1b-no-libwfs.diff ++++++ --- /var/tmp/diff_new_pack.a19978/_old 2007-03-01 20:14:50.000000000 +0100 +++ /var/tmp/diff_new_pack.a19978/_new 2007-03-01 20:14:50.000000000 +0100 @@ -26,12 +26,13 @@ my $distro = '@DISTRO@'; --- patches/src680/apply +++ patches/src680/apply -@@ -210,9 +210,7 @@ +@@ -210,10 +210,8 @@ # 64bit stuff cws-sixtyfour09.diff cws-cmcfixes30.diff -# MS Works import filter (following patches depend on each other) Fridrich cws-fs08.diff + cws-fsfixes06.diff -cws-wpsimport01.diff [ GCJ ] ++++++ ooo-build-2.1.6-hyperlinks-quotes.diff ++++++ --- patches/src680/apply +++ patches/src680/apply @@ -400,6 +400,10 @@ # silly leaks around the place leak-sal-file.diff, i#49510, michael +[ Fixes ] +# Security issue with hyper links, CVE-2007-0239, n#241636 +hyperlinks-2.1.diff +cws-obr04-quotes.diff [ QuickStarter ] # External splash screen implementation / 2nd time accelerator --- patches/src680/cws-obr04-quotes.diff +++ patches/src680/cws-obr04-quotes.diff @@ -0,0 +1,123 @@ +Index: shell/source/unix/misc/cde-open-url.sh +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/misc/cde-open-url.sh,v +retrieving revision 1.3 +retrieving revision 1.3.120.1 +diff -u -p -u -p -r1.3 -r1.3.120.1 +--- shell/source/unix/misc/cde-open-url.sh 27 Sep 2005 12:54:22 -0000 1.3 ++++ shell/source/unix/misc/cde-open-url.sh 20 Dec 2006 15:03:24 -0000 1.3.120.1 +@@ -58,5 +58,5 @@ else + fi + + if [ -z "$TMPFILE" ]; then exit 1; fi +-( echo $1 > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) & ++( echo "$1" > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) & + exit 0 +Index: shell/source/unix/misc/gnome-open-url.sh +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/misc/gnome-open-url.sh,v +retrieving revision 1.3 +retrieving revision 1.3.166.1 +diff -u -p -u -p -r1.3 -r1.3.166.1 +--- shell/source/unix/misc/gnome-open-url.sh 13 May 2005 07:31:07 -0000 1.3 ++++ shell/source/unix/misc/gnome-open-url.sh 20 Dec 2006 15:03:25 -0000 1.3.166.1 +@@ -50,6 +50,6 @@ case `uname -s` in + esac + + # use gnome-open utility coming with libgnome if available +-gnome-open $1 2>/dev/null || "$0.bin" $1 ++gnome-open "$1" 2>/dev/null || "$0.bin" $1 + + exit 0 +Index: shell/source/unix/misc/kde-open-url.sh +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/misc/kde-open-url.sh,v +retrieving revision 1.2 +retrieving revision 1.2.254.1 +diff -u -p -u -p -r1.2 -r1.2.254.1 +--- shell/source/unix/misc/kde-open-url.sh 10 May 2004 13:08:06 -0000 1.2 ++++ shell/source/unix/misc/kde-open-url.sh 20 Dec 2006 15:03:25 -0000 1.2.254.1 +@@ -51,9 +51,9 @@ esac + + # special handling for mailto: uris + if echo $1 | grep '^mailto:' > /dev/null; then +- kmailservice $1 & ++ kmailservice "$1" & + else +- kfmclient openURL $1 & ++ kfmclient openURL "$1" & + fi + + exit 0 +Index: shell/source/unix/misc/open-url.sh +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/misc/open-url.sh,v +retrieving revision 1.3 +retrieving revision 1.3.120.2 +diff -u -p -u -p -r1.3 -r1.3.120.2 +--- shell/source/unix/misc/open-url.sh 27 Sep 2005 12:54:42 -0000 1.3 ++++ shell/source/unix/misc/open-url.sh 20 Dec 2006 15:03:25 -0000 1.3.120.2 +@@ -96,15 +96,15 @@ esac + # special handling for mailto: uris + if echo $1 | grep '^mailto:' > /dev/null; then + # check $MAILER variable +- if [ $MAILER ]; then +- $MAILER $1 & ++ if [ ! -z "$MAILER" ]; then ++ $MAILER "$1" & + exit 0 + else + # mozilla derivates may need -remote semantics + for i in thunderbird mozilla netscape; do + mailer=`which $i` + if [ ! -z "$mailer" ]; then +- run_mozilla $mailer $1 ++ run_mozilla "$mailer" "$1" + exit 0 + fi + done +@@ -113,15 +113,15 @@ if echo $1 | grep '^mailto:' > /dev/null + fi + else + # check $BROWSER variable +- if [ $BROWSER ]; then +- $BROWSER $1 & ++ if [ ! -z "$BROWSER" ]; then ++ $BROWSER "$1" & + exit 0 + else + # mozilla derivates may need -remote semantics + for i in firefox mozilla netscape; do + browser=`which $i` + if [ ! -z "$browser" ]; then +- run_mozilla $browser $1 ++ run_mozilla "$browser" "$1" + exit 0 + fi + done +Index: scp2/source/ooo/file_ooo.scp +=================================================================== +RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v +retrieving revision 1.175 +retrieving revision 1.175.10.1 +diff -u -p -u -p -r1.175 -r1.175.10.1 +--- scp2/source/ooo/file_ooo.scp 13 Dec 2006 15:14:08 -0000 1.175 ++++ scp2/source/ooo/file_ooo.scp 12 Jan 2007 08:06:00 -0000 1.175.10.1 +@@ -369,7 +369,7 @@ File gid_File_Bin_Gnome_Open_Url + BIN_FILE_BODY; + Dir = gid_Dir_Program; + Name = "gnome-open-url"; +- Styles = (PACKED); ++ Styles = (PACKED, PATCH); + End + + File gid_File_Bin_Gnome_Open_Url_Bin +@@ -383,7 +383,7 @@ File gid_File_Bin_Kde_Open_Url + BIN_FILE_BODY; + Dir = gid_Dir_Program; + Name = "kde-open-url"; +- Styles = (PACKED); ++ Styles = (PACKED, PATCH); + End + + File gid_File_Bin_Cde_Open_Url --- patches/src680/hyperlinks-2.1.diff +++ patches/src680/hyperlinks-2.1.diff @@ -0,0 +1,240 @@ +--- shell/source/unix/exec/shellexec.hxx.old 2005-09-07 21:54:18.000000000 +0200 ++++ shell/source/unix/exec/shellexec.hxx 2007-02-01 18:41:49.000000000 +0100 +@@ -44,6 +44,10 @@ + #include <osl/mutex.hxx> + #endif + ++#ifndef _RTL_USTRBUF_HXX_ ++#include <rtl/ustrbuf.hxx> ++#endif ++ + #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ + #include <com/sun/star/lang/XServiceInfo.hpp> + #endif +@@ -65,6 +69,8 @@ + ::rtl::OString m_aDesktopEnvironment; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + m_xContext; ++ ++ sal_Int32 SAL_CALL tryExecuteProcess( const rtl::OUString& aCommand, const rtl::OUString& aParameter ); + + public: + ShellExec(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext); +--- shell/source/unix/exec/shellexec.cxx.old 2006-09-17 03:41:54.000000000 +0200 ++++ shell/source/unix/exec/shellexec.cxx 2007-02-02 16:03:56.000000000 +0100 +@@ -56,10 +56,6 @@ + #include <rtl/strbuf.hxx> + #endif + +-#ifndef _RTL_USTRBUF_HXX_ +-#include <rtl/ustrbuf.hxx> +-#endif +- + #ifndef _RTL_URI_H_ + #include <rtl/uri.hxx> + #endif +@@ -124,6 +120,47 @@ + } + } + ++//------------------------------------------------------------------------ ++// helper method ++//------------------------------------------------------------------------ ++ ++sal_Int32 SAL_CALL ShellExec::tryExecuteProcess( const OUString& aCommand, const OUString& aParameter ) ++{ ++ OUString aCommandURL; ++ osl::FileBase::getFileURLFromSystemPath(aCommand, aCommandURL); ++ ++ rtl_uString *args[] = { aCommandURL.pData, aParameter.pData }; ++ oslProcess pProcess = NULL; ++ sal_Int32 rc = 1; ++ ++ oslProcessError error = osl_executeProcess( ++ args[0], /* ustrImageName */ ++ args+1, /* ustrArguments[] */ ++ 1, /* nArguments */ ++ osl_Process_WAIT | osl_Process_SEARCHPATH | osl_Process_NORMAL, /* Options */ ++ NULL, /* Security */ ++ NULL, /* ustrDirectory */ ++ NULL, /* ustrEnvironments[] */ ++ 0, /* nEnvironmentVars */ ++ &pProcess); /* pProcess*/ ++ ++ if (error == osl_Process_E_None) ++ { ++ error = osl_joinProcess( pProcess ); ++ if (error==osl_Process_E_None) ++ { ++ oslProcessInfo aProcessInfo; ++ aProcessInfo.Size = sizeof(aProcessInfo); ++ error = osl_getProcessInfo( pProcess, osl_Process_EXITCODE, &aProcessInfo ); ++ if (error==osl_Process_E_None) ++ rc = aProcessInfo.Code; ++ } ++ } ++ osl_freeProcessHandle(pProcess); ++ ++ return rc; ++} ++ + //----------------------------------------------------------------------------------------- + // + //----------------------------------------------------------------------------------------- +@@ -157,23 +194,28 @@ + void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 /*nFlags*/ ) + throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) + { +- OStringBuffer aBuffer, aLaunchBuffer; ++ OStringBuffer aOfficeLauncher; ++ OUString aURL; ++ ++ sal_Bool bTryDesktopLauncher = sal_False; + + // DESKTOP_LAUNCH, see http://freedesktop.org/pipermail/xdg/2004-August/004489.html +- static const char *pDesktopLaunch = getenv( "DESKTOP_LAUNCH" ); ++ static const char *pDesktopLauncher = getenv( "DESKTOP_LAUNCH" ); + + // Check wether aCommand contains a document url or not + sal_Int32 nIndex = aCommand.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM(":/") ) ); + + if( nIndex > 0 || 0 == aCommand.compareToAscii("mailto:", 7) ) + { +- // It seems to be a url .. ++ // It seems to be an url .. ++ if ( pDesktopLauncher && *pDesktopLauncher ) ++ bTryDesktopLauncher = sal_True; ++ + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps + // expect. +- OUString aURL( +- com::sun::star::uri::ExternalUriReferenceTranslator::create( +- m_xContext)->translateToExternal(aCommand)); ++ aURL = com::sun::star::uri::ExternalUriReferenceTranslator::create( ++ m_xContext)->translateToExternal(aCommand); + if ( aURL.getLength() == 0 && aCommand.getLength() != 0 ) + { + throw RuntimeException( +@@ -183,15 +225,17 @@ + + aCommand), + static_cast< cppu::OWeakObject * >(this)); + } +- ++ ++ // URL needs furher changes depending on the launcher ++ // FIXME: Should we try pDesktopLauncher before we modify the URL? + #ifdef MACOSX +- aBuffer.append("open"); ++ aOfficeLauncher.append("open"); + #else + OUString aProgramURL; + if ( osl_Process_E_None != osl_getExecutableFile(&aProgramURL.pData) ) + { + throw SystemShellExecuteException( +- OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not determine executable path")), ++ OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not determine executable path")), + static_cast < XSystemShellExecute * > (this), ENOENT ); + } + +@@ -199,7 +243,7 @@ + if ( FileBase::E_None != FileBase::getSystemPathFromFileURL(aProgramURL, aProgram)) + { + throw SystemShellExecuteException( +- OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not convert executable path")), ++ OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not convert executable path")), + static_cast < XSystemShellExecute * > (this), ENOENT ); + } + +@@ -208,7 +252,7 @@ + OString aTmp = OUStringToOString(aProgram, osl_getThreadTextEncoding()); + nIndex = aTmp.lastIndexOf('/'); + if (nIndex > 0) +- aBuffer.append(aTmp.copy(0, nIndex+1)); ++ aOfficeLauncher.append(aTmp.copy(0, nIndex+1)); + + // Respect the desktop environment - if there is an executable named + // <desktop-environement-is>-open-url, pass the url to this one instead +@@ -216,17 +260,17 @@ + if ( m_aDesktopEnvironment.getLength() > 0 ) + { + OString aDesktopEnvironment(m_aDesktopEnvironment.toAsciiLowerCase()); +- OStringBuffer aCopy(aBuffer); ++ OStringBuffer aCopy(aOfficeLauncher); + + aCopy.append(aDesktopEnvironment); + aCopy.append("-open-url"); + + if ( 0 == access( aCopy.getStr(), X_OK) ) + { +- aBuffer.append(aDesktopEnvironment); +- aBuffer.append("-"); ++ aOfficeLauncher.append(aDesktopEnvironment); ++ aOfficeLauncher.append("-"); + +- /* CDE requires file urls to be decoded */ ++ /* CDE requires file urls to be decoded */ + if ( m_aDesktopEnvironment.equals("CDE") && 0 == aURL.compareToAscii("file://", 7) ) + { + aURL = rtl::Uri::decode(aURL, rtl_UriDecodeWithCharset, osl_getThreadTextEncoding()); +@@ -234,44 +278,30 @@ + } + } + +- aBuffer.append("open-url"); ++ aOfficeLauncher.append("open-url"); + #endif +- aBuffer.append(" \'"); +- aBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding())); +- aBuffer.append("\'"); +- +- if ( pDesktopLaunch && *pDesktopLaunch ) +- { +- aLaunchBuffer.append( pDesktopLaunch ); +- aLaunchBuffer.append( " \'" ); +- aLaunchBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding())); +- aLaunchBuffer.append( "\'" ); +- } + } else { +- aBuffer.append(OUStringToOString(aCommand, osl_getThreadTextEncoding())); +- aBuffer.append(" "); +- aBuffer.append(OUStringToOString(aParameter, osl_getThreadTextEncoding())); ++ aOfficeLauncher.append(OUStringToOString(aCommand, osl_getThreadTextEncoding())); ++ aURL = aParameter; + } + +- // Prefer DESKTOP_LAUNCH when available +- if ( aLaunchBuffer.getLength() > 0 ) ++ if ( bTryDesktopLauncher ) + { +- FILE *pLaunch = popen( aLaunchBuffer.makeStringAndClear().getStr(), "w" ); +- if ( pLaunch != NULL ) +- { +- if ( 0 == pclose( pLaunch ) ) +- return; +- } +- // Failed, do not try DESKTOP_LAUNCH any more +- pDesktopLaunch = NULL; ++ sal_Int32 nErr = tryExecuteProcess( OUString::createFromAscii(pDesktopLauncher), aURL); ++ if ( nErr ) ++ // Failed, do not try DESKTOP_LAUNCH any more ++ pDesktopLauncher = NULL; ++ else ++ return; + } + +- OString cmd = aBuffer.makeStringAndClear(); +- if ( 0 != pclose(popen(cmd.getStr(), "w")) ) ++ OUString aOfficeLauncherOUStr = ::rtl::OStringToOUString(aOfficeLauncher.makeStringAndClear(), osl_getThreadTextEncoding()); ++ sal_Int32 nErr = tryExecuteProcess( aOfficeLauncherOUStr, aURL); ++ if ( nErr ) + { +- int nerr = errno; +- throw SystemShellExecuteException(OUString::createFromAscii( strerror( nerr ) ), +- static_cast < XSystemShellExecute * > (this), nerr ); ++ OUString msg = OUString::createFromAscii( "Failed to execute ") + aOfficeLauncherOUStr; ++ throw SystemShellExecuteException(msg, ++ static_cast < XSystemShellExecute * > (this), nErr ); + } + } + ++++++ ooo-build-2.1.6-starcalc-file-format-parser-2.2.diff ++++++ --- patches/src680/apply +++ patches/src680/apply @@ -405,6 +405,9 @@ hyperlinks-2.1.diff cws-obr04-quotes.diff +# Critical vulnerability in OpenOffice StarCalc file format parser, CVE-2007-0238, n#241652 +starcalc-file-format-parser-2.2.diff + [ QuickStarter ] # External splash screen implementation / 2nd time accelerator # (Old version of these is in CWS unxsplash) --- patches/src680/starcalc-file-format-parser-2.2.diff +++ patches/src680/starcalc-file-format-parser-2.2.diff @@ -0,0 +1,28 @@ +Index: sc/source/filter/starcalc/scflt.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/filter/starcalc/scflt.cxx,v +retrieving revision 1.16 +retrieving revision 1.16.84.1 +diff -u -p -u -p -r1.16 -r1.16.84.1 +--- sc/source/filter/starcalc/scflt.cxx 5 Oct 2006 16:21:16 -0000 1.16 ++++ sc/source/filter/starcalc/scflt.cxx 10 Jan 2007 14:31:00 -0000 1.16.84.1 +@@ -1770,12 +1770,13 @@ void Sc10Import::LoadCol(SCCOL Col, SCTA + rStream >> NoteLen; + if (NoteLen != 0) + { +- sal_Char Note[4096]; +- rStream.Read(Note, NoteLen); +- Note[NoteLen] = 0; +- String aText( SC10TOSTRING(Note)); +- ScPostIt aNote(aText, pDoc); ++ sal_Char* pNote = new sal_Char[NoteLen+1]; ++ rStream.Read(pNote, NoteLen); ++ pNote[NoteLen] = 0; ++ String aText( SC10TOSTRING(pNote)); ++ ScPostIt aNote(aText, pDoc); + pDoc->SetNote(Col, static_cast<SCROW> (Row), Tab, aNote ); ++ delete [] pNote; + } + } + pPrgrsBar->Progress(); + ++++++ ooo-build-2.1.6.tar.gz -> ooo-build-2.1.7.tar.gz ++++++ ++++ 3444 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