summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD8
-rw-r--r--fix_file_eof.patch24
3 files changed, 35 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b6aa26151139..8ef2aae9deee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
pkgbase = ike
pkgdesc = Shrew Soft VPN client for Linux
pkgver = 2.2.1
- pkgrel = 7
+ pkgrel = 8
url = http://www.shrew.net
arch = i686
arch = x86_64
+ arch = aarch64
license = BSD
makedepends = cmake
depends = openssl
@@ -16,9 +17,13 @@ pkgbase = ike
source = iked.service
source = openssl-1.1.0.patch
source = cmake-threadlib.patch
+ source = fix_double_free.patch
+ source = fix_file_eof.patch
md5sums = 3dac18a2da5809ccb38c50cd4a455897
md5sums = 3cb3ff3b663805f76be1efd527ae436c
md5sums = 57348fe9112555c0204709c1716e5fff
md5sums = 4c823bae9e006cf7bfb11fa633a59837
+ md5sums = 57f7f50b68020b5df6d54288757249c1
+ md5sums = 05e75984d6e8982859339fd2a42d43a1
pkgname = ike
diff --git a/PKGBUILD b/PKGBUILD
index b24adc4b1647..8386e5cfe39f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,22 @@
pkgname=ike
pkgver=2.2.1
-pkgrel=7
+pkgrel=8
pkgdesc='Shrew Soft VPN client for Linux'
-arch=(i686 x86_64)
+arch=(i686 x86_64 aarch64)
url='http://www.shrew.net'
license=(BSD)
depends=(openssl ncurses libedit)
makedepends=(cmake)
optdepends=(openldap)
backup=(etc/iked.conf)
-source=("http://www.shrew.net/download/ike/ike-$pkgver-release.tgz" iked.service openssl-1.1.0.patch cmake-threadlib.patch fix_double_free.patch)
+source=("http://www.shrew.net/download/ike/ike-$pkgver-release.tgz" iked.service openssl-1.1.0.patch cmake-threadlib.patch fix_double_free.patch fix_file_eof.patch)
md5sums=('3dac18a2da5809ccb38c50cd4a455897'
'3cb3ff3b663805f76be1efd527ae436c'
'57348fe9112555c0204709c1716e5fff'
'4c823bae9e006cf7bfb11fa633a59837'
'57f7f50b68020b5df6d54288757249c1'
+ '05e75984d6e8982859339fd2a42d43a1'
)
prepare () {
@@ -27,6 +28,7 @@ prepare () {
patch -p1 -i "$srcdir/openssl-1.1.0.patch"
patch -p1 -i "$srcdir/cmake-threadlib.patch"
patch -p1 -i "$srcdir/fix_double_free.patch"
+ patch -p1 -i "$srcdir/fix_file_eof.patch"
sed -i 's/define "parser_class_name"/define parser_class_name/' ./source/iked/conf.parse.yy
}
diff --git a/fix_file_eof.patch b/fix_file_eof.patch
new file mode 100644
index 000000000000..172ef7427673
--- /dev/null
+++ b/fix_file_eof.patch
@@ -0,0 +1,24 @@
+diff --git a/old/source/libike/manager.file.cpp b/new/source/libike/manager.file.cpp
+index 42d2938..08f7c9b 100644
+--- a/source/libike/manager.file.cpp
++++ b/source/libike/manager.file.cpp
+@@ -208,8 +208,8 @@ bool _CONFIG_MANAGER::file_vpn_load( CONFIG & config, const char * path, bool sa
+
+ while( true )
+ {
+- char next;
+- char type;
++ int next;
++ int type;
+ BDATA name;
+ BDATA data;
+
+@@ -410,7 +410,7 @@ bool _CONFIG_MANAGER::file_vpn_del( CONFIG & config )
+
+ bool read_line_pcf( FILE * fp, BDATA & name, BDATA & data )
+ {
+- char next;
++ int next;
+ BDATA line;
+
+ name.del();