Hello community, here is the log from the commit of package kvpnc for openSUSE:Factory checked in at 2016-06-19 12:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvpnc (Old) and /work/SRC/openSUSE:Factory/.kvpnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kvpnc" Changes: -------- --- /work/SRC/openSUSE:Factory/kvpnc/kvpnc.changes 2016-03-17 16:47:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kvpnc.new/kvpnc.changes 2016-06-19 12:52:58.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 17 12:04:25 UTC 2016 - [email protected] + +- Cherry pick important commits from upstream (also fixes GCC6 build) + * upstream-fixes.patch + * kvpnc-gcc6.patch (boo#985190) + +------------------------------------------------------------------- New: ---- kvpnc-gcc6.patch upstream-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvpnc.spec ++++++ --- /var/tmp/diff_new_pack.0piMJk/_old 2016-06-19 12:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.0piMJk/_new 2016-06-19 12:52:59.000000000 +0200 @@ -26,6 +26,8 @@ Source0: http://download.gna.org/kvpnc/%{name}-%{version}-kde4.tar.bz2 Source1: http://download.gna.org/kvpnc/%{name}-0.9.6-kde4-locale.tar.bz2 Patch0: kvpnc-gcc47.patch +Patch1: upstream-fixes.patch +Patch2: kvpnc-gcc6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # only needed to patch broken images in the upstream tarball BuildRequires: ImageMagick @@ -49,6 +51,8 @@ %prep %setup -q -n %{name}-%{version}-kde4 -a1 %patch0 -p1 +%patch1 -p0 +%patch2 -p1 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt echo "add_subdirectory( po )" >> CMakeLists.txt ++++++ kvpnc-gcc6.patch ++++++ diff -urNB new/src/utils.cpp new1/src/utils.cpp --- new/src/utils.cpp 2016-06-17 14:36:23.534039790 +0200 +++ new1/src/utils.cpp 2016-06-17 14:43:20.292353264 +0200 @@ -914,7 +914,7 @@ NameAndPidOfProgramListenProcess->start(proc, args); if (!NameAndPidOfProgramListenProcess->waitForStarted()) { kError() << "netstat fails!" << endl; - return false; + return ""; } else { NameAndPidOfProgramListenProcess->waitForFinished(); @@ -946,7 +946,7 @@ GetEmailAddressOfCertProcess->start(proc, args); if (!GetEmailAddressOfCertProcess->waitForStarted()) { kError() << "GetEmailAddressOfCertProcess" << endl; - return false; + return ""; } else { GetEmailAddressOfCertProcess->waitForFinished(); disconnect(GetEmailAddressOfCertProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutGetEmailAddressOfCert())); ++++++ upstream-fixes.patch ++++++ --- loginfo 2005-10-08 14:26:34.000000000 +0200 +++ loginfo 2016-06-17 14:31:39.532482472 +0200 @@ -1 +0,0 @@ -ALL /usr/bin/perl /home/crissi/ciabot_cvs_1.12.pl %p %{s} %n $USER project from_email dest_email ignore_regexp --- src/CMakeLists.txt 2010-05-19 10:47:21.000000000 +0200 +++ src/CMakeLists.txt 2016-06-17 14:31:39.532482472 +0200 @@ -180,7 +180,8 @@ target_link_libraries(kvpnc_bin ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} ${LIBGCRYPT_LIBRARIES} ${KDE4_KPTY_LIBS}) -install(FILES kvpnc.notifyrc ping_check.sh DESTINATION ${DATA_INSTALL_DIR}/kvpnc) +install(FILES kvpnc.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kvpnc) +install(PROGRAMS ping_check.sh DESTINATION ${DATA_INSTALL_DIR}/kvpnc) install(TARGETS kvpnc_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES kvpncui.rc DESTINATION ${DATA_INSTALL_DIR}/kvpnc) install(FILES kvpnc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) --- src/kvpncconfig.cpp 2010-03-08 11:26:33.000000000 +0100 +++ src/kvpncconfig.cpp 2016-06-17 14:31:42.208497071 +0200 @@ -4295,7 +4295,7 @@ appPointer->processEvents(); if (useKwallet && KWallet::Wallet::isEnabled()) - configgroup.deleteEntry("First use of Kwallet", false); + configgroup.deleteEntry("First use of Kwallet"); /* = user data = */ --- src/utils.cpp 2010-02-28 12:22:35.000000000 +0100 +++ src/utils.cpp 2016-06-17 14:36:23.534039790 +0200 @@ -1146,27 +1146,6 @@ return needsPassphrase; } -QString Utils::getHostname() -{ - Hostname = "linux.local"; - - GetHostnameProcess = new QProcess(this); - QString proc = "hostname"; - QStringList args; - connect(GetHostnameProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readStdOutGetHostname())); - connect(GetHostnameProcess, SIGNAL(readyReadStandardError()), this, SLOT(readStdErrGetHostname())); - GetHostnameProcess->setEnvironment(*env); - GetHostnameProcess->start(proc, args); - if (!GetHostnameProcess->waitForStarted()) { - kError() << "Unable to start getHostname process!" << endl; - return false; - } else { - GetHostnameProcess->waitForFinished(); - return Hostname; - } - -} - /* === Slots === */ void Utils::readStdOutCreateTunDev() { @@ -1540,27 +1519,6 @@ } -void Utils::readStdOutGetHostname() -{ - QStringList msg_list = QString(GetHostnameProcess->readAllStandardOutput()).split('\n'); - for (int i = 0; i < msg_list.size(); ++i) { - QString msg = msg_list.at(i).simplified().section(' ', 0, 0); -// KMessageBox::sorry( 0, QString("msg: "+msg), QString("foo1"),0 ); - if (!msg.isEmpty()) - Hostname = msg; - } -} - -void Utils::readStdErrGetHostname() -{ - QStringList msg_list = QString(GetHostnameProcess->readAllStandardError()).split('\n'); - for (int i = 0; i < msg_list.size(); ++i) { - QString msg = msg_list.at(i); - KMessageBox::error(0, QString(msg), QString("getHostname()"), 0); - } -} - - QString Utils::dec2bin(int n) { if (0 == n) --- src/utils.h 2010-02-15 14:27:14.000000000 +0100 +++ src/utils.h 2016-06-17 14:31:42.208497071 +0200 @@ -60,7 +60,6 @@ QString removeSpecialCharsForFilename(QString filename); QString getNameAndPidOfProgramListen(int port); QString getEmailAddressOfCert(QString cert); - QString getHostname(); QStringList getSmartcardSlots(QString ProviderLib); QStringList getSmartcardCertsFromSlot(QString slot, QString IdType, QString ProviderLib); bool getNeedsPassphrase(QString key); @@ -129,8 +128,6 @@ void readOutNeedsPassphrase(); void readOutGetCertsFromCiscoCertStoreSlot(); void readPppdtestProcessOutput(); - void readStdOutGetHostname(); - void readStdErrGetHostname(); private: bool modprobeSuccess; @@ -139,7 +136,6 @@ bool retrieveOpenvpnDigests; bool retrieveIpsecAlgos; bool retrieveNameAndPidOfProgramListen; - bool retrieveHotsname; bool needsPassphrase; bool testPppdReplacedefaultroute; bool testPppdRequireMppe128; @@ -165,7 +161,6 @@ QProcess *NeedsPassphraseProcess; QProcess *IpsecAlgosProcess; QProcess *TestPppdProcess; - QProcess *GetHostnameProcess; QString resolvedIP; bool resolveFinished; @@ -182,7 +177,6 @@ QString EmailAddressOfCert; QString OpenvpnDigestString; QString IdType; - QString Hostname; QStringList SmartcardSlots; QStringList SmartcardCertsFromSlot; QStringList CertsFromCiscoCertStore;
