From aa1f149b954eb912bf8628aff989e519b6a180b0 Mon Sep 17 00:00:00 2001
From: qwjyh <urataw421@gmail.com>
Date: Sun, 2 Jun 2024 17:42:47 +0900
Subject: [PATCH] Fix gcc14 porting (pkgrel 2)

* disable -Wincompatible-pointer-types
* upstream should fix these problems
** https://gcc.gnu.org/gcc-14/porting_to.html
** https://wiki.gentoo.org/wiki/Modern_C_porting
---
 .SRCINFO          |  6 +++++-
 PKGBUILD          | 10 +++++++++-
 linux_32bit.patch |  8 ++++++++
 linux_64bit.patch |  8 ++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 linux_32bit.patch
 create mode 100644 linux_64bit.patch

diff --git a/.SRCINFO b/.SRCINFO
index 2a7aa92..4199698 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = softethervpn
 	pkgdesc = Multi-protocol VPN Program from University of Tsukuba
 	pkgver = v4.42_9798
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.softether.org/
 	arch = i686
 	arch = x86_64
@@ -13,11 +13,15 @@ pkgbase = softethervpn
 	depends = zlib
 	source = https://www.softether-download.com/files/softether/v4.42-9798-rtm-2023.06.30-tree/Source_Code/softether-src-v4.42-9798-rtm.tar.gz
 	source = aarch64.patch
+	source = linux_32bit.patch
+	source = linux_64bit.patch
 	source = softethervpn-bridge.service
 	source = softethervpn-client.service
 	source = softethervpn-server.service
 	md5sums = bd70e9ae9a19c3f227c26d731503cc7f
 	md5sums = 8b92f69f9d8d852a3739d0e48bad0454
+	md5sums = 576277be87dd458c8d889d24a0072abe
+	md5sums = 1b3d536da4b9fa9a79f113089c13252e
 	md5sums = 1d54c0065ae8947bd8455b9e2050c1af
 	md5sums = a1134fea991e6e00dc4910b1be16dc73
 	md5sums = b54b4f68d56555ddfffc50c2c399624f
diff --git a/PKGBUILD b/PKGBUILD
index a9b0232..046354b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=softethervpn
 pkgver=v4.42_9798
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi-protocol VPN Program from University of Tsukuba"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h')
 url="https://www.softether.org/"
@@ -12,11 +12,15 @@ license=('Apache')
 depends=('bash' 'openssl' 'zlib')
 source=("https://www.softether-download.com/files/softether/${pkgver//_/-}-rtm-2023.06.30-tree/Source_Code/softether-src-${pkgver//_/-}-rtm.tar.gz"
         'aarch64.patch'
+        'linux_32bit.patch'
+        'linux_64bit.patch'
         'softethervpn-bridge.service'
         'softethervpn-client.service'
         'softethervpn-server.service')
 md5sums=('bd70e9ae9a19c3f227c26d731503cc7f'
          '8b92f69f9d8d852a3739d0e48bad0454'
+         '576277be87dd458c8d889d24a0072abe'
+         '1b3d536da4b9fa9a79f113089c13252e'
          '1d54c0065ae8947bd8455b9e2050c1af'
          'a1134fea991e6e00dc4910b1be16dc73'
          'b54b4f68d56555ddfffc50c2c399624f')
@@ -26,12 +30,16 @@ build(){
   patch -Np1 -i "${srcdir}/aarch64.patch"
 
   if [ "${CARCH}" == "i686" ]; then
+    patch src/makefiles/linux_32bit.mak "${srcdir}/linux_32bit.patch"
     cp src/makefiles/linux_32bit.mak Makefile
   elif [ "${CARCH}" == "x86_64" ]; then
+    patch src/makefiles/linux_64bit.mak "${srcdir}/linux_64bit.patch"
     cp src/makefiles/linux_64bit.mak Makefile
   elif [ "${CARCH}" == "aarch64" ]; then
+    patch src/makefiles/linux_64bit.mak "${srcdir}/linux_64bit.patch"
     cp src/makefiles/linux_64bit.mak Makefile
   elif [ "${CARCH}" == "armv7h" ]; then
+    patch src/makefiles/linux_32bit.mak "${srcdir}/linux_32bit.patch"
     cp src/makefiles/linux_32bit.mak Makefile
   fi
 
diff --git a/linux_32bit.patch b/linux_32bit.patch
new file mode 100644
index 0000000..8dab4ab
--- /dev/null
+++ b/linux_32bit.patch
@@ -0,0 +1,8 @@
+80c80
+< 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+---
+> 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG) -fpermissive
+83c83
+< 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_RELEASE)
+---
+> 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_RELEASE) -fpermissive
diff --git a/linux_64bit.patch b/linux_64bit.patch
new file mode 100644
index 0000000..3fee355
--- /dev/null
+++ b/linux_64bit.patch
@@ -0,0 +1,8 @@
+86c86
+< 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+---
+> 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG) -fpermissive
+89c89
+< 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_RELEASE)
+---
+> 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_RELEASE) -fpermissive