Thu Oct 24 00:55:58 PDT 2013

15 files changed, 416 insertions, 58 deletions

diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD
index 65b775c23..d079efce6 100644
--- a/extra/aspell-de/PKGBUILD
+++ b/extra/aspell-de/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160921 2012-06-07 02:05:22Z pierre $
+# $Id: PKGBUILD 197171 2013-10-23 13:51:59Z pierre $
 # Maintainer:
 # Contributor: Simo Leone <simo@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=aspell-de
 pkgver=20120607
-pkgrel=1
+pkgrel=2
 pkgdesc="German dictionary for aspell"
 arch=('i686' 'x86_64')
 url="http://j3e.de/ispell/igerman98/index.html"
diff --git a/extra/fcgi/PKGBUILD b/extra/fcgi/PKGBUILD
index a08e81b65..e87a059a2 100644
--- a/extra/fcgi/PKGBUILD
+++ b/extra/fcgi/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 173924 2012-12-28 05:30:53Z pierre $
+# $Id: PKGBUILD 197174 2013-10-23 13:52:02Z pierre $
 # Maintainer: tobias <tobias@justdreams.de>
 # Modified by: eliott <eliott@cactuswax.net>
 # Original by Benjamin Andresen, klapmuetz [at] gmail [dot] com
 
 pkgname=fcgi
 pkgver=2.4.0
-pkgrel=8
+pkgrel=9
 depends=('gcc-libs')
-pkgdesc="FASTCgi(fcgi) islanguage independent, high performant extension to CGI"
+pkgdesc="FASTCgi (fcgi) is a language independent, high performant extension to CGI"
 arch=('i686' 'x86_64')
 license=('custom')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 url="http://www.fastcgi.com"
 source=("http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz"
         'gcc44-fix-include.patch')
 md5sums=('d15060a813b91383a9f3c66faf84867e'
          'a8028462163755f3ce457a5c641f237b')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}/gcc44-fix-include.patch"
   libtoolize --force
   aclocal
   autoconf
   automake --foreign
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index 64e52346a..28de86fd1 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -5,12 +5,12 @@
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
 pkgver="${_pkgver}u"
-pkgrel="3"
+pkgrel="4"
 pkgdesc="Library for building UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
 arch=('x86_64' 'i686')
-options=('!strip' '!makeflags')
+options=('!strip' '!makeflags' 'staticlibs')
 makedepends=('pciutils')
 
 source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 9482ca348..25ff3ef1e 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196467 2013-10-14 07:09:39Z bisson $
+# $Id: PKGBUILD 197179 2013-10-23 15:19:35Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.34.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
@@ -22,14 +22,17 @@ optdepends=('mono: sharp bindings'
             'r: r bindings'
             'tcl: tcl bindings'
             'qt4: gvedit')
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441')
+source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
+        'dotty.patch')
+sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441'
+          '31bc9f505c8b6470289a0d6ec31c237765cba239')
 
 options=('!libtool')
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../dotty.patch
 	sed \
 		-e '/LIBPOSTFIX="64"/d' \
 		-i configure
diff --git a/extra/graphviz/dotty.patch b/extra/graphviz/dotty.patch
new file mode 100644
index 000000000..7c8ca1d7f
--- /dev/null
+++ b/extra/graphviz/dotty.patch
@@ -0,0 +1,21 @@
+diff -Naur old/cmd/dotty/dotty_layout.lefty new/cmd/dotty/dotty_layout.lefty
+--- old/cmd/dotty/dotty_layout.lefty	2013-09-06 15:07:52.000000000 -1000
++++ new/cmd/dotty/dotty_layout.lefty	2013-10-22 15:23:50.153028328 -1000
+@@ -5,7 +5,7 @@
+     local fd;
+ 
+     if (~dotty.lservers[lserver] | tablesize (dotty.lservers[lserver]) == 0) {
+-        if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot')) >= 0)) {
++        if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot1.2')) >= 0)) {
+             dotty.message (0, concat ('cannot start ', lserver));
+             return null;
+         }
+@@ -438,6 +438,8 @@
+             }
+         } else if (t[i] == 'I') {
+             i = i + 7;
++        } else if (t[i] == 't') {
++            i = i + 2;
+         } else {
+             dotty.message (0, concat ('draw language parser error: ', t[i]));
+             return null;
diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD
index 44835eea1..8be9b7e81 100644
--- a/extra/imap/PKGBUILD
+++ b/extra/imap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185244 2013-05-12 11:04:34Z pierre $
+# $Id: PKGBUILD 197175 2013-10-23 13:52:03Z pierre $
 
 pkgname=imap
 pkgver=2007f
-pkgrel=3
+pkgrel=4
 pkgdesc="An IMAP/POP server"
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -12,19 +12,22 @@ provides=('imap-server' 'pop3-server')
 conflicts=('courier-mta' 'courier-imap')
 source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz"
         'imap' 'ipop2' 'ipop3')
+options=('staticlibs')
 backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem)
 md5sums=('2126fd125ea26b73b20f01fcd5940369'
          '3ae5b3b333bc8ea2da106f6a97d7bd8d'
          '448f988dc5f9bdb2223dcea3abc4f5f1'
          '1499b13015075f0aafba04324a6f523a')
 
-build() {
+prepare() {
   sed \
     -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
     -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
     -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
     -i $srcdir/$pkgname-$pkgver/src/osdep/unix/Makefile
+}
 
+build() {
   cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
diff --git a/extra/kdeplasma-applets-plasma-nm/PKGBUILD b/extra/kdeplasma-applets-plasma-nm/PKGBUILD
index cce059559..8b3f6260e 100644
--- a/extra/kdeplasma-applets-plasma-nm/PKGBUILD
+++ b/extra/kdeplasma-applets-plasma-nm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196670 2013-10-16 15:11:21Z andrea $
+# $Id: PKGBUILD 197151 2013-10-23 12:04:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 
 pkgname=kdeplasma-applets-plasma-nm
 pkgver=0.9.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Plasma applet written in QML for managing network connections"
 arch=('i686' 'x86_64')
 url="https://projects.kde.org/projects/playground/network/plasma-nm"
@@ -14,11 +14,16 @@ makedepends=('cmake' 'automoc4' 'openconnect')
 optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers'
             'openconnect: Cisco AnyConnect VPN plugin')
 conflicts=('kdeplasma-applets-networkmanagement')
-source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz")
-md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f')
+source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz"
+        'plasma-nm-fixes.patch')
+md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f'
+         'e5825709f49ba6c4386e909b80f75066')
 
 prepare() {
   mkdir build
+
+  cd plasma-nm-${pkgver}
+  patch -p1 -i "${srcdir}"/plasma-nm-fixes.patch
 }
 
 build() {
diff --git a/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch b/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch
new file mode 100644
index 000000000..d98448d7a
--- /dev/null
+++ b/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch
@@ -0,0 +1,322 @@
+diff --git a/applet/declarative/contents/ui/main.qml b/applet/declarative/contents/ui/main.qml
+index 8ea88cc..aa81707 100644
+--- a/applet/declarative/contents/ui/main.qml
++++ b/applet/declarative/contents/ui/main.qml
+@@ -19,6 +19,7 @@
+ */
+ 
+ import QtQuick 1.1
++import org.kde.plasma.extras 0.1 as PlasmaExtras
+ import org.kde.plasma.components 0.1 as PlasmaComponents
+ import org.kde.plasma.core 0.1 as PlasmaCore
+ import org.kde.networkmanagement 0.1 as PlasmaNM
+@@ -77,16 +78,7 @@ Item {
+         anchors.fill: parent
+     }
+ 
+-    ListView {
+-        id: connectionView;
+-
+-        property bool expandedItem: false;
+-        property string previouslyExpandedItem: "";
+-
+-        property bool activeExpanded: true;
+-        property bool previousExpanded: true;
+-        property bool unknownExpanded: true;
+-
++    PlasmaExtras.ScrollArea {
+         anchors {
+             left: parent.left;
+             right: parent.right;
+@@ -95,50 +87,64 @@ Item {
+             topMargin: padding.margins.top;
+             bottomMargin: padding.margins.bottom
+         }
+-        clip: true
+-        model: connectionSortModel;
+-        currentIndex: -1;
+-        interactive: true;
+-        boundsBehavior: Flickable.StopAtBounds;
+-        section.property: "itemSection";
+-        section.delegate: SectionHeader {
+-            onHideSection: {
+-                if (section == i18n("Active connections")) {
+-                    connectionView.activeExpanded = false;
+-                } else if (section == i18n("Previous connections")) {
+-                    connectionView.previousExpanded = false;
+-                } else {
+-                    connectionView.unknownExpanded = false;
++
++        ListView {
++            id: connectionView;
++
++            property bool expandedItem: false;
++            property string previouslyExpandedItem: "";
++
++            property bool activeExpanded: true;
++            property bool previousExpanded: true;
++            property bool unknownExpanded: true;
++
++            anchors.fill: parent;
++
++            clip: true
++            model: connectionSortModel;
++            currentIndex: -1;
++            interactive: true;
++            boundsBehavior: Flickable.StopAtBounds;
++            section.property: "itemSection";
++            section.delegate: SectionHeader {
++                onHideSection: {
++                    if (section == i18n("Active connections")) {
++                        connectionView.activeExpanded = false;
++                    } else if (section == i18n("Previous connections")) {
++                        connectionView.previousExpanded = false;
++                    } else {
++                        connectionView.unknownExpanded = false;
++                    }
+                 }
+-            }
+ 
+-            onShowSection: {
+-                if (section == i18n("Active connections")) {
+-                    connectionView.activeExpanded = true;
+-                } else if (section == i18n("Previous connections")) {
+-                    connectionView.previousExpanded = true;
+-                } else {
+-                    connectionView.unknownExpanded = true;
++                onShowSection: {
++                    if (section == i18n("Active connections")) {
++                        connectionView.activeExpanded = true;
++                    } else if (section == i18n("Previous connections")) {
++                        connectionView.previousExpanded = true;
++                    } else {
++                        connectionView.unknownExpanded = true;
++                    }
+                 }
+             }
+-        }
+ 
+-        delegate: ConnectionItem {
+-            expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni;
+-            onItemExpanded: {
+-                if (itemExpanded) {
+-                    connectionView.expandedItem = true;
+-                    connectionView.previouslyExpandedItem = itemUni;;
+-                    connectionView.currentIndex = index;
+-                } else {
+-                    connectionView.expandedItem = false;
+-                    connectionView.previouslyExpandedItem = "";
++            delegate: ConnectionItem {
++                expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni;
++                onItemExpanded: {
++                    if (itemExpanded) {
++                        connectionView.expandedItem = true;
++                        connectionView.previouslyExpandedItem = itemUni;;
++                        connectionView.currentIndex = index;
++                    } else {
++                        connectionView.expandedItem = false;
++                        connectionView.previouslyExpandedItem = "";
++                    }
+                 }
+-            }
+ 
+-            ListView.onRemove: {
+-                if (ListView.isCurrentItem) {
+-                    connectionView.previouslyExpandedItem = "";
++                ListView.onRemove: {
++                    if (ListView.isCurrentItem) {
++                        connectionView.previouslyExpandedItem = "";
++                    }
+                 }
+             }
+         }
+diff --git a/declarative-plugins/applet/connectionicon.cpp b/declarative-plugins/applet/connectionicon.cpp
+index c3f8540..76bdca0 100644
+--- a/declarative-plugins/applet/connectionicon.cpp
++++ b/declarative-plugins/applet/connectionicon.cpp
+@@ -166,12 +166,24 @@ void ConnectionIcon::setIcons()
+ 
+     foreach (const NetworkManager::ActiveConnection::Ptr & active, actives) {
+         if (((active->default4() || active->default6()) && active->state() == NetworkManager::ActiveConnection::Activated) || !defaultRouteExists) {
++            NetworkManager::ActiveConnection::Ptr activeConnection;
++            if (active->vpn()) {
++                NetworkManager::ActiveConnection::Ptr activeTmp;
++                activeTmp = NetworkManager::findActiveConnection(active->specificObject());
++                if (activeTmp) {
++                    activeConnection = activeTmp;
++                }
+ 
+-            if (active->vpn() || active->devices().isEmpty()) {
++                vpnFound = true;
++                NMAppletDebug() << "Emit signal setHoverIcon(object-locked)";
++                Q_EMIT setHoverIcon("object-locked");
++            } else {
++                activeConnection = active;
++            }
++            if (activeConnection->devices().isEmpty()) {
+                 continue;
+             }
+-
+-            NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(active->devices().first());
++            NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(activeConnection->devices().first());
+             if (device) {
+                 NetworkManager::Device::Type type = device->type();
+ 
+@@ -184,7 +196,7 @@ void ConnectionIcon::setIcons()
+                         setWirelessIconForSignalStrength(100);
+                         connectionFound = true;
+                     } else {
+-                        NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(active->specificObject());
++                        NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(activeConnection->specificObject());
+                         if (ap) {
+                             setWirelessIcon(device, ap->ssid());
+                             connectionFound = true;
+@@ -222,9 +234,7 @@ void ConnectionIcon::setIcons()
+                     }
+                 }
+             }
+-        }
+-
+-        if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) {
++        } else if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) {
+             vpnFound = true;
+             NMAppletDebug() << "Emit signal setHoverIcon(object-locked)";
+             Q_EMIT setHoverIcon("object-locked");
+diff --git a/declarative-plugins/applet/networkstatus.cpp b/declarative-plugins/applet/networkstatus.cpp
+index d63066d..8149da9 100644
+--- a/declarative-plugins/applet/networkstatus.cpp
++++ b/declarative-plugins/applet/networkstatus.cpp
+@@ -129,8 +129,8 @@ void NetworkStatus::changeTooltip()
+     }
+ 
+     QString tooltip = "<qt>";
+-    QString format = "<b>%1 - %2</b><br>%3<br><br>";
+-    QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>";
++    const QString format = "<b>%1 - %2</b><br>%3<br><br>";
++    const QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>";
+ 
+     foreach (const NetworkManager::ActiveConnection::Ptr & active, NetworkManager::activeConnections()) {
+         if (!active->devices().isEmpty()) {
+@@ -145,7 +145,6 @@ void NetworkStatus::changeTooltip()
+                 } else {
+                     devName = device->ipInterfaceName();
+                 }
+-//                 conType = NetworkManager::ConnectionSettings::typeAsString(active->connection()->settings()->connectionType());
+                 if (active->vpn()) {
+                     conType = i18n("VPN Connection");
+                 } else {
+diff --git a/declarative-plugins/model/model.cpp b/declarative-plugins/model/model.cpp
+index 1b3f4c3..bb88362 100644
+--- a/declarative-plugins/model/model.cpp
++++ b/declarative-plugins/model/model.cpp
+@@ -230,7 +230,7 @@ void Model::addConnection(const QString& connection, const QString& device)
+ {
+     NetworkManager::Connection::Ptr con = NetworkManager::findConnection(connection);
+ 
+-    if (con->settings()->isSlave()) {
++    if (con->settings()->isSlave() || con->name().isEmpty() || con->uuid().isEmpty()) {
+         return;
+     }
+ 
+@@ -395,7 +395,11 @@ void Model::removeWirelessNetwork(const QString& ssid, const QString& device)
+         if (wirelessDevice) {
+             accessPoint = wirelessDevice->findAccessPoint(item->specificPath());
+         }
+-        if (accessPoint && accessPoint->mode() == NetworkManager::AccessPoint::Adhoc &&
++
++        // When accesspoint in ad-hoc mode dissapears, we should remove the item only when there is no connection. Similar case is when
++        // a wireless device is in AP mode, but in this case there could be only one visible AP and this should always be associated with some connection.
++        if (accessPoint && ((accessPoint->mode() == NetworkManager::AccessPoint::Adhoc && !item->connectionPath().isEmpty()) ||
++                            wirelessDevice->mode() == NetworkManager::WirelessDevice::ApMode) &&
+             NetworkManager::isWirelessEnabled() && NetworkManager::isWirelessHardwareEnabled()) {
+             item->setWirelessNetwork(QString());
+             if (updateItem(item)) {
+diff --git a/declarative-plugins/model/modelitem.cpp b/declarative-plugins/model/modelitem.cpp
+index 9a5931f..58d5c42 100644
+--- a/declarative-plugins/model/modelitem.cpp
++++ b/declarative-plugins/model/modelitem.cpp
+@@ -151,6 +151,17 @@ QString ModelItem::icon() const
+             break;
+         case NetworkManager::ConnectionSettings::Wireless:
+             if (m_signal == 0 ) {
++                if (!m_connectionPath.isEmpty()) {
++                    NetworkManager::Connection::Ptr con = NetworkManager::findConnection(m_connectionPath);
++                    if (con) {
++                        NetworkManager::WirelessSetting::Ptr wirelessSetting;
++                        wirelessSetting = con->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
++                        if (wirelessSetting && (wirelessSetting->mode() == NetworkManager::WirelessSetting::Adhoc ||
++                                                wirelessSetting->mode() == NetworkManager::WirelessSetting::Ap)) {
++                            return "network-wireless-100";
++                        }
++                    }
++                }
+                 return "network-wireless-00";
+             } else if (m_signal < 20) {
+                 return "network-wireless-20";
+diff --git a/kded/bluetoothmonitor.cpp b/kded/bluetoothmonitor.cpp
+index 2221d09..5d0218b 100644
+--- a/kded/bluetoothmonitor.cpp
++++ b/kded/bluetoothmonitor.cpp
+@@ -220,6 +220,7 @@ void BluetoothMonitor::init()
+ 
+     mDunDevice = reply.value();
+ }
++
+ #if WITH_MODEMMANAGER_SUPPORT
+ void BluetoothMonitor::modemAdded(const QString &udi)
+ {
+diff --git a/lib/editor/bridgewidget.cpp b/lib/editor/bridgewidget.cpp
+index 8815eb2..95344c4 100644
+--- a/lib/editor/bridgewidget.cpp
++++ b/lib/editor/bridgewidget.cpp
+@@ -216,5 +216,5 @@ void BridgeWidget::populateBridges()
+ 
+ bool BridgeWidget::isValid() const
+ {
+-    return !m_ui->ifaceName->text().isEmpty() && m_ui->bridges->count() > 0;
++    return !m_ui->ifaceName->text().isEmpty();
+ }
+diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp
+index d4a511d..645249d 100644
+--- a/vpn/vpnc/vpnc.cpp
++++ b/vpn/vpnc/vpnc.cpp
+@@ -145,7 +145,6 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
+     KConfigGroup cg(config, "main");   // Keys&Values are stored under [main]
+     if (cg.exists()) {
+         // Setup cisco-decrypt binary to decrypt the passwords
+-        QStringList decrArgs;
+         const QString ciscoDecryptBinary = KStandardDirs::findExe("cisco-decrypt", QString::fromLocal8Bit(qgetenv("PATH")) + ":/usr/lib/vpnc");
+         if (ciscoDecryptBinary.isEmpty()) {
+             mErrorMessage = i18n("Needed executable cisco-decrypt could not be found.");
+@@ -174,11 +173,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
+         }
+         else if (!decrPlugin->readStringKeyValue(cg,"enc_UserPassword").isEmpty() && !ciscoDecryptBinary.isEmpty()) {
+             // Decrypt the password and insert into map
+-            decrArgs.clear();
+-            decrArgs << decrPlugin->readStringKeyValue(cg,"enc_UserPassword");
+-            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs);
++            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary);
+             decrPlugin->ciscoDecrypt->start();
+-            if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) {
++            decrPlugin->ciscoDecrypt->waitForStarted();
++            decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_UserPassword").toUtf8());
++            if (decrPlugin->ciscoDecrypt->waitForFinished()) {
+                 secretData.insert(NM_VPNC_KEY_XAUTH_PASSWORD, decrPlugin->decryptedPasswd);
+             }
+         }
+@@ -203,11 +202,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
+         }
+         else if (!decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").isEmpty() && !ciscoDecryptBinary.isEmpty()) {
+             //Decrypt the password and insert into map
+-            decrArgs.clear();
+-            decrArgs << decrPlugin->readStringKeyValue(cg,"enc_GroupPwd");
+-            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs);
++            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary);
+             decrPlugin->ciscoDecrypt->start();
+-            if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) {
++            decrPlugin->ciscoDecrypt->waitForStarted();
++            decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").toUtf8());
++            if (decrPlugin->ciscoDecrypt->waitForFinished()) {
+                 secretData.insert(NM_VPNC_KEY_SECRET, decrPlugin->decryptedPasswd);
+                 data.insert(NM_VPNC_KEY_SECRET"-flags", QString::number(NetworkManager::Setting::AgentOwned));
+             }
diff --git a/extra/libasyncns/PKGBUILD b/extra/libasyncns/PKGBUILD
index 2776eb4e8..8b4a087b7 100644
--- a/extra/libasyncns/PKGBUILD
+++ b/extra/libasyncns/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149434 2012-02-07 17:05:44Z heftig $
+# $Id: PKGBUILD 197186 2013-10-23 16:57:44Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Eric Belanger <belanger@astro.umontreal.ca>
@@ -7,7 +7,7 @@
 
 pkgname=libasyncns
 pkgver=0.8
-pkgrel=4
+pkgrel=5
 pkgdesc="A C library for executing name service queries asynchronously"
 arch=('i686' 'x86_64')
 url="http://0pointer.de/lennart/projects/libasyncns"
diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD
index a793fffb7..cb8b913f2 100644
--- a/extra/lynx/PKGBUILD
+++ b/extra/lynx/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 162749 2012-06-29 12:15:20Z pierre $
+# $Id: PKGBUILD 197170 2013-10-23 13:51:58Z pierre $
 # Maintainer:
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=lynx
 pkgver=2.8.7
-_pkgver=2-8-7
-pkgrel=6
+pkgrel=7
 pkgdesc="A text browser for the World Wide Web"
 url="http://lynx.isc.org/"
 arch=('i686' 'x86_64')
@@ -17,10 +16,10 @@ source=("http://lynx.isc.org/release/${pkgname}${pkgver}.tar.gz")
 md5sums=('e36d70f3f09b2d502055ca67f09e363c')
 
 build() {
-  cd ${srcdir}/${pkgname}${_pkgver}
+  cd ${srcdir}/${pkgname}${pkgver//./-}
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
-    --with-ssl \
+    --with-ssl=/usr \
     --enable-nls \
     --enable-ipv6 \
     --mandir=/usr/share/man
@@ -28,7 +27,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}${_pkgver}
+  cd ${srcdir}/${pkgname}${pkgver//./-}
   make DESTDIR=${pkgdir} install
 
   # FS#20404 - points to local help
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index fb61adc46..d097464e6 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196938 2013-10-21 10:23:27Z tpowa $
+# $Id: PKGBUILD 197147 2013-10-23 10:26:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
 pkgname=('ocaml' 'ocaml-compiler-libs')
 pkgver=4.01.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64')
 license=('LGPL2.1' 'custom: QPL-1.0')
@@ -13,7 +13,7 @@ depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
 source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz)
-options=('!makeflags' '!emptydirs')
+options=('!makeflags' '!emptydirs' 'staticlibs')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 86b1a20bd..1ce2339d3 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197132 2013-10-22 10:32:29Z andrea $
+# $Id: PKGBUILD 197149 2013-10-23 11:49:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -21,7 +21,7 @@ pkgname=('qt5-base'
          'qt5-x11extras'
          'qt5-xmlpatterns')
 pkgver=5.1.1
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -113,7 +113,7 @@ package_qt5-base() {
 
   cd ${_pkgfqn}/qtbase
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   cd "${srcdir}"
   install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \
     ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
@@ -140,11 +140,11 @@ package_qt5-declarative() {
 
   cd ${_pkgfqn}/qtdeclarative
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
@@ -189,7 +189,7 @@ package_qt5-xmlpatterns() {
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
@@ -243,11 +243,11 @@ package_qt5-quick1() {
 
   cd ${_pkgfqn}/qtquick1
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
@@ -270,7 +270,7 @@ package_qt5-script() {
 
   cd ${_pkgfqn}/qtscript
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -282,7 +282,7 @@ package_qt5-sensors() {
 
   cd ${_pkgfqn}/qtsensors
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -291,10 +291,10 @@ package_qt5-sensors() {
 package_qt5-serialport() {
   pkgdesc='A cross-platform application and UI framework (QtSerialPort)'
   depends=('qt5-base')
-  
+
   cd ${_pkgfqn}/qtserialport
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -307,12 +307,12 @@ package_qt5-svg() {
 
   cd ${_pkgfqn}/qtsvg
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 }
-  
+
 package_qt5-tools() {
   pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
   depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme'
@@ -320,10 +320,11 @@ package_qt5-tools() {
   optdepends=('qt5-doc: documentation')
   install='qt5-tools.install'
   conflicts=('qt')
+  options=('staticlibs') # libQtUiTools builds as static only$
 
   cd ${_pkgfqn}/qttools
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # install missing icons and desktop files
   for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
     size=$(echo $(basename ${icon}) | cut -d- -f2)
@@ -348,12 +349,12 @@ package_qt5-tools() {
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
     ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-  done 
+  done
 }
 
 package_qt5-webkit() {
@@ -362,7 +363,7 @@ package_qt5-webkit() {
 
   cd ${_pkgfqn}/qtwebkit
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -374,10 +375,10 @@ package_qt5-webkit() {
 package_qt5-x11extras() {
   pkgdesc='A cross-platform application and UI framework (QtX11Extras)'
   depends=('qt5-base')
-  
+
   cd ${_pkgfqn}/qtx11extras
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD
index 6da6577b7..902579d4c 100644
--- a/extra/sdl_gfx/PKGBUILD
+++ b/extra/sdl_gfx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165865 2012-09-01 20:41:32Z heftig $
+# $Id: PKGBUILD 197197 2013-10-23 17:26:34Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_gfx
 pkgver=2.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="SDL Graphic Primitives"
 arch=('i686' 'x86_64')
 license=('LGPL')
diff --git a/extra/sdl_pango/PKGBUILD b/extra/sdl_pango/PKGBUILD
index 2587f1ed1..6726ed03b 100644
--- a/extra/sdl_pango/PKGBUILD
+++ b/extra/sdl_pango/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149427 2012-02-07 16:56:19Z heftig $
+# $Id: PKGBUILD 197198 2013-10-23 17:26:53Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.com>
 # Contributor: gyo <nucleogeek@gmail.com>
 
 pkgname=sdl_pango
 pkgver=0.1.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Pango SDL binding"
 arch=('i686' 'x86_64')
 url="http://sdlpango.sourceforge.net/"
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index 4944a2207..31dac811a 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183482 2013-04-21 22:21:02Z heftig $
+# $Id: PKGBUILD 197192 2013-10-23 17:22:29Z heftig $
 #Maintainer : Ionut Biru <ibiru@archlinux.org>
 #Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=seed
 pkgver=3.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Seed/"
@@ -20,7 +20,7 @@ sha256sums=('80cb4db7fa6f6cf8d3e255fc45a81657388d458bc8bf23e4089e35f69eeaac32'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   install -m644 ../GLib.js extensions/
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }