File upstream-fixes.patch of Package kvpnc

Overview Repositories Revisions Requests Users Attributes Meta

File upstream-fixes.patch of Package kvpnc (Revision 994b65f1cd69f5ce145d342854cc1140)

Currently displaying revision 994b65f1cd69f5ce145d342854cc1140 , Show latest

--- 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;

Places

File upstream-fixes.patch of Package kvpnc (Revision 994b65f1cd69f5ce145d342854cc1140)

Places