commit 164e823cd9a130a4ea3b6d4d397a01a6c60ae913
Author: Jan Rękorajski <[email protected]>
Date: Sun Oct 17 22:13:04 2021 +0200
- fix linking with gcc 10+, rebuild with openssl 3.0.0, rel 4
gcc10.patch | 26 ++++++++++++++++++++++++++
kannel.spec | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/kannel.spec b/kannel.spec
index 4f574c4..59ad3d2 100644
--- a/kannel.spec
+++ b/kannel.spec
@@ -10,7 +10,7 @@ Summary: SMS/WAP gateway
Summary(pl.UTF-8): Bramka WAP oraz SMS
Name: kannel
Version: 1.4.5
-Release: 3
+Release: 4
License: BSD-like (see COPYING)
Group: Networking/Daemons
Source0:
http://www.kannel.org/download/%{version}/gateway-%{version}.tar.gz
@@ -21,6 +21,7 @@ Source3: %{name}.conf
Patch0: %{name}-bison.patch
Patch1: %{name}-openssl-1.1.0.patch
Patch2: %{name}-parallel-build.patch
+Patch3: gcc10.patch
URL: http://www.kannel.org/
BuildRequires: ImageMagick
BuildRequires: autoconf
@@ -88,6 +89,7 @@ Statyczna biblioteka %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
cp -f /usr/share/automake/config.sub .
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..ce8092a
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,26 @@
+diff -ur gateway-1.4.5/gw/wap_push_ota.c gateway-1.4.5-gcc10/gw/wap_push_ota.c
+--- gateway-1.4.5/gw/wap_push_ota.c 2018-01-17 10:24:38.000000000 +0100
++++ gateway-1.4.5-gcc10/gw/wap_push_ota.c 2021-10-17 22:08:54.582360839
+0200
+@@ -113,7 +113,7 @@
+
+ static List *ota_queue = NULL;
+
+-wap_dispatch_func_t *dispatch_to_wsp;
++extern wap_dispatch_func_t *dispatch_to_wsp;
+ wap_dispatch_func_t *dispatch_to_wsp_unit;
+
+ /**************************************************************************
+diff -ur gateway-1.4.5/wap/wtp_init.c gateway-1.4.5-gcc10/wap/wtp_init.c
+--- gateway-1.4.5/wap/wtp_init.c 2018-01-17 10:24:38.000000000 +0100
++++ gateway-1.4.5-gcc10/wap/wtp_init.c 2021-10-17 22:08:13.404881915 +0200
+@@ -100,8 +100,8 @@
+ */
+ static enum { limbo, running, terminating } initiator_run_status = limbo;
+
+-static wap_dispatch_func_t *dispatch_to_wdp;
+-static wap_dispatch_func_t *dispatch_to_wsp;
++extern wap_dispatch_func_t *dispatch_to_wdp;
++extern wap_dispatch_func_t *dispatch_to_wsp;
+
+ /*
+ * This is a timer 'tick'. All timer values multiplies of this value.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kannel.git/commitdiff/164e823cd9a130a4ea3b6d4d397a01a6c60ae913
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
