diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
| commit | b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71 (patch) | |
| tree | 5948e97345062a759a5ab8d355b0b49849abcfcf /user/strongswan | |
| parent | d61220e97e3a4fec8c1e43970cb1408f790c2c2e (diff) | |
| parent | 6bd200ed124893c95fda0335b684b26eba0bb743 (diff) | |
| download | packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.gz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.bz2 packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.xz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.zip | |
Merge branch 'bashisms' into 'master'
Purge bashisms, adduser, and addgroup from packages.git
See merge request adelie/packages!293
Diffstat (limited to 'user/strongswan')
| -rw-r--r-- | user/strongswan/APKBUILD | 6 | ||||
| -rw-r--r-- | user/strongswan/strongswan.pre-install | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD index 29390b652..e81d0be7c 100644 --- a/user/strongswan/APKBUILD +++ b/user/strongswan/APKBUILD @@ -3,8 +3,7 @@ # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=strongswan pkgver=5.7.1 -_pkgver=${pkgver//_rc/rc} -pkgrel=0 +pkgrel=1 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" url="https://www.strongswan.org/" arch="all" @@ -17,7 +16,7 @@ makedepends="$depends_dev linux-headers python3 sqlite-dev openssl-dev curl-dev gmp-dev libcap-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc" -source="https://download.strongswan.org/$pkgname-$_pkgver.tar.bz2 +source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch 1001-charon-add-optional-source-and-remote-overrides-for-.patch 1002-vici-send-certificates-for-ike-sa-events.patch @@ -26,7 +25,6 @@ source="https://download.strongswan.org/$pkgname-$_pkgver.tar.bz2 strongswan.initd charon.initd " -builddir="$srcdir/$pkgname-$_pkgver" # secfixes: # 5.7.1-r0: diff --git a/user/strongswan/strongswan.pre-install b/user/strongswan/strongswan.pre-install index da43ede66..71663f7d2 100644 --- a/user/strongswan/strongswan.pre-install +++ b/user/strongswan/strongswan.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S ipsec 2>/dev/null -adduser -S -D -H -h /var/empty -s /sbin/nologin -G ipsec -g ipsec ipsec 2>/dev/null +groupadd -r ipsec 2>/dev/null +useradd -c ipsec -s /sbin/nologin -g ipsec \ + -m -d /var/empty -r ipsec 2>/dev/null exit 0 |