commit f774a5f66023bbecdd8b46624f1481d0e030ad96
Author: Jakub Bogusz <[email protected]>
Date: Sun Feb 5 13:55:19 2017 +0100
- updated to 2.5.1
- removed obsolete patches
...-generators-for-parsing-of-integer-values.patch | 38 --------
0001-Fix-java-version-detection.patch | 26 -----
...ix-liberal-use-of-casting-for-the-SNIPPET.patch | 108 ---------------------
lasso.spec | 20 ++--
4 files changed, 7 insertions(+), 185 deletions(-)
---
diff --git a/lasso.spec b/lasso.spec
index 15db7f7..65da653 100644
--- a/lasso.spec
+++ b/lasso.spec
@@ -6,7 +6,7 @@
%bcond_with wsf # experimental ID-WSF support
%bcond_with tests # build tests
%bcond_without java # Java bindings
-%bcond_without php # PHP bindings
+%bcond_without php # PHP 5 bindings (not ready for PHP 7)
%bcond_without perl # Perl bindings
%bcond_without python # Python 2.x bindings
%bcond_without static_libs # static library
@@ -18,20 +18,17 @@
Summary: Liberty Alliance Single Sign On
Summary(pl.UTF-8): Implementacja Liberty Alliance Single Sign On
Name: lasso
-Version: 2.4.0
-Release: 6
+Version: 2.5.1
+Release: 1
License: GPL v2+
Group: Libraries
-Source0: http://dev.entrouvert.org/lasso/%{name}-%{version}.tar.gz
-# Source0-md5: 3d04aaff37c816aa16f2d1bcc2639f27
-Patch1: 0001-Fix-java-version-detection.patch
-Patch2: 0001-Fix-generators-for-parsing-of-integer-values.patch
-Patch3:
0002-xml-xml.c-fix-liberal-use-of-casting-for-the-SNIPPET.patch
+Source0: https://dev.entrouvert.org/lasso/%{name}-%{version}.tar.gz
+# Source0-md5: f943f3ed67fabad11c6bad1ab615398f
URL: http://lasso.entrouvert.org/
BuildRequires: autoconf >= 2.53
BuildRequires: automake >= 1:1.11
%{?with_tests:BuildRequires: check-devel}
-%{?with_wsf:BuildRequires: cyrus-sasl-devel}
+%{?with_wsf:BuildRequires: cyrus-sasl-devel >= 2}
BuildRequires: glib2-devel >= 1:2.17.0
BuildRequires: gtk-doc >= 1.9
BuildRequires: libtool
@@ -53,7 +50,7 @@ BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-Test-Simple
%endif
%if %{with java}
-BuildRequires: jdk
+BuildRequires: jdk >= 1.4
BuildRequires: rpm-javaprov
%endif
%if %{with python}
@@ -164,9 +161,6 @@ On).
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%{__sed} -i -e '
s/OPTIMIZE="-g"/CC="%{__cc}" OPTIMIZE="%{rpmcflags}" INSTALLDIRS=vendor/
diff --git a/0001-Fix-generators-for-parsing-of-integer-values.patch
b/0001-Fix-generators-for-parsing-of-integer-values.patch
deleted file mode 100644
index b346032..0000000
--- a/0001-Fix-generators-for-parsing-of-integer-values.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0caa4e7b254b26d418048191aa588c6696a55a4d Mon Sep 17 00:00:00 2001
-From: Simo Sorce <[email protected]>
-Date: Thu, 17 Apr 2014 18:10:31 -0400
-Subject: [PATCH 1/2] Fix generators for parsing of integer values
-
-All number types including enums are parse as if they were integers,
-this breaks in many ways, long and int are not the same size in all
-architectures as well as enum may vary in size depening on compiler,
-architecture and optimizations.
-
-Always pass an actual long to PyArg_ParseTuple() and rely on the a
-cast from long to the destination variable type in the following
-assignment.
-
-Signed-off-by: Simo Sorce <[email protected]>
----
- bindings/python/lang.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/python/lang.py b/bindings/python/lang.py
-index
f5c9d36ec6bd4550a8edd4ba93e5f4862bd40139..c695518e5a553738f11d614c9ce98953338408b7
100644
---- a/bindings/python/lang.py
-+++ b/bindings/python/lang.py
-@@ -770,9 +770,9 @@ register_constants(PyObject *d)
- parse_arg = '&value'
- print >> fd, ' %s value;' % type
- elif is_int(m, self.binding_data):
-- parse_format = 'i'
-+ parse_format = 'l'
- parse_arg = '&value'
-- print >> fd, ' %s value;' % type
-+ print >> fd, ' long value;'
- elif is_glist(m) or is_hashtable(m) or is_xml_node(m) or
is_boolean(m):
- parse_format = 'O'
- print >> fd, ' PyObject *cvt_value;'
---
-1.9.0
-
diff --git a/0001-Fix-java-version-detection.patch
b/0001-Fix-java-version-detection.patch
deleted file mode 100644
index 4c2e544..0000000
--- a/0001-Fix-java-version-detection.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8e2b247819b343c12aa29ad8d342f839632ace3c Mon Sep 17 00:00:00 2001
-From: Simo Sorce <[email protected]>
-Date: Mon, 14 Apr 2014 14:19:20 -0400
-Subject: [PATCH] Fix java version detection
-
-Signed-off-by: Simo Sorce <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index
0f32ad3164fb20f179ec1cca0af3f6ab485b8ffd..5668e6f325f8ad2caee1e960ed92f13fffca258f
100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -220,7 +220,7 @@ if test "x$JAVAC" = "xjavac"; then
- dnl If we have a java compiler
- dnl need to change quotes to allow square brackets
- changequote(<<, >>)dnl
-- JAVA_VERSION=`$JAVA -version 2>&1 | $SED -ne 's/java version
"\([^"]*\)".*/\1/p' 2>/dev/null`
-+ JAVA_VERSION=`$JAVA -version 2>&1 | $SED -ne 's/\(openjdk\|java\)
\(full\)*version "\([^"]*\)".*/\3/p' 2>/dev/null`
- changequote([, ])dnl
- dnl If no java version found, perphas it is a kaffee environment...
- if test "x$JAVA_VERSION" = x; then
---
-1.8.5.3
-
diff --git a/0002-xml-xml.c-fix-liberal-use-of-casting-for-the-SNIPPET.patch
b/0002-xml-xml.c-fix-liberal-use-of-casting-for-the-SNIPPET.patch
deleted file mode 100644
index e7b356c..0000000
--- a/0002-xml-xml.c-fix-liberal-use-of-casting-for-the-SNIPPET.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 53c4298876331c1312a9a0f4dbe6eb28b2dbea59 Mon Sep 17 00:00:00 2001
-From: Benjamin Dauvergne <[email protected]>
-Date: Thu, 24 Apr 2014 01:30:49 +0200
-Subject: [PATCH 2/2] xml/xml.c: fix liberal use of casting for the
- SNIPPET_INTEGER and SNIPPET_BOOLEAN case
-
-Some behaviour are also made more explicit like the optional if equals
-to -1 case for integer fields, and the optional if FALSE for boolean
-fields.
----
- lasso/xml/xml.c | 55 ++++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 34 insertions(+), 21 deletions(-)
-
-diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
-index
ba207f552cf5c6a587c1866adecab9f2ac9a339a..4485d47669deb5b15c3f3cbcfec98942bd2edbf6
100644
---- a/lasso/xml/xml.c
-+++ b/lasso/xml/xml.c
-@@ -2717,7 +2717,6 @@ lasso_node_build_xmlNode_from_snippets(LassoNode *node,
LassoNodeClass *class, x
- struct XmlSnippet *snippets, gboolean lasso_dump)
- {
- struct XmlSnippet *snippet;
-- SnippetType type;
- GType g_type;
- xmlNode *t;
- GList *elem;
-@@ -2727,36 +2726,49 @@ lasso_node_build_xmlNode_from_snippets(LassoNode
*node, LassoNodeClass *class, x
-
- for (snippet = snippets; snippet && snippet->name; snippet++) {
- void *value;
-+ int int_value;
-+ gboolean bool_value;
- char *str;
-+ gboolean optional = snippet->type & SNIPPET_OPTIONAL;
-+ gboolean optional_neg = snippet->type & SNIPPET_OPTIONAL_NEG;
-
- if (! snippet->offset && ! (snippet->type & SNIPPET_PRIVATE)) {
- continue;
- }
-- type = snippet->type & 0xff;
-- value = SNIPPET_STRUCT_MEMBER(void *, node, g_type, snippet);
-- str = value;
-- if (lasso_dump == FALSE && snippet->type & SNIPPET_LASSO_DUMP)
-+ if (lasso_dump == FALSE && snippet->type & SNIPPET_LASSO_DUMP) {
- continue;
--
-- if (type == SNIPPET_ATTRIBUTE && snippet->type & SNIPPET_ANY) {
-+ }
-+ if ((snippet->type & 0xff) == SNIPPET_ATTRIBUTE &&
(snippet->type & SNIPPET_ANY)) {
- snippet_any_attribute = snippet;
- continue;
- }
-- if (value == NULL && (!(snippet->type & SNIPPET_BOOLEAN ||
-- snippet->type & SNIPPET_INTEGER) ||
-- snippet->type & SNIPPET_OPTIONAL))
-- continue;
-
-- if (snippet->type & SNIPPET_OPTIONAL_NEG &&
GPOINTER_TO_INT(value) == -1)
-- continue;
-+ // convert input type to string if needed
-+ if (snippet->type & SNIPPET_INTEGER) {
-+ int_value = SNIPPET_STRUCT_MEMBER(int, node, g_type,
snippet);
-+ if (int_value == 0 && optional) {
-+ continue;
-+ }
-+ if (int_value == -1 && optional_neg) {
-+ continue;
-+ }
-+ str = g_strdup_printf("%i", int_value);
-+ } else if (snippet->type & SNIPPET_BOOLEAN) {
-+ bool_value = SNIPPET_STRUCT_MEMBER(gboolean, node,
g_type, snippet);
-+ if (bool_value == FALSE && optional) {
-+ continue;
-+ }
-+ str = bool_value ? "true" : "false";
-+ } else {
-+ value = SNIPPET_STRUCT_MEMBER(void *, node, g_type,
snippet);
-+ if (value == NULL) {
-+ continue;
-+ }
-+ str = value;
-+ }
-
-- /* XXX: not sure it is 64-bits clean */
-- if (snippet->type & SNIPPET_BOOLEAN)
-- str = GPOINTER_TO_INT(value) ? "true" : "false";
-- if (snippet->type & SNIPPET_INTEGER)
-- str = g_strdup_printf("%d", GPOINTER_TO_INT(value));
--
-- switch (type) {
-+ // output type
-+ switch (snippet->type & 0xff) {
- case SNIPPET_ATTRIBUTE:
- if (snippet->ns_name) {
- xmlNsPtr ns;
-@@ -2840,8 +2852,9 @@ lasso_node_build_xmlNode_from_snippets(LassoNode *node,
LassoNodeClass *class, x
- case SNIPPET_UNUSED1:
- g_assert_not_reached();
- }
-- if (snippet->type & SNIPPET_INTEGER)
-+ if (snippet->type & SNIPPET_INTEGER) {
- lasso_release(str);
-+ }
- }
-
- if (snippet_any_attribute) {
---
-1.9.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lasso.git/commitdiff/f774a5f66023bbecdd8b46624f1481d0e030ad96
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
