rcritten pushed to lasso (f21). "New upstream relase 2.4.1 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Mar 25 14:13:36 UTC 2015
>From ad77ebf5c8ac7fef991741e6d095524611a4c983 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo at redhat.com>
Date: Thu, 28 Aug 2014 12:19:10 -0400
Subject: New upstream relase 2.4.1
- Drop patches as they have all been integrated upstream
diff --git a/.gitignore b/.gitignore
index a0ccc8d..7865387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/lasso-2.3.6.tar.gz
/lasso-2.4.0.tar.gz
+/lasso-2.4.1.tar.gz
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 <simo at redhat.com>
-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 <simo at redhat.com>
----
- 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 <simo at redhat.com>
-Date: Mon, 14 Apr 2014 14:19:20 -0400
-Subject: [PATCH] Fix java version detection
-
-Signed-off-by: Simo Sorce <simo at redhat.com>
----
- 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 <bdauvergne at entrouvert.com>
-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
-
diff --git a/lasso.spec b/lasso.spec
index c547478..27a5784 100644
--- a/lasso.spec
+++ b/lasso.spec
@@ -14,8 +14,8 @@
Summary: Liberty Alliance Single Sign On
Name: lasso
-Version: 2.4.0
-Release: 5%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz
@@ -27,10 +27,6 @@ BuildRequires: glib2-devel, swig
BuildRequires: libxml2-devel, xmlsec1-devel, openssl-devel, xmlsec1-openssl-devel
Url: http://lasso.entrouvert.org/
-Patch01: 0001-Fix-java-version-detection.patch
-Patch02: 0001-Fix-generators-for-parsing-of-integer-values.patch
-Patch03: 0002-xml-xml.c-fix-liberal-use-of-casting-for-the-SNIPPET.patch
-
%description
Lasso is a library that implements the Liberty Alliance Single Sign On
standards, including the SAML and SAML2 specifications. It allows to handle
@@ -105,9 +101,6 @@ library.
%prep
%setup -q -n %{name}-%{version}
-%patch01 -p1 -b .java_version
-%patch02 -p1 -b .generators
-%patch03 -p1 -b .xml_casts
%build
./autogen.sh
@@ -216,6 +209,10 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
%endif
%changelog
+* Thu Aug 28 2014 Simo Sorce <simo at redhat.com> - 2.4.1-1
+- New upstream relase 2.4.1
+- Drop patches as they have all been integrated upstream
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 73e262d..fb0c62b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d04aaff37c816aa16f2d1bcc2639f27 lasso-2.4.0.tar.gz
+6507ad5df2c81e1c3e6a4ef803f3d463 lasso-2.4.1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/lasso.git/commit/?h=f21&id=ad77ebf5c8ac7fef991741e6d095524611a4c983
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list