fix_dirent_access_after_closedir.patch

3 files changed, 29 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 831faff1d9f7..df4a7f9918a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = shrew-vpn-client
 	pkgdesc = A portable VPN client for Linux with Qt GUI
 	pkgver = 2.2.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.shrew.net/
 	arch = i686
 	arch = x86_64
@@ -22,11 +22,13 @@ pkgbase = shrew-vpn-client
 	source = iked.conf
 	source = iked.service
 	source = fix-openssl.patch
+	source = fix_dirent_access_after_closedir.patch
 	md5sums = 8fc14ac86771ee693d3950757c84f335
 	md5sums = 5b35a4246eb1b7bd4bfb6780c23d39f2
 	md5sums = 3cfe649578267235d60ab7cfb6fb4c57
 	md5sums = e90d5922d37f9e45515c5754a3a29c73
 	md5sums = c1f793c174db5d7f5c11c8009a967a4d
+	md5sums = cb4720dab4f9cae5aeac1e62abc6348b
 
 pkgname = shrew-vpn-client
 
diff --git a/PKGBUILD b/PKGBUILD
index 10418d427aaf..cd60bafcc545 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=shrew-vpn-client
 pkgver=2.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A portable VPN client for Linux with Qt GUI"
 arch=('i686' 'x86_64')
 url="http://www.shrew.net/"
@@ -17,17 +17,21 @@ source=("http://www.shrew.net/download/ike/ike-$pkgver-release.tbz2"
 	'ikea.desktop'
 	'iked.conf'
 	'iked.service'
-	fix-openssl.patch)
+	fix-openssl.patch
+	fix_dirent_access_after_closedir.patch)
 md5sums=('8fc14ac86771ee693d3950757c84f335'
          '5b35a4246eb1b7bd4bfb6780c23d39f2'
          '3cfe649578267235d60ab7cfb6fb4c57'
          'e90d5922d37f9e45515c5754a3a29c73'
-         'c1f793c174db5d7f5c11c8009a967a4d')
+         'c1f793c174db5d7f5c11c8009a967a4d'
+         'cb4720dab4f9cae5aeac1e62abc6348b')
 
 prepare() {
 
   cd $srcdir/ike
   patch -Np1 -i ../fix-openssl.patch
+  # https://build.opensuse.org/package/view_file/security/ike/fix_dirent_access_after_closedir.patch
+  patch -Np1 -i ../fix_dirent_access_after_closedir.patch
 
 }
 
diff --git a/fix_dirent_access_after_closedir.patch b/fix_dirent_access_after_closedir.patch
new file mode 100644
index 000000000000..e3324f127a66
--- /dev/null
+++ b/fix_dirent_access_after_closedir.patch
@@ -0,0 +1,19 @@
+--- a/source/libike/manager.file.cpp	2019-01-02 00:49:44.450296883 +0100
++++ b/source/libike/manager.file.cpp	2019-01-02 00:52:28.367472254 +0100
+@@ -107,12 +107,14 @@
+ 		found++;

+ 	}

+ 

+-	closedir( dirp );

+-	if( dp == NULL )

++	if( dp == NULL ) {

++		closedir( dirp );

+ 		return false;

++		}

+ 

+ 	config.set_id( dp->d_name );

+ 	index++;

++	closedir( dirp );

+ 

+ 	return file_vpn_load( config );

+