summaryrefslogtreecommitdiff
path: root/security/lasso/patches
diff options
context:
space:
mode:
Diffstat (limited to 'security/lasso/patches')
-rw-r--r--security/lasso/patches/patch-aa22
-rw-r--r--security/lasso/patches/patch-ba14
-rw-r--r--security/lasso/patches/patch-bb70
-rw-r--r--security/lasso/patches/patch-bc13
-rw-r--r--security/lasso/patches/patch-bd25
-rw-r--r--security/lasso/patches/patch-ca133
-rw-r--r--security/lasso/patches/patch-cb74
-rw-r--r--security/lasso/patches/patch-cc77
-rw-r--r--security/lasso/patches/patch-cd9
9 files changed, 0 insertions, 437 deletions
diff --git a/security/lasso/patches/patch-aa b/security/lasso/patches/patch-aa
deleted file mode 100644
index f7dd6012743..00000000000
--- a/security/lasso/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/07/06 22:01:34 joerg Exp $
-
---- lasso/registry.c.orig 2010-05-31 15:45:21.000000000 +0200
-+++ lasso/registry.c
-@@ -116,7 +116,7 @@ guint lasso_registry_direct_mapping_hash
- {
- return g_direct_hash((void*)(record->from_namespace
- ^ record->from_name
-- ^ record->to_namespace));
-+ ^ (size_t)record->to_namespace));
- }
-
- /**
-@@ -129,7 +129,7 @@ guint lasso_registry_direct_mapping_hash
- */
- guint lasso_registry_functional_mapping_hash(LassoRegistryFunctionalMappingRecord *record)
- {
-- return g_direct_hash((void*)(record->from_namespace ^ record->to_namespace));
-+ return g_direct_hash((void*)(record->from_namespace ^ (size_t)record->to_namespace));
- }
-
- /**
diff --git a/security/lasso/patches/patch-ba b/security/lasso/patches/patch-ba
deleted file mode 100644
index acc47a0c18e..00000000000
--- a/security/lasso/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2009/04/09 03:23:55 manu Exp $
---- configure.ac.orig 2008-07-22 12:46:24.000000000 +0000
-+++ configure.ac 2009-03-01 06:41:53.000000000 +0000
-@@ -791,9 +791,9 @@
- if test "z$PKG_CONFIG_PATH" != "z"; then
- export PKG_CONFIG_PATH
- fi
-
--PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl)
-+PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6)
-
- AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for WSF-Auth])
- if test "x$enable_wsf" = "xyes"; then
- if test "$with_sasl2" != "no" && test "$with_sasl2" != "yes"
diff --git a/security/lasso/patches/patch-bb b/security/lasso/patches/patch-bb
deleted file mode 100644
index 388bdcf2c3e..00000000000
--- a/security/lasso/patches/patch-bb
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2009/05/26 05:26:00 manu Exp $
---- configure.orig 2009-04-05 09:25:04.000000000 +0200
-+++ configure 2009-04-05 09:25:48.000000000 +0200
-@@ -15388,14 +15388,14 @@
- if test -n "$LASSO_CFLAGS"; then
- pkg_cv_LASSO_CFLAGS="$LASSO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
-+ pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
- else
- pkg_failed=yes
- fi
- fi
-@@ -15406,14 +15406,14 @@
- if test -n "$LASSO_LIBS"; then
- pkg_cv_LASSO_LIBS="$LASSO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
-+ pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
- else
- pkg_failed=yes
- fi
- fi
-@@ -15430,16 +15430,16 @@
- else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
-+ LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
- else
-- LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
-+ LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LASSO_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
-
- $LASSO_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
-@@ -15448,9 +15448,9 @@
- Alternatively, you may set the environment variables LASSO_CFLAGS
- and LASSO_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
-+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
-
- $LASSO_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
diff --git a/security/lasso/patches/patch-bc b/security/lasso/patches/patch-bc
deleted file mode 100644
index 45b1ac7cc80..00000000000
--- a/security/lasso/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.3 2009/07/06 22:01:34 joerg Exp $
-
---- lasso/xml/tools.c.orig 2009-03-27 17:12:48.000000000 +0100
-+++ lasso/xml/tools.c
-@@ -1210,7 +1210,7 @@ is_base64(const char *message)
- const char *c;
-
- c = message;
-- while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
-+ while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
- while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
-
- if (*c == 0)
diff --git a/security/lasso/patches/patch-bd b/security/lasso/patches/patch-bd
deleted file mode 100644
index ce3d6879426..00000000000
--- a/security/lasso/patches/patch-bd
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-bd,v 1.3 2009/07/06 22:01:34 joerg Exp $
-
---- lasso/xml/xml.c.orig 2009-03-27 17:12:48.000000000 +0100
-+++ lasso/xml/xml.c
-@@ -1554,8 +1554,9 @@ lasso_node_new_from_xmlNode(xmlNode *xml
- }
- }
- }
--
-- node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
-+ if (typename) {
-+ node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
-+ }
- lasso_release(typename);
-
- return node;
-@@ -1592,7 +1593,7 @@ is_base64(const char *message)
- const char *c;
-
- c = message;
-- while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
-+ while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
- while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
-
- if (*c == 0)
diff --git a/security/lasso/patches/patch-ca b/security/lasso/patches/patch-ca
deleted file mode 100644
index 8592d58baae..00000000000
--- a/security/lasso/patches/patch-ca
+++ /dev/null
@@ -1,133 +0,0 @@
-$NetBSD: patch-ca,v 1.2 2009/12/01 08:49:46 manu Exp $
---- lasso/saml-2.0/profile.c.orig 2009-03-27 17:12:48.000000000 +0100
-+++ lasso/saml-2.0/profile.c 2009-11-30 20:19:47.000000000 +0100
-@@ -49,5 +49,5 @@
- static char* lasso_saml20_profile_build_artifact(LassoProvider *provider);
- static void remove_all_signatures(LassoNode *node);
--static char * lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign);
-+static int lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign, char **query);
-
- /*
-@@ -1014,36 +1014,41 @@
- * Return value: a newly allocated string containing the query string if successfull, NULL otherwise.
- */
--static char *
--lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign) {
-+static int
-+lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign, char **query) {
- char *unsigned_query = NULL;
- char *result = NULL;
-+ int rc = 0;
-
-- g_return_val_if_fail(LASSO_IS_NODE(msg), NULL);
-+ lasso_bad_param(PROFILE, profile);
-+ lasso_bad_param(NODE, msg);
-
- unsigned_query = lasso_node_build_query(msg);
- if (profile->msg_relayState) {
-- char *query = unsigned_query;
-- xmlChar *encoded_relayState;
-- if (strlen(profile->msg_relayState) < 81) {
-- encoded_relayState = xmlURIEscape((xmlChar*)profile->msg_relayState);
-- if (encoded_relayState != NULL) {
-- unsigned_query = g_strdup_printf("%s&RelayState=%s", query,
-- (char*)encoded_relayState);
-- lasso_release_string(query);
-- lasso_release_xml_string(encoded_relayState);
-- }
-- } else {
-- g_warning("Refused to encode a RelayState of more than 80 bytes, #3.4.3 of"
-- " saml-bindings-2.0-os");
-+ unsigned_query = lasso_url_add_parameters(unsigned_query, 1, "RelayState", profile->msg_relayState, NULL);
-+
-+ if (strlen(profile->msg_relayState) > 80) {
-+ g_warning("Encoded a RelayState of more than 80 bytes, see #3.4.3 of saml-bindings-2.0-os");
- }
- }
- if (sign && lasso_flag_add_signature) {
-+ LassoServer *server = profile->server;
-+ goto_cleanup_if_fail_with_rc (LASSO_IS_SERVER(server),
-+ LASSO_PROFILE_ERROR_MISSING_SERVER);
-+ goto_cleanup_if_fail_with_rc (
-+ profile->server->signature_method != LASSO_SIGNATURE_TYPE_NONE &&
-+ profile->server->private_key,
-+ LASSO_DS_ERROR_PRIVATE_KEY_LOAD_FAILED);
-+
- result = lasso_query_sign(unsigned_query, profile->server->signature_method,
- profile->server->private_key);
-- lasso_release_string(unsigned_query);
-+ lasso_transfer_string(*query, result);
- } else {
-- result = unsigned_query;
-+ lasso_transfer_string(*query, unsigned_query);
- }
-- return result;
-+cleanup:
-+ lasso_release_string(unsigned_query);
-+ lasso_release_string(result);
-+ return rc;
-+
- }
-
-@@ -1054,8 +1059,13 @@
- if (node == NULL)
- return;
-+
- klass = LASSO_NODE_GET_CLASS(node);
-- if (klass->node_data->sign_type_offset != 0) {
-- G_STRUCT_MEMBER(LassoSignatureType, node,klass->node_data->sign_type_offset) =
-- LASSO_SIGNATURE_TYPE_NONE;
-+ /* follow the class parenting chain */
-+ while (klass && LASSO_IS_NODE_CLASS(klass)) {
-+ if (klass && klass->node_data && klass->node_data->sign_type_offset != 0) {
-+ G_STRUCT_MEMBER(LassoSignatureType, node, klass->node_data->sign_type_offset) =
-+ LASSO_SIGNATURE_TYPE_NONE;
-+ }
-+ klass = g_type_class_peek_parent(klass);
- }
- }
-@@ -1097,4 +1107,17 @@
- }
-
-+/**
-+ * lasso_saml20_profile_build_http_redirect:
-+ * @profile: a #LassoProfile object
-+ * @msg: a #LassoNode object representing a SAML 2.0 message
-+ * @must_sign: wheter to sign the query message using query signatures
-+ * @url: the URL where the query is targeted
-+ *
-+ * Build an HTTP URL with a query-string following the SAML 2.0 HTTP-Redirect binding rules,
-+ * eventually sign it. Any signature at the message level is removed.
-+ *
-+ * Return value: 0 if successful, an error code otherwise.
-+ */
-+
- gint
- lasso_saml20_profile_build_http_redirect(LassoProfile *profile,
-@@ -1103,12 +1126,17 @@
- const char *url)
- {
-- char *query;
-+ char *query = NULL;
-+ int rc = 0;
-
- if (url == NULL) {
- return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL);
- }
-+ /* remove XML signature */
-+ remove_signature(msg);
- /* No signature on the XML message */
-- remove_all_signatures(msg);
-- query = lasso_saml20_profile_export_to_query(profile, msg, must_sign);
-+ rc = lasso_saml20_profile_export_to_query(profile, msg, must_sign, &query);
-+ if (rc)
-+ return rc;
-+
- lasso_assign_new_string(profile->msg_url, lasso_concat_url_query(url, query));
- lasso_release(profile->msg_body);
-@@ -1317,4 +1345,5 @@
- lasso_release(idx);
- }
-+ /* remove signature at the message level */
- rc = lasso_saml20_profile_build_http_redirect(profile, msg, must_sign, url);
- lasso_release(url);
diff --git a/security/lasso/patches/patch-cb b/security/lasso/patches/patch-cb
deleted file mode 100644
index 7f91cc07faf..00000000000
--- a/security/lasso/patches/patch-cb
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-cb,v 1.3 2009/12/01 08:49:46 manu Exp $
---- lasso/xml/tools.c.orig 2009-11-30 18:38:05.000000000 +0100
-+++ lasso/xml/tools.c 2009-11-30 18:39:45.000000000 +0100
-@@ -1492,2 +1492,70 @@
- return result;
- }
-+
-+
-+/**
-+ * lasso_url_add_parameters:
-+ * @url: the original URL
-+ * @free: whether to free the URL parameter
-+ * @...: pairs of strings, key, value, followed by NULL
-+ *
-+ * Iterate over all pairs of key,value, and concatenate them to @url encoded as "&key=value", where
-+ * key and value are url-encoded.
-+ * If free is true and at least one pair was given, url is freed. If url is NULL, the first
-+ * ampersand is omitted.
-+ *
-+ * Return value: a newly allocated string, or url.
-+ */
-+char*
-+lasso_url_add_parameters(char *url,
-+ gboolean free, ...)
-+{
-+ char *old_url = url, *new_url;
-+ xmlChar *encoded_key, *encoded_value;
-+ int rc = 0;
-+ va_list ap;
-+
-+ va_start(ap, free);
-+
-+ while (1) {
-+ char *key;
-+ char *value;
-+
-+ key = va_arg(ap, char*);
-+ if (! key) {
-+ break;
-+ }
-+ encoded_key = xmlURIEscapeStr((xmlChar*)key, NULL);
-+ goto_cleanup_if_fail_with_rc(encoded_key, 0);
-+
-+ value = va_arg(ap, char*);
-+ if (! value) {
-+ message(G_LOG_LEVEL_CRITICAL, "lasso_url_add_parameter: key without a value !!");
-+ break;
-+ }
-+ encoded_value = xmlURIEscapeStr((xmlChar*)value, NULL);
-+ goto_cleanup_if_fail_with_rc(encoded_value, 0);
-+
-+ if (old_url) {
-+ new_url = g_strdup_printf("%s&%s=%s", old_url, (char*)encoded_key, (char*)encoded_value);
-+ } else {
-+ new_url = g_strdup_printf("%s=%s", (char*)encoded_key, (char*)encoded_value);
-+ }
-+ if (old_url != url) {
-+ lasso_release_string(old_url);
-+ }
-+ old_url = new_url;
-+
-+ lasso_release_xml_string(encoded_key);
-+ lasso_release_xml_string(encoded_value);
-+ }
-+cleanup:
-+ va_end(ap);
-+ if (free && new_url != url) {
-+ lasso_release(url);
-+ }
-+ lasso_release_xml_string(encoded_key);
-+
-+ return new_url;
-+}
-+
diff --git a/security/lasso/patches/patch-cc b/security/lasso/patches/patch-cc
deleted file mode 100644
index c6466cda4db..00000000000
--- a/security/lasso/patches/patch-cc
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2009/12/01 08:49:46 manu Exp $
---- lasso/utils.h.orig 2009-11-30 18:54:46.000000000 +0100
-+++ lasso/utils.h 2009-11-30 19:31:22.000000000 +0100
-@@ -336,4 +336,73 @@
- g_return_val_if_fail(name != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
-
-+/**
-+ * The following macros are made to create some formalism for function's cleanup code.
-+ *
-+ * The exit label should be called 'cleanup'. And for functions returning an integer error code, the
-+ * error code should be named 'rc' and 'return rc;' should be the last statement of the function.
-+ */
-+
-+/**
-+ * goto_cleanup_with_rc:
-+ * @rc_value: integer return value
-+ *
-+ * This macro jump to the 'cleanup' label and set the return value to @rc_value.
-+ *
-+ */
-+#define goto_cleanup_with_rc(rc_value) \
-+ {\
-+ rc = (rc_value); \
-+ goto cleanup; \
-+ }
-+
-+/**
-+ * goto_cleanup_if_fail:
-+ * @condition: a boolean condition
-+ *
-+ * Jump to the 'cleanup' label if the @condition is FALSE.
-+ *
-+ */
-+#define goto_cleanup_if_fail(condition) \
-+ {\
-+ if (! (condition) ) {\
-+ goto cleanup; \
-+ } \
-+ }
-+
-+/**
-+ * goto_cleanup_if_fail_with_rc:
-+ * @condition: a boolean condition
-+ * @rc_value: integer return value
-+ *
-+ * Jump to the 'cleanup' label if the @condition is FALSE and set the return value to
-+ * @rc_value.
-+ *
-+ */
-+#define goto_cleanup_if_fail_with_rc(condition, rc_value) \
-+ {\
-+ if (! (condition) ) {\
-+ rc = (rc_value); \
-+ goto cleanup; \
-+ } \
-+ }
-+
-+/**
-+ * goto_cleanup_if_fail_with_rc_with_warning:
-+ * @condition: a boolean condition
-+ * @rc_value: integer return value
-+ *
-+ * Jump to the 'cleanup' label if the @condition is FALSE and set the return value to
-+ * @rc_value. Also emit a warning, showing the condition and the return value.
-+ *
-+ */
-+#define goto_cleanup_if_fail_with_rc_with_warning(condition, rc_value) \
-+ {\
-+ if (! (condition) ) {\
-+ g_warning("%s failed, returning %s", __STRING(condition), __STRING(rc_value));\
-+ rc = (rc_value); \
-+ goto cleanup; \
-+ } \
-+ }
-+
- #define goto_exit_with_rc(rc_value) \
- {\
diff --git a/security/lasso/patches/patch-cd b/security/lasso/patches/patch-cd
deleted file mode 100644
index 8b8ac3821bb..00000000000
--- a/security/lasso/patches/patch-cd
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2009/12/01 08:49:46 manu Exp $
---- lasso/xml/private.h.orig 2009-11-30 19:54:53.000000000 +0100
-+++ lasso/xml/private.h 2009-11-30 19:55:04.000000000 +0100
-@@ -214,4 +214,5 @@
-
- char * lasso_get_relaystate_from_query(const char *query);
-+char * lasso_url_add_parameters(char *url, gboolean free, ...);
-
- #ifdef __cplusplus