summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--0001-gcc9-strncpy.patch21
-rw-r--r--PKGBUILD15
3 files changed, 9 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0e31c28b8809..25802174d9c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = openswan
pkgdesc = Open Source implementation of IPsec for Linux
- pkgver = 2.6.52.3
+ pkgver = 3.0.0
pkgrel = 1
url = https://www.openswan.org
arch = i686
@@ -23,18 +23,13 @@ pkgbase = openswan
backup = etc/ipsec.d/policies/clear-or-private
backup = etc/ipsec.d/policies/private
backup = etc/ipsec.d/policies/private-or-clear
- source = openswan-2.6.52.3.tar.gz::https://github.com/xelerance/Openswan/archive/v2.6.52.3.tar.gz
- source = 0001-gcc9-strncpy.patch
+ source = openswan-3.0.0.tar.gz::https://github.com/xelerance/Openswan/archive/v3.0.0.tar.gz
source = openswan.service
- md5sums = 4330ed6fac51b1ec4835c32573143f56
- md5sums = b54891b73bc62fce51f8ca46c8731882
+ md5sums = d4952668703e28692016c18039c86f97
md5sums = e428e61ba81048eef92475dffa2ffc23
- sha256sums = 2ad80f0ec6cba47d675f999b598480ff3cee81d1c9ef3b7c4634fcbc8047a441
- sha256sums = b30cfd22b14450668ecf798e6117ca6ea07609dabbee6d0ac15ef07dcef11804
+ sha256sums = 69fe7a71e54aaf0ea93b874db4963057c1ff4904b3617b36f2c9be2010c23331
sha256sums = 9f42bc005d4c361b31d41c7186a19ed8dbd1f95be31c16663bd2a1a8da8a29f0
- sha512sums = ab1364365fdd2109f0610d2ea7b56908eb7036cabef4dcaee98361940c6594e69e10e11654eeeba5478a9af864ebaa31898e173b3e430cf084b74e2223f69367
- sha512sums = def41d3c407ef11fef7c53e5293b5b7b4d0d394218caa0ee0b0508a016f9c229dec5569dc013955e3521140a200582e3183198e2aa1dd314d13fd73e6bad415b
+ sha512sums = fda8e4a4d22b2d028475eb05ee0e799ee4cda20bee111ac487fa7045a9d839445b9d90ebbe1b1378058453a8eca7ea76ed131f76744400a7f16aa11e352cb975
sha512sums = a234e97a4fe10fb85a8a1b69d0b55b7c7a4a9ef44c199f876f64bb7290e9f161b20e4c721112e26c6a5636a898a27a36b525aae0944cf6217ff81c36389d5803
pkgname = openswan
-
diff --git a/0001-gcc9-strncpy.patch b/0001-gcc9-strncpy.patch
deleted file mode 100644
index bbce9239cac7..000000000000
--- a/0001-gcc9-strncpy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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() */
diff --git a/PKGBUILD b/PKGBUILD
index 250e7027ac7a..59b27929b93a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
set -u
_pkgname='Openswan'
pkgname="${_pkgname,,}"
-pkgver='2.6.52.3'
+pkgver='3.0.0'
pkgrel='1'
pkgdesc='Open Source implementation of IPsec for Linux'
arch=('i686' 'x86_64')
@@ -30,26 +30,19 @@ _srcdir="${_pkgname}-${pkgver}"
source=(
#"https://download.openswan.org/openswan/openswan-${pkgver}.tar.gz"
"${_srcdir,,}.tar.gz::${_giturl}/archive/v${pkgver}.tar.gz"
- '0001-gcc9-strncpy.patch'
'openswan.service'
)
-md5sums=('4330ed6fac51b1ec4835c32573143f56'
- 'b54891b73bc62fce51f8ca46c8731882'
+md5sums=('d4952668703e28692016c18039c86f97'
'e428e61ba81048eef92475dffa2ffc23')
-sha256sums=('2ad80f0ec6cba47d675f999b598480ff3cee81d1c9ef3b7c4634fcbc8047a441'
- 'b30cfd22b14450668ecf798e6117ca6ea07609dabbee6d0ac15ef07dcef11804'
+sha256sums=('69fe7a71e54aaf0ea93b874db4963057c1ff4904b3617b36f2c9be2010c23331'
'9f42bc005d4c361b31d41c7186a19ed8dbd1f95be31c16663bd2a1a8da8a29f0')
-sha512sums=('ab1364365fdd2109f0610d2ea7b56908eb7036cabef4dcaee98361940c6594e69e10e11654eeeba5478a9af864ebaa31898e173b3e430cf084b74e2223f69367'
- 'def41d3c407ef11fef7c53e5293b5b7b4d0d394218caa0ee0b0508a016f9c229dec5569dc013955e3521140a200582e3183198e2aa1dd314d13fd73e6bad415b'
+sha512sums=('fda8e4a4d22b2d028475eb05ee0e799ee4cda20bee111ac487fa7045a9d839445b9d90ebbe1b1378058453a8eca7ea76ed131f76744400a7f16aa11e352cb975'
'a234e97a4fe10fb85a8a1b69d0b55b7c7a4a9ef44c199f876f64bb7290e9f161b20e4c721112e26c6a5636a898a27a36b525aae0944cf6217ff81c36389d5803')
prepare() {
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 -e 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' -i 'Makefile.inc'