diff options
author | Chris Severance | 2019-08-09 20:57:52 -0400 |
---|---|---|
committer | Chris Severance | 2019-08-09 20:57:52 -0400 |
commit | 2242be4f5788fc618cf89df4820f813e9a4d347e (patch) | |
tree | 7bb06b6a7608ba1f217cdf2bc0fedea20fcf1de0 | |
parent | cb43d9c6ac195e0069216a0231d1f6423129d1c8 (diff) | |
download | aur-2242be4f5788fc618cf89df4820f813e9a4d347e.tar.gz |
autu: Update to 2.6.51.5-1
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | 0001-gcc9-strncpy.patch | 21 | ||||
-rw-r--r-- | PKGBUILD | 91 |
4 files changed, 90 insertions, 38 deletions
@@ -1,5 +1,7 @@ +# Generated by mksrcinfo v8 +# Sat Aug 10 00:57:51 UTC 2019 pkgbase = openswan - pkgdesc = Open Source implementation of IPsec for the Linux operating system + pkgdesc = Open Source implementation of IPsec for Linux pkgver = 2.6.51.5 pkgrel = 1 url = https://www.openswan.org @@ -23,8 +25,16 @@ pkgbase = openswan backup = etc/ipsec.d/policies/private backup = etc/ipsec.d/policies/private-or-clear source = http://download.openswan.org/openswan/openswan-2.6.51.5.tar.gz + source = 0001-gcc9-strncpy.patch source = openswan.service + md5sums = 49641ce5801d5f3f5b2754fe22d051ec + md5sums = b54891b73bc62fce51f8ca46c8731882 + md5sums = e428e61ba81048eef92475dffa2ffc23 + sha256sums = 4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d + sha256sums = b30cfd22b14450668ecf798e6117ca6ea07609dabbee6d0ac15ef07dcef11804 + sha256sums = 9f42bc005d4c361b31d41c7186a19ed8dbd1f95be31c16663bd2a1a8da8a29f0 sha512sums = b7864a1f2bf4a6c713de8ed669934567d89f79bcacf146ebd83d26d3ffb2bc482bc238308fd36a83a540fb3a832a5ff264529295c2bc309777b1e516b0e9f718 + sha512sums = def41d3c407ef11fef7c53e5293b5b7b4d0d394218caa0ee0b0508a016f9c229dec5569dc013955e3521140a200582e3183198e2aa1dd314d13fd73e6bad415b sha512sums = a234e97a4fe10fb85a8a1b69d0b55b7c7a4a9ef44c199f876f64bb7290e9f161b20e4c721112e26c6a5636a898a27a36b525aae0944cf6217ff81c36389d5803 pkgname = openswan diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 018a3de08144..000000000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!PKGBUILD -!.SRCINFO -!.gitignore diff --git a/0001-gcc9-strncpy.patch b/0001-gcc9-strncpy.patch new file mode 100644 index 000000000000..bbce9239cac7 --- /dev/null +++ b/0001-gcc9-strncpy.patch @@ -0,0 +1,21 @@ +--- programs/tncfg/tncfg.c.orig 2019-06-14 15:35:45.000000000 -0400 ++++ programs/tncfg/tncfg.c 2019-08-09 20:50:45.519711644 -0400 +@@ -228,14 +228,16 @@ main(int argc, char *argv[]) + createdelete = SADB_X_UNPLUMBIF; + strncat(virtname, optarg, sizeof(virtname)-1); + break; + + case 'V': +- strncpy(ifr.ifr_name, optarg, sizeof(ifr.ifr_name)); ++ memset(ifr.ifr_name,0,sizeof(ifr.ifr_name)); ++ strncpy(ifr.ifr_name, optarg, sizeof(ifr.ifr_name)-1); + break; + case 'P': +- strncpy(shc.cf_name, optarg, sizeof(shc.cf_name)); ++ memset(shc.cf_name,0,sizeof(shc.cf_name)); ++ strncpy(shc.cf_name, optarg, sizeof(shc.cf_name)-1); + break; + case 'l': + { + char *toolname= malloc(strlen(argv[0]) + + 10 /* update this when changing the sprintf() */ @@ -1,65 +1,90 @@ -# Maintainer: Carsten Feuls <archlinux@carstenfeuls.de> -# Contributor: AXVill -# Contributor: dacoit <dacoit at tuta.io> -# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info> -# Contributor: uuwe -pkgname=openswan -pkgver=2.6.51.5 -pkgrel=1 -pkgdesc='Open Source implementation of IPsec for the Linux operating system' -url='https://www.openswan.org' +# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: Carsten Feuls <archlinux@carstenfeuls.de> +# Contributor: AXVill +# Contributor: dacoit <dacoit at tuta.io> +# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info> +# Contributor: uuwe + +set -u +pkgname='openswan' +pkgver='2.6.51.5' +pkgrel='1' +pkgdesc='Open Source implementation of IPsec for Linux' arch=('i686' 'x86_64') +url='https://www.openswan.org' license=('GPL' 'custom') depends=('gmp' 'perl' 'iproute2') -makedepends=('flex' 'bison') optdepends=('python') +makedepends=('flex' 'bison') conflicts=('ipsec-tools' 'strongswan') +backup=( + 'etc/ipsec.conf' + 'etc/ipsec.d/policies/'{block,clear,clear-or-private,private,private-or-clear} +) 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') +_srcdir="${pkgname}-${pkgver}" +source=( + "http://download.openswan.org/openswan/openswan-${pkgver}.tar.gz" + '0001-gcc9-strncpy.patch' + 'openswan.service' +) +md5sums=('49641ce5801d5f3f5b2754fe22d051ec' + 'b54891b73bc62fce51f8ca46c8731882' + 'e428e61ba81048eef92475dffa2ffc23') +sha256sums=('4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d' + 'b30cfd22b14450668ecf798e6117ca6ea07609dabbee6d0ac15ef07dcef11804' + '9f42bc005d4c361b31d41c7186a19ed8dbd1f95be31c16663bd2a1a8da8a29f0') +sha512sums=('b7864a1f2bf4a6c713de8ed669934567d89f79bcacf146ebd83d26d3ffb2bc482bc238308fd36a83a540fb3a832a5ff264529295c2bc309777b1e516b0e9f718' + 'def41d3c407ef11fef7c53e5293b5b7b4d0d394218caa0ee0b0508a016f9c229dec5569dc013955e3521140a200582e3183198e2aa1dd314d13fd73e6bad415b' + 'a234e97a4fe10fb85a8a1b69d0b55b7c7a4a9ef44c199f876f64bb7290e9f161b20e4c721112e26c6a5636a898a27a36b525aae0944cf6217ff81c36389d5803') prepare() { - cd "$pkgname-$pkgver" + set -u + cd "${_srcdir}" + + #diff -pNau5 programs/tncfg/tncfg.c{.orig,} > '0001-gcc9-strncpy.patch' + patch -Nbup0 -i "${srcdir}/0001-gcc9-strncpy.patch" # Change install paths to Arch defaults - sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc + sed -e 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' -i 'Makefile.inc' # Replace invalid init script paths with systemd script path - sed -i 's/^INC_RCDIRS.*/INC_RCDIRS\?\=\/usr\/lib\/systemd\/scripts/' Makefile.inc + sed -e 's/^INC_RCDIRS.*/INC_RCDIRS\?\=\/usr\/lib\/systemd\/scripts/' -i 'Makefile.inc' + set +u } build() { - cd "$pkgname-$pkgver" - make USE_XAUTH=true USE_OBJDIR=true programs + set -u + cd "${_srcdir}" + make USE_XAUTH='true' USE_OBJDIR='true' programs + set +u } package() { - cd "$pkgname-$pkgver" + set -u + cd "${_srcdir}" # 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 -Dpm644 LICENSE "${pkgdir}/usr/share/licenses/openswan/LICENSE" # Install service unit - install -Dm644 "$srcdir/openswan.service" "$pkgdir/usr/lib/systemd/system/openswan.service" + install -Dpm644 "${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 -e '1s|python|python2|' -i "${pkgdir}/usr/lib/openswan/verify" + set +u } - -sha512sums=('b7864a1f2bf4a6c713de8ed669934567d89f79bcacf146ebd83d26d3ffb2bc482bc238308fd36a83a540fb3a832a5ff264529295c2bc309777b1e516b0e9f718' - 'a234e97a4fe10fb85a8a1b69d0b55b7c7a4a9ef44c199f876f64bb7290e9f161b20e4c721112e26c6a5636a898a27a36b525aae0944cf6217ff81c36389d5803') +set +u |