Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

9 files changed, 248 insertions, 59 deletions

diff --git a/pcr/gtk-theme-numix/PKGBUILD b/pcr/gtk-theme-numix/PKGBUILD
new file mode 100644
index 000000000..4c4c10b20
--- /dev/null
+++ b/pcr/gtk-theme-numix/PKGBUILD
@@ -0,0 +1,21 @@
+# Mantainer: Diego
+# Contributor: Aleessio Sergi
+
+pkgname=gtk-theme-numix
+_theme=Numix
+pkgver=1.4
+pkgrel=1
+pkgdesc="A flat and light theme with a modern look"
+arch=('any')
+url="http://satya164.deviantart.com/art/Numix-GTK3-theme-360223962"
+license=('GPL3')
+depends=('gtk-engine-murrine')
+source=(https://github.com/shimmerproject/${_theme}/archive/v${pkgver}.tar.gz)
+md5sums=('323ce459ebf9ee30bf920d18fab3645a')
+
+package() {
+  install -d "$pkgdir/usr/share/themes/${_theme}"
+  cp -rv ${srcdir}/${_theme}-${pkgver}/* "$pkgdir/usr/share/themes/${_theme}/"
+}
+
+md5sums=('323ce459ebf9ee30bf920d18fab3645a')
diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD
new file mode 100644
index 000000000..16ff977b3
--- /dev/null
+++ b/pcr/networkmanager-openswan/PKGBUILD
@@ -0,0 +1,26 @@
+# Contributor: Marti Raudsepp <marti@juffo.org>
+
+pkgname=networkmanager-openswan
+_pkgname=NetworkManager-openswan
+pkgver=0.9.8.0
+pkgrel=1
+pkgdesc="NetworkManager plugin for IPSec VPN tunnels"
+arch=('i686' 'x86_64')
+url="http://ftp.acc.umu.se/pub/GNOME/sources/NetworkManager-openswan/"
+license=('GPL')
+depends=('openswan' 'gtk3' 'networkmanager' 'libgnome-keyring')
+makedepends=('intltool')
+source=(http://ftp.acc.umu.se/pub/GNOME/sources/$_pkgname/0.9/$_pkgname-$pkgver.tar.xz)
+md5sums=('6a373868f85ac3b7c953f7fd6c76e637')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/networkmanager
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/networkmanager-strongswan/PKGBUILD b/pcr/networkmanager-strongswan/PKGBUILD
new file mode 100644
index 000000000..31573dc82
--- /dev/null
+++ b/pcr/networkmanager-strongswan/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Michael Seiwald <michael@mseiwald.at>
+# Maintainer: Dmitry Korzhevin <dkorzhevin at gmail dot com>
+pkgname=networkmanager-strongswan
+_pkgname=NetworkManager-strongswan
+pkgver=1.3.0
+pkgrel=2
+pkgdesc="strongswan NetworkManager plugin"
+arch=('i686' 'x86_64')
+url="http://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager"
+license=('GPL')
+depends=(networkmanager strongswan libgnomeui)
+makedepends=(intltool)
+source=(http://download.strongswan.org/NetworkManager/$_pkgname-$pkgver.tar.gz)
+md5sums=('215f1d3b7b65be236b86bf30b6a4615b')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./configure --sysconfdir=/etc \
+              --prefix=/usr \
+              --libexecdir=/usr/lib \
+              --with-charon=/usr/lib/strongswan/charon \
+              CFLAGS="$CFLAGS -Wno-error=unused-local-typedefs"
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  #make install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD
index bae970025..97cea98e6 100644
--- a/pcr/openswan/PKGBUILD
+++ b/pcr/openswan/PKGBUILD
@@ -1,24 +1,23 @@
-# Contributor: Jan Fader <jan.fader@web.de>
+# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
 pkgname=openswan
-pkgver=2.6.36
-pkgrel=2
+pkgver=2.6.38
+pkgrel=1
 pkgdesc="Open Source implementation of IPsec for the Linux operating system"
 url="http://www.openswan.org"
 license=('GPL' 'custom')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('iproute' 'gmp' 'perl')
+arch=('i686' 'x86_64')
+depends=('iproute2>=2.6.8' 'gmp' 'perl')
+makedepends=('flex' 'bison')
+conflicts=('ipsec-tools' 'openswan')
+provides=('openswan')
 backup=(etc/ipsec.conf \
         etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz
-        openswan.rc.d
-        compile.patch)
+source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz
+        openswan
+        openswan.service)
 
 build() {
-  # Create /etc/rc.d for init script, and license directory
-  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
-
   cd $srcdir/openswan-$pkgver
-  patch -p1 -i $srcdir/compile.patch
 
   # Change install paths to Arch defaults
   sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc
@@ -26,21 +25,27 @@ build() {
   make USE_XAUTH=true USE_OBJDIR=true programs
 }
 
-package(){
+package() {
   cd $srcdir/openswan-$pkgver
+
+  # Create /etc/rc.d for init script, and license directory
+  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
   make DESTDIR=$pkgdir install
 
   # Change permissions in /var
-  chmod 755 $pkgdir/var/run/pluto
-  
+  chmod 700 $pkgdir/var/run/pluto
+
   # Copy License
   cp LICENSE $pkgdir/usr/share/licenses/openswan
-  
+
   # Install init script
-  install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan
+  install -Dm755 ../openswan $pkgdir/etc/rc.d/openswan
+  install -Dm644 ../openswan.service $pkgdir/usr/lib/systemd/system/openswan.service
+  mkdir $pkgdir/usr/lib/systemd/scripts/
+  cp $pkgdir/etc/rc.d/ipsec $pkgdir/usr/lib/systemd/scripts/ipsec
   # fix manpages
   mv $pkgdir/usr/man $pkgdir/usr/share/
 }
-md5sums=('b3a1733493520bb18729633b62ef8247'
+md5sums=('13073eb5314b83a31be88e4117e8bbcd'
          '543d84162761b9cc9ec319e938c4dd2a'
-         '5540437bb334873da646e21ac9caa963')
+         'd8b465c10838c72e31329d65011002b6')
diff --git a/pcr/openswan/openswan b/pcr/openswan/openswan
new file mode 100755
index 000000000..30bd0d56e
--- /dev/null
+++ b/pcr/openswan/openswan
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting Openswan IPsec"
+    /etc/rc.d/ipsec --start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      add_daemon openswan
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Openswan IPsec"
+    /etc/rc.d/ipsec --stop
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      rm_daemon openswan
+    fi
+    ;;
+  restart)
+    stat_busy "Restarting Openswan IPsec"
+    /etc/rc.d/ipsec --restart
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+      add_daemon openswan
+    fi
+    ;;
+  status)
+    /etc/rc.d/ipsec --status
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart|status}"  
+esac
+
diff --git a/pcr/openswan/openswan.service b/pcr/openswan/openswan.service
new file mode 100755
index 000000000..6d899705c
--- /dev/null
+++ b/pcr/openswan/openswan.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Openswan daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/lib/systemd/scripts/ipsec --start
+ExecStop=/usr/lib/systemd/scripts/ipsec --stop
+ExecReload=/usr/lib/systemd/scripts/ipsec --restart
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/strongswan/CHANGELOG b/pcr/strongswan/CHANGELOG
new file mode 100644
index 000000000..a798a08c4
--- /dev/null
+++ b/pcr/strongswan/CHANGELOG
@@ -0,0 +1,20 @@
+strongswan-5.0.4
+----------------
+
+- Fixed a security vulnerability in the openssl plugin which was reported by
+  Kevin Wojtysiak. The vulnerability has been registered as CVE-2013-2944.
+  Before the fix, if the openssl plugin's ECDSA signature verification was used,
+  due to a misinterpretation of the error code returned by the OpenSSL
+  ECDSA_verify() function, an empty or zeroed signature was accepted as a
+  legitimate one.
+
+- The handling of a couple of other non-security relevant openssl return codes
+  was fixed as well.
+
+- The tnc_ifmap plugin now publishes virtual IPv4 and IPv6 addresses via its
+  TCG TNC IF-MAP 2.1 interface.
+
+- The charon.initiator_only option causes charon to ignore IKE initiation
+  requests.
+
+- The openssl plugin can now use the openssl-fips library.
diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
index ed603e5c2..975e7a21f 100644
--- a/pcr/strongswan/PKGBUILD
+++ b/pcr/strongswan/PKGBUILD
@@ -7,24 +7,27 @@
 # Maintainer: dkorzhevin <dkorzhevin at gmail dot com>
 
 pkgname=strongswan
-pkgver=5.0.1
-pkgrel=2
+pkgver=5.0.4
+pkgrel=5
 pkgdesc="open source IPsec implementation"
 url='http://www.strongswan.org'
 license=("GPL")
-arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3')
+arch=('i686' 'x86_64')
+depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite')
 conflicts=('openswan')
 options=(!libtool)
 backup=(etc/ipsec.conf etc/strongswan.conf)
 source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc)
-md5sums=('58fdeb49f133139a58f4d8adafc69a16'
+changelog='CHANGELOG'
+md5sums=('0ab0397b44b197febfd0f89148344035'
          'cf815adef48a1ffee34517380c731277')
-
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver} || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
 
-  ./configure   --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-ipsecdir=/usr/lib/strongswan \
+  ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib \
+        --with-ipsecdir=/usr/lib/strongswan \
         --enable-sqlite \
         --enable-openssl --enable-curl \
         --enable-sql --enable-attr-sql \
@@ -34,12 +37,15 @@ build() {
         --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
         --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \
         --enable-ha \
-        --disable-mysql --disable-ldap || return 1
+        --disable-mysql --disable-ldap
 
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
 
-  install -d ${pkgdir}/etc/rc.d || return 1
-  ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec || return 1
-  install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+  install -d ${pkgdir}/etc/rc.d
+  ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec
+  install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan
 }
diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD
index 0c5f9501d..74f21775e 100644
--- a/pcr/xfce-theme-greybird/PKGBUILD
+++ b/pcr/xfce-theme-greybird/PKGBUILD
@@ -1,32 +1,55 @@
-# Maintainer: flan_suse
+# Maintainer: Limao Luo <luolimao+AUR@gmail.com>
+# Contributor: flan_suse
+
+# This suite contains the following:
+#        * xfwm4 theme
+#        * xfwm4 compact theme
+#        * metacity theme
+#        * emerald theme
+#        * gtk2 theme
+#        * gtk2 theme (classic)
+#        * gtk3 theme
+#        * gtk3 theme (classic)
+#        * unity theme
+#        * xfce4-notify theme
+#        * lightdm theme
+#        * wallpaper (found in the shimmer-wallpapers package; optdepends)
+
+# There have been some drastic changes as of July 22nd, 2012!
+# Please read through the AUR page comments if you wish to learn more.
+# I have modified this PKGBUILD to compensate for the drastic changes.
+
 pkgname=xfce-theme-greybird
-pkgver=1.0.7
+_pkgname=Greybird
+pkgver=1.1.1
+_pkgverclassic=0.8.2
 pkgrel=1
-pkgdesc="A grey and blue Xfce theme, introduced in the release of Xubuntu 11.04 and updated for 12.04; includes the classic low saturation theme"
-arch=('any')
-url="http://shimmerproject.org/projects/greybird/"
-license=('GPL2' 'CC-BY-SA-3.0')
-groups=('xfce-themes-shimmer-collection')
-depends=('gtk-engine-murrine')
-optdepends=('shimmer-wallpapers: contains the Greybird wallpaper, among others'
-            'gtk3: required for CSS/GTK3 theme'
-            'elementary-xfce-icons: matching icon set; use the dark icon theme'
-            'lightdm-gtk-greeter: required for the LightDM GTK theme'
-            'lightdm-unity-greeter: required for the LightDM Unity theme'
-            'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme')
-source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/Greybird/tarball/v${pkgver})
+pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04; includes the classic low saturation theme"
+arch=(any)
+url=http://shimmerproject.org/projects/greybird/
+license=(CCPL:by-sa-3.0 GPL)
+groups=(xfce-themes-shimmer-collection)
+depends=(gtk-engine-murrine)
+optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme'
+    'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme'
+    'gtk3: required for CSS/GTK3 theme'
+    'lightdm-gtk-greeter: required for the LightDM GTK theme'
+    'lightdm-unity-greeter: required for the LightDM Unity theme'
+    'shimmer-wallpapers: contains the Greybird wallpaper, among others')
+conflicts=($pkgname-git)
+source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz
+    $pkgname-$_pkgverclassic.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$_pkgverclassic.tar.gz)
+sha256sums=('374bc55d6af98ca6052cc5dd6c55db3b1ce9002fe81d3fde3e9b72febe697878'
+    'b63da3527760c194bb7299c1cb45297268439740e52e2c5e1f39fc31dce6293a')
+sha512sums=('1e4f7dea5e0206972d7d4a5bf42b353abf21e40d215fc1b0e7b546a4c95c7ce0604a37e9f2ad6c272fedf4720d0a5eee732a6b89d83c635c24082c24711c9e5e'
+    '09f19bbfe02a477de6635198736897d143a5eec8ed13e6d1863c80f5d78b341ecdf2b2cf48bffddead25082eeadde475d360fc7bee773307c5cc10fb3ff90034')
 
 package() {
-    cd "${srcdir}/shimmerproject-Greybird"*
-
-    # Create installation directories
-    install -d -m755 "${pkgdir}/usr/share/themes/Greybird"{,\ Compact}
-
-    # Install the current theme
-    cp -a * "${pkgdir}/usr/share/themes/Greybird/"
+    local _themedir="$pkgdir/usr/share/themes"
+    install -d "$_themedir/$_pkgname "{Classic,Compact}
 
-    # Make a symbolic link for the compact version of the xfwm4 theme
-    cd "${pkgdir}/usr/share/themes/Greybird Compact"
-    ln -s "../${_pkgname}/xfwm4_compact" "xfwm4"
+    cp -rf $_pkgname-$pkgver/ "$_themedir"/$_pkgname/
+    rm "$_themedir"/$_pkgname/.gitignore
+    cp -rf $_pkgname-$_pkgverclassic/gtk-{2,3}.0 "$_themedir/$_pkgname Classic"
+    ln -s /usr/share/themes/$_pkgname/xfwm4_compact "$_themedir/$_pkgname Compact/xfwm4"
 }
-md5sums=('d7c291408cd644e102cf811ee62e7a37')