February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit libtorrent-rasterbar for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package libtorrent-rasterbar for openSUSE:Factory checked in at 2015-02-22 17:26:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtorrent-rasterbar (Old) and /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libtorrent-rasterbar" Changes: -------- --- /work/SRC/openSUSE:Factory/libtorrent-rasterbar/libtorrent-rasterbar.changes 2014-07-02 15:05:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new/libtorrent-rasterbar.changes 2015-02-22 17:26:21.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 19 19:04:57 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 0.16.19 + * python binding build fix for boost-1.57.0 + * add --enable-export-all option to configure script, to export + all symbols from libtorrent + * python bindings fixes + * handle overlong utf-8 sequences + * fix bug in error handling in protocol encryption +- Remove obsolete conditional macros + +------------------------------------------------------------------- Old: ---- libtorrent-rasterbar-0.16.17.tar.gz New: ---- libtorrent-rasterbar-0.16.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtorrent-rasterbar.spec ++++++ --- /var/tmp/diff_new_pack.iIpJb4/_old 2015-02-22 17:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.iIpJb4/_new 2015-02-22 17:26:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libtorrent-rasterbar # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,7 +23,7 @@ %bcond_with examples Name: libtorrent-rasterbar -Version: 0.16.17 +Version: 0.16.19 Release: 0 Summary: Libtorrent is a C++ implementation of the BitTorrent protocol License: BSD-3-Clause @@ -36,17 +36,15 @@ BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: python-devel -%if 0%{?suse_version} > 01201 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(zlib) -%else -BuildRequires: pkgconfig -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -libtorrent is a C++ library that aims to be a good alternative to all the other bittorrent implementations around. It is a library and not a full featured client, although it comes with a working example client. +libtorrent is a C++ library that aims to be a good alternative to all the other +bittorrent implementations around. It is a library and not a full featured client, +although it comes with a working example client. The main goals of libtorrent are: * to be cpu efficient @@ -60,7 +58,9 @@ Group: System/Libraries %description -n %{name}%{_soname} -libtorrent is a C++ library that aims to be a good alternative to all the other bittorrent implementations around. It is a library and not a full featured client, although it comes with a working example client. +libtorrent is a C++ library that aims to be a good alternative to all the other +bittorrent implementations around. It is a library and not a full featured client, +although it comes with a working example client. The main goals of libtorrent are: * to be cpu efficient @@ -92,12 +92,8 @@ Requires: boost-devel >= 1.36 Requires: gcc-c++ Requires: libGeoIP-devel -%if 0%{?suse_version} > 01201 Requires: pkgconfig(openssl) Requires: pkgconfig(zlib) -%else -Requires: pkgconfig -%endif %description devel libtorrent is a C++ library that aims to be a good alternative to all the other bittorrent implementations around. It is a library and not a full featured client, although it comes with a working example client. ++++++ libtorrent-rasterbar-0.16.17.tar.gz -> libtorrent-rasterbar-0.16.19.tar.gz ++++++ ++++ 4755 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit licq for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package licq for openSUSE:Factory checked in at 2015-02-22 17:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/licq (Old) and /work/SRC/openSUSE:Factory/.licq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "licq" Changes: -------- --- /work/SRC/openSUSE:Factory/licq/licq.changes 2013-11-07 08:42:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.licq.new/licq.changes 2015-02-22 17:26:18.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Feb 19 22:01:21 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 1.8.2 + * Fixed crash when loading protocol plugins + * GPG: Don't retry decrypting if password is invalid + * ICQ: Fixed crash when receiving status updates + * MSN: Change default authentication host to login.passport.com + * Jabber: Fixed crash when disconnecting multiple accounts +- Remove licq-1.8.1-65026d6.patch; fixed on upstream release +- Use the relative sourceforge download Url instead of mirror Url for + source tarball downloading +- Split out translation files + +------------------------------------------------------------------- Old: ---- licq-1.8.1-65026d6.patch licq-1.8.1.tar.bz2 New: ---- licq-1.8.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ licq.spec ++++++ --- /var/tmp/diff_new_pack.b0WNLx/_old 2015-02-22 17:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.b0WNLx/_new 2015-02-22 17:26:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package licq # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,18 +27,16 @@ BuildRequires: libkde4-devel BuildRequires: xosd-devel BuildRequires: pkgconfig(QtGui) >= 4.7 -Version: 1.8.1 +Version: 1.8.2 Release: 0 Summary: Linux ICQ Client License: GPL-2.0+ Group: Productivity/Networking/ICQ -Source: http://switch.dl.sourceforge.net/project/licq/licq/%{version}/licq-%{versio… +Source: http://sourceforge.net/projects/licq/files/licq/%{version}/licq-%{version}.… Source2: licq.png Recommends: sox +Recommends: %{name}-lang Patch2: licq-1.5.0-remove_desktop_file.patch -# TODO: please drop it after the next subj update! -# PATCH-FIX-UPSTREAM to prevent compiling error. -Patch3: licq-1.8.1-65026d6.patch Url: http://www.licq.org/ %description @@ -52,8 +50,6 @@ written in C++ and comes with a GUI plug-in using the Qt widget set. Other plug-ins are also available. - - %package qt4-gui-data Summary: Qt4 data files for Licq Group: Productivity/Networking/ICQ @@ -61,8 +57,6 @@ %description qt4-gui-data Data files for the Qt4 Licq plug-in. - - %package qt4-gui Summary: Qt4 plug-in for Licq Group: Productivity/Networking/ICQ @@ -73,7 +67,6 @@ %description qt4-gui This plug-in uses the Qt4 libraries to provide Licq GUI. - %package kde4-gui Summary: KDE4 plug-in for Licq Group: Productivity/Networking/ICQ @@ -85,7 +78,6 @@ %description kde4-gui This plug-in uses the KDE4 libraries to provide Licq GUI. - %package devel Summary: Development files of Licq Group: Development/Sources @@ -94,12 +86,11 @@ %description devel Header files of Licq program. - +%lang_package %prep %setup %patch2 -p1 -%patch3 # disabled for now (deps missing) rm -r plugins/aosd plugins/jabber @@ -133,14 +124,14 @@ %find_lang licq_osd_plugin %{name}.lang %fdupes -s $RPM_BUILD_ROOT -%files -f %{name}.lang +%files %defattr(-,root,root,755) %doc %{_docdir}/licq/ %{_bindir}/licq %{_libdir}/licq/ %{_datadir}/licq/ -/usr/share/applications/licq.desktop -/usr/share/pixmaps/licq.png +%{_datadir}/applications/licq.desktop +%{_datadir}/pixmaps/licq.png %exclude %{_includedir}/licq/ %exclude %{_libdir}/licq/licq_qt4-gui.so %exclude %{_libdir}/licq/licq_kde4-gui.so @@ -164,4 +155,6 @@ %defattr(-,root,root,755) %{_libdir}/licq/licq_kde4-gui.so +%files lang -f %{name}.lang + %changelog ++++++ licq-1.8.1.tar.bz2 -> licq-1.8.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/README new/licq-1.8.2/README --- old/licq-1.8.1/README 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/README 2014-06-01 21:16:42.000000000 +0200 @@ -1,11 +1,10 @@ - LICQ v1.8.1 README + LICQ v1.8.2 README http://www.licq.org/ #Licq on irc.freenode.net This is a bugfix release, mainly to solve some crashes and fix build problems. -This release also includes a big update of the Turkish translation. -For more information on what has changed since Licq 1.8.0, see doc/CHANGELOG. +For more information on what has changed since Licq 1.8.1, see doc/CHANGELOG. For general information on how to build and run Licq, see doc/README. For information about building and using the different plugins, see README or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/cmake/LicqVersion.cmake new/licq-1.8.2/cmake/LicqVersion.cmake --- old/licq-1.8.1/cmake/LicqVersion.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/cmake/LicqVersion.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -5,7 +5,7 @@ # Licq version set(LICQ_VERSION_MAJOR 1) # 0 <= major <= 64 set(LICQ_VERSION_MINOR 8) # 0 <= minor <= 99 -set(LICQ_VERSION_RELEASE 1) # 0 <= release <= 9 +set(LICQ_VERSION_RELEASE 2) # 0 <= release <= 9 set(LICQ_VERSION_EXTRA "") # Any string # When building from a git clone, set the extra version to the HEAD revision, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/doc/CHANGELOG new/licq-1.8.2/doc/CHANGELOG --- old/licq-1.8.1/doc/CHANGELOG 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/doc/CHANGELOG 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,13 @@ Change log for Licq. +New in 1.8.2 +o Fixed crash when loading protocol plugins +o GPG: Don't retry decrypting if password is invalid +o ICQ: Fixed crash when receiving status updates +o MSN: Change default authentication host to login.passport.com +o Jabber: Fixed crash when disconnecting multiple accounts + + New in 1.8.1 o Fixed crash when shutting down plugins o Handle slashes in account/contact ids diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/doc/README new/licq-1.8.2/doc/README --- old/licq-1.8.1/doc/README 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/doc/README 2014-06-01 21:16:42.000000000 +0200 @@ -1,4 +1,4 @@ -LICQ v1.8.1 +LICQ v1.8.2 An ICQ clone written in C and C++ using a plugin system to allow for many possible interfaces. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/doc/README-1.8.1 new/licq-1.8.2/doc/README-1.8.1 --- old/licq-1.8.1/doc/README-1.8.1 1970-01-01 01:00:00.000000000 +0100 +++ new/licq-1.8.2/doc/README-1.8.1 2014-06-01 21:16:42.000000000 +0200 @@ -0,0 +1,14 @@ + LICQ v1.8.1 README + http://www.licq.org/ + #Licq on irc.freenode.net + +This is a bugfix release, mainly to solve some crashes and fix build problems. +This release also includes a big update of the Turkish translation. + +For more information on what has changed since Licq 1.8.0, see doc/CHANGELOG. + +For general information on how to build and run Licq, see doc/README. +For information about building and using the different plugins, see README or +doc/README for the respective plugins. + +The Licq Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/aosd/version.cmake new/licq-1.8.2/plugins/aosd/version.cmake --- old/licq-1.8.1/plugins/aosd/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/aosd/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/auto-reply/version.cmake new/licq-1.8.2/plugins/auto-reply/version.cmake --- old/licq-1.8.1/plugins/auto-reply/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/auto-reply/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/forwarder/version.cmake new/licq-1.8.2/plugins/forwarder/version.cmake --- old/licq-1.8.1/plugins/forwarder/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/forwarder/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/icq/src/icq-srv.cpp new/licq-1.8.2/plugins/icq/src/icq-srv.cpp --- old/licq-1.8.1/plugins/icq/src/icq-srv.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/icq/src/icq-srv.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 1998-2013 Licq developers <licq-dev(a)googlegroups.com> + * Copyright (C) 1998-2014 Licq developers <licq-dev(a)googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -3252,21 +3252,24 @@ } u.unlock(); - Licq::Event* e = DoneServerEvent(nMsgID, Licq::Event::ResultAcked); - if (e) - { - e->m_pExtendedAck = pExtendedAck; - e->mySubResult = subResult; - ProcessDoneEvent(e); - return; - } - else + if (nMsgID != 0) { - gLog.warning(tr("Ack for unknown event.")); - break; + Licq::Event* e = DoneServerEvent(nMsgID, Licq::Event::ResultAcked); + if (e != NULL) + { + e->m_pExtendedAck = pExtendedAck; + e->mySubResult = subResult; + ProcessDoneEvent(e); + return; + } + else + { + gLog.warning(tr("Ack for unknown event.")); + break; + } } - break; + break; } case ICQ_SNACxMSG_RIGHTSxGRANTED: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/icq/version.cmake new/licq-1.8.2/plugins/icq/version.cmake --- old/licq-1.8.1/plugins/icq/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/icq/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/jabber/src/client.cpp new/licq-1.8.2/plugins/jabber/src/client.cpp --- old/licq-1.8.1/plugins/jabber/src/client.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/jabber/src/client.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2010-2013 Licq developers <licq-dev(a)googlegroups.com> + * Copyright (C) 2010-2014 Licq developers <licq-dev(a)googlegroups.com> * * Please refer to the COPYRIGHT file distributed with this source * distribution for the names of the individual contributors. @@ -171,6 +171,7 @@ Licq::MutexLocker locker(myGlooxMutex); changeStatus(status, false); + myMainLoop.removeCallback(this); if (!myClient.connect(false)) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/jabber/version.cmake new/licq-1.8.2/plugins/jabber/version.cmake --- old/licq-1.8.1/plugins/jabber/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/jabber/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/licqweb/README new/licq-1.8.2/plugins/licqweb/README --- old/licq-1.8.1/plugins/licqweb/README 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/licqweb/README 2014-06-01 21:16:42.000000000 +0200 @@ -1,4 +1,4 @@ -licqweb 1.8.1 +licqweb 1.8.2 To use this you need latest cvs of licq with the rms plugin. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msn.cpp new/licq-1.8.2/plugins/msn/src/msn.cpp --- old/licq-1.8.1/plugins/msn/src/msn.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msn.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -72,7 +72,8 @@ CMSN::CMSN() : myServerSocket(NULL), mySslSocket(NULL), - m_vlPacketBucket(211) + m_vlPacketBucket(211), + myNextTimeoutId(1) { m_bWaitingPingReply = m_bCanPing = false; m_pPacketBuf = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msn.h new/licq-1.8.2/plugins/msn/src/msn.h --- old/licq-1.8.1/plugins/msn/src/msn.h 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msn.h 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2004-2013 Licq developers <licq-dev(a)googlegroups.com> + * Copyright (C) 2004-2014 Licq developers <licq-dev(a)googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -128,7 +128,7 @@ void SendPacket(CMSNPacket *); void Send_SB_Packet(const Licq::UserId& userId, CMSNPacket* p, Licq::TCPSocket* sock, bool bDelete = true); - void MSNAuthenticate(const std::string& host = "loginnet.passport.com", + void MSNAuthenticate(const std::string& host = "login.passport.com", const std::string& path = "/login2.srf"); bool MSNSBConnectStart(const std::string& server, const std::string& cookie); bool MSNSBConnectAnswer(const std::string& server, const std::string& sessionId, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msnpacket.cpp new/licq-1.8.2/plugins/msn/src/msnpacket.cpp --- old/licq-1.8.1/plugins/msn/src/msnpacket.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msnpacket.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -158,17 +158,17 @@ m_pBuffer->packRaw(buf, strlen(buf)); } -char* CMSNPacket::CreateGUID() +std::string CMSNPacket::CreateGUID() { - char *szGUID = new char[37]; + char guid[37]; static int x = 1; x++; // Create a random UID srand(time(0)+x); - sprintf(szGUID, "%4X%4X-%4X-%4X-%4X-%4X%4X%4X", + sprintf(guid, "%4X%4X-%4X-%4X-%4X-%4X%4X%4X", rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF); - return szGUID; + return guid; } CMSNPayloadPacket::CMSNPayloadPacket(char msgType) @@ -202,7 +202,6 @@ : CMSNPayloadPacket('A'), myToEmail(toEmail) { - m_szCallGUID = 0; m_nSessionId = nSessionId; m_nBaseId = nBaseId; m_nDataOffsetLO = nDataOffsetLO; @@ -219,7 +218,7 @@ CMSNP2PPacket::~CMSNP2PPacket() { - /* Empty */ + // Empty } void CMSNP2PPacket::InitBuffer() @@ -536,8 +535,8 @@ CPS_MSNInvitation::CPS_MSNInvitation(const string& toEmail, const string& fromEmail, const string& msnObject) : CMSNP2PPacket(toEmail) { - char *szBranchGUID = CreateGUID(); - m_szCallGUID = CreateGUID(); + std::string branchGUID = CreateGUID(); + myCallGUID = CreateGUID(); string strMSNObject64 = MSN_Base64Encode(msnObject); char szBodyBuf[512]; @@ -564,8 +563,8 @@ "Max-Forwards: 0\r\n" "Content-Type: application/x-msnmsgr-sessionreqbody\r\n" "Content-Length: %lu\r\n" - "\r\n", toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), szBranchGUID, - m_szCallGUID, static_cast<unsigned long>(strlen(szBodyBuf)+1)); + "\r\n", toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), branchGUID.c_str(), + myCallGUID.c_str(), static_cast<unsigned long>(strlen(szBodyBuf)+1)); string strMsg = szHeaderBuf; strMsg += szBodyBuf; @@ -592,7 +591,7 @@ : CMSNP2PPacket(toEmail, 0, _nBaseId, 0, 0, 0, 4, 0, 0, _nAckId, 0, 0, 0) //SizeHI, _nDataSizeLO) { - char *szBranchGUID = CreateGUID(); + std::string branchGUID = CreateGUID(); char szMsgBuf[768]; @@ -608,7 +607,8 @@ "Content-Length: 3\r\n" "\r\n" "\r\n", - toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), szBranchGUID, callId.c_str()); + toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), + branchGUID.c_str(), callId.c_str()); string strMsg = szMsgBuf; strMsg += '\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msnpacket.h new/licq-1.8.2/plugins/msn/src/msnpacket.h --- old/licq-1.8.1/plugins/msn/src/msnpacket.h 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msnpacket.h 2014-06-01 21:16:42.000000000 +0200 @@ -50,7 +50,7 @@ virtual void InitBuffer(); - char *CreateGUID(); + std::string CreateGUID(); protected: @@ -90,13 +90,13 @@ unsigned long SessionId() { return m_nSessionId; } unsigned long BaseId() { return m_nBaseId; } - char *CallGUID() { return m_szCallGUID; } + const std::string& CallGUID() { return myCallGUID; } // unsigned long DataSize() {} //unsigned long Offset() {} protected: std::string myToEmail; - char *m_szCallGUID; + std::string myCallGUID; unsigned long m_nSessionId, m_nBaseId, m_nDataSizeLO, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/version.cmake new/licq-1.8.2/plugins/msn/version.cmake --- old/licq-1.8.1/plugins/msn/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/osd/version.cmake new/licq-1.8.2/plugins/osd/version.cmake --- old/licq-1.8.1/plugins/osd/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/osd/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/qt4-gui/src/helpers/usercodec.h new/licq-1.8.2/plugins/qt4-gui/src/helpers/usercodec.h --- old/licq-1.8.1/plugins/qt4-gui/src/helpers/usercodec.h 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/qt4-gui/src/helpers/usercodec.h 2014-06-01 21:16:42.000000000 +0200 @@ -20,13 +20,14 @@ #ifndef USERCODEC_H #define USERCODEC_H +#include <QObject> #include <QString> namespace LicqQtGui { class UserCodec { - Q_OBJECT + Q_GADGET public: struct encoding_t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/qt4-gui/version.cmake new/licq-1.8.2/plugins/qt4-gui/version.cmake --- old/licq-1.8.1/plugins/qt4-gui/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/qt4-gui/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/rms/version.cmake new/licq-1.8.2/plugins/rms/version.cmake --- old/licq-1.8.1/plugins/rms/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/rms/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/src/gpghelper.cpp new/licq-1.8.2/src/gpghelper.cpp --- old/licq-1.8.1/src/gpghelper.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/src/gpghelper.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2004-2013 Licq developers <licq-dev(a)googlegroups.com> + * Copyright (C) 2004-2014 Licq developers <licq-dev(a)googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -231,12 +231,13 @@ } #ifdef HAVE_LIBGPGME -gpgme_error_t GpgHelper::PassphraseCallback(void* helperPtr, const char *, const char *, int, int fd) +gpgme_error_t GpgHelper::PassphraseCallback(void* helperPtr, const char *, + const char *, int prev_was_bad, int fd) { GpgHelper* helper = static_cast<GpgHelper*>(helperPtr); const char nl = '\n'; const string& pf = helper->myGpgPassphrase; - if (pf.empty()) + if (prev_was_bad || pf.empty()) { write(fd, &nl, 1); return GPG_ERR_CANCELED; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/src/plugin/pluginmanager.cpp new/licq-1.8.2/src/plugin/pluginmanager.cpp --- old/licq-1.8.1/src/plugin/pluginmanager.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/src/plugin/pluginmanager.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2010-2013 Licq developers <licq-dev(a)googlegroups.com> + * Copyright (C) 2010-2014 Licq developers <licq-dev(a)googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -586,12 +586,9 @@ // Load contacts and owners for the new protocol gUserManager.loadProtocol(plugin->protocolId()); - ProtocolPlugin::Instances instances = plugin->instances(); - BOOST_FOREACH(Licq::ProtocolPluginInstance::Ptr instance, instances) - { - startInstance( - boost::dynamic_pointer_cast<ProtocolPluginInstance>(instance)); - } + // Don't start any protocol instance here, as it has already been started in + // createProtocolOwner() (called by gUserManager.loadProtocol()). + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/src/sighandler.cpp new/licq-1.8.2/src/sighandler.cpp --- old/licq-1.8.1/src/sighandler.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/src/sighandler.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 1998-2012 Licq Developers <licq-dev(a)googlegroups.com> + * Copyright (C) 1998-2014 Licq developers <licq-dev(a)googlegroups.com> * * Please refer to the COPYRIGHT file distributed with this source * distribution for the names of the individual contributors. @@ -207,10 +207,10 @@ char error[1024]; snprintf(error, 1024, "Licq has encountered a fatal error.\n" - "Please report this error either by creating a new ticket " - "at http://trac.licq.org/ or by sending an e-mail to the mailing list " - "licq-dev(a)googlegroups.com (you must be registered to be able to post, " - "see http://trac.licq.org/wiki/MailingList).\n" + "Please report this error either by creating a new ticket at" + "https://github.com/licq-im/licq/issues or by sending an e-mail to the" + "mailing list licq-dev(a)googlegroups.com (you must be registered to be" + "able to post, see http://groups.google.com/group/licq-dev).\n" "\n" "To help us debug the error, please include a full description of " "what you did when the error occurred. Additionally, please include " -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit open-vm-tools for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2015-02-22 17:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-vm-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools-KMP.changes 2015-01-06 09:07:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools-KMP.changes 2015-02-22 17:26:15.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 19 13:35:44 UTC 2015 - dimstar(a)opensuse.org + +- Add open-vm-tools-linux-3.19.0.patch: Fix building of vmhgfs with + Kernel 3.19.0+. + +------------------------------------------------------------------- open-vm-tools.changes: same change New: ---- open-vm-tools-linux-3.19.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools-KMP.spec ++++++ --- /var/tmp/diff_new_pack.QzVgKx/_old 2015-02-22 17:26:16.000000000 +0100 +++ /var/tmp/diff_new_pack.QzVgKx/_new 2015-02-22 17:26:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-vm-tools-KMP # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -80,6 +80,7 @@ Patch10: open-vm-tools-linux-3.17.patch Patch11: open-vm-tools-linux-3.17.7.patch Patch12: open-vm-tools-linux-3.18.0.patch +Patch13: open-vm-tools-linux-3.19.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ # don't use pkgconfig(gtk+-2.0) so we can build on SLE @@ -234,6 +235,10 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +KVER=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $2}') +if [ $KVER -ge 19 ]; then +%patch13 -p1 +fi %build %if ! %{KMP} ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.QzVgKx/_old 2015-02-22 17:26:16.000000000 +0100 +++ /var/tmp/diff_new_pack.QzVgKx/_new 2015-02-22 17:26:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-vm-tools # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -80,6 +80,7 @@ Patch10: open-vm-tools-linux-3.17.patch Patch11: open-vm-tools-linux-3.17.7.patch Patch12: open-vm-tools-linux-3.18.0.patch +Patch13: open-vm-tools-linux-3.19.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ # don't use pkgconfig(gtk+-2.0) so we can build on SLE @@ -234,6 +235,10 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +KVER=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $2}') +if [ $KVER -ge 19 ]; then +%patch13 -p1 +fi %build %if ! %{KMP} ++++++ open-vm-tools-linux-3.19.0.patch ++++++ Index: open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/dir.c =================================================================== --- open-vm-tools-9.4.6-1770165.orig/modules/linux/vmhgfs/dir.c +++ open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/dir.c @@ -414,7 +414,7 @@ HgfsPackDirOpenRequest(struct file *file /* Build full name to send to server. */ if (HgfsBuildPath(name, req->bufferSize - (requestSize - 1), - file->f_dentry) < 0) { + file->f_path.dentry) < 0) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsPackDirOpenRequest: build path failed\n")); return -EINVAL; } @@ -560,8 +560,8 @@ HgfsPrivateDirRelease(struct file *file, int result = 0; ASSERT(file); - ASSERT(file->f_dentry); - ASSERT(file->f_dentry->d_sb); + ASSERT(file->f_path.dentry); + ASSERT(file->f_path.dentry->d_sb); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsPrivateDirRelease: close fh %u\n", handle)); @@ -704,7 +704,7 @@ HgfsDirLlseek(struct file *file, loff_t offset, int origin) { - struct dentry *dentry = file->f_dentry; + struct dentry *dentry = file->f_path.dentry; struct inode *inode = dentry->d_inode; compat_mutex_t *mtx; @@ -853,7 +853,7 @@ HgfsReaddirRefreshEntries(struct file *f } LOG(6, (KERN_DEBUG "VMware hgfs: %s: error: stale handle (%s) return %d)\n", - __func__, file->f_dentry->d_name.name, result)); + __func__, file->f_path.dentry->d_name.name, result)); return result; } @@ -988,9 +988,9 @@ HgfsReaddirNextEntry(struct file *file, char *fileName = NULL; int result; - ASSERT(file->f_dentry->d_inode->i_sb); + ASSERT(file->f_path.dentry->d_inode->i_sb); - si = HGFS_SB_TO_COMMON(file->f_dentry->d_inode->i_sb); + si = HGFS_SB_TO_COMMON(file->f_path.dentry->d_inode->i_sb); *entryIgnore = FALSE; /* @@ -1079,18 +1079,18 @@ HgfsReaddirNextEntry(struct file *file, */ if (!strncmp(entryName, ".", sizeof ".")) { if (!dotAndDotDotIgnore) { - *entryIno = file->f_dentry->d_inode->i_ino; + *entryIno = file->f_path.dentry->d_inode->i_ino; } else { *entryIgnore = TRUE; } } else if (!strncmp(entryName, "..", sizeof "..")) { if (!dotAndDotDotIgnore) { - *entryIno = compat_parent_ino(file->f_dentry); + *entryIno = compat_parent_ino(file->f_path.dentry); } else { *entryIgnore = TRUE; } } else { - *entryIno = HgfsGetFileInode(&entryAttrs, file->f_dentry->d_inode->i_sb); + *entryIno = HgfsGetFileInode(&entryAttrs, file->f_path.dentry->d_inode->i_sb); } if (*entryIgnore) { @@ -1170,16 +1170,16 @@ HgfsDoReaddir(struct file *file, ASSERT(filldirCtx); if (!file || - !(file->f_dentry) || - !(file->f_dentry->d_inode)) { + !(file->f_path.dentry) || + !(file->f_path.dentry->d_inode)) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsReaddir: null input\n")); return -EFAULT; } LOG(4, (KERN_DEBUG "VMware hgfs: %s(%s, inum %lu, pos %Lu)\n", __func__, - file->f_dentry->d_name.name, - file->f_dentry->d_inode->i_ino, + file->f_path.dentry->d_name.name, + file->f_path.dentry->d_inode->i_ino, *currentPos)); /* @@ -1294,7 +1294,7 @@ HgfsReaddir(struct file *file, / /* If either dot and dotdot are filled in for us we can exit. */ if (!dir_emit_dots(file, ctx)) { LOG(6, (KERN_DEBUG "VMware hgfs: %s: dir_emit_dots(%s, @ %Lu)\n", - __func__, file->f_dentry->d_name.name, ctx->pos)); + __func__, file->f_path.dentry->d_name.name, ctx->pos)); return 0; } @@ -1464,8 +1464,8 @@ HgfsDirRelease(struct inode *inode, // ASSERT(inode); ASSERT(file); - ASSERT(file->f_dentry); - ASSERT(file->f_dentry->d_sb); + ASSERT(file->f_path.dentry); + ASSERT(file->f_path.dentry->d_sb); handle = FILE_GET_FI_P(file)->handle; Index: open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/file.c =================================================================== --- open-vm-tools-9.4.6-1770165.orig/modules/linux/vmhgfs/file.c +++ open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/file.c @@ -362,7 +362,7 @@ HgfsPackOpenRequest(struct inode *inode, /* Build full name to send to server. */ if (HgfsBuildPath(name, req->bufferSize - (requestSize - 1), - file->f_dentry) < 0) { + file->f_path.dentry) < 0) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsPackOpenRequest: build path " "failed\n")); return -EINVAL; @@ -589,8 +589,8 @@ HgfsOpen(struct inode *inode, // IN: In ASSERT(inode); ASSERT(inode->i_sb); ASSERT(file); - ASSERT(file->f_dentry); - ASSERT(file->f_dentry->d_inode); + ASSERT(file->f_path.dentry); + ASSERT(file->f_path.dentry->d_inode); iinfo = INODE_GET_II_P(inode); @@ -667,7 +667,7 @@ HgfsOpen(struct inode *inode, // IN: In * This is not the root of our file system so there should always * be a parent. */ - ASSERT(file->f_dentry->d_parent); + ASSERT(file->f_path.dentry->d_parent); /* * Here we obtain a reference on the parent to make sure it doesn't @@ -682,10 +682,10 @@ HgfsOpen(struct inode *inode, // IN: In * We could do this if we were willing to give up support for * O_EXCL on 2.4 kernels. */ - dparent = dget(file->f_dentry->d_parent); + dparent = dget(file->f_path.dentry->d_parent); iparent = dparent->d_inode; - HgfsSetUidGid(iparent, file->f_dentry, + HgfsSetUidGid(iparent, file->f_path.dentry, current_fsuid(), current_fsgid()); dput(dparent); @@ -745,7 +745,7 @@ out: * forcing a revalidate on one will not force it on any others. */ if (result != 0 && iinfo->createdAndUnopened == TRUE) { - HgfsDentryAgeForce(file->f_dentry); + HgfsDentryAgeForce(file->f_path.dentry); } return result; } @@ -781,12 +781,12 @@ HgfsAioRead(struct kiocb *iocb, // ASSERT(iocb); ASSERT(iocb->ki_filp); - ASSERT(iocb->ki_filp->f_dentry); + ASSERT(iocb->ki_filp->f_path.dentry); ASSERT(iov); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsAioRead: was called\n")); - result = HgfsRevalidate(iocb->ki_filp->f_dentry); + result = HgfsRevalidate(iocb->ki_filp->f_path.dentry); if (result) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsAioRead: invalid dentry\n")); goto out; @@ -832,10 +832,10 @@ HgfsAioWrite(struct kiocb *iocb, // ASSERT(iocb); ASSERT(iocb->ki_filp); - ASSERT(iocb->ki_filp->f_dentry); + ASSERT(iocb->ki_filp->f_path.dentry); ASSERT(iov); - writeDentry = iocb->ki_filp->f_dentry; + writeDentry = iocb->ki_filp->f_path.dentry; iinfo = INODE_GET_II_P(writeDentry->d_inode); LOG(4, (KERN_DEBUG "VMware hgfs: HgfsAioWrite(%s/%s, %lu@%Ld)\n", @@ -915,14 +915,14 @@ HgfsRead(struct file *file, // IN: Fil int result; ASSERT(file); - ASSERT(file->f_dentry); + ASSERT(file->f_path.dentry); ASSERT(buf); ASSERT(offset); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsRead: read %Zu bytes from fh %u " "at offset %Lu\n", count, FILE_GET_FI_P(file)->handle, *offset)); - result = HgfsRevalidate(file->f_dentry); + result = HgfsRevalidate(file->f_path.dentry); if (result) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsRead: invalid dentry\n")); goto out; @@ -968,15 +968,15 @@ HgfsWrite(struct file *file, // IN: int result; ASSERT(file); - ASSERT(file->f_dentry); - ASSERT(file->f_dentry->d_inode); + ASSERT(file->f_path.dentry); + ASSERT(file->f_path.dentry->d_inode); ASSERT(buf); ASSERT(offset); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsWrite: write %Zu bytes to fh %u " "at offset %Lu\n", count, FILE_GET_FI_P(file)->handle, *offset)); - result = HgfsRevalidate(file->f_dentry); + result = HgfsRevalidate(file->f_path.dentry); if (result) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsWrite: invalid dentry\n")); goto out; @@ -1020,12 +1020,12 @@ HgfsSeek(struct file *file, // IN: Fil loff_t result = -1; ASSERT(file); - ASSERT(file->f_dentry); + ASSERT(file->f_path.dentry); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsSeek: seek to %Lu bytes from fh %u " "from position %d\n", offset, FILE_GET_FI_P(file)->handle, origin)); - result = (loff_t) HgfsRevalidate(file->f_dentry); + result = (loff_t) HgfsRevalidate(file->f_path.dentry); if (result) { LOG(6, (KERN_DEBUG "VMware hgfs: HgfsSeek: invalid dentry\n")); goto out; @@ -1108,8 +1108,8 @@ HgfsFlush(struct file *file int ret = 0; LOG(4, (KERN_DEBUG "VMware hgfs: HgfsFlush(%s/%s)\n", - file->f_dentry->d_parent->d_name.name, - file->f_dentry->d_name.name)); + file->f_path.dentry->d_parent->d_name.name, + file->f_path.dentry->d_name.name)); if ((file->f_mode & FMODE_WRITE) == 0) { goto exit; @@ -1121,7 +1121,7 @@ HgfsFlush(struct file *file #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) ret = vfs_fsync(file, 0); #else - ret = HgfsDoFsync(file->f_dentry->d_inode); + ret = HgfsDoFsync(file->f_path.dentry->d_inode); #endif exit: @@ -1177,13 +1177,13 @@ HgfsFsync(struct file *file, // IN: Fil #endif LOG(4, (KERN_DEBUG "VMware hgfs: HgfsFsync(%s/%s, %lld, %lld, %d)\n", - file->f_dentry->d_parent->d_name.name, - file->f_dentry->d_name.name, + file->f_path.dentry->d_parent->d_name.name, + file->f_path.dentry->d_name.name, startRange, endRange, datasync)); /* Flush writes to the server and return any errors */ - inode = file->f_dentry->d_inode; + inode = file->f_path.dentry->d_inode; #if defined VMW_FSYNC_31 ret = filemap_write_and_wait_range(inode->i_mapping, startRange, endRange); #else @@ -1223,11 +1223,11 @@ HgfsMmap(struct file *file, // IN: File ASSERT(file); ASSERT(vma); - ASSERT(file->f_dentry); + ASSERT(file->f_path.dentry); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsMmap: was called\n")); - result = HgfsRevalidate(file->f_dentry); + result = HgfsRevalidate(file->f_path.dentry); if (result) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsMmap: invalid dentry\n")); goto out; @@ -1268,8 +1268,8 @@ HgfsRelease(struct inode *inode, // IN: ASSERT(inode); ASSERT(file); - ASSERT(file->f_dentry); - ASSERT(file->f_dentry->d_sb); + ASSERT(file->f_path.dentry); + ASSERT(file->f_path.dentry->d_sb); handle = FILE_GET_FI_P(file)->handle; LOG(6, (KERN_DEBUG "VMware hgfs: HgfsRelease: close fh %u\n", handle)); @@ -1398,14 +1398,14 @@ HgfsSendfile(struct file *file, // IN ssize_t result; ASSERT(file); - ASSERT(file->f_dentry); + ASSERT(file->f_path.dentry); ASSERT(target); ASSERT(offset); ASSERT(actor); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsSendfile: was called\n")); - result = HgfsRevalidate(file->f_dentry); + result = HgfsRevalidate(file->f_path.dentry); if (result) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsSendfile: invalid dentry\n")); goto out; @@ -1452,11 +1452,11 @@ HgfsSpliceRead(struct file *file, ssize_t result; ASSERT(file); - ASSERT(file->f_dentry); + ASSERT(file->f_path.dentry); LOG(6, (KERN_DEBUG "VMware hgfs: HgfsSpliceRead: was called\n")); - result = HgfsRevalidate(file->f_dentry); + result = HgfsRevalidate(file->f_path.dentry); if (result) { LOG(4, (KERN_DEBUG "VMware hgfs: HgfsSpliceRead: invalid dentry\n")); goto out; Index: open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/fsutil.c =================================================================== --- open-vm-tools-9.4.6-1770165.orig/modules/linux/vmhgfs/fsutil.c +++ open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/fsutil.c @@ -1936,7 +1936,7 @@ HgfsCreateFileInfo(struct file *file, / ASSERT(file); - inodeInfo = INODE_GET_II_P(file->f_dentry->d_inode); + inodeInfo = INODE_GET_II_P(file->f_path.dentry->d_inode); ASSERT(inodeInfo); /* Get the mode of the opened file. */ Index: open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/tcp.c =================================================================== --- open-vm-tools-9.4.6-1770165.orig/modules/linux/vmhgfs/tcp.c +++ open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/tcp.c @@ -250,7 +250,7 @@ HgfsSocketRecvMsg(struct socket *socket, size_t bufferLen) // IN: Buffer length { struct iovec iov; - struct msghdr msg; + struct user_msghdr msg; int ret; int flags = MSG_DONTWAIT | MSG_NOSIGNAL; mm_segment_t oldfs = get_fs(); @@ -765,7 +765,7 @@ HgfsSocketSendMsg(struct socket *socket, size_t bufferLen) // IN: Buffer length { struct iovec iov; - struct msghdr msg; + struct user_msghdr msg; int ret = 0; int i = 0; mm_segment_t oldfs = get_fs(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cloop for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package cloop for openSUSE:Factory checked in at 2015-02-22 17:26:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloop (Old) and /work/SRC/openSUSE:Factory/.cloop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cloop" Changes: -------- --- /work/SRC/openSUSE:Factory/cloop/cloop.changes 2014-05-13 20:43:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cloop.new/cloop.changes 2015-02-22 17:26:14.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 19 20:32:52 UTC 2015 - jengelh(a)inai.de + +- Add cloop-3.19.diff to make cloop compile with Linux 3.19+ + +------------------------------------------------------------------- New: ---- cloop-3.19.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloop.spec ++++++ --- /var/tmp/diff_new_pack.rWxBo5/_old 2015-02-22 17:26:15.000000000 +0100 +++ /var/tmp/diff_new_pack.rWxBo5/_new 2015-02-22 17:26:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cloop # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,6 +29,7 @@ Patch1: cloop-kmod-install.diff Patch2: cloop-3.9.diff Patch3: cloop-3.13.diff +Patch4: cloop-3.19.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: kernel-syms @@ -55,8 +56,11 @@ %prep %setup -q %patch -P 1 -P 2 -p1 -%if 0%{?suse_version} >= 1315 +%if 0%{?suse_version} >= 1320 %patch -P 3 -p1 +%patch -P 4 -p1 +%endif +%if 0%{?suse_version} >= 1321 %endif %build ++++++ cloop-3.19.diff ++++++ --- cloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: cloop-2.639/cloop.c =================================================================== --- cloop-2.639.orig/cloop.c +++ cloop-2.639/cloop.c @@ -423,7 +423,7 @@ static int cloop_set_file(int cloop_num, unsigned int i, offsets_read, total_offsets; int isblkdev; int error = 0; - inode = file->f_dentry->d_inode; + inode = file->f_path.dentry->d_inode; isblkdev=S_ISBLK(inode->i_mode)?1:0; if(!isblkdev&&!S_ISREG(inode->i_mode)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dogtail for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package dogtail for openSUSE:Factory checked in at 2015-02-22 17:26:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dogtail (Old) and /work/SRC/openSUSE:Factory/.dogtail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dogtail" Changes: -------- New Changes file: --- /dev/null 2014-12-25 22:38:16.200041506 +0100 +++ /work/SRC/openSUSE:Factory/.dogtail.new/dogtail.changes 2015-02-22 17:26:11.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Thu Feb 19 09:30:23 CET 2015 - fcrozat(a)suse.com + +- Initial package (based on Fedora) + + New: ---- dogtail-0.9.0.tar.gz dogtail.changes dogtail.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dogtail.spec ++++++ # # spec file for package dogtail # # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: dogtail Version: 0.9.0 Release: 0 Summary: GUI test tool and automation framework License: GPL-2.0 Url: http://dogtail.fedorahosted.org/ Source0: http://fedorahosted.org/released/dogtail/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: gobject-introspection BuildRequires: hicolor-icon-theme BuildRequires: python-devel BuildRequires: update-desktop-files Requires: hicolor-icon-theme Requires: python-atspi Requires: python-cairo Requires: python-gobject Requires: python-imaging Requires: rpm-python Requires: xinit BuildArch: noarch %description GUI test tool and automation framework that uses assistive technologies to communicate with desktop applications. %prep %setup -q %build python ./setup.py build %install python ./setup.py install -O2 --root=%{buildroot} --record=%{name}.files rm -rf %{buildroot}/%{_docdir}/dogtail rm -f %{buildroot}/%{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info find examples -type f -exec chmod 0644 \{\} \; desktop-file-install %{buildroot}/%{_datadir}/applications/sniff.desktop \ --dir=%{buildroot}/%{_datadir}/applications \ %suse_update_desktop_file -G "UI test application" -r %{buildroot}/%{_datadir}/applications/sniff.desktop Development Profiling %post %icon_theme_cache_post %postun %icon_theme_cache_postun %files %defattr(-,root,root) %{_bindir}/* %{python_sitelib}/dogtail/ %{_datadir}/applications/* %{_datadir}/dogtail/ %{_datadir}/icons/hicolor/*/apps/%{name}*.* %doc COPYING %doc README %doc NEWS %doc %{_datadir}/doc/dogtail %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-simplecov for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package rubygem-simplecov for openSUSE:Factory checked in at 2015-02-22 17:26:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-simplecov (Old) and /work/SRC/openSUSE:Factory/.rubygem-simplecov.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-simplecov" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-simplecov/rubygem-simplecov.changes 2014-10-18 09:10:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-simplecov.new/rubygem-simplecov.changes 2015-02-22 17:26:09.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 19 05:30:33 UTC 2015 - coolo(a)suse.com + +- updated to version 0.9.2 + +------------------------------------------------------------------- Old: ---- simplecov-0.9.1.gem New: ---- simplecov-0.9.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-simplecov.spec ++++++ --- /var/tmp/diff_new_pack.pNPU0C/_old 2015-02-22 17:26:10.000000000 +0100 +++ /var/tmp/diff_new_pack.pNPU0C/_new 2015-02-22 17:26:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-simplecov # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,13 +24,13 @@ # Name: rubygem-simplecov -Version: 0.9.1 +Version: 0.9.2 Release: 0 %define mod_name simplecov %define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: %{ruby >= 1.8.7} BuildRequires: %{rubygem gem2rpm} -BuildRequires: %{ruby} BuildRequires: ruby-macros >= 5 Url: http://github.com/colszowka/simplecov Source: http://rubygems.org/gems/%{mod_full_name}.gem ++++++ simplecov-0.9.1.gem -> simplecov-0.9.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.travis.yml new/.travis.yml --- old/.travis.yml 2014-09-21 13:52:55.000000000 +0200 +++ new/.travis.yml 2015-02-18 15:46:13.000000000 +0100 @@ -1,12 +1,24 @@ language: ruby + +before_install: + - gem install bundler + +bundler_args: --without development --jobs=3 --retry=3 + +cache: bundler + +sudo: false + rvm: - 1.8.7 - 1.9.3 - 2.0.0 - 2.1 + - 2.2 - ruby-head - jruby - rbx-2 + matrix: allow_failures: - rvm: ruby-head diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2014-09-21 13:52:55.000000000 +0200 +++ new/CHANGELOG.md 2015-02-18 15:46:13.000000000 +0100 @@ -1,10 +1,31 @@ -Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.9.1...master)) +Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.9.2...master)) ==================== ## Enhancements ## Bugfixes +0.9.2, 2015-02-18 ([changes](https://github.com/colszowka/simplecov/compare/v0.9.1...v0.9.2)) +==================== + +This is a minor bugfix release for simplecov-html, released as `0.9.0`. Due to the tight version constraint in the gemspec +a new release of simplecov had to be shipped to allow using simplecov-html `~> 0.9.0`. + + * The browser back / forward button should now work again. See [#36](https://github.com/colszowka/simplecov-html/pull/36) and + [#35](https://github.com/colszowka/simplecov-html/pull/35). Thanks @whatasunnyday and @justinsteele for submitting PRs to fix this. + * Fix "warning: possibly useless use of a variable in void context" See [#31](https://github.com/colszowka/simplecov-html/pull/31). Thanks @cbandy + * Always use binary file format. See [#32](https://github.com/colszowka/simplecov-html/pull/32). Thanks @andy128k + * Avoid slow file output with JRuby/Windows. See [#16](https://github.com/colszowka/simplecov-html/pull/16). Thanks @pschambacher + +Other than the release includes a bunch of mostly documentation improvements: + + * Update Rails path for Rails 4+. See [#336](https://github.com/colszowka/simplecov/pull/336). Thanks @yazinsai + * Encourage use of .simplecov to avoid lost files. See [#338](https://github.com/colszowka/simplecov/pull/338). thanks @dankohn + * Specified in the gemspec that simplecov needs ruby 1.8.7. See [#343](https://github.com/colszowka/simplecov/pull/343). thanks @iainbeeston + * Fix mispointed link in CHANGELOG.md. See [#353](https://github.com/colszowka/simplecov/pull/353). Thanks @dleve123 + * Improve command name docs. See [#356](https://github.com/colszowka/simplecov/pull/356). Thanks @gtd + + 0.9.1, 2014-09-21 ([changes](https://github.com/colszowka/simplecov/compare/v0.9.0...v0.9.1)) ==================== @@ -43,7 +64,7 @@ * Does not look for .simplecov in ~/ when $HOME is not set. See [#311](https://github.com/colszowka/simplecov/pull/311) (thanks @lasseebert) * Exit with code only if it's Numeric > 0. - See [#302](https://github.com/colszowka/simplecov/pull/303)(thanks @hajder) + See [#302](https://github.com/colszowka/simplecov/pull/302) (thanks @hajder) * Make default filter case insensitive. See [#280](https://github.com/colszowka/simplecov/pull/280) (thanks @ryanatball) * Improve regexp that matches functional tests. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2014-09-21 13:52:55.000000000 +0200 +++ new/Gemfile 2015-02-18 15:46:13.000000000 +0100 @@ -6,22 +6,28 @@ # Uncomment this to use development version of html formatter from github # gem 'simplecov-html', :github => 'colszowka/simplecov-html' -gemspec - gem 'rake', '>= 10.3' group :test do - gem 'activesupport', '~> 3.2.0' # Older version required for Ruby 1.8.7 support + # Older versions of some gems required for Ruby 1.8.7 support + platform :ruby_18 do + gem 'activesupport', '~> 3.2.21' + gem 'shoulda-matchers', '~> 2.0.0' + gem 'i18n', '~> 0.6.11' + end + gem 'minitest', '>= 5.5' gem 'rspec', '>= 3.0' gem 'rspec-legacy_formatters', '>= 1.0' gem 'shoulda', '>= 3.5' - gem 'shoulda-matchers', '~> 2.0.0' # Older version required for Ruby 1.8.7 support end -if 'Integration test (cucumber) suite is 1.9+ only'.respond_to?(:encoding) +platform :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22 do gem 'aruba', '~> 0.6' gem 'capybara', '~> 2.0.0' - gem 'poltergeist', '~> 1.1' - gem 'phantomjs', '~> 1.9' gem 'cucumber', '~> 1.1' + gem 'phantomjs', '~> 1.9' + gem 'poltergeist', '~> 1.1' + gem 'test-unit', '~> 3.0' end + +gemspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2014-09-21 13:52:55.000000000 +0200 +++ new/README.md 2015-02-18 15:46:13.000000000 +0100 @@ -9,7 +9,7 @@ * [Mailing List] * [Continuous Integration] -**Important Notice: There is a bug that affects exit code handling on the 0.8 line of SimpleCov, see [#281](https://github.com/colszowka/simplecov/issues/281). Please use versions `~> 0.7.1` or `~> 0.9.0` to avoid this.** +**Important Notice: There is a bug that affects exit code handling on the 0.8 line of SimpleCov, see [#281](https://github.com/colszowka/simplecov/issues/281). Please use versions `~> 0.9.0` to avoid this.** [Coverage]: http://www.ruby-doc.org/stdlib-2.1.0/libdoc/coverage/rdoc/Coverage.html "API doc for Ruby's Coverage library" [Source Code]: https://github.com/colszowka/simplecov "Source Code @ GitHub" @@ -75,7 +75,7 @@ SimpleCov must be running in the process that you want the code coverage analysis to happen on. When testing a server process (i.e. a JSON API endpoint) via a separate test process (i.e. when using Selenium) where you want to see all code executed by the `rails server`, and not just code executed in your actual test files, you'll want to add something -like this to the top of `script/rails`: +like this to the top of `script/rails` (or `bin/rails` for Rails 4.*): ```ruby if ENV['RAILS_ENV'] == 'test' @@ -251,6 +251,7 @@ # any custom configs like groups and filters can be here at a central place end ``` +Using `.simplecov` rather than separately requiring SimpleCov multiple times is recommended if you are merging multiple test frameworks like Cucumber and RSpec that rely on each other, as invoking SimpleCov multiple times can cause coverage information to be lost. ## Filters @@ -378,7 +379,7 @@ that invoked the test suite as a command name. If you have some non-standard setup and still want nicely labeled test suites, you have to give Simplecov a cue as to what the -name of the currently running test suite is. You can do so by specifying SimpleCov.command_name in one test file that is +name of the currently running test suite is. You can do so by specifying `SimpleCov.command_name` in one test file that is part of your specific suite. To customize the suite names on a Rails app (yeah, sorry for being Rails-biased, but everyone knows what @@ -402,14 +403,25 @@ Note that this only has to be invoked ONCE PER TEST SUITE, so even if you have 200 unit test files, specifying it in some_test.rb is enough. +Last but not least **if multiple suites resolve to the same `command_name`** be aware that the coverage results **will +clobber each other instead of being merged**. SimpleCov is smart enough to detect unique names for the most common +setups, but if you have more than one test suite that doesn't follow a common pattern then you will want to manually +ensure that each suite gets a unique `command_name`. + +If you are running tests in parallel each process has the potential to clobber results from the other test processes. +If you are relying on the default `command_name` then SimpleCov will attempt to detect and avoid parallel test suite +`command_name` collisions based on the presence of `ENV['PARALLEL_TEST_GROUPS']` and `ENV['TEST_ENV_NUMBER']`. If your +parallel test runner does not set one or both of these then *you must* set a `command_name` and ensure that it is unique +per process (eg. `command_name "Unit Tests PID #{$$}"`). + [simplecov-html] prints the used test suites in the footer of the generated coverage report. ### Timeout for merge Of course, your cached coverage data is likely to become invalid at some point. Thus, result sets that are older than -SimpleCov.merge_timeout will not be used any more. By default, the timeout is 600 seconds (10 minutes), and you can +`SimpleCov.merge_timeout` will not be used any more. By default, the timeout is 600 seconds (10 minutes), and you can raise (or lower) it by specifying `SimpleCov.merge_timeout 3600` (1 hour), or, inside a configure/start block, with -just "merge_timeout 3600". +just `merge_timeout 3600`. You can deactivate merging altogether with `SimpleCov.use_merging false`. @@ -587,6 +599,11 @@ A formatter that generates a coverage badge for use in your project's readme using ImageMagick. +#### [simplecov-cobertura](https://github.com/dashingrocket/simplecov-cobertura) +*by Jesse Bowes* + +A formatter that generates Cobertura XML. + ## Ruby version compatibility [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)](http://travi… @@ -596,7 +613,7 @@ test suite crash right now. Whether SimpleCov will support JRuby/Rubinius in the future depends solely on whether those Ruby interpreters add the coverage library. -SimpleCov is built in [Continuous Integration] on 1.9.3, 2.0.0, 2.1.0 and ruby-head. +SimpleCov is built in [Continuous Integration] on Ruby 1.9.3, 2.0.0, 2.1, and 2.2. ## Want to find dead code in production? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Rakefile new/Rakefile --- old/Rakefile 2014-09-21 13:52:55.000000000 +0200 +++ new/Rakefile 2015-02-18 15:46:13.000000000 +0100 @@ -21,7 +21,7 @@ end # Cucumber integration test suite is for impls that work with simplecov only - a.k.a. 1.9+ -if '1.9+'.respond_to? :encoding +if RUBY_VERSION >= "1.9" require 'cucumber/rake/task' Cucumber::Rake::Task.new task :default => [:test, :cucumber] Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/features/support/env.rb new/features/support/env.rb --- old/features/support/env.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/features/support/env.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,4 +1,4 @@ -unless '1.9'.respond_to?(:encoding) +if RUBY_VERSION < "1.9" $stderr.puts "Sorry, Cucumber features are only meant to run on Ruby 1.9+ :(" exit 0 end @@ -8,6 +8,7 @@ require 'aruba/cucumber' require 'aruba/jruby' if RUBY_ENGINE == 'jruby' require 'capybara/cucumber' +require 'minitest/autorun' require 'phantomjs/poltergeist' # Fake rack app for capybara that just returns the latest coverage report from aruba temp project dir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/version.rb new/lib/simplecov/version.rb --- old/lib/simplecov/version.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/lib/simplecov/version.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,3 +1,3 @@ module SimpleCov - VERSION = "0.9.1" + VERSION = "0.9.2" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2014-09-21 13:52:55.000000000 +0200 +++ new/metadata 2015-02-18 15:46:13.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: simplecov version: !ruby/object:Gem::Version - version: 0.9.1 + version: 0.9.2 platform: ruby authors: - Christoph Olszowka autorequire: bindir: bin cert_chain: [] -date: 2014-09-21 00:00:00.000000000 Z +date: 2015-02-18 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: multi_json @@ -30,14 +30,14 @@ requirements: - - "~>" - !ruby/object:Gem::Version - version: 0.8.0 + version: 0.9.0 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: 0.8.0 + version: 0.9.0 - !ruby/object:Gem::Dependency name: docile requirement: !ruby/object:Gem::Requirement @@ -181,7 +181,7 @@ requirements: - - ">=" - !ruby/object:Gem::Version - version: '0' + version: 1.8.7 required_rubygems_version: !ruby/object:Gem::Requirement requirements: - - ">=" @@ -189,7 +189,7 @@ version: '0' requirements: [] rubyforge_project: -rubygems_version: 2.2.2 +rubygems_version: 2.4.5 signing_key: specification_version: 4 summary: Code coverage for Ruby 1.9+ with a powerful configuration library and automatic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplecov.gemspec new/simplecov.gemspec --- old/simplecov.gemspec 2014-09-21 13:52:55.000000000 +0200 +++ new/simplecov.gemspec 2015-02-18 15:46:13.000000000 +0100 @@ -13,8 +13,9 @@ gem.summary = gem.description gem.license = "MIT" + gem.required_ruby_version = ">= 1.8.7" gem.add_dependency 'multi_json', '~> 1.0' - gem.add_dependency 'simplecov-html', '~> 0.8.0' + gem.add_dependency 'simplecov-html', '~> 0.9.0' gem.add_dependency 'docile', '~> 1.1.0' gem.files = `git ls-files`.split("\n") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/helper.rb new/test/helper.rb --- old/test/helper.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/helper.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,21 +1,19 @@ require 'bundler/setup' require 'simplecov' -require 'test/unit' +require 'minitest/autorun' require 'shoulda' SimpleCov.coverage_dir('tmp/coverage') -class Test::Unit::TestCase - def source_fixture(filename) - File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename)) - end +def source_fixture(filename) + File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename)) end require 'shoulda_macros' -Test::Unit::TestCase.send :extend, ShouldaMacros +Minitest::Test.send :extend, ShouldaMacros # Taken from http://stackoverflow.com/questions/4459330/how-do-i-temporarily-redirect-st… -require "stringio" +require 'stringio' def capture_stderr # The output stream must be an IO-like object. In this case we capture it in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_1_8_fallbacks.rb new/test/test_1_8_fallbacks.rb --- old/test/test_1_8_fallbacks.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_1_8_fallbacks.rb 2015-02-18 15:46:13.000000000 +0100 @@ -6,7 +6,7 @@ # TODO: This should be expanded upon all methods that could potentially # be called in a test/spec-helper simplecov config block # -class Test18FallBacks < Test::Unit::TestCase +class Test18FallBacks < Minitest::Test should "return false when calling SimpleCov.start" do assert_equal false, SimpleCov.start end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_command_guesser.rb new/test/test_command_guesser.rb --- old/test/test_command_guesser.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_command_guesser.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,6 +1,6 @@ require 'helper' -class TestCommandGuesser < Test::Unit::TestCase +class TestCommandGuesser < Minitest::Test def self.should_guess_command_name(expectation, *argv) argv.each do |args| should "return '#{expectation}' for '#{args}'" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_deleted_source.rb new/test/test_deleted_source.rb --- old/test/test_deleted_source.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_deleted_source.rb 2015-02-18 15:46:13.000000000 +0100 @@ -2,7 +2,7 @@ # Test to verify correct handling of deleted files, # see issue #9 on github -class TestDeletedSource < Test::Unit::TestCase +class TestDeletedSource < Minitest::Test context "A source file which is subsequently deleted" do should "not cause an error" do Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures')) do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_file_list.rb new/test/test_file_list.rb --- old/test/test_file_list.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_file_list.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,6 +1,6 @@ require 'helper' -class TestFileList < Test::Unit::TestCase +class TestFileList < Minitest::Test context "With a file list from a result" do setup do original_result = {source_fixture('sample.rb') => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_filters.rb new/test/test_filters.rb --- old/test/test_filters.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_filters.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,6 +1,6 @@ require 'helper' -class TestFilters < Test::Unit::TestCase +class TestFilters < Minitest::Test context "A source file initialized with some coverage data" do setup do @source_file = SimpleCov::SourceFile.new(source_fixture('sample.rb'), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_merge_helpers.rb new/test/test_merge_helpers.rb --- old/test/test_merge_helpers.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_merge_helpers.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,6 +1,10 @@ require 'helper' -class TestMergeHelpers < Test::Unit::TestCase +class TestMergeHelpers < Minitest::Test + def self.test_order + :alpha + end + context "With two faked coverage resultsets" do setup do SimpleCov.use_merging true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_result.rb new/test/test_result.rb --- old/test/test_result.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_result.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,6 +1,6 @@ require 'helper' -class TestResult < Test::Unit::TestCase +class TestResult < Minitest::Test context "With a (mocked) Coverage.result" do setup do SimpleCov.filters = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_return_codes.rb new/test/test_return_codes.rb --- old/test/test_return_codes.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_return_codes.rb 2015-02-18 15:46:13.000000000 +0100 @@ -2,7 +2,11 @@ # Make sure that exit codes of tests are propagated properly when using # simplecov. See github issue #5 -class TestReturnCodes < Test::Unit::TestCase +class TestReturnCodes < Minitest::Test + def self.test_order + :alpha + end + context "Inside fixtures/frameworks" do setup do @current_dir = Dir.getwd @@ -22,12 +26,12 @@ should "have non-0 return code when running testunit_bad.rb" do `ruby testunit_bad.rb` - assert_not_equal 0, $?.exitstatus + refute_equal 0, $?.exitstatus end should "have return code 1 when running rspec_bad.rb" do `rspec rspec_bad.rb` - assert_not_equal 0, $?.exitstatus + refute_equal 0, $?.exitstatus end teardown do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_source_file.rb new/test/test_source_file.rb --- old/test/test_source_file.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_source_file.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,6 +1,6 @@ require 'helper' -class TestSourceFile < Test::Unit::TestCase +class TestSourceFile < Minitest::Test COVERAGE_FOR_SAMPLE_RB = [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil, nil, nil, nil, nil, nil, nil] context "A source file initialized with some coverage data" do setup do @@ -70,37 +70,4 @@ assert_match(/^Warning: coverage data provided/, captured_output) end end - - context "Encoding" do - should "handle utf-8 encoded source files" do - source_file = SimpleCov::SourceFile.new(source_fixture('utf-8.rb'), [nil, nil, 1]) - - assert_nothing_raised do - source_file.process_skipped_lines! - end - end - - should "handle iso-8859 encoded source files" do - source_file = SimpleCov::SourceFile.new(source_fixture('iso-8859.rb'), [nil, nil, 1]) - - assert_nothing_raised do - source_file.process_skipped_lines! - end - end - - should "handle utf-8 encoded source files when the default_internal encoding is binary" do - original_internal_encoding = Encoding.default_internal - Encoding.default_internal = "BINARY" - begin - source_file = SimpleCov::SourceFile.new(source_fixture('utf-8.rb'), [nil, nil, 1]) - ensure - Encoding.default_internal = original_internal_encoding - end - - assert_nothing_raised do - source_file.process_skipped_lines! - end - end - end end if SimpleCov.usable? - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_source_file_line.rb new/test/test_source_file_line.rb --- old/test/test_source_file_line.rb 2014-09-21 13:52:55.000000000 +0200 +++ new/test/test_source_file_line.rb 2015-02-18 15:46:13.000000000 +0100 @@ -1,6 +1,6 @@ require 'helper' -class TestSourceFileLine < Test::Unit::TestCase +class TestSourceFileLine < Minitest::Test context "A source line" do setup do @line = SimpleCov::SourceFile::Line.new('# the ruby source', 5, 3) @@ -87,19 +87,19 @@ end should "raise ArgumentError when initialized with invalid src" do - assert_raise ArgumentError do + assert_raises ArgumentError do SimpleCov::SourceFile::Line.new(:symbol, 5, 3) end end should "raise ArgumentError when initialized with invalid line_number" do - assert_raise ArgumentError do + assert_raises ArgumentError do SimpleCov::SourceFile::Line.new("some source", "five", 3) end end should "raise ArgumentError when initialized with invalid coverage" do - assert_raise ArgumentError do + assert_raises ArgumentError do SimpleCov::SourceFile::Line.new("some source", 5, "three") end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hp2xx for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package hp2xx for openSUSE:Factory checked in at 2015-02-22 17:26:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hp2xx (Old) and /work/SRC/openSUSE:Factory/.hp2xx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hp2xx" Changes: -------- --- /work/SRC/openSUSE:Factory/hp2xx/hp2xx.changes 2012-09-13 00:02:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hp2xx.new/hp2xx.changes 2015-02-22 17:26:07.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 18 15:00:20 UTC 2015 - dimstar(a)opensuse.org + +- Add hp2xx-texinfo-5.0.patch: Escape '@' inside .texi files. Fixes + info generation using texinfo 5.0. + +------------------------------------------------------------------- New: ---- hp2xx-texinfo-5.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hp2xx.spec ++++++ --- /var/tmp/diff_new_pack.eCkP4W/_old 2015-02-22 17:26:08.000000000 +0100 +++ /var/tmp/diff_new_pack.eCkP4W/_new 2015-02-22 17:26:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package hp2xx # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,6 +30,8 @@ Patch1: hp2xx-3.4.2-implicit-decls.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch2: hp2xx-3.4.2-png-deprecated.patch +# PATCH-FIX-UPSTREAM hp2xx-texinfo-5.0.patch dimstar(a)opensuse.org -- Escape '@' in .texi file +Patch3: hp2xx-texinfo-5.0.patch BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -50,6 +52,7 @@ %patch0 -p1 -b .fix %patch1 %patch2 +%patch3 -p1 %build make CC="gcc" OPTFLAGS="%{optflags}" LFLAGS="-L/usr/X11R6/%{_lib}" ++++++ hp2xx-texinfo-5.0.patch ++++++ Index: hp2xx-3.4.2/doc/hp2xxinf.tex =================================================================== --- hp2xx-3.4.2.orig/doc/hp2xxinf.tex +++ hp2xx-3.4.2/doc/hp2xxinf.tex @@ -91,7 +91,7 @@ by the Free Software Foundation instead @page @tex {\parskip=0pt -\hfill mk\(a)daveg.com\par +\hfill mk\@@daveg.com\par \hfill {\it Using HP2XX}, \manvers\par \hfill \TeX{}info \texinfoversion\par } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dante for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package dante for openSUSE:Factory checked in at 2015-02-22 17:26:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dante (Old) and /work/SRC/openSUSE:Factory/.dante.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dante" Changes: -------- --- /work/SRC/openSUSE:Factory/dante/dante.changes 2014-06-01 18:57:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dante.new/dante.changes 2015-02-22 17:26:05.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 30 14:35:48 UTC 2015 - diego.ercolani(a)gmail.com + +- reviewed the systemd init script +- added patch: + * dante-1.4.0-sockd_conf.patch to accomplish new syntax + +------------------------------------------------------------------- New: ---- dante-1.4.0-sockd_conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dante.spec ++++++ --- /var/tmp/diff_new_pack.gaqJEk/_old 2015-02-22 17:26:06.000000000 +0100 +++ /var/tmp/diff_new_pack.gaqJEk/_new 2015-02-22 17:26:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dante # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -40,6 +40,7 @@ Patch3: dante-1.4.0-socksify_man_format.patch Patch4: dante-1.4.0-glibc-2.17.patch Patch5: dante-1.4.0-sendbuf_macro.patch +Patch6: dante-1.4.0-sockd_conf.patch # SuSE series: sec %description @@ -94,6 +95,7 @@ %patch4 %endif %patch5 -p1 +%patch6 -p1 %build DANTELIBC=`find /%{_lib}/ -maxdepth 1 -iname "libc.so.*"` ++++++ dante-1.4.0-sockd_conf.patch ++++++ --- dante-1.4.0/example/sockd.conf 2012-06-01 21:59:26.000000000 +0200 +++ dante-1.4.1/example/sockd.conf 2015-01-22 13:27:37.325928880 +0100 @@ -1,4 +1,4 @@ -# $Id: sockd.conf,v 1.52 2012/06/01 19:59:26 karls Exp $ +# $Id: sockd.conf,v 1.52.10.2 2014/09/03 14:49:13 michaels Exp $ # # A sample sockd.conf # @@ -13,7 +13,7 @@ # logoutput # internal # external -# method +# socksmethod # clientmethod # users # compatibility @@ -29,7 +29,7 @@ # # block/pass # from to -# method +# socksmethod # command # libwrap # log @@ -52,24 +52,24 @@ # 195.168.1.1 #external: 192.168.1.1 -# list over acceptable methods, order of preference. -# A method not set here will never be selected. +# list over acceptable authentication methods, order of preference. +# An authentication method not set here will never be selected. # -# If the method field is not set in a rule, the global -# method is filled in for that rule. +# If the socksmethod field is not set in a rule, the global +# socksmethod is filled in for that rule. # # methods for socks-rules. -#method: username none #rfc931 +#socksmethod: username none #rfc931 # methods for client-rules. #clientmethod: none #or if you want to allow rfc931 (ident) too -#method: username rfc931 none +#socksmethod: username rfc931 none #or for PAM authentication -#method: pam +#socksmethod: pam # # User identities, an important section. @@ -82,6 +82,8 @@ # when running as usual, it will use the unprivileged userid of "sockd". #user.unprivileged: sockd +# If you are not using libwrap, no need for the below line, so leave +# it commented. # If you compiled with libwrap support, what userid should it use # when executing your libwrap commands? "libwrap". #user.libwrap: libwrap @@ -98,9 +100,8 @@ # This will usually require user.privileged to be set to "root". #compatibility: sameport -# If you are using the bind extension and have trouble running servers -# via the server, you might try setting this. The consequences of it -# are unknown. +# If you are using the Inferno Nettverk bind extension and have trouble +# running servers via the server, you might try setting this. #compatibility: reuseaddr # @@ -162,7 +163,7 @@ # Allow our clients, also provides an example of the port range command. #client pass { # from: 10.0.0.0/8 port 1-65535 to: 0.0.0.0/0 -# method: rfc931 # match all idented users that also are in passwordfile +# clientmethod: rfc931 # match all idented users that also are in passwordfile #} # This is identical to above, but allows clients without a rfc931 (ident) @@ -187,7 +188,7 @@ # you probably don't want people connecting to loopback addresses, # who knows what could happen then. -#block { +#socks block { # from: 0.0.0.0/0 to: lo0 # log: connect error #} @@ -195,14 +196,14 @@ # the people at the 172.16.0.0/12 are bad, no one should talk to them. # log the connect request and also provide an example on how to # interact with libwrap. -#block { +#socks block { # from: 0.0.0.0/0 to: 172.16.0.0/12 # libwrap: spawn finger @%a # log: connect error #} # unless you need it, you could block any bind requests. -#block { +#socks block { # from: 0.0.0.0/0 to: 0.0.0.0/0 # command: bind # log: connect error @@ -213,7 +214,7 @@ # should usually by from "0.0.0.0/0", i.e if a client of yours # has permission to bind, it will also have permission to accept # the reply from anywhere. -#pass { +#socks pass { # from: 10.0.0.0/8 to: 0.0.0.0/0 # command: bind # log: connect error @@ -225,7 +226,7 @@ # Note that nothing is done to verify that it's a "genuine" reply, # that is in general not possible anyway. The below will allow # all "replies" in to your clients at the 10.0.0.0/8 net. -#pass { +#socks pass { # from: 0.0.0.0/0 to: 10.0.0.0/8 # command: bindreply udpreply # log: connect error @@ -235,29 +236,29 @@ # pass any http connects to the example.com domain if they # authenticate with username. # This matches "example.com" itself and everything ending in ".example.com". -#pass { +#socks pass { # from: 10.0.0.0/8 to: .example.com port = http # log: connect error -# method: username +# clientmethod: username #} # block any other http connects to the example.com domain. -#block { +#socks block { # from: 0.0.0.0/0 to: .example.com port = http # log: connect error #} # everyone from our internal network, 10.0.0.0/8 is allowed to use # tcp and udp for everything else. -#pass { +#socks pass { # from: 10.0.0.0/8 to: 0.0.0.0/0 # protocol: tcp udp #} # last line, block everyone else. This is the default but if you provide # one yourself you can specify your own logging/actions -#block { +#socks block { # from: 0.0.0.0/0 to: 0.0.0.0/0 # log: connect error #} ++++++ sockd.service ++++++ --- /var/tmp/diff_new_pack.gaqJEk/_old 2015-02-22 17:26:06.000000000 +0100 +++ /var/tmp/diff_new_pack.gaqJEk/_new 2015-02-22 17:26:06.000000000 +0100 @@ -4,9 +4,9 @@ [Service] Type=forking -EnvironmentFile=/etc/sockd.conf +#EnvironmentFile=/etc/sockd.conf PIDFile=/run/sockd.pid -ExecStart=/usr/sbin/sockd $SOCKD_OPTS +ExecStart=/usr/sbin/sockd -D $SOCKD_OPTS [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit metamail for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package metamail for openSUSE:Factory checked in at 2015-02-22 17:26:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metamail (Old) and /work/SRC/openSUSE:Factory/.metamail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "metamail" Changes: -------- --- /work/SRC/openSUSE:Factory/metamail/metamail.changes 2014-10-15 16:26:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.metamail.new/metamail.changes 2015-02-22 17:26:04.000000000 +0100 @@ -1,0 +2,14 @@ +Sat Dec 27 23:15:00 UTC 2014 - Led <ledest(a)gmail.com> + +- rebase metamail-2.7-19-fix-bashisms.patch + +------------------------------------------------------------------- +Thu Nov 27 01:57:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashisms in showaudio and mgrep scripts +- update patches: + * metamail-2.7-19.dif +- add patches: + * metamail-2.7-19-fix-bashisms.patch + +------------------------------------------------------------------- New: ---- metamail-2.7-19-fix-bashisms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metamail.spec ++++++ --- /var/tmp/diff_new_pack.ZulC7W/_old 2015-02-22 17:26:05.000000000 +0100 +++ /var/tmp/diff_new_pack.ZulC7W/_new 2015-02-22 17:26:05.000000000 +0100 @@ -33,6 +33,7 @@ Patch1: metamail-2.7-19-security.dif Patch2: metamail-2.7-19-getline.dif Patch3: metamail-2.7-19-binderman.dif +Patch4: metamail-2.7-19-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,6 +48,7 @@ %patch -P 0 %patch2 %patch3 +%patch4 -p1 %build make ++++++ metamail-2.7-19-fix-bashisms.patch ++++++ diff -Ndur metamail-2.7-19/bin/extcompose metamail-2.7-19-fix-bashisms/bin/extcompose --- metamail-2.7-19/bin/extcompose 1997-04-28 11:15:05.000000000 +0300 +++ metamail-2.7-19-fix-bashisms/bin/extcompose 2014-12-28 01:12:48.394929799 +0200 @@ -28,7 +28,7 @@ echo " 4 -- In an Internet FTP directory that requires a valid login" echo " 5 -- Under the control of a mail server that will send the data on request" echo "" - echo -n "Please enter a number from 1 to 5: \c" + echo -n "Please enter a number from 1 to 5: " read ans case "$ans" in 1) accesstype=local-file ;; diff -Ndur metamail-2.7-19/bin/showaudio metamail-2.7-19-fix-bashisms/bin/showaudio --- metamail-2.7-19/bin/showaudio 2014-12-28 01:10:13.923940249 +0200 +++ metamail-2.7-19-fix-bashisms/bin/showaudio 2014-12-28 01:12:48.395929799 +0200 @@ -269,8 +269,8 @@ read AUDIOPHONE fi - if test "$thishost" == "$AUDIOPHONEHOST" \ - -o "$thishost" == "$AUDIOPHONEHOSTLONG" + if test "$thishost" = "$AUDIOPHONEHOST" \ + -o "$thishost" = "$AUDIOPHONEHOSTLONG" then echo Calling Phone number $AUDIOPHONE echo "You MUST SAY HELLO when you answer the phone, or you will not hear the message." ++++++ metamail-2.7-19.dif ++++++ --- /var/tmp/diff_new_pack.ZulC7W/_old 2015-02-22 17:26:05.000000000 +0100 +++ /var/tmp/diff_new_pack.ZulC7W/_new 2015-02-22 17:26:05.000000000 +0100 @@ -495,10 +495,10 @@ + + list=0 +silent=0 -+case "${opt//[ -]/}" in ++case "$opt" in + *l*) list=1 +esac -+case "${opt//[ -]/}" in ++case "$opt" in + *h*) silent=1 +esac + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2015-02-22 17:26:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2015-02-11 16:35:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2015-02-22 17:26:01.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 18 19:48:26 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Add fix-for-the-random-wallet-open-failure-when-updating.patch + from upstream (kde#343718, boo#917988) + +------------------------------------------------------------------- New: ---- fix-for-the-random-wallet-open-failure-when-updating.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.EPkGSW/_old 2015-02-22 17:26:02.000000000 +0100 +++ /var/tmp/diff_new_pack.EPkGSW/_new 2015-02-22 17:26:02.000000000 +0100 @@ -37,6 +37,8 @@ Patch6: Remove-volume-control-from-KNotify.patch # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- bnc#852256 Patch7: kdesu-add-some-i18n-love.patch +# PATCH-FIX-UPSTREAM fix-for-the-random-wallet-open-failure-when-updating.patch +Patch8: fix-for-the-random-wallet-open-failure-when-updating.patch BuildRequires: NetworkManager-devel BuildRequires: alsa-devel BuildRequires: automoc4 @@ -129,6 +131,7 @@ %patch6 -p1 %endif %patch7 -p1 +%patch8 -p1 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FPIE=1 ++++++ fix-for-the-random-wallet-open-failure-when-updating.patch ++++++ commit 345e36a8b35e2c6f8fcda50d0776d77102d6648a Author: Valentin Rusu <kde(a)rusu.info> Date: Mon Feb 16 22:44:07 2015 +0100 Fix for the random wallet open failure when updating The problem seems to be caused by the use of BackendPersistHandler singleton when the user has several wallets on his system and not all of them have been updated to the new schema. BUG: 343718 diff --git a/kwalletd/backend/backendpersisthandler.cpp b/kwalletd/backend/backendpersisthandler.cpp index 5c321c9..b7f63f8 100644 --- a/kwalletd/backend/backendpersisthandler.cpp +++ b/kwalletd/backend/backendpersisthandler.cpp @@ -140,25 +140,14 @@ static int getRandomBlock(QByteArray& randBlock) { #endif } - - -static BlowfishPersistHandler *blowfishHandler =0; -#ifdef HAVE_QGPGME -static GpgPersistHandler *gpgHandler =0; -#endif // HAVE_QGPGME - BackendPersistHandler *BackendPersistHandler::getPersistHandler(BackendCipherType cipherType) { switch (cipherType){ case BACKEND_CIPHER_BLOWFISH: - if (0 == blowfishHandler) - blowfishHandler = new BlowfishPersistHandler; - return blowfishHandler; + return new BlowfishPersistHandler; #ifdef HAVE_QGPGME case BACKEND_CIPHER_GPG: - if (0 == gpgHandler) - gpgHandler = new GpgPersistHandler; - return gpgHandler; + return new GpgPersistHandler; #endif // HAVE_QGPGME default: Q_ASSERT(0); @@ -170,21 +159,16 @@ BackendPersistHandler *BackendPersistHandler::getPersistHandler(char magicBuf[12 { if ((magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB || magicBuf[2] == KWALLET_CIPHER_BLOWFISH_CBC) && (magicBuf[3] == KWALLET_HASH_SHA1 || magicBuf[3] == KWALLET_HASH_PBKDF2_SHA512)) { - if (0 == blowfishHandler) { - bool useECBforReading = magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB; - if (useECBforReading) { - qDebug() << "this wallet uses ECB encryption. It'll be converted to CBC on next save."; - } - blowfishHandler = new BlowfishPersistHandler(useECBforReading); + bool useECBforReading = magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB; + if (useECBforReading) { + qDebug() << "this wallet uses ECB encryption. It'll be converted to CBC on next save."; } - return blowfishHandler; + return new BlowfishPersistHandler(useECBforReading); } #ifdef HAVE_QGPGME if (magicBuf[2] == KWALLET_CIPHER_GPG && magicBuf[3] == 0) { - if (0 == gpgHandler) - gpgHandler = new GpgPersistHandler; - return gpgHandler; + return new GpgPersistHandler; } #endif // HAVE_QGPGME return 0; // unknown cipher or hash diff --git a/kwalletd/backend/kwalletbackend.cc b/kwalletd/backend/kwalletbackend.cc index 7d439e3..9240103 100644 --- a/kwalletd/backend/kwalletbackend.cc +++ b/kwalletd/backend/kwalletbackend.cc @@ -266,7 +266,7 @@ int Backend::open(const QByteArray& password, WId w) { if (_open) { return -255; // already open } - + setPassword(password); return openInternal(w); } @@ -287,20 +287,20 @@ int Backend::openPreHashed(const QByteArray &passwordHash) if (_open) { return -255; // already open } - + // check the password hash for correct size (currently fixed) if (passwordHash.size() != 20 && passwordHash.size() != 40 && passwordHash.size() != 56) { return -42; // unsupported encryption scheme } - + _passhash = passwordHash; _newPassHash = passwordHash; _useNewHash = true;//Only new hash is supported return openInternal(); } - + int Backend::openInternal(WId w) { // No wallet existed. Let's create it. @@ -350,7 +350,9 @@ int Backend::openInternal(WId w) if (0 == phandler){ return 42; // unknown cipher or hash } - return phandler->read(this, db, w); + int result = phandler->read(this, db, w); + delete phandler; + return result; } void Backend::swapToNewHash() @@ -427,6 +429,7 @@ int Backend::sync(WId w) { notification->setText( i18n("Failed to sync wallet %1 to disk. Error codes are:\nRC %2\nSF %3. Please file a BUG report using this information to bugs.kde.org").arg(_name).arg(rc).arg(sf.errorString()) ); notification->sendEvent(); } + delete phandler; return rc; } @@ -439,7 +442,7 @@ int Backend::close(bool save) { return rc; } } - + // do the actual close for (FolderMap::ConstIterator i = _entries.constBegin(); i != _entries.constEnd(); ++i) { for (EntryMap::ConstIterator j = i.value().constBegin(); j != i.value().constEnd(); ++j) { @@ -447,13 +450,13 @@ int Backend::close(bool save) { } } _entries.clear(); - + // empty the password hash _passhash.fill(0); _newPassHash.fill(0); _open = false; - + return 0; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0