From a888ed7792aa3b35215cb92de644edee16126fbd Mon Sep 17 00:00:00 2001 From: John Dennis Date: Wed, 24 Feb 2016 10:15:32 -0500 Subject: [PATCH] Upgrade to upstream 2.5.1 release See Changelog for details, mostly bugs fixes, most signficant is proper support of SHA-2 Resolves: #1295472 Resolves: #1303573 Add java_binding_lasso_log.patch to fix "make check" failure during rpmbuild upstream commit d8e3ae8 --- .gitignore | 1 + java_binding_lasso_log.patch | 51 ++++++++++++++++++++++++++++++++++++ lasso.spec | 17 ++++++++++-- sources | 2 +- 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 java_binding_lasso_log.patch diff --git a/.gitignore b/.gitignore index 34ac5d9..98f569b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /lasso-2.4.0.tar.gz /lasso-2.4.1.tar.gz /lasso-2.5.0.tar.gz +/lasso-2.5.1.tar.gz diff --git a/java_binding_lasso_log.patch b/java_binding_lasso_log.patch new file mode 100644 index 0000000..23f6993 --- /dev/null +++ b/java_binding_lasso_log.patch @@ -0,0 +1,51 @@ +commit d8e3ae85044a23424e8fcccc4af2ce7ce883ef74 +Author: John Dennis +Date: Tue Feb 23 20:00:45 2016 -0500 + + add inline implementation of lasso_log + + lasso_log is a private function of lasso and as such cannot be + referenced by the loader. + + This is equivalent to commit e0bda691 in the PHP binding which + exhibited the same problem. + + lasso_log is referenced in jobject_to_gobject() because of + lasso_assign_gobject macro, which includes the lasso_release_gobject + macro which invokes the message macro which expands to lasso_log. + + License: MIT + Signed-off-by: John Dennis + +diff --git a/bindings/java/wrapper_top.c b/bindings/java/wrapper_top.c +index 54bdeef..29c2014 100644 +--- a/bindings/java/wrapper_top.c ++++ b/bindings/java/wrapper_top.c +@@ -6,6 +6,27 @@ + #include "com_entrouvert_lasso_LassoJNI.h" + #include + #include "../ghashtable.h" ++ ++#if defined(__GNUC__) ++# define lasso_log(level, filename, line, function, format, args...) \ ++ g_log("Lasso", level, "%s:%i:%s" format, filename, line, function, ##args) ++#elif defined(HAVE_VARIADIC_MACROS) ++# define lasso_log(level, format, line, function, ...) \ ++ g_log("Lasso", leve, "%s:%i:%s" format, filename, line, function, __VA_ARGS__) ++#else ++static inline void lasso_log(GLogLevelFlags level, const char *filename, ++ int line, const char *function, const char *format, ...) ++{ ++ va_list ap; ++ char s[1024]; ++ va_start(ap, format); ++ g_vsnprintf(s, 1024, format, ap); ++ va_end(ap); ++ g_log("Lasso", level, "%s:%i:%s %s", filename, line, function, s); ++} ++#define lasso_log lasso_log ++#endif ++ + #include "../../lasso/utils.h" + #include "../utils.c" + #include "../../lasso/backward_comp.h" diff --git a/lasso.spec b/lasso.spec index e77fe13..6ae9a1b 100644 --- a/lasso.spec +++ b/lasso.spec @@ -14,11 +14,14 @@ Summary: Liberty Alliance Single Sign On Name: lasso -Version: 2.5.0 -Release: 2%{?dist} +Version: 2.5.1 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz + +patch1: java_binding_lasso_log.patch + %if %{with_wsf} BuildRequires: cyrus-sasl-devel %endif @@ -104,6 +107,7 @@ library. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b java_binding_lasso_log %build LDFLAGS="${LDFLAGS} -fPIC" @@ -218,6 +222,15 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name} %endif %changelog +* Mon Feb 22 2016 John Dennis - 2.5.1-1 +- Upgrade to upstream 2.5.1 release + See Changelog for details, mostly bugs fixes, + most signficant is proper support of SHA-2 + Resolves: #1295472 + Resolves: #1303573 +- Add java_binding_lasso_log.patch to fix "make check" failure during rpmbuild + upstream commit d8e3ae8 + * Thu Feb 04 2016 Fedora Release Engineering - 2.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index d675e0b..2ddb993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -197c980660dba3eb5984455b9250335c lasso-2.5.0.tar.gz +f943f3ed67fabad11c6bad1ab615398f lasso-2.5.1.tar.gz