#1 1.5-2 - Fix GCC 9 buildability issue
Closed 6 months ago by jpokorny. Opened 9 months ago by jpokorny.
rpms/ jpokorny/kronosnet common-fix-gcc9-buildability  into  master

file added
+28

@@ -0,0 +1,28 @@ 

+ From 97924ac12d8da26b61d3bc3ab90fbd86b0b58e72 Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>

+ Date: Thu, 24 Jan 2019 14:54:24 +0100

+ Subject: [PATCH] [common] fix not reporting a true dlinfo error cause

+ MIME-Version: 1.0

+ Content-Type: text/plain; charset=UTF-8

+ Content-Transfer-Encoding: 8bit

+ 

+ This was automatically caught with GCC 9

+ ("'%s' directive argument is null").

+ 

+ Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

+ ---

+  libknet/common.c | 1 +

+  1 file changed, 1 insertion(+)

+ 

+ diff --git a/libknet/common.c b/libknet/common.c

+ index 957b8ab3..52563dde 100644

+ --- a/libknet/common.c

+ +++ b/libknet/common.c

+ @@ -82,6 +82,7 @@ static void *open_lib(knet_handle_t knet_h, const char *libname, int extra_flags

+  		/*

+  		 * should we dlclose and return error?

+  		 */

+ +		error = dlerror();

+  		log_warn(knet_h, KNET_SUB_COMMON, "unable to dlinfo %s: %s",

+  			 libname, error);

+  	} else {

file modified
+10 -3

@@ -74,10 +74,11 @@ 

  Name: kronosnet

  Summary: Multipoint-to-Multipoint VPN daemon

  Version: 1.5

- Release: 1%{?dist}

+ Release: 2%{?dist}

  License: GPLv2+ and LGPLv2+

  URL: http://www.kronosnet.org

  Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz

+ Patch: https://github.com/kronosnet/kronosnet/pull/195/commits/97924ac12d8da26b61d3bc3ab90fbd86b0b58e72.patch#/gcc9-fix.patch

  

  

  # Build dependencies

@@ -119,8 +120,12 @@ 

  BuildRequires: libtool

  %endif

  

+ # "git am" patch application

+ BuildRequires: git

+ 

  %prep

- %setup -q -n %{name}-%{version}

+ %global __scm git_am

+ %autosetup -n %{name}-%{version}

  

  %build

  %if %{with runautogen}

@@ -479,6 +484,8 @@ 

  %endif

  

  %changelog

+ * Thu Jan 24 2019 Jan Pokorný <jpokorny+rpm-kronosnet@fedoraproject.org> - 1.5-2

+ - Fix GCC 9 buildability issue

+ 

  * Mon Nov 26 2018 Madison Kelly <mkelly@alteeve.ca> - 1.5-1

  - Updated to upstream release v1.5.

- 

no initial comment

This patch was merged into upstream master on 2019-01-24, so is included in current 1.7 release. Patch no longer required.

https://github.com/kronosnet/kronosnet/pull/195/commits/97924ac12d8da26b61d3bc3ab90fbd86b0b58e72

Could maintainer or submitter please close this PR? Thanks.

Sure, indeed, the fixes were propagated back through the
right = upstream direction. Strange I haven't heard back from
the maintainer at the time.

Pull-Request has been closed by jpokorny

6 months ago