pcr/openswan: updated to 2.6.49.1

2 files changed, 39 insertions, 30 deletions

diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD
index 3d554ace2..d3a9a16d4 100644
--- a/pcr/openswan/PKGBUILD
+++ b/pcr/openswan/PKGBUILD
@@ -1,27 +1,31 @@
-# Contributor: uuwe
-# Maintainer: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
+# Maintainer (AUR): Carsten Feuls <archlinux@carstenfeuls.de>
+# Contributor (AUR):   AXVill
+# Contributor (AUR):  dacoit <dacoit at tuta.io>
+# Contributor (AUR):  xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
+# Contributor (AUR):  uuwe
+
+# parabola changes and rationale:
+#  - removed "open source" term from pkgdesc
+
 pkgname=openswan
-pkgver=2.6.42
-pkgrel=3
-pkgdesc="Open Source implementation of IPsec for the Linux operating system"
-url="http://www.openswan.org"
+pkgver=2.6.49.1
+pkgrel=1
+pkgdesc='A libre implementation of IPsec for the Linux operating system'
+url='https://www.openswan.org'
+arch=('i686' 'x86_64' 'armv7h')
 license=('GPL' 'custom')
-arch=('i686' 'x86_64')
-depends=('iproute2>=2.6.8' 'gmp' 'perl')
-optdepends=('python2')
+depends=('gmp' 'perl' 'iproute2')
 makedepends=('flex' 'bison')
+optdepends=('python2')
 conflicts=('ipsec-tools')
-backup=(etc/ipsec.conf \
-        etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz{,.asc}
-        openswan.service)
-validpgpkeys=('9A9A392AA8D738BA263458AAF51005129FC816CA')
-md5sums=('22240ce28be48f051bfdc874083c8947'
-         'SKIP'
-         'd8b465c10838c72e31329d65011002b6')
+options=('!makeflags')
+backup=('etc/ipsec.conf'
+        'etc/ipsec.d/policies/'{block,clear,clear-or-private,private,private-or-clear})
+source=("http://download.openswan.org/openswan/openswan-${pkgver}.tar.gz"
+        'openswan.service')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
   # Change install paths to Arch defaults
   sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
@@ -31,32 +35,35 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   make USE_XAUTH=true USE_OBJDIR=true programs
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
   # Pre-create init script directory
-  mkdir -p "${pkgdir}"/usr/lib/systemd/scripts/
+  mkdir -p "$pkgdir/usr/lib/systemd/scripts"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   # Change permissions in /var
-  mv "${pkgdir}"/var/run "${pkgdir}"/
-  rm -r "${pkgdir}"/var
-  chmod 700 "${pkgdir}"/run/pluto
+  mv "$pkgdir/var/run" "$pkgdir/"
+  rm -r "$pkgdir/var"
+  chmod 700 "$pkgdir/run/pluto"
 
   # Copy License
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/openswan/LICENSE
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/openswan/LICENSE"
 
-  # Install init script
-  install -Dm644 "${srcdir}"/openswan.service "${pkgdir}"/usr/lib/systemd/system/openswan.service
+  # Install service unit
+  install -Dm644 "$srcdir/openswan.service" "$pkgdir/usr/lib/systemd/system/openswan.service"
 
   # fix manpages
-  mv "${pkgdir}"/usr/man "${pkgdir}"/usr/share/
+  mv "$pkgdir/usr/man" "$pkgdir/usr/share/"
 
   # fix python2
-  sed -i '1s|python|python2|' "${pkgdir}"/usr/lib/openswan/verify
+  sed -i '1s|python|python2|' "$pkgdir/usr/lib/openswan/verify"
 }
+
+sha512sums=('9e6c03aa5f5ed7338473bfd6b9b2740f928ac38775149f90519181b6b9ef95fcb1af68ea737554dd11d2faef22a71458171fff9d0566bb115096a04b03395e76'
+            'a234e97a4fe10fb85a8a1b69d0b55b7c7a4a9ef44c199f876f64bb7290e9f161b20e4c721112e26c6a5636a898a27a36b525aae0944cf6217ff81c36389d5803')
diff --git a/pcr/openswan/openswan.service b/pcr/openswan/openswan.service
index 6d899705c..2963e866c 100755..100644
--- a/pcr/openswan/openswan.service
+++ b/pcr/openswan/openswan.service
@@ -4,6 +4,8 @@ After=network.target
 
 [Service]
 Type=forking
+RuntimeDirectory=pluto
+RuntimeDirectoryMode=0700
 ExecStart=/usr/lib/systemd/scripts/ipsec --start
 ExecStop=/usr/lib/systemd/scripts/ipsec --stop
 ExecReload=/usr/lib/systemd/scripts/ipsec --restart