Dist/Tizen: Fix build breaks on GCC 13 06/295106/1 accepted/tizen_unified_dev tizen accepted/tizen/unified/dev/20230726.115523
authorWook Song <wook16.song@samsung.com>
Mon, 3 Jul 2023 02:36:54 +0000 (11:36 +0900)
committerWook Song <wook16.song@samsung.com>
Mon, 3 Jul 2023 02:40:37 +0000 (11:40 +0900)
This patch fixes build breaks on Tizen GCC-13 using temporary
workarounds.

Change-Id: I30a8c645553d37c401328f801a3e42c64094ded8
Signed-off-by: Wook Song <wook16.song@samsung.com>
packaging/0001-Local-Fix-link-error-related-to-tun_fwd_ifnames.patch [new file with mode: 0644]
packaging/openssh.spec

diff --git a/packaging/0001-Local-Fix-link-error-related-to-tun_fwd_ifnames.patch b/packaging/0001-Local-Fix-link-error-related-to-tun_fwd_ifnames.patch
new file mode 100644 (file)
index 0000000..8a32102
--- /dev/null
@@ -0,0 +1,29 @@
+From 3cbc2261df3074491a9595fb55795f18f89816be Mon Sep 17 00:00:00 2001
+From: Wook Song <wook16.song@samsung.com>
+Date: Mon, 3 Jul 2023 11:24:05 +0900
+Subject: [PATCH 1/1] Local: Fix link error related to 'tun_fwd_ifnames'
+
+There is a missing 'extern' keyword for the function 'tun_fwd_ifnames',
+which makes a link error. This local patch fixes this bug.
+
+Signed-off-by: Wook Song <wook16.song@samsung.com>
+---
+ session.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/session.c b/session.c
+index 58826db1..4afcb451 100644
+--- a/session.c
++++ b/session.c
+@@ -141,7 +141,7 @@ extern int startup_pipe;
+ extern void destroy_sensitive_data(void);
+ extern Buffer loginmsg;
+ extern struct sshauthopt *auth_opts;
+-char *tun_fwd_ifnames; /* serverloop.c */
++extern char *tun_fwd_ifnames; /* serverloop.c */
+ /* original command from peer. */
+ const char *original_command = NULL;
+-- 
+2.25.1
+
index 4d0d08d..45dcd47 100644 (file)
@@ -17,6 +17,7 @@ Source12:       sshd.service
 Source13:       sshd.socket
 Source14:       sshd@.service
 Source1001:     openssh.manifest
+Patch0:         0001-Local-Fix-link-error-related-to-tun_fwd_ifnames.patch
 
 BuildRequires:  systemd
 BuildRequires:  autoconf
@@ -55,6 +56,7 @@ also be forwarded over the secure channel.
 
 %prep
 %setup -q 
+%patch0 -p1
 cp %{SOURCE1001} .
 
 %build