January 2010 - openSUSE Commits - openSUSE Mailing Lists

commit soprano for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package soprano for openSUSE:Factory checked in at Thu Jan 7 13:02:56 CET 2010. -------- --- soprano/soprano-backend-sesame.changes 2009-12-19 16:31:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/soprano/soprano-backend-sesame.changes 2010-01-02 21:59:55.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Jan 2 21:59:42 CET 2010 - dmueller(a)suse.de + +- fix build against redland 1.0.10 + +------------------------------------------------------------------- soprano-backend-virtuoso.changes: same change soprano.changes: same change calling whatdependson for head-i586 New: ---- redland-cmake-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soprano-backend-sesame.spec ++++++ --- /var/tmp/diff_new_pack.ue8C8v/_old 2010-01-07 13:02:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ue8C8v/_new 2010-01-07 13:02:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package soprano-backend-sesame (Version 2.3.70) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -30,8 +30,9 @@ BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel BuildRequires: clucene-core-devel doxygen raptor Version: 2.3.70 -Release: 2 +Release: 3 Source: soprano-%{version}.tar.bz2 +Patch0: redland-cmake-check.diff # COMMON1-END # COMMON1-END Provides: soprano_backend = %version @@ -45,6 +46,7 @@ # COMMON2-BEGIN # COMMON2-BEGIN %setup -q -n soprano-%{version} +%patch0 # COMMON2-END # COMMON2-END soprano-backend-virtuoso.spec: same change ++++++ soprano.spec ++++++ --- /var/tmp/diff_new_pack.ue8C8v/_old 2010-01-07 13:02:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ue8C8v/_new 2010-01-07 13:02:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package soprano (Version 2.3.70) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -29,8 +29,9 @@ BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel BuildRequires: clucene-core-devel doxygen raptor Version: 2.3.70 -Release: 2 +Release: 3 Source: soprano-%{version}.tar.bz2 +Patch0: redland-cmake-check.diff # COMMON1-END Requires: libsoprano4 = %{version} Recommends: soprano_backend = %version @@ -54,6 +55,7 @@ %prep # COMMON2-BEGIN %setup -q -n soprano-%{version} +%patch0 # COMMON2-END %package -n libsoprano-devel ++++++ redland-cmake-check.diff ++++++ --- CMakeLists.txt +++ CMakeLists.txt @@ -87,6 +87,8 @@ ################## setup variables ################################ +macro_ensure_version( "1.0.5" ${REDLAND_VERSION} REDLAND_VERSION_GOOD ) + if(REDLAND_FOUND AND NOT SOPRANO_DISABLE_REDLAND_BACKEND) set(BUILD_REDLAND_BACKEND TRUE) endif(REDLAND_FOUND AND NOT SOPRANO_DISABLE_REDLAND_BACKEND) @@ -99,9 +101,9 @@ if(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER) set(BUILD_RAPTOR_PARSER TRUE) endif(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER) -if(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER) +if(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION_GOOD AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER) set(BUILD_RAPTOR_SERIALIZER TRUE) -endif(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER) +endif(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION_GOOD AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER) if(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND) set(BUILD_DBUS_SUPPORT TRUE) endif(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qt-creator for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at Thu Jan 7 13:02:26 CET 2010. -------- --- KDE/qt-creator/qt-creator.changes 2009-09-29 13:26:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt-creator/qt-creator.changes 2010-01-02 13:12:43.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Jan 2 12:54:18 CET 2010 - dmueller(a)suse.de + +- update to 1.3.0 final: + * only bugfixes compared to previous version update + +------------------------------------------------------------------- +Sat Nov 21 08:16:46 UTC 2009 - binner(a)kde.org + +- update to 1.3 release candidate: + * Preliminary support for Qt development targeting Symbian platform + * New support for source code refactoring + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix-build-doc.diff fix-designer-integration.diff qt-creator-1.2.1-src.tar.bz2 New: ---- qt-creator-1.3.0-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.pq1suC/_old 2010-01-07 13:02:20.000000000 +0100 +++ /var/tmp/diff_new_pack.pq1suC/_new 2010-01-07 13:02:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package qt-creator (Version 1.2.1) +# spec file for package qt-creator (Version 1.3.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,29 +19,26 @@ Name: qt-creator -License: LGPL v2.1 only ; LGPL v2.1 or later ; MIT License (or similar) +License: LGPLv2.1 ; LGPLv2.1+ ; MIT License (or similar) Group: Development/Tools/IDE Summary: Lightweight IDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.qtsoftware.com/developer/qt-creator/ -Version: 1.2.1 -Release: 3 -Source: %name-%version-src.tar.bz2 +Version: 1.3.0 +Release: 1 +%define rversion %version +Source: %name-%rversion-src.tar.bz2 Source1: qtcreator.desktop Source99: %name-rpmlintrc -#Patch0: no-docu.diff -Patch1: fix-designer-integration.diff -Patch2: fix-build-doc.diff ######################################################################################### # SuSE, openSUSE ######################################################################################### %if 0%{?suse_version} BuildRequires: update-desktop-files -BuildRequires: libqt4-devel >= 4.5 +BuildRequires: libqt4-devel >= 4.5.80 BuildRequires: libqt4-devel-doc BuildRequires: libQtWebKit-devel Recommends: libqt4-debuginfo -%requires_ge libqt4-x11 %endif ######################################################################################### # Fedora, RHEL or CentOS @@ -63,10 +60,7 @@ Qt Software %prep -%setup -q -n %name-%version-src -#%patch0 -#%patch1 -p1 -%patch2 -p1 +%setup -q -n %name-%rversion %build %if "%{_lib}"=="lib64" ++++++ qt-creator-1.2.1-src.tar.bz2 -> qt-creator-1.3.0-src.tar.bz2 ++++++ KDE/qt-creator/qt-creator-1.2.1-src.tar.bz2 /mounts/work_src_done/STABLE/qt-creator/qt-creator-1.3.0-src.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-gobject2 for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package python-gobject2 for openSUSE:Factory checked in at Thu Jan 7 13:02:16 CET 2010. -------- --- python-gobject2/python-gobject2.changes 2009-12-24 18:14:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-gobject2/python-gobject2.changes 2010-01-06 12:29:10.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 6 12:26:38 CET 2010 - vuntz(a)opensuse.org + +- Update to version 2.21.1: + + Wrap a lot of new API. + + Make cancellable optional in gio.SocketClient.connect_to_host, + gio.SocketAddressEnumerator.next, + gio.Resolver.lookup_by_address, GFile.create_readwrite + + Deprecate old gio.Drive methods + + Strip g_ prefix for many other functions + + Strip g_ prefix from InetAddress functions + + Fix function name gio.resolver_get_default + + Register enums and flags in PyGI if needed (bgo#603534) + + Remove a duplicate entry in gio.defs + + Fix handling of uchar in pyg_value_from_pyobject + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pygobject-2.21.0.tar.bz2 New: ---- pygobject-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gobject2.spec ++++++ --- /var/tmp/diff_new_pack.PiKVZp/_old 2010-01-07 13:02:06.000000000 +0100 +++ /var/tmp/diff_new_pack.PiKVZp/_new 2010-01-07 13:02:06.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-gobject2 (Version 2.21.0) +# spec file for package python-gobject2 (Version 2.21.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -26,7 +26,7 @@ # BuildRequires: libffi-devel BuildRequires: python-devel Summary: Python bindings for GObject -Version: 2.21.0 +Version: 2.21.1 Release: 1 License: LGPLv2.1+ Group: Development/Libraries/Python ++++++ pygobject-2.21.0.tar.bz2 -> pygobject-2.21.1.tar.bz2 ++++++ ++++ 4973 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 pcsc-lite for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at Thu Jan 7 13:02:08 CET 2010. -------- --- pcsc-lite/pcsc-lite.changes 2009-08-06 18:39:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcsc-lite/pcsc-lite.changes 2009-12-15 01:39:36.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 15 01:39:25 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.1oGUCv/_old 2010-01-07 13:02:01.000000000 +0100 +++ /var/tmp/diff_new_pack.1oGUCv/_new 2010-01-07 13:02:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pcsc-lite (Version 1.5.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,16 +23,17 @@ %define ifddir %{_libdir}/readers BuildRequires: hal-devel pkg-config readline-devel Version: 1.5.5 -Release: 1 +Release: 2 PreReq: %{insserv_prereq} %{fillup_prereq} Group: Productivity/Security -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Url: http://pcsclite.alioth.debian.org/ Summary: PCS Smart Cards Library Source: %{name}-%{version}.tar.bz2 Source1: %{name}.sysconfig Source2: README.SUSE Source3: pre_checkin.sh +Source4: baselibs.conf Patch1: pcsc-lite-init.patch Requires: libpcsclite1 >= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,7 +66,7 @@ Antti Tapaninen <aet(a)cc.hut.fi> %package -n libpcsclite1 -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: System/Libraries Summary: PCS Smart Cards Library @@ -97,7 +98,7 @@ Antti Tapaninen <aet(a)cc.hut.fi> %package devel -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: Development/Libraries/C and C++ Summary: Development package for the MUSCLE project SmartCards library Requires: %{name} = %{version} pcsc-lite glibc-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openct for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package openct for openSUSE:Factory checked in at Thu Jan 7 13:01:34 CET 2010. -------- --- openct/openct.changes 2009-08-10 14:06:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/openct/openct.changes 2009-12-15 10:30:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 15 10:30:44 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openct.spec ++++++ --- /var/tmp/diff_new_pack.BX0eI0/_old 2010-01-07 13:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.BX0eI0/_new 2010-01-07 13:01:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openct (Version 0.6.17) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,18 +20,19 @@ Name: openct Version: 0.6.17 -Release: 2 +Release: 3 BuildRequires: db-devel doxygen krb5-devel libusb-devel licenses openldap2-devel pcsc-lite-devel pkg-config # NOTE: We prefer multiple RPM directory ownership here, because # dependency on hal increases bootstrap build time. #BuildRequires: hal PreReq: %insserv_prereq %fillup_prereq Group: Productivity/Security -License: BSD 3-clause (or similar) ; LGPL v2.1 or later +License: BSD3c(or similar) ; LGPLv2.1+ Url: http://www.opensc-project.org/openct/ Summary: OpenCT Tools for Smart Card Readers Source: %{name}-%{version}.tar.bz2 Source2: README.SUSE +Source3: baselibs.conf Patch1: %{name}-init.patch Patch5: %{name}-old-hal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -77,7 +78,7 @@ Andreas Jellinghaus <aj(a)dungeon.inka.de> %package -n libopenct1 -License: BSD 3-clause (or similar) ; LGPL v2.1 or later +License: BSD3c(or similar) ; LGPLv2.1+ Group: System/Libraries Summary: OpenCT Library for Smart Card Readers # bug437293 @@ -104,7 +105,7 @@ Andreas Jellinghaus <aj(a)dungeon.inka.de> %package -n pcsc-openct -License: BSD 3-clause (or similar) ; LGPL v2.1 or later +License: BSD3c(or similar) ; LGPLv2.1+ Group: Productivity/Security Summary: PC/SC IFD Handler for OpenCT Smart Card Drivers @@ -130,7 +131,7 @@ Andreas Jellinghaus <aj(a)dungeon.inka.de> %package devel -License: BSD 3-clause (or similar) ; LGPL v2.1 or later +License: BSD3c(or similar) ; LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: OpenCT Library for Smart Card Readers Requires: libopenct1 = %{version} glibc-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 netpbm for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at Thu Jan 7 13:01:13 CET 2010. -------- --- netpbm/netpbm.changes 2009-11-24 18:56:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/netpbm/netpbm.changes 2009-12-18 22:20:31.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 18 22:20:11 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.u3WvvC/_old 2010-01-07 13:00:49.000000000 +0100 +++ /var/tmp/diff_new_pack.u3WvvC/_new 2010-01-07 13:00:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package netpbm (Version 10.35.69) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -30,10 +30,11 @@ %endif # Version: 10.35.69 -Release: 1 +Release: 2 Summary: A Powerful Graphics Conversion Package Source: netpbm-%{version}.tar.bz2 Source1: netpbm-%{version}-documentation.tar.bz2 +Source2: baselibs.conf Source3: prepare-src-tarball Patch: netpbm-%{version}.dif Patch2: netpbm-%{version}-manpages.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner191 for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package mozilla-xulrunner191 for openSUSE:Factory checked in at Thu Jan 7 13:01:12 CET 2010. -------- --- mozilla-xulrunner191/mozilla-xulrunner191.changes 2009-12-19 13:33:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner191/mozilla-xulrunner191.changes 2010-01-05 09:31:17.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Dec 25 09:37:02 CET 2009 - wr(a)rosenauer.org + +- update to version 1.9.1.7 (bnc#568011) + * DNS resolution in MakeSN of nsAuthSSPI causing issues for + proxy servers that support NTLM auth (bmo#535193) +- added missing lockdown preferences (bnc#567131) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-1.9.1.6.tar.bz2 xulrunner-source-1.9.1.6.tar.bz2 New: ---- l10n-1.9.1.7.tar.bz2 toolkit-lockdown.js xulrunner-source-1.9.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner191.spec ++++++ --- /var/tmp/diff_new_pack.Pqv1hz/_old 2010-01-07 13:00:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Pqv1hz/_new 2010-01-07 13:00:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mozilla-xulrunner191 (Version 1.9.1.6) +# spec file for package mozilla-xulrunner191 (Version 1.9.1.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006-2009 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -36,8 +36,8 @@ #BuildRequires: libproxy-devel #%endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.1.6 -Release: 2 +Version: 1.9.1.7 +Release: 1 Summary: Mozilla Runtime Environment 1.9.1 Url: http://www.mozilla.org Group: Productivity/Other @@ -60,6 +60,7 @@ Source5: add-plugins.sh.in Source6: create-tar.sh Source7: baselibs.conf +Source8: toolkit-lockdown.js Patch1: toolkit-download-folder.patch Patch2: mozilla-libproxy.patch Patch3: mozilla-pkgconfig.patch @@ -93,10 +94,10 @@ %if %suse_version > 1110 %define has_system_cairo 1 %endif -%define releasedate 2009120100 +%define releasedate 2009122200 %define version_internal %{version} %define apiversion 1.9.1 -%define uaweight 191060 +%define uaweight 191070 ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -331,6 +332,7 @@ #cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/ # preferences cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js +cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js # install add-plugins.sh sed "s:%%PROGDIR:%{_libdir}/xulrunner-%{version_internal}:g" \ %{SOURCE5} > $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh @@ -459,6 +461,7 @@ %{_libdir}/xulrunner-%{version_internal}/greprefs/security-prefs.js %{_libdir}/xulrunner-%{version_internal}/greprefs/xpinstall.js %{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js +%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js %{_libdir}/xulrunner-%{version_internal}/icons/ %{_libdir}/xulrunner-%{version_internal}/modules/ %{_libdir}/xulrunner-%{version_internal}/plugins/ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.Pqv1hz/_old 2010-01-07 13:00:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Pqv1hz/_new 2010-01-07 13:00:46.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_5_6_RELEASE" -VERSION="1.9.1.6" +RELEASE_TAG="FIREFOX_3_5_7_RELEASE" +VERSION="1.9.1.7" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.1 mozilla ++++++ l10n-1.9.1.6.tar.bz2 -> l10n-1.9.1.7.tar.bz2 ++++++ mozilla-xulrunner191/l10n-1.9.1.6.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner191/l10n-1.9.1.7.tar.bz2 differ: char 11, line 1 ++++++ toolkit-lockdown.js ++++++ pref("config.lockdown.showsavedpasswords", false); pref("config.lockdown.savepage", false); pref("config.lockdown.printing", false); ++++++ xulrunner-source-1.9.1.6.tar.bz2 -> xulrunner-source-1.9.1.7.tar.bz2 ++++++ mozilla-xulrunner191/xulrunner-source-1.9.1.6.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner191/xulrunner-source-1.9.1.7.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lsscsi for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package lsscsi for openSUSE:Factory checked in at Thu Jan 7 13:00:31 CET 2010. -------- --- lsscsi/lsscsi.changes 2008-10-31 10:25:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/lsscsi/lsscsi.changes 2009-12-07 16:00:29.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 7 15:57:51 CET 2009 - jdelvare(a)suse.de + +- Update to lsscsi-0.23: + * Show protection information with '--protection' option, ATA, + SATA and USB transport information. + * Stop scanning /proc/mounts; assume /sys unless overridden by + '--sysfsroot=PATH' option. +- This update fixes bnc#556180. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lsscsi-0.21-usb-transport lsscsi-0.21.tar.bz2 New: ---- lsscsi-0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsscsi.spec ++++++ --- /var/tmp/diff_new_pack.xwiXKq/_old 2010-01-07 13:00:24.000000000 +0100 +++ /var/tmp/diff_new_pack.xwiXKq/_new 2010-01-07 13:00:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lsscsi (Version 0.21) +# spec file for package lsscsi (Version 0.23) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,15 @@ Url: http://sg.danny.cz/scsi/lsscsi.html Name: lsscsi -%define lsscsiver 0.21 -License: GPL v2 or later +%define lsscsiver 0.23 +License: GPLv2+ Group: Hardware/Other AutoReqProv: on Provides: scsi:/usr/bin/lsscsi -Version: 0.21 -Release: 13 +Version: 0.23 +Release: 1 Summary: List all SCSI devices in the system -Source: http://sg.torque.net/scsi/lsscsi-%{lsscsiver}.tar.bz2 -Patch1: %{name}-%{version}-usb-transport +Source: lsscsi-%{lsscsiver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,7 +42,6 @@ %prep %setup -%patch1 %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --mandir=%{_mandir} ++++++ lsscsi-0.21.tar.bz2 -> lsscsi-0.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/CREDITS new/lsscsi-0.23/CREDITS --- old/lsscsi-0.21/CREDITS 2008-07-09 21:07:00.000000000 +0200 +++ new/lsscsi-0.23/CREDITS 2009-12-01 01:25:55.000000000 +0100 @@ -8,12 +8,21 @@ proposed additional code so lsscsi would work with lk 2.6.26 (when CONFIG_SYSFS_DEPRECATED_V2 not defined) [20080318] +Ihab Hamadi <ihab dot hamadi at emulex dot com> + co-author of protection information addition [20081206] + James Smart <James dot Smart at Emulex dot Com> transport help, especially for FC [20061128] +Jean Delvare <jdelvare(a)suse.de> + retire /proc/mounts scan for sysfs mount point; + Luben Tuikov <ltuikov at yahoo dot com> transport help [20061127] +Martin K. Petersen <martin dot petersen at oracle dot com> + co-author of protection information addition [20081206] + Mike Christie <michaelc at cs dot wisc dot edu> iSCSI transport help [20070104] @@ -27,4 +36,4 @@ transport help with ieee1394 [20061231] Doug Gilbert -9th July 2008 +30th November 2009 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/ChangeLog new/lsscsi-0.23/ChangeLog --- old/lsscsi-0.21/ChangeLog 2008-07-10 06:09:41.000000000 +0200 +++ new/lsscsi-0.23/ChangeLog 2009-12-03 02:27:40.000000000 +0100 @@ -1,4 +1,13 @@ +Version 0.23 2009/12/01 [svn: r76] + - remove /proc/mounts scan for sysfs mount point, assume + /sys unless overridden by re-instated '--sysfsroot' option + +Version 0.22 2008/12/26 [svn: r71] + - add protection information (see CREDITS file) + - add USB transport type with USB device name + - add ATA and SATA transport types (crude: by driver name) + Version 0.21 2008/7/10 [svn: r64] - more sysfs scanning work needed for lk 2.6.26 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/README new/lsscsi-0.23/README --- old/lsscsi-0.21/README 2008-03-19 20:46:46.000000000 +0100 +++ new/lsscsi-0.23/README 2008-12-27 01:41:45.000000000 +0100 @@ -1,7 +1,7 @@ Installation instructions are in the INSTALL file. For a description of this utility see: -http://www.torque.net/scsi/lsscsi.html +http://sg.danny.cz/scsi/lsscsi.html a copy of this web page is in doc/lsscsi.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/configure new/lsscsi-0.23/configure --- old/lsscsi-0.21/configure 2008-07-09 22:19:19.000000000 +0200 +++ new/lsscsi-0.23/configure 2009-01-04 18:35:49.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for lsscsi 0.21. +# Generated by GNU Autoconf 2.61 for lsscsi 0.23. # # Report bugs to <dgilbert(a)interlog.com>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='lsscsi' PACKAGE_TARNAME='lsscsi' -PACKAGE_VERSION='0.21' -PACKAGE_STRING='lsscsi 0.21' +PACKAGE_VERSION='0.23' +PACKAGE_STRING='lsscsi 0.23' PACKAGE_BUGREPORT='dgilbert(a)interlog.com' ac_subst_vars='SHELL @@ -1166,7 +1166,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lsscsi 0.21 to adapt to many kinds of systems. +\`configure' configures lsscsi 0.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1232,7 +1232,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lsscsi 0.21:";; + short | recursive ) echo "Configuration of lsscsi 0.23:";; esac cat <<\_ACEOF @@ -1315,7 +1315,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lsscsi configure 0.21 +lsscsi configure 0.23 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1329,7 +1329,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lsscsi $as_me 0.21, which was +It was created by lsscsi $as_me 0.23, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2020,7 +2020,7 @@ # Define the identity of the package. PACKAGE='lsscsi' - VERSION='0.21' + VERSION='0.23' cat >>confdefs.h <<_ACEOF @@ -3751,7 +3751,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lsscsi $as_me 0.21, which was +This file was extended by lsscsi $as_me 0.23, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3804,7 +3804,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -lsscsi config.status 0.21 +lsscsi config.status 0.23 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/configure.ac new/lsscsi-0.23/configure.ac --- old/lsscsi-0.21/configure.ac 2008-07-09 22:17:32.000000000 +0200 +++ new/lsscsi-0.23/configure.ac 2009-01-04 18:35:49.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(lsscsi, 0.21, dgilbert(a)interlog.com) +AC_INIT(lsscsi, 0.23, dgilbert(a)interlog.com) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/debian/changelog new/lsscsi-0.23/debian/changelog --- old/lsscsi-0.21/debian/changelog 2008-07-10 06:10:10.000000000 +0200 +++ new/lsscsi-0.23/debian/changelog 2009-12-03 02:27:40.000000000 +0100 @@ -1,38 +1,50 @@ +lsscsi (0.23-0.1) unstable; urgency=low + + * new upstream version + + -- Douglas Gilbert <dgilbert(a)interlog.com> Thu, 03 Dec 2009 02:00:00 +0100 + +lsscsi (0.22-0.1) unstable; urgency=low + + * new upstream version + + -- Douglas Gilbert <dgilbert(a)interlog.com> Fri, 26 Dec 2008 19:30:00 -0500 + lsscsi (0.21-0.1) unstable; urgency=low * new upstream version - -- Douglas Gilbert <dgilbert(a)interlog.org> Thu, 10 Jul 2008 01:00:00 -0400 + -- Douglas Gilbert <dgilbert(a)interlog.com> Thu, 10 Jul 2008 01:00:00 -0400 lsscsi (0.20-0.1) unstable; urgency=low * new upstream version - -- Douglas Gilbert <dgilbert(a)interlog.org> Wed, 9 Jul 2008 15:00:00 -0400 + -- Douglas Gilbert <dgilbert(a)interlog.com> Wed, 9 Jul 2008 15:00:00 -0400 lsscsi (0.19-0.1) unstable; urgency=low * new upstream version - -- Douglas Gilbert <dgilbert(a)interlog.org> Wed, 25 Jan 2007 14:00:00 -0500 + -- Douglas Gilbert <dgilbert(a)interlog.com> Wed, 25 Jan 2007 14:00:00 -0500 lsscsi (0.18-0.1) unstable; urgency=low * new upstream version - -- Douglas Gilbert <dgilbert(a)interlog.org> Fri, 24 Mar 2006 22:00:00 -0500 + -- Douglas Gilbert <dgilbert(a)interlog.com> Fri, 24 Mar 2006 22:00:00 -0500 lsscsi (0.17-0.1) unstable; urgency=low * new upstream version - -- Douglas Gilbert <dgilbert(a)interlog.org> Mon, 06 Feb 2006 16:00:00 +1000 + -- Douglas Gilbert <dgilbert(a)interlog.com> Mon, 06 Feb 2006 16:00:00 +1000 lsscsi (0.16-0.1) unstable; urgency=low * add debian build directory - -- Douglas Gilbert <dgilbert(a)interlog.org> Fri, 30 Dec 2005 16:00:00 +1000 + -- Douglas Gilbert <dgilbert(a)interlog.com> Fri, 30 Dec 2005 16:00:00 +1000 lsscsi (0.15-1) unstable; urgency=low diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/debian/copyright new/lsscsi-0.23/debian/copyright --- old/lsscsi-0.21/debian/copyright 2008-03-19 20:46:18.000000000 +0100 +++ new/lsscsi-0.23/debian/copyright 2008-12-27 01:41:45.000000000 +0100 @@ -1,9 +1,9 @@ This package was debianized by Matt Taggart <taggart(a)debian.org> on Wed, 2 Feb 2005 00:27:11 -0800. -It was downloaded from http://www.torque.net/scsi/lsscsi.html +It was downloaded from http://sg.danny.cz/scsi/lsscsi.html -Copyright: Copyright (C) 2003-2005 D. Gilbert +Copyright: Copyright (C) 2003-2008 D. Gilbert Upstream Author: Doug Gilbert <dgilbert(a)interlog.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/doc/lsscsi.html new/lsscsi-0.23/doc/lsscsi.html --- old/lsscsi-0.21/doc/lsscsi.html 2008-07-10 06:22:22.000000000 +0200 +++ new/lsscsi-0.23/doc/lsscsi.html 2008-12-27 01:41:45.000000000 +0100 @@ -22,15 +22,18 @@ <li><a href="#mozTocId473619">Command line interface</a></li> <li><a href="#mozTocId782775">Transports</a> <ol> + <li><a href="#mozTocId961094">ATA</a></li> <li><a href="#mozTocId339163">FC</a></li> <li><a href="#mozTocId419863">1394</a></li> <li><a href="#mozTocId194875">iSCSI</a></li> <li><a href="#mozTocId80471">SAS</a></li> + <li><a href="#mozTocId348880">SATA</a></li> <li><a href="#mozTocId798449">SPI</a></li> + <li><a href="#mozTocId607245">USB</a></li> </ol> </li> <li><a href="#mozTocId908089">lsscsi version 0.15 -to 0.21 notes</a></li> +to 0.22 notes</a></li> <li><a href="#mozTocId856130"> Download and Build information</a></li> </ol> @@ -88,7 +91,7 @@ Linux    scsi_debug       0004  /dev/sdb</tt> -The first entry on each line is the scsi_host,channel,target_number,lun +The first entry on each line is the scsi_host,channel,target_number, tuple. It is placed in brackets and each element is colon separated. When there are multiple SCSI devices their entries are sorted in ascending tuple order. @@ -226,7 +229,7 @@ spaces; alternatively it can be of the form "host<n>" where <n> is a host number. The four numbers represent host number, channel (or bus) number, target number and logical unit number (i.e. -lun) respectively. The "-" symbol is used to represent a wildcard. For +LUN) respectively. The "-" symbol is used to represent a wildcard. For device listings, no filter argument is equivalent to "-:-:-:-". Numbers missing from the filter are treated as wildcards: hence "5:0:1" and "5:0:1:-" are the same. @@ -339,6 +342,17 @@ </td> </tr> <tr> + <td style="vertical-align: top;">--protection + </td> + <td style="vertical-align: top;">-p + </td> + <td style="vertical-align: top;">0.22 + </td> + <td style="vertical-align: top;">show protection information +(T10-DIF). + </td> + </tr> + <tr> <td style="vertical-align: top;">--transport </td> <td style="vertical-align: top;">-t @@ -386,6 +400,7 @@ wide unique name or identifier. The transports for which extra information is provided are: <ul> + <li>ATA</li> <li>Fibre channel (FC): substantial amount both for target and host </li> <li>IEEE 1394 (SBP): target and host @@ -395,7 +410,9 @@ <li>SCSI Parallel Interface (SPI): trivial </li> <li>Serial Attached SCSI (SAS): substantial amount for both target -and host +and host</li> + <li>SATA</li> + <li>USB </li> </ul> Even though lsscsi, in the @@ -419,6 +436,64 @@ href="http://www.t10.org/ftp/t10/drafts/sam4/sam4r08.pdf">SAM-4</a> document has been used as a guide for the appropriate initiator (i.e. host) and target names and identifiers to display. +<h3><a class="mozTocH3" name="mozTocId961094"></a>ATA</h3> +The detection of  parallel ATA devices is somewhat crude and is +performed after checks are made for more traditional SCSI transports. +The identification of an ATA transport is made on the basis of the low +level driver name that the device or host uses. A similar mechanism is +used to detect SATA devices and there is some overlap since some +drivers support both SATA and PATA devices. No other attributes are +provided. For example: +$ lsscsi +[0:0:0:0]    +disk    ATA      FUJITSU +MHY2160B 0000  /dev/sda +[3:0:0:0]    +cd/dvd  MATSHITA DVD/CDRW UJDA775 CB03  /dev/scd0 +[5:0:0:0]    +disk    USB 2.0  SD/MMC +Reader          /dev/sdb +[6:0:0:0]    +disk    JetFlash TS2GJFVxx +       8.01  /dev/sdc +$ lsscsi -t +[0:0:0:0]    +disk    +sata:                           +/dev/sda +[3:0:0:0]    +cd/dvd  +ata:                            +/dev/scd0 +[5:0:0:0]    +disk    usb: +7-1:1.0                    +/dev/sdb +[6:0:0:0]    +disk    usb: +7-2.4:1.0                  +/dev/sdc +$ lsscsi -Ht +[0]    +ahci          sata: +[1]    +ahci          sata: +[2]    +ahci          sata: +[3]    ata_piix      ata: +[4]    ata_piix      ata: +[5]    usb-storage   usb: 7-1:1.0 +[6]    usb-storage   usb: 7-2.4:1.0 + +In this case the device at 3:0:0:0 (and device node /dev/scd0) is a +DVD/CD drive whose transport is (parallel) ATA. That device is attached +to host3 which is associated with the ata_piix driver. + <h3><a class="mozTocH3" name="mozTocId339163"></a>FC</h3> For FC devices (logical units), the '--transport' option will show the port name and the port identifier instead of the SCSI INQUIRY @@ -734,6 +809,16 @@ Adding a '--list' option will print multiple 'name=value' pair lines, each indented with two or more spaces. +<h3><a class="mozTocH3" name="mozTocId348880"></a>SATA</h3> +The detection of serial ATA (SATA) devices is somewhat crude and is +performed after checks are made for more traditional SCSI transports. +The identification of an SATA transport is made on the basis of the low +level driver name that the device or host uses. A similar mechanism is +used to detect  parallel ATA devices and there is some overlap +since some +drivers support both SATA and PATA devices. No other attributes are +provided. See the example in the <a href="#mozTocId961094">ATA</a> +section, specifically device 0:0:0:0 and the associated host0. <h3><a class="mozTocH3" name="mozTocId798449"></a>SPI</h3> The SCSI parallel interface (SPI) can be detected (as indicated by the "spi:" prefix) but sysfs provides no world wide unique names (there may @@ -794,9 +879,25 @@ style="font-family: monospace;">   transport=spi -  signalling=unknown +  signalling=unknown + + +<h3><a class="mozTocH3" name="mozTocId607245"></a>USB</h3> +When a USB transport is detected the device or host summary line will +contain "usb:" followed by a USB device name. The USB device name has +the form "-<p1>[.<p2>]+:<c>." where + is the USB bus number, <p1> is the port on the host. +<p2> is a port on a host connected hub, if  present. If +needed <p3> is another USB hub port closer to the USB storage +device. <c> refers to the configuration number while is +the interface number. There is a separate USB SCSI host for each USB +logical unit. Thus the same "usb: <device_name>" appears for both +the device (logical unit) and the corresponding SCSI host. See the +example in the <a href="lsscsi.html#mozTocId961094">ATA</a> section, +specifically devices 5:0:0:0 and 6:0:0:0 . 5:0:0:0 is connected +directly to a laptop while 6:0:0:0 is connected via an external hub. <h2><a class="mozTocH2" name="mozTocId908089"></a>lsscsi version 0.15 -to 0.21 notes</h2> +to 0.22 notes</h2> These versions attempt to find the device name used in the /dev directory rather than the kernel generated name. The kernel generated @@ -825,7 +926,7 @@ By default lsscsi lists all SCSI devices (or hosts). This version allows select arguments to reduce the number of devices listed. For -example "lsscsi 1" will list all channels, targets and luns within +example "lsscsi 1" will list all channels, targets and LUNs within host1. A single SCSI device can be listed with 'lsscsi 1 0 0 0' (or 'lsscsi 1:0:0:0' or 'lsscsi [1:0:0:0]'). See man page for more information. This version of lsscsi uses the facilities of the @@ -976,6 +1077,18 @@ <td style="vertical-align: top;">more changes for lk 2.6.26 </td> </tr> + <tr> + <td style="vertical-align: top;"><a href="lsscsi-0.22.tgz">lsscsi-0.22.tgz</a> +20081226</td> + <td style="vertical-align: top;"><a href="lsscsi-0.22-1.i386.rpm">lsscsi-0.22-1.i386.rpm</a> + <a href="lsscsi_0.22-0.1_i386.deb">lsscsi_0.22-0.1_i386.deb</a> + </td> + <td style="vertical-align: top;"><a href="lsscsi-0.22-1.src.rpm">lsscsi-0.22-1.src.rpm</a> + </td> + <td style="vertical-align: top;">show protection information with +'--protection' option, ATA, SATA and USB transport information + </td> + </tr> </tbody> </table> Here is the most recent <a href="lsscsi.ChangeLog">ChangeLog</a> . @@ -987,7 +1100,7 @@ <div style="text-align: center;">Doug Gilbert (dgilbert(a)interlog.com) -Last updated: 10th july 2008 +Last updated: 26th December 2008 </div>   </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/lsscsi.8 new/lsscsi-0.23/lsscsi.8 --- old/lsscsi-0.21/lsscsi.8 2008-07-09 21:01:44.000000000 +0200 +++ new/lsscsi-0.23/lsscsi.8 2009-12-01 01:25:55.000000000 +0100 @@ -1,12 +1,12 @@ -.TH lsscsi "8" "July 2008" "lsscsi\-0.20" LSSCSI +.TH lsscsi "8" "November 2009" "lsscsi\-0.23" LSSCSI .SH NAME lsscsi \- list SCSI devices (or hosts) and their attributes .SH SYNOPSIS .B lsscsi [\fI\-\-classic\fR] [\fI\-\-device\fR] [\fI\-\-generic\fR] [\fI\-\-help\fR] [\fI\-\-hosts\fR] [\fI\-\-kname\fR] [\fI\-\-list\fR] [\fI\-\-long\fR] -[\fI\-\-transport\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR] -[\fIH:C:T:L\fR] +[\fI\-\-protection\fR] [\fI\-\-sysfsroot=PATH\fR] [\fI\-\-transport\fR] +[\fI\-\-verbose\fR] [\fI\-\-version\fR] [\fIH:C:T:L\fR] .SH DESCRIPTION .\" Add any additional description here .PP @@ -38,7 +38,7 @@ report disk error messages using the disk's default kernel name. .PP Information about this utility including examples can also be found at: -http://www.torque.net/scsi/lsscsi.html . +http://sg.danny.cz/scsi/lsscsi.html . .SH OPTIONS .TP \fB\-c\fR, \fB\-\-classic\fR @@ -75,6 +75,9 @@ outputs SCSI device (host) attributes one per line; preceded by two spaces; in the form "<attribute_name>=<value>". .TP +\fB\-p\fR, \fB\-\-protection\fR +Output additional data integrity (protection) information. +.TP \fB\-t\fR, \fB\-\-transport\fR Output transport information. This will be a target related information or, if \fI\-\-hosts\fR is given, initiator related information. When used without @@ -91,9 +94,14 @@ .TP \fB\-V\fR, \fB\-\-version\fR outputs version information then exits. +.TP +\fB\-y\fR, \fB\-\-sysfsroot\fR=\fIPATH\fR +assumes sysfs is mounted at PATH instead of the default '/sys' . If this +option is given PATH should be an absolute path (i.e. start with '/'). .SH NOTES -Information for this command is derived from the sysfs file system -whose mount point is found by examining the contents of /proc/mounts . +Information for this command is derived from the sysfs file system, +which is assumed to be mounted at /sys unless specified otherwise +by the user. SCSI (pseudo) devices that have been detected by the SCSI mid level will be listed even if the required upper level drivers (i.e. sd, sr, st, osst or ch) have not been loaded. If the appropriate upper level @@ -103,8 +111,8 @@ level driver and can only be accessed via a scsi generic (sg) device name. .PP -This version of lsscsi (0.20) or later is required to correctly display -SCSI devices in linux kernel 2.6.26 (and possibly later) when the +lsscsi version 0.21 or later is required to correctly display SCSI devices +in linux kernel 2.6.26 (and possibly later) when the CONFIG_SYSFS_DEPRECATED_V2 kernel option is not defined. .SH TRANSPORTS This utility lists SCSI devices which are known as logical units (lu) in @@ -133,8 +141,8 @@ Using a filter argument will reduce the volume of output if a lot of devices or hosts are present. .PP -The transports that are currently recognized are: IEEE 1394, FC, iSCSI, SAS -and SPI. +The transports that are currently recognized are: IEEE 1394, ATA, FC, +iSCSI, SAS, SATA, SPI and USB. .PP For IEEE 1394 (a.k.a. Firewire and "SBP" when storage is involved), the EUI-64 based target port name is output when \fI\-\-transport\fR is given, @@ -142,6 +150,13 @@ option is given then the EUI-64 initiator port name is output. Output on the summary line specific to the IEEE 1394 transport is prefixed by "sbp:". .PP +to detect ATA and SATA a crude check is performed on the driver +name (after the checks for other transports are exhausted). Based on the +driver name either ATA or SATA transport type is chosen. Output on the +summary line is either "ata:" or "sata:". No other attributes are given. +Most device and hosts flagged as "ata:" will use the parallel ATA +transport (PATA). +.PP For Fibre Channel (FC) the port name and port identifier are output when \fI\-\-transport\fR is given. In the absence of the \fI\-\-hosts\fR option these ids will be for the target port associated with the @@ -169,12 +184,23 @@ a number between 0 and 15 inclusive) is output when \fI\-\-transport\fR is given, in the absence of the \fI\-\-hosts\fR option. When the \fI\-\-hosts\fR option is given then only "spi:" is output on the summary line. +.PP +When a USB transport is detected, the summary line will contain "usb:" +followed by a USB device name. The USB device name has the +form "-<p1>[.<p2>[.<p3>]]:<c>." where is the USB bus number, <p1> +is the port on the host. <p2> is a port on a host connected hub, if present. +If needed <p3> is a USB hub port closer to the USB storage device. <c> +refers to the configuration number while is the interface number. There +is a separate SCSI host for each USB (SCSI) target. A USB SCSI target may +contain multiple logical units. Thus the same "usb: <device_name>" string +appears for a USB SCSI host and all logical units that belong to the USB +SCSI target associated with that USB SCSI host. .SH AUTHOR Written by Doug Gilbert .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2003\-2008 Douglas Gilbert +Copyright \(co 2003\-2009 Douglas Gilbert .br This software is distributed under the GPL version 2. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/lsscsi.c new/lsscsi-0.23/lsscsi.c --- old/lsscsi-0.21/lsscsi.c 2008-07-10 06:14:05.000000000 +0200 +++ new/lsscsi-0.23/lsscsi.c 2009-12-03 02:27:40.000000000 +0100 @@ -1,7 +1,7 @@ /* This is a utility program for listing SCSI devices and hosts (HBAs) * in the Linux operating system. It is applicable to kernel versions * 2.6.1 and greater. - * Copyright (C) 2003-2007 D. Gilbert + * Copyright (C) 2003-2009 D. Gilbert * 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) @@ -26,7 +26,7 @@ #include <linux/major.h> #include <time.h> -static const char * version_str = "0.21 2008/07/10"; +static const char * version_str = "0.23 2009/12/03"; #define NAME_LEN_MAX 260 #define FT_OTHER 0 @@ -40,18 +40,17 @@ #define TRANSPORT_SAS_CLASS 4 #define TRANSPORT_ISCSI 5 #define TRANSPORT_SBP 6 +#define TRANSPORT_USB 7 +#define TRANSPORT_ATA 8 /* probably PATA, could be SATA */ +#define TRANSPORT_SATA 9 /* most likely SATA */ static int transport_id = TRANSPORT_UNKNOWN; -static char sysfsroot[NAME_LEN_MAX]; -static const char * sysfs_name = "sysfs"; -static const char * sysfs_test_dir = "/sys/class"; -static const char * sysfs_test_top = "/sys"; -static const char * proc_mounts = "/proc/mounts"; +static const char * sysfsroot = "/sys"; static const char * bus_scsi_devs = "/bus/scsi/devices"; static const char * class_scsi_dev = "/class/scsi_device/"; -static const char * scsi_host = "/class/scsi_host"; +static const char * scsi_host = "/class/scsi_host/"; static const char * spi_host = "/class/spi_host/"; static const char * spi_transport = "/class/spi_transport/"; static const char * sas_host = "/class/sas_host/"; @@ -83,6 +82,7 @@ int kname; int transport; int verbose; + int protection; /* data integrity */ }; @@ -135,7 +135,8 @@ {"long", 0, 0, 'l'}, {"list", 0, 0, 'L'}, /* {"name", 0, 0, 'n'}, */ -/* {"sysfsroot", 1, 0, 'y'}, */ + {"protection", 0, 0, 'p'}, + {"sysfsroot", 1, 0, 'y'}, {"transport", 0, 0, 't'}, {"verbose", 0, 0, 'v'}, {"version", 0, 0, 'V'}, @@ -160,15 +161,17 @@ }; static struct dev_node_list* dev_node_listhead = NULL; -struct sg_item_t { +struct item_t { char name[NAME_LEN_MAX]; int ft; int d_type; }; -static struct sg_item_t non_sg; -static struct sg_item_t aa_sg; -static struct sg_item_t aa_first; +static struct item_t non_sg; +static struct item_t aa_sg; +static struct item_t aa_first; +static struct item_t aa_sd; +static struct item_t aa_block; static char sas_low_phy[NAME_LEN_MAX]; static char sas_hold_end_device[NAME_LEN_MAX]; @@ -178,7 +181,36 @@ static int iscsi_tsession_num; +static const char * usage_message = +"Usage: lsscsi [--classic] [--device] [--generic] [--help] [--hosts]\n" + "\t\t[--kname] [--list] [--long] [--protection] [--sysfsroot=PATH]\n" + "\t\t[--transport] [--verbose] [--version] [<h:c:t:l>]\n" +" where:\n" +" --classic|-c alternate output similar to 'cat /proc/scsi/scsi'\n" +" --device|-d show device node's major + minor numbers\n" +" --generic|-g show scsi generic device name\n" +" --help|-h this usage information\n" +" --hosts|-H lists scsi hosts rather than scsi devices\n" +" --kname|-k show kernel name instead of device node name\n" +" --list|-L additional information output one\n" +" attribute=value per line\n" +" --long|-l additional information output\n" +" --protection|-p show data integrity (protection) information\n" +" --sysfsroot=PATH|-y PATH set sysfs mount point to PATH (def: /sys)\n" +" --transport|-t transport information for target or, if '--hosts'\n" +" given, for initiator\n" +" --verbose|-v output path names where data is found\n" +" --version|-V output version string and exit\n" +" <h:c:t:l> filter output list (def: '- - - -' (all))\n\n" +"List SCSI devices or hosts, optionally with additional information\n"; +static void +usage() +{ + fprintf(stderr, "%s", usage_message); +} + +/* Compare <host:controller:target:lun> tuples (aka <h:c:t:l> or hctl) */ static int cmp_hctl(const struct addr_hctl * le, const struct addr_hctl * ri) { @@ -206,43 +238,9 @@ } } -static void -usage() -{ - fprintf(stderr, "Usage: lsscsi [--classic] [--device] [--generic]" - " [--help] [--hosts]\n" - "\t\t[--kname] [--list] [--long] [--transport] " - "[--verbose]\n" - "\t\t[--version] [<h:c:t:l>]\n"); - fprintf(stderr, " where:\n"); - fprintf(stderr, " --classic|-c alternate output similar " - "to 'cat /proc/scsi/scsi'\n"); - fprintf(stderr, " --device|-d show device node's major + " - "minor numbers\n"); - fprintf(stderr, " --generic|-g show scsi generic device " - "name\n"); - fprintf(stderr, " --help|-h this usage information\n"); - fprintf(stderr, " --hosts|-H lists scsi hosts rather than " - "scsi devices\n"); - fprintf(stderr, " --kname|-k show kernel name instead of " - "device node name\n"); - fprintf(stderr, " --list|-L additional information " - "output one\n"); - fprintf(stderr, " attribute=value per line\n"); - fprintf(stderr, " --long|-l additional information " - "output\n"); - fprintf(stderr, " --transport|-t transport information for " - "target or, if '--hosts'\n" - " given, for initiator\n"); - fprintf(stderr, " --verbose|-v output path names where data " - "is found\n"); - fprintf(stderr, " --version|-V output version string and " - "exit\n"); - fprintf(stderr, " <h:c:t:l> filter output list (def: " - "'- - - -' (all))\n\n"); - fprintf(stderr, "List SCSI devices or hosts\n"); -} - +/* Return 1 for directory entry that is link or directory (other than + * a directory name starting with dot). Else return 0. + */ static int first_scandir_select(const struct dirent * s) { @@ -257,6 +255,80 @@ return 1; } +/* Return 1 for directory entry that is link or directory (other than a + * directory name starting with dot) that contains "block". Else return 0. + */ +static int +block_scandir_select(const struct dirent * s) +{ + if ((DT_LNK != s->d_type) && + ((DT_DIR != s->d_type) || ('.' == s->d_name[0]))) + return 0; + if (strstr(s->d_name, "block")){ + strncpy(aa_block.name, s->d_name, NAME_LEN_MAX); + aa_block.ft = FT_CHAR; /* dummy */ + aa_block.d_type = s->d_type; + } + return 1; +} + +/* scan for scsi_disk directory in /sys/bus/scsi/devices/<h:c:i:l> */ +static int +block_scan(const char * dir_name, const struct lsscsi_opt_coll * opts) +{ + char name[NAME_LEN_MAX]; + struct dirent ** namelist; + int num, k; + + num = scandir(dir_name, &namelist, block_scandir_select, NULL); + if (num < 0) { + if (opts->verbose > 0) { + snprintf(name, NAME_LEN_MAX, "scandir: %s", dir_name); + perror(name); + } + return -1; + } + for (k = 0; k < num; ++k) + free(namelist[k]); + free(namelist); + return num; +} + +static int +sd_scandir_select(const struct dirent * s) +{ + if ((DT_LNK != s->d_type) && + ((DT_DIR != s->d_type) || ('.' == s->d_name[0]))) + return 0; + if (strstr(s->d_name, "scsi_disk")){ + strncpy(aa_sd.name, s->d_name, NAME_LEN_MAX); + aa_sd.ft = FT_CHAR; /* dummy */ + aa_sd.d_type = s->d_type; + } + return 1; +} + +static int +sd_scan(const char * dir_name, const struct lsscsi_opt_coll * opts) +{ + char name[NAME_LEN_MAX]; + struct dirent ** namelist; + int num, k; + + num = scandir(dir_name, &namelist, sd_scandir_select, NULL); + if (num < 0) { + if (opts->verbose > 0) { + snprintf(name, NAME_LEN_MAX, "scandir: %s", dir_name); + perror(name); + } + return -1; + } + for (k = 0; k < num; ++k) + free(namelist[k]); + free(namelist); + return num; +} + /* scan for directory entry that is either a symlink or a directory */ static int scan_for_first(const char * dir_name, const struct lsscsi_opt_coll * opts) @@ -470,50 +542,8 @@ } -/* Return 1 if found (in /proc/mounts or /sys/class directory exists), - else 0 if problems */ -static int -find_sysfsroot() -{ - char buff[NAME_LEN_MAX]; - char dev[34]; - char fs_type[34]; - FILE * f; - int res = 0; - int n; - - memset(buff, 0, sizeof(buff)); - memset(dev, 0, sizeof(dev)); - memset(fs_type, 0, sizeof(fs_type)); - if (NULL == (f = fopen(proc_mounts, "r"))) { - DIR * dirp; - - dirp = opendir(sysfs_test_dir); - if (dirp) { - closedir(dirp); - strcpy(sysfsroot, sysfs_test_top); - return 1; - } - fprintf(stderr, "Unable to open %s for reading", - proc_mounts); - return 0; - } - while (fgets(buff, sizeof(buff) - 2, f)) { - n = sscanf(buff, "%32s %256s %32s", dev, sysfsroot, fs_type); - if (3 != n) { - fprintf(stderr, "unexpected short scan,n=%d\n", n); - break; - } - if (0 == strcmp(fs_type, sysfs_name)) { - res = 1; - break; - } - } - fclose(f); - return res; -} - -/* Return 1 if directory, else 0 */ +/* If 'dir_name'/'base_name' is a directory chdir to it. If that is successful + return 1, else 0 */ static int if_directory_chdir(const char * dir_name, const char * base_name) { @@ -533,7 +563,10 @@ return 0; } -/* Return 1 if directory, else 0 */ +/* If 'dir_name'/generic is a directory chdir to it. If that is successful + return 1. Otherwise look a directory of the form + 'dir_name'/scsi_generic:sg<n> and if found chdir to it and return 1. + Otherwise return 0. */ static int if_directory_ch2generic(const char * dir_name) { @@ -565,7 +598,9 @@ return 0; } -/* Return 1 if found, else 0 if problems */ +/* If 'dir_name'/'base_name' is found places corresponding value in 'value' + * and returns 1 . Else returns 0. + */ static int get_value(const char * dir_name, const char * base_name, char * value, int max_value_len) @@ -738,8 +773,49 @@ return match_found; } +/* Fetch USB device name string (form "-<p1>[.<p2>]+:<c>.") given + * either a SCSI host name or devname (i.e. "h:c:t:l") string. If detected + * return 'b' (pointer to start of USB device name string which is null + * terminated), else return NULL. + */ +static char * +get_usb_devname(const char * hname, const char * devname, char * b, int b_len) +{ + char buff[NAME_LEN_MAX]; + char bf2[NAME_LEN_MAX]; + int len; + const char * np; + char * cp; + char * c2p; + + strcpy(buff, sysfsroot); + if (hname) { + strcat(buff, scsi_host); + np = hname; + } else if (devname) { + strcat(buff, class_scsi_dev); + np = devname; + } else + return NULL; + if (if_directory_chdir(buff, np) && getcwd(bf2, NAME_LEN_MAX) && + strstr(bf2, "usb")) { + if (b_len > 0) + b[0] = '\0'; + if ((cp = strstr(bf2, "/host"))) { + len = (cp - bf2) - 1; + if ((len > 0) && ((c2p = memrchr(bf2, '/', len)))) { + len = cp - ++c2p; + snprintf(b, b_len, "%.*s", len, c2p); + } + } + return b; + } + return NULL; +} + /* Parse colon_list into host/channel/target/lun ("hctl") array, - * return 1 if successful, else 0 */ + * return 1 if successful, else 0. + */ static int parse_colon_list(const char * colon_list, struct addr_hctl * outp) { @@ -767,14 +843,16 @@ return 1; } -/* Fetch initiator (port) wwn(s) or identifier if available. Return 1 if - successful, 0 otherwise */ +/* Check host associated with 'devname' for known transport types. If so set + transport_id, place a string in 'b' and return 1. Otherwise return 0. */ static int transport_init(const char * devname, /* const struct lsscsi_opt_coll * opts, */ int b_len, char * b) { char buff[NAME_LEN_MAX]; + char wd[NAME_LEN_MAX]; int off; + char * cp; struct stat a_stat; /* SPI host */ @@ -831,7 +909,6 @@ /* SAS class representation */ strcpy(buff, sysfsroot); strcat(buff, scsi_host); - strcat(buff, "/"); strcat(buff, devname); strcat(buff, "/device/sas/ha"); if ((stat(buff, &a_stat) >= 0) && S_ISDIR(a_stat.st_mode)) { @@ -852,7 +929,6 @@ /* resolve SCSI host device */ strcpy(buff, sysfsroot); strcat(buff, scsi_host); - strcat(buff, "/"); strcat(buff, devname); strcat(buff, "/device"); if (readlink(buff, buff2, sizeof(buff2)) <= 0) @@ -876,7 +952,7 @@ strcat(buff, buff2); /* read the FireWire host's EUI-64 */ - if (!get_value(buff, "host_id/guid", buff2, sizeof(buff)) || + if (!get_value(buff, "host_id/guid", buff2, sizeof(buff2)) || strlen(buff2) != 18) break; snprintf(b, b_len, "sbp:%s", buff2 + 2); @@ -895,9 +971,39 @@ // Hmmm, probably would like SAM-4 ",i,0x" notation here. return 1; } + /* USB host? */ + cp = get_usb_devname(devname, NULL, wd, sizeof(wd) - 1); + if (cp) { + transport_id = TRANSPORT_USB; + snprintf(b, b_len, "usb: %s", cp); + return 1; + } + /* ATA or SATA host, crude check: driver name */ + strcpy(buff, sysfsroot); + strcat(buff, scsi_host); + strcat(buff, devname); + if (get_value(buff, "proc_name", wd, sizeof(wd))) { + if (0 == strcmp("ahci", wd)) { + transport_id = TRANSPORT_SATA; + snprintf(b, b_len, "sata:"); + return 1; + } else if (strstr(wd, "ata")) { + if (0 == memcmp("sata", wd, 4)) { + transport_id = TRANSPORT_SATA; + snprintf(b, b_len, "sata:"); + return 1; + } + transport_id = TRANSPORT_ATA; + snprintf(b, b_len, "ata:"); + return 1; + } + } return 0; } +/* Given the transport_id of a SCSI host (initiator) associated with + * 'path_name' output additional information. + */ static void transport_init_longer(const char * path_name, const struct lsscsi_opt_coll * opts) @@ -1026,11 +1132,23 @@ case TRANSPORT_ISCSI: printf(" transport=iSCSI\n"); // >>> This is the multi-line host output for iSCSI. Anymore to -// add here? [From /sys/class/scsi_host/hostN/device/iscsi_host:hostN directory] +// add here? [From +// /sys/class/scsi_host/hostN/device/iscsi_host:hostN directory] break; case TRANSPORT_SBP: printf(" transport=sbp\n"); break; + case TRANSPORT_USB: + printf(" transport=usb\n"); + printf(" device_name=%s\n", get_usb_devname(cp, NULL, + value, NAME_LEN_MAX)); + break; + case TRANSPORT_ATA: + printf(" transport=ata\n"); + break; + case TRANSPORT_SATA: + printf(" transport=sata\n"); + break; default: if (opts->verbose > 1) fprintf(stderr, "No transport information\n"); @@ -1038,8 +1156,9 @@ } } -/* Fetch target port wwn(s) or identifier if available. Return 1 if - successful, 0 otherwise */ +/* Attempt to determine the transport type of the SCSI device (LU) associated + with 'devname'. If found set transport_id, place string in 'b' and return + 1. Otherwise return 0. */ static int transport_tport(const char * devname, /* const struct lsscsi_opt_coll * opts, */ int b_len, char * b) @@ -1055,6 +1174,7 @@ if (! parse_colon_list(devname, &hctl)) return 0; + /* SAS host? */ strcpy(buff, sysfsroot); strcat(buff, sas_host); @@ -1173,9 +1293,39 @@ // (UTF-8) excluding trailing null. return 1; } + /* USB device? */ + cp = get_usb_devname(NULL, devname, wd, sizeof(wd) - 1); + if (cp) { + transport_id = TRANSPORT_USB; + snprintf(b, b_len, "usb: %s", cp); + return 1; + } + /* ATA or SATA device, crude check: driver name */ + strcpy(buff, sysfsroot); + strcat(buff, scsi_host); + len = strlen(buff); + snprintf(buff + len, NAME_LEN_MAX - len, "host%d", hctl.h); + if (get_value(buff, "proc_name", wd, sizeof(wd))) { + if (0 == strcmp("ahci", wd)) { + transport_id = TRANSPORT_SATA; + snprintf(b, b_len, "sata:"); + return 1; + } else if (strstr(wd, "ata")) { + if (0 == memcmp("sata", wd, 4)) { + transport_id = TRANSPORT_SATA; + snprintf(b, b_len, "sata:"); + return 1; + } + transport_id = TRANSPORT_ATA; + snprintf(b, b_len, "ata:"); + return 1; + } + } return 0; } +/* Given the transport_id of the SCSI device (LU) associated with 'devname' + output additional information. */ static void transport_tport_longer(const char * devname, const struct lsscsi_opt_coll * opts) @@ -1384,6 +1534,17 @@ if (opts->verbose > 2) printf("fetched from directory: %s\n", buff); break; + case TRANSPORT_USB: + printf(" transport=usb\n"); + printf(" device_name=%s\n", get_usb_devname(NULL, devname, + value, NAME_LEN_MAX)); + break; + case TRANSPORT_ATA: + printf(" transport=ata\n"); + break; + case TRANSPORT_SATA: + printf(" transport=sata\n"); + break; default: if (opts->verbose > 1) fprintf(stderr, "No transport information\n"); @@ -1670,7 +1831,7 @@ else if (!get_dev_node(wd, dev_node, typ)) snprintf(dev_node, NAME_MAX, "- "); - printf("%s", dev_node); + printf("%-9s", dev_node); if (opts->dev_maj_min) { if (get_value(wd, "dev", value, NAME_LEN_MAX)) printf("[%s]", value); @@ -1709,6 +1870,58 @@ else printf(" -"); } + + if (opts->protection) { + int kernel_dif_support = 0; + if (sd_scan(buff,opts)) { + if (if_directory_chdir(buff,aa_sd.name)) { + char value[NAME_LEN_MAX]; + char sddir[NAME_LEN_MAX]; + strncpy(sddir,buff,NAME_LEN_MAX); + strcat(sddir,"/"); + strcat(sddir,aa_sd.name); + if (!get_value(sddir, "protection_type", value, + NAME_LEN_MAX)) { + /* kernel < 2.6.27 */ + if (opts->verbose) + printf(" No Data Integrity " + "Support\n"); + } else { + kernel_dif_support = 1; + if (strncmp(value, "0", 1)) + printf(" DIF/Type%1s ",value); + else + printf(" - "); + } + } else { + printf(" - "); + } + } + + if (kernel_dif_support && block_scan(buff,opts)) { + if (if_directory_chdir(buff,aa_block.name)) { + char value[NAME_LEN_MAX]; + char blkdir[NAME_LEN_MAX]; + strncpy(blkdir,buff,NAME_LEN_MAX); + strcat(blkdir,"/"); + strcat(blkdir,aa_block.name); + if (if_directory_chdir(blkdir,"integrity")) { + if (!get_value(".", "format", value, + NAME_LEN_MAX)) { + if (opts->verbose) + printf(" No Data " + "Integrity " + "Support\n"); + } else { + printf(" %-17s",value); + } + } else { + printf(" %-17s","- "); + } + } + } + } + printf("\n"); if (opts->long_opt > 0) longer_d_entry(buff, devname, opts); @@ -1764,11 +1977,16 @@ return 0; } +/* Returns -1 if (a->d_name < b->d_name) ; 0 if they are equal + * and 1 otherwise. + * Function signature was more generic before version 0.23 : + * static int sdev_scandir_sort(const void * a, const void * b) + */ static int -sdev_scandir_sort(const void * a, const void * b) +sdev_scandir_sort(const struct dirent ** a, const struct dirent ** b) { - const char * lnam = (*(struct dirent **)a)->d_name; - const char * rnam = (*(struct dirent **)b)->d_name; + const char * lnam = (*a)->d_name; + const char * rnam = (*b)->d_name; struct addr_hctl left_hctl; struct addr_hctl right_hctl; @@ -1783,6 +2001,7 @@ return cmp_hctl(&left_hctl, &right_hctl); } +/* List SCSI devices (LUs). */ static void list_sdevices(const struct lsscsi_opt_coll * opts) { @@ -1818,6 +2037,7 @@ free(namelist); } +/* List host (initiator) attributes when --long given (one or more times). */ static void longer_h_entry(const char * path_name, const struct lsscsi_opt_coll * opts) { @@ -1972,11 +2192,16 @@ return 0; } +/* Returns -1 if (a->d_name < b->d_name) ; 0 if they are equal + * and 1 otherwise. + * Function signature was more generic before version 0.23 : + * static int host_scandir_sort(const void * a, const void * b) + */ static int -host_scandir_sort(const void * a, const void * b) +host_scandir_sort(const struct dirent ** a, const struct dirent ** b) { - const char * lnam = (*(struct dirent **)a)->d_name; - const char * rnam = (*(struct dirent **)b)->d_name; + const char * lnam = (*a)->d_name; + const char * rnam = (*b)->d_name; unsigned int l, r; if (1 != sscanf(lnam, "host%u", &l)) @@ -2071,7 +2296,7 @@ return 0; } -/* Return 0 if able to decode, otheriwse 1 */ +/* Return 0 if able to decode, otherwise 1 */ static int decode_filter_arg(const char * a1p, const char * a2p, const char * a3p, const char * a4p, struct addr_hctl * filtp) @@ -2142,13 +2367,12 @@ int do_hosts = 0; struct lsscsi_opt_coll opts; - sysfsroot[0] = '\0'; invalidate_hctl(&filter); memset(&opts, 0, sizeof(opts)); while (1) { int option_index = 0; - c = getopt_long(argc, argv, "cdghHklLtvV", long_options, + c = getopt_long(argc, argv, "cdghHklLptvVy:", long_options, &option_index); if (c == -1) break; @@ -2178,6 +2402,9 @@ case 'L': opts.long_opt += 3; break; + case 'p': + ++opts.protection; + break; case 't': ++opts.transport; break; @@ -2187,11 +2414,9 @@ case 'V': fprintf(stderr, "version: %s\n", version_str); return 0; -#if 0 case 'y': /* sysfsroot <dir> */ - strncpy(sysfsroot, optarg, sizeof(sysfsroot)); + sysfsroot = optarg; break; -#endif case '?': usage(); return 1; @@ -2237,14 +2462,6 @@ "with --transport\n"); return 1; } - if ('\0' == sysfsroot[0]) { - if (! find_sysfsroot()) { - fprintf(stderr, "Unable to locate sysfsroot. If " - "kernel >= 2.6.0\n Try something like" - " 'mount -t sysfs none /sys'\n"); - return 1; - } - } if (opts.verbose > 1) { printf(" sysfsroot: %s\n", sysfsroot); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lsscsi-0.21/lsscsi.spec new/lsscsi-0.23/lsscsi.spec --- old/lsscsi-0.21/lsscsi.spec 2008-07-10 06:09:26.000000000 +0200 +++ new/lsscsi-0.23/lsscsi.spec 2009-12-03 02:27:40.000000000 +0100 @@ -1,5 +1,5 @@ %define name lsscsi -%define version 0.21 +%define version 0.23 %define release 1 Summary: List SCSI devices (or hosts) and associated information @@ -8,8 +8,8 @@ Release: %{release} License: GPL Group: Utilities/System -Source0: http://www.torque.net/scsi/%{name}-%{version}.tgz -Url: http://www.torque.net/scsi/lsscsi.html +Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz +Url: http://sg.danny.cz/scsi/lsscsi.html BuildRoot: %{_tmppath}/%{name}-%{version}-root/ Packager: dgilbert at interlog dot com @@ -28,24 +28,20 @@ %setup -q %build - -./configure --prefix=%{_prefix} --mandir=%{_mandir} -make +%configure %install - -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +if [ "$RPM_BUILD_ROOT" != "/" ]; then + rm -rf $RPM_BUILD_ROOT +fi make install \ DESTDIR=$RPM_BUILD_ROOT -%post - -%postun - %clean - -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +if [ "$RPM_BUILD_ROOT" != "/" ]; then + rm -rf $RPM_BUILD_ROOT +fi %files %defattr(-,root,root) @@ -55,7 +51,13 @@ %changelog -* Thu Jul 10 2008 - dgilbert at interlog dot com +* Thu Dec 03 2009 - dgilbert at interlog dot com +- remove /proc/mounts scan for sysfs mount point, assume /sys + * lsscsi-0.23 +* Fri Dec 26 2008 - dgilbert at interlog dot com +- protection (T10-DIF) information, USB, ATA + SATA transports + * lsscsi-0.22 +* Tue Jul 29 2008 - dgilbert at interlog dot com - more changes for lk 2.6.26 (SCSI sysfs) * lsscsi-0.21 * Wed Jul 9 2008 - dgilbert at interlog dot com ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kopete-protocol-facebook for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package kopete-protocol-facebook for openSUSE:Factory checked in at Thu Jan 7 12:58:52 CET 2010. -------- --- KDE/kopete-protocol-facebook/kopete-protocol-facebook.changes 2009-10-16 00:36:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kopete-protocol-facebook/kopete-protocol-facebook.changes 2010-01-02 01:17:22.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 1 23:40:48 UTC 2010 - duncan(a)kde.org + +- fix breakage due to protocol changes +- 0.1.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dmacvicar-kopete-facebook-faec2bc.tar.gz New: ---- dmacvicar-kopete-facebook-3376a46.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopete-protocol-facebook.spec ++++++ --- /var/tmp/diff_new_pack.ASuV7S/_old 2010-01-07 12:58:41.000000000 +0100 +++ /var/tmp/diff_new_pack.ASuV7S/_new 2010-01-07 12:58:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kopete-protocol-facebook (Version 0.1.4) +# spec file for package kopete-protocol-facebook (Version 0.1.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -17,16 +17,16 @@ # norootforbuild -%define gitrev faec2bc +%define gitrev 3376a46 Name: kopete-protocol-facebook BuildRequires: kopete-devel >= 4.2 libkdepimlibs4-devel libqjson-devel -License: GPL v2 or later +License: GPLv2+ Url: http://kopete.kde.org/ Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Facebook Protocol Support for Kopete -Version: 0.1.4 +Version: 0.1.5 Release: 1 Source: dmacvicar-kopete-facebook-%{gitrev}.tar.gz Provides: kde4-kopete-protocol-facebook = 0.1.2 ++++++ dmacvicar-kopete-facebook-faec2bc.tar.gz -> dmacvicar-kopete-facebook-3376a46.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmacvicar-kopete-facebook-faec2bc/facebook/.#json.cpp new/dmacvicar-kopete-facebook-3376a46/facebook/.#json.cpp --- old/dmacvicar-kopete-facebook-faec2bc/facebook/.#json.cpp 2010-01-07 12:58:41.000000000 +0100 +++ new/dmacvicar-kopete-facebook-3376a46/facebook/.#json.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to duncan@tarro.9578:1242500824 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmacvicar-kopete-facebook-faec2bc/facebook/chatservice.cpp new/dmacvicar-kopete-facebook-3376a46/facebook/chatservice.cpp --- old/dmacvicar-kopete-facebook-faec2bc/facebook/chatservice.cpp 2009-10-15 23:58:29.000000000 +0200 +++ new/dmacvicar-kopete-facebook-3376a46/facebook/chatservice.cpp 2009-11-15 17:36:46.000000000 +0100 @@ -16,12 +16,14 @@ */ // Useful resources when implementing the Facebook chat protocol -// +// // http://code.google.com/p/pidgin-facebookchat/source/browse/trunk // http://coderrr.wordpress.com/2008/05/06/facebook-chat-api/ // http://snipplr.com/view/6246/facebook-chat/ -// http://imfreedom.org/wiki/Facebook // https://www.limewire.org/fisheye/browse/limecvs/components/facebook/src/mai… +// +// The following is useful but partially outdated +// http://imfreedom.org/wiki/Facebook #include <QObject> #include <QDebug> @@ -50,14 +52,43 @@ namespace Facebook { +/* + TODO: + * find out what buddy_list.php is used for + - is update.php still necessary (FB still uses it) + * find out what reconnect.php is used for + - maybe it's the second step of FB visibility updating + */ + +/* + When CONNECTing + 1. settings.php is used to set visibility=true + 2. update.php is POSTed and the following are returned: + - buddy info on own account + - buddy info on other online accounts + - other things + 3. reconnect.php is POSTed + - I'm guessing post_form_id and reason are the only two important params + - afaict reason=3 means page reloaded + (doesn't mark you as online if used initially) + - afaict reason=5 means used ``Go offline'' and now I've come back + (doesn't mark you as online if used initially) + - afaict reason=6 means just logged in + (doesn't mark you as online if used initially) + _. buddy_list.php is POSTed + - sometimes this returns the buddy infos just for me + - sometimes for others as well + */ + #define FACEBOOK_URL "http://www.facebook.com" #define FACEBOOK_LOGIN_URL "https://login.facebook.com/login.php" -#define FACEBOOK_BUDDYLIST_URL "http://apps.facebook.com/ajax/presence/update.php" +#define FACEBOOK_BUDDYLIST_URL "http://www.facebook.com/ajax/chat/buddy_list.php" #define FACEBOOK_PAGE_URL "http://www.facebook.com/presence/popout.php" #define FACEBOOK_VISIBILITY_URL "http://apps.facebook.com/ajax/chat/settings.php" #define FACEBOOK_STATUS_URL "http://www.facebook.com/updatestatus.php" #define FACEBOOK_MESSAGE_URL "http://www.facebook.com/ajax/chat/send.php" #define FACEBOOK_ACK_MESSAGE_URL "http://www.facebook.com/ajax/chat/settings.php?_ecdc=false" +#define FACEBOOK_RECONNECT_URL "http://www.facebook.com/ajax/presence/reconnect.php" // only wait one second as the rest is done by the comet style connection #define FACEBOOK_MESSAGE_POLL_INTERVAL 1000 @@ -76,13 +107,13 @@ while (i.hasNext()) { i.next(); - + QStringList bothParams; bothParams << i.key(); bothParams << QUrl::toPercentEncoding(i.value().toAscii()); paramList << bothParams.join("="); } - + data = paramList.join("&"); return data; //return QString("Content-Type: application/x-www-form-urlencoded\nContent-Length: %1\n\n%2\n").arg(data.length()).arg(data); @@ -131,7 +162,7 @@ QString location = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); diskCache->setCacheDirectory(location); _network->setCache(diskCache); - + QObject::connect(_network, SIGNAL(sslErrors( QNetworkReply *, const QList<QSslError> &)), this, SLOT(slotSslErrors( QNetworkReply *, const QList<QSslError> & ))); // timer for the buddylist, but we dont start it until we get the form_id @@ -150,7 +181,7 @@ QString ChatService::userId() const { - return _user_id; + return _user_id; } void ChatService::setLoginInformation( const QString &login, const QString &pass ) @@ -176,13 +207,13 @@ // signals all users offline foreach (QString userId, _availableBuddies.keys() ) { - _availableBuddies.remove(userId); + _availableBuddies.remove(userId); if ( _buddyInfos.contains(userId) ) emit buddyNotAvailable(_buddyInfos.value(userId)); else qDebug() << "no info for buddy " << userId; } - + // clear cookies _network->setCookieJar(new QNetworkCookieJar()); _loggedin = false; @@ -194,12 +225,12 @@ void ChatService::logoutFromService() { if ( _loggedin ) - { - disconnect(); + { + disconnect(); emit logoutFromServiceFinished(); } } - + bool ChatService::isLoggedIn() const { return _loggedin; @@ -227,10 +258,10 @@ void ChatService::startLoginRequest() { _buddylist_poll_timer->stop(); - + qDebug() << _network->cookieJar()->cookiesForUrl(QUrl(FACEBOOK_URL)).count() << " cookies"; QList<QNetworkCookie> cookies; - + QMap<QString, QString> params; QUrl url(FACEBOOK_LOGIN_URL); @@ -268,7 +299,7 @@ QNetworkReply *reply = _network->post(QNetworkRequest(url), data.toAscii()); reply->setParent(this); - + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotLoginRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotLoginRequestError(QNetworkReply::NetworkError))); } @@ -294,9 +325,9 @@ cookies << QNetworkCookie::parseCookies(rawcookie.toAscii()); } qDebug() << "Received " << cookies.count() << " cookies"; - + _network->cookieJar()->setCookiesFromUrl(cookies, QUrl(FACEBOOK_URL)); - + QListIterator<QByteArray> header_it(reply->rawHeaderList()); while (header_it.hasNext()) @@ -313,21 +344,21 @@ if (cookie.name() == "c_user") _user_id = cookie.value(); } - + if ( _user_id.isEmpty() ) - { + { qDebug() << "No user set"; _loggedin = false; emit loginToServiceError(); return; - } + } else qDebug() << "c_user: " << _user_id; qDebug() << _network->cookieJar()->cookiesForUrl(QUrl(FACEBOOK_URL)).count() << " cookies"; // queue the job to grab the form_id - QTimer::singleShot(0, this, SLOT(startRetrievePageRequest())); + QTimer::singleShot(0, this, SLOT(startRetrievePageRequest())); } void ChatService::slotLoginRequestError(QNetworkReply::NetworkError code) @@ -340,21 +371,24 @@ { // avoids two request in parallel _buddylist_poll_timer->stop(); - + QMap<QString, QString> params; QUrl url(FACEBOOK_BUDDYLIST_URL); + params.insert("__a", "1"); params.insert("user", _user_id); - params.insert("notifications", "1"); + params.insert("fb_dtsg", "TOglY"); // No idea what this is params.insert("popped_out", "false"); params.insert("force_render", "true"); params.insert("buddy_list", "1"); + params.insert("post_form_id", _form_id); + params.insert("post_form_id_source", "AsyncRequest"); QString data = encodePostParams(params); - qDebug() << data; - + QNetworkReply *reply = _network->post(QNetworkRequest(url), data.toAscii()); + qDebug() << "Buddy request: " << reply->url() << data; reply->setParent(this); - + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotRetrieveBuddyListRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotRetrieveBuddyListRequestError(QNetworkReply::NetworkError))); } @@ -383,10 +417,10 @@ { QMap<QString, QString> params; QUrl url(FACEBOOK_PAGE_URL); - + QNetworkReply *reply = _network->get(QNetworkRequest(url)); reply->setParent(this); - + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotRetrievePageRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotRetrievePageRequestError(QNetworkReply::NetworkError))); } @@ -394,26 +428,26 @@ void ChatService::slotRetrievePageRequestFinished() { qDebug() << "got facebook page, looking for form_id"; - + QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); if ( !reply ) return; QString page(reply->readAll()); - + _form_id = scrapValue(page, "id=\"post_form_id\" name=\"post_form_id\" value=\""); - + if ( _form_id.isEmpty() ) { qDebug() << "Could not find form_id" << _form_id; return; } - + qDebug() << "Found form_id: " << _form_id; qDebug() << "looking for channel id"; _channel = scrapValue(page, "\", \"channel"); - + if ( _form_id.isEmpty() ) { qDebug() << "Could not find form_id" << _form_id; @@ -451,12 +485,13 @@ { Q_UNUSED(reply); Q_UNUSED(errors); - + qDebug() << "ssl error"; } void ChatService::startUpdateVisibilityRequest(bool visible) { + _visible = visible; QMap<QString, QString> params; QUrl url(FACEBOOK_VISIBILITY_URL); // visibility=true&post_form_id=1234 @@ -464,9 +499,10 @@ params.insert("post_form_id", _form_id ); QString data = encodePostParams(params); + qDebug() << data; QNetworkReply *reply = _network->post(QNetworkRequest(url), data.toAscii()); reply->setParent(this); - + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotUpdateVisibilityRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotUpdateVisibilityRequestError(QNetworkReply::NetworkError))); } @@ -474,6 +510,10 @@ void ChatService::slotUpdateVisibilityRequestFinished() { qDebug() << "visibility updated"; + if (_visible) { + qDebug() << "reconnecting..."; + startReconnectRequest(3); + } } void ChatService::slotUpdateVisibilityRequestError(QNetworkReply::NetworkError code) @@ -481,18 +521,43 @@ qDebug() << "error on when setting visibility" << code; } +void ChatService::startReconnectRequest(int reason) { + QMap<QString, QString> params; + QUrl url(FACEBOOK_RECONNECT_URL); + // reason=6&post_form_id=1234 + params.insert("reason", QString("%1").arg(reason).toStdString().c_str()); + params.insert("post_form_id", _form_id); + + QString data = encodePostParams(params); + qDebug() << data; + QNetworkReply *reply = _network->post(QNetworkRequest(url), data.toAscii()); + reply->setParent(this); + + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotReconnectRequestFinished())); + QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotReconnectRequestError(QNetworkReply::NetworkError))); +} + +void ChatService::slotReconnectRequestFinished() { + qDebug() << "reconnect finished"; +} + +void ChatService::slotReconnectRequestError(QNetworkReply::NetworkError code) { + qDebug() << "error on when reconnecting" << code; +} + void ChatService::startUpdateStatusRequest(const QString &status) { - qDebug() << "starting update status request..."; + qDebug() << "starting update status request..."; QMap<QString, QString> params; QUrl url(FACEBOOK_STATUS_URL); - // visibility=true&post_form_id=1234 + // status=<status> params.insert("status", status ); QString data = encodePostParams(params); + qDebug() << data; QNetworkReply *reply = _network->post(QNetworkRequest(url), data.toAscii()); reply->setParent(this); - + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotUpdateStatusRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotUpdateStatusRequestError(QNetworkReply::NetworkError))); } @@ -524,7 +589,7 @@ params.insert("post_form_id", _form_id); _messageQueue[message.messageId()] = message; - + QString data = encodePostParams(params); // pass the message id as an attribute @@ -533,8 +598,8 @@ qDebug() << "startMessageSendRequest() posting to " << url; QNetworkReply *reply = _network->post(request, data.toAscii()); - qDebug() << "startMessageSendRequest() going to set parent"; - reply->setParent(this); + qDebug() << "startMessageSendRequest() going to set parent"; + reply->setParent(this); qDebug() << "startMessageSendRequest() connecting signals"; QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotMessageSendRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotMessageSendRequestError(QNetworkReply::NetworkError))); @@ -554,7 +619,7 @@ if ( ! _messageQueue.contains(messageid) ) return; - + emit messageSendFinished(_messageQueue[messageid]); _messageQueue.remove(messageid); } @@ -571,7 +636,7 @@ if ( ! _messageQueue.contains(messageid) ) return; - + emit messageSendError(_messageQueue[messageid]); _messageQueue.remove(messageid); @@ -592,11 +657,11 @@ QNetworkReply *reply = _network->get(QNetworkRequest(url)); reply->setParent(this); - + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotGetMessagesRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotGetMessagesRequestError(QNetworkReply::NetworkError))); } - + void ChatService::slotGetMessagesRequestFinished() { QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); @@ -619,12 +684,13 @@ // read the useless for input->read(QString("for (;;);").count()); QString json = input->readAll(); - + QJson::Parser parser; - + + bool ok = true; QVariant result = parser.parse(json.toAscii(), &ok); - + qDebug() << json; if (ok) @@ -640,9 +706,9 @@ qDebug() << "Server message reply is not a map"; return; } - + QString tValue = result.toMap()["t"].toString(); - + // in case we got a new seq, if ( tValue == "continue" ) { @@ -666,19 +732,19 @@ { // our old seq was zero, and now it got reseted, to zero // which may be some problem. - qDebug() << "bad: old seq and new seq are 0"; + qDebug() << "bad: old seq and new seq are 0"; disconnect(); emit error(ErrorDisconnected, ""); - return; + return; } else { // we had a normal seq, even zero, and it got resetted, this // means we have to read the channel value and form_id again - qDebug() << "seq reset by server"; + qDebug() << "seq reset by server"; QTimer::singleShot(0, this, SLOT(startRetrievePageRequest())); - return; - } + return; + } } else if ( tValue == "msg" ) { @@ -698,14 +764,14 @@ qDebug() << "Error decoding message item"; continue; } - + if ( ms.toMap()["type"].toString() == "typ" ) { // typing event ChatMessage message; if ( message.readVariant(ms.toMap()) ) { - qDebug() << "typing from: " << message.from() << " to " << message.to(); + qDebug() << "typing from: " << message.from() << " to " << message.to(); emit typingEventAvailable(message.from(), message.to()); } else @@ -727,7 +793,7 @@ // the ack only if the message is not set _to_ us if ( message.from() != userId() ) { - qDebug() << "sending ack for message from " << message.fromName(); + qDebug() << "sending ack for message from " << message.fromName(); QMap<QString,QString> params; params.insert("focus_chat", message.from() ); params.insert("windows_id", "12345" ); params.insert("post_form_id", _form_id ); @@ -736,9 +802,9 @@ QNetworkReply *reply = _network->post(QNetworkRequest(ackurl), data.toAscii() ); reply->setParent(this); QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotMessageAckRequestFinished())); - QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotMessageAckRequestError(QNetworkReply::NetworkError))); + QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotMessageAckRequestError(QNetworkReply::NetworkError))); } - } + } else { qDebug() << "Error decoding message"; @@ -751,13 +817,13 @@ { // complain } - - + + qDebug() << "We got a message!!!"; // process it _seq++; } - + // setup next poll QTimer::singleShot(FACEBOOK_MESSAGE_POLL_INTERVAL, this, SLOT(startGetMessagesRequest())); } @@ -765,13 +831,13 @@ { qDebug() << "invalid json reply"; qDebug() << "parser error message: " << parser.errorString(); - qDebug() << json; + qDebug() << json; } } void ChatService::slotMessageAckRequestFinished() { - qDebug() << "message ack done"; + qDebug() << "message ack done"; } @@ -786,7 +852,7 @@ QString errorSummary; QString errorDesc; bool listChanged = true; - + // we could pass the input IO device // directly to the JSON reader but we need // first to strip the for{;;};" string @@ -797,10 +863,14 @@ // the format we will have hard time figuring out responseInput->read(QString("for (;;);").count()); - QJson::Parser parser; + QByteArray responseText = responseInput->readAll(); + qDebug() << "Buddy List JSON: " << responseText; + + QJson::Parser parser; bool ok = true; - QVariant result = QJson::Parser().parse(responseInput, &ok); - + //QVariant result = QJson::Parser().parse(responseInput, &ok); + QVariant result = QJson::Parser().parse(responseText, &ok); + if (ok) { // No errors occured @@ -813,7 +883,7 @@ error = result.toMap()["error"].toBool(); errorSummary = result.toMap()["errorSummary"].toString(); errorDesc = result.toMap()["errorDescription"].toString(); - + QVariantMap payload = result.toMap()["payload"].toMap(); QVariantMap buddy_list = payload["buddy_list"].toMap(); listChanged = true; //buddy_list["listChanged"].toBool(); @@ -821,12 +891,12 @@ QVariantMap userInfos = buddy_list["userInfos"].toMap(); if ( ! listChanged ) - { + { qDebug() << "buddy list did not change. " << availableCount << " buddies available" ; - return; + return; } - - + + foreach (QString userId, userInfos.keys()) { BuddyInfo buddy; @@ -836,7 +906,7 @@ qDebug() << "invalid buddy"; qDebug() << buddy; } - qDebug() << "got buddy: " << buddy; + qDebug() << "got buddy: " << buddy; _buddyInfos[userId] = buddy; emit buddyInformation(buddy); } @@ -848,13 +918,13 @@ { if ( ! nowAvailableList.contains(userId) ) { - _availableBuddies.remove(userId); + _availableBuddies.remove(userId); if ( _buddyInfos.contains(userId) ) emit buddyNotAvailable(_buddyInfos.value(userId)); else qDebug() << "no info for buddy " << userId; } - + } // update available contacts @@ -863,11 +933,11 @@ bool idle = nowAvailableList.value(userId).toMap()["i"].toBool(); if ( _buddyInfos.contains(userId) ) { - + // if the user id is already there with the same idle status, don't emit // anything qDebug() << "checking status for" << userId << "(" << _buddyInfos.value(userId).name() << ")"; - if ( _availableBuddies.contains(userId) && + if ( _availableBuddies.contains(userId) && ( _availableBuddies.value(userId) == idle ) ) continue; @@ -881,12 +951,12 @@ if (firstTime && idle) emit buddyAvailable(_buddyInfos.value(userId), false); emit buddyAvailable(_buddyInfos.value(userId), idle); - } + } else - { - qDebug() << "no info for buddy " << userId; - } - } + { + qDebug() << "no info for buddy " << userId; + } + } } else { @@ -903,19 +973,19 @@ { if ( ! _buddyInfos.contains(buddyid) ) return; - + QUrl url = QUrl(_buddyInfos.value(buddyid).thumbSrc()); QNetworkRequest request(url); request.setAttribute(QNetworkRequest::User, buddyid); - + qDebug() << "requesting photo for " << buddyid << " at " << url; QNetworkReply *reply = _network->get(request); reply->setParent(this); - + QObject::connect(reply, SIGNAL(finished()), this, SLOT(slotRetrievePictureRequestFinished())); QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotRetrievePictureRequestError(QNetworkReply::NetworkError))); } - + void ChatService::slotRetrievePictureRequestFinished() { QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); @@ -930,7 +1000,7 @@ qDebug() << "photo for unknown buddy"; return; } - + QImage image(QImage::fromData(reply->readAll())); if ( image.format() == QImage::Format_Invalid ) { @@ -947,4 +1017,4 @@ } } //ns - + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmacvicar-kopete-facebook-faec2bc/facebook/chatservice.h new/dmacvicar-kopete-facebook-3376a46/facebook/chatservice.h --- old/dmacvicar-kopete-facebook-faec2bc/facebook/chatservice.h 2009-10-15 23:58:29.000000000 +0200 +++ new/dmacvicar-kopete-facebook-3376a46/facebook/chatservice.h 2009-11-15 17:36:46.000000000 +0100 @@ -139,6 +139,15 @@ void startUpdateStatusRequest(const QString &status); /** + * Initiate a reconnect request + + * Note how I don't say what a reconnect request is or what it's + * used for. Hell, the usefulness of the function descriptions here + * is on par with: i++; // increment i + */ + void startReconnectRequest(int reason); + + /** * Initiates a message send request */ void startMessageSendRequest( const ChatMessage &message ); @@ -200,6 +209,17 @@ */ void slotUpdateVisibilityRequestError(QNetworkReply::NetworkError code); +/** + * Handles the response from the page request to reconnect when it + * is finished + */ + void slotReconnectRequestFinished(); + /** + * Handles the response from the page request to reconnect when it + * has failed + */ + void slotReconnectRequestError(QNetworkReply::NetworkError code); + /** * Handles the response from the page request to update status * when it is finished @@ -343,6 +363,7 @@ QString _password; QString _form_id; QString _channel; + bool _visible; int _seq; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmacvicar-kopete-facebook-faec2bc/facebookaccount.cpp new/dmacvicar-kopete-facebook-3376a46/facebookaccount.cpp --- old/dmacvicar-kopete-facebook-faec2bc/facebookaccount.cpp 2009-10-15 23:58:29.000000000 +0200 +++ new/dmacvicar-kopete-facebook-3376a46/facebookaccount.cpp 2009-11-15 17:36:46.000000000 +0100 @@ -52,6 +52,7 @@ FacebookAccount::~FacebookAccount() { + qDebug() << "destructing FacebookAccount"; } FacebookContact * FacebookAccount::contact( const QString &id ) @@ -156,6 +157,7 @@ QObject::connect(m_service, SIGNAL(buddyThumbAvailable( const QString &, const QImage & )), this, SLOT(slotBuddyThumbAvailable( const QString &, const QImage & ))); QObject::connect(m_service, SIGNAL(typingEventAvailable(const QString &, const QString &)), this, SLOT(slotTypingEventAvailable(const QString &, const QString &))); QObject::connect(m_service, SIGNAL(error( int, const QString &)), this, SLOT(slotError(int, const QString &))); + QObject::connect(m_service, SIGNAL(logoutFromServiceFinished()), this, SLOT(slotLogoutFromServiceFinished())); } void FacebookAccount::slotLoginToServiceError() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebase3 for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at Thu Jan 7 12:58:50 CET 2010. -------- --- KDE/kdebase3/kdebase3.changes 2009-11-20 21:03:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2010-01-01 20:10:24.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 1 20:09:49 CET 2010 - jengelh(a)medozas.de + +- package baselibs.conf +- enable full parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.bBthh3/_old 2010-01-07 12:58:32.000000000 +0100 +++ /var/tmp/diff_new_pack.bBthh3/_new 2010-01-07 12:58:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebase3 (Version 3.5.10.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -70,16 +70,17 @@ %if %suse_version < 1120 Requires: kdebase3-apps kdebase3-workspace %endif -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: The KDE Core Components BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.10.1 -Release: 2 +Release: 3 %define kde_version 3.5.10 Requires: kdebase3-runtime == %{version} Source0: kdebase-%{kde_version}.tar.bz2 +Source1: baselibs.conf Source3: startkde.suse.sh Source4: kdebase3.fillup Source6: ksysguardd.init @@ -257,7 +258,7 @@ The KDE Team <kde(a)kde.org> %package -n misc-console-font -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: A font for terminal usage @@ -271,7 +272,7 @@ The KDE Team <kde(a)kde.org> %package runtime -License: GPL v2 or later +License: GPLv2+ Summary: Runtime Dependencies of KDE3 Applications Group: System/GUI/KDE Provides: kio_fish @@ -289,7 +290,7 @@ The KDE Team <kde(a)kde.org> %package workspace -License: GPL v2 or later +License: GPLv2+ Summary: Workspace Components of KDE3 Desktop Group: System/GUI/KDE Requires: kdebase3 == %{version} @@ -305,7 +306,7 @@ The KDE Team <kde(a)kde.org> %package apps -License: GPL v2 or later +License: GPLv2+ Summary: Major Applications KDE3 Desktop Group: System/GUI/KDE Requires: kdebase3 == %{version} @@ -321,7 +322,7 @@ The KDE Team <kde(a)kde.org> %package devel -License: GPL v2 or later +License: GPLv2+ Requires: kdelibs3-devel kdebase3 = %version kdebase3-apps = %version kdebase3-runtime = %version kdebase3-workspace = %version Summary: KDE Base Package: Base, Build Environment Group: System/GUI/KDE @@ -342,7 +343,7 @@ The KDE Team <kde(a)kde.org> %package kdm -License: GPL v2 or later +License: GPLv2+ # usesubdirs kdm Summary: The KDE login and display manager Provides: kdebase3:/opt/kde3/bin/kdm @@ -363,7 +364,7 @@ The KDE Team <kde(a)kde.org> %package samba -License: GPL v2 or later +License: GPLv2+ # usesubdirs kioslave/smb kcontrol/samba Summary: KDE Base package: Windows Connection Module Group: System/GUI/KDE @@ -379,7 +380,7 @@ The KDE Team <kde(a)kde.org> %package extra -License: GPL v2 or later +License: GPLv2+ # usesubdirs kpersonalizer kcontrol/thememgr Summary: KDE Base package: Extra Applications Group: System/GUI/KDE @@ -399,7 +400,7 @@ The KDE Team <kde(a)kde.org> %package nsplugin -License: GPL v2 or later +License: GPLv2+ %if %suse_version > 1020 %ifarch x86_64 ppc64 s390x ia64 Requires: nspluginwrapper @@ -423,7 +424,7 @@ %if %suse_version < 1031 %package ksysguardd -License: GPL v2 or later +License: GPLv2+ PreReq: %insserv_prereq %fillup_prereq aaa_base Summary: KDE base package: ksysguard daemon Group: System/GUI/KDE @@ -443,7 +444,7 @@ %endif %package session -License: GPL v2 or later +License: GPLv2+ Summary: The KDE Session Group: System/GUI/KDE %if %suse_version > 1010 @@ -466,7 +467,7 @@ %if %suse_version > 1010 %package beagle -License: GPL v2 or later +License: GPLv2+ Summary: Beagle dependent plugins for KDE desktop Group: System/GUI/KDE %if %suse_version > 1030 @@ -492,11 +493,11 @@ %endif %package -n fileshareset -License: GPL v2 or later +License: GPLv2+ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 571 +Release: 572 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -724,10 +725,10 @@ --with-kdm-pam=xdm \ --with-kcp-pam=kcheckpass \ --with-kss-pam=kcheckpass - do_make %{?jobs:-j %jobs} + do_make %{?_smp_mflags} cd ../fileshareset2 ./configure --prefix=%{fileshare_prefix} - make + make %{?_smp_mflags} %install . /etc/opt/kde3/common_options ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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