view src/libgsasl-1-fixes.patch @ 2661:3567da505594

json-c update to version 0.10, using github downloads. Squashed commit of the following: commit a93e1e80e4a6b668009bd024923e387f71eff7a3 Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 23:16:59 2012 +0200 Patches for: - missing file - remove check for rpl_* functions commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 19:08:40 2012 +0200 Fixed indentation commit 78b51e08e5174454495b8df547c4bccdc06bef73 Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 01:13:08 2012 +0200 json-c compiles correctly (finally). commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab Author: Thomas Mayer <thomas@residuum.org> Date: Fri Jul 13 22:16:41 2012 +0200 Changes to json-c files according to current MXE standards. commit a533fe5439d56de76c2d3b9d634c597cba94ff52 Author: Thomas Mayer <thomas@residuum.org> Date: Thu Jul 12 22:27:54 2012 +0200 Update to json-c 0.10, and use github repository.
author Thomas Mayer <thomas@residuum.org>
date Tue, 17 Jul 2012 23:18:18 +0200
parents dddd4581f8d3
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001
From: MXE
Date: Mon, 7 Nov 2011 18:01:56 +0100
Subject: [PATCH] use memxor from nettle


diff --git a/gl/memxor.c b/gl/memxor.c
index 7fec454..d9b62cd 100644
--- a/gl/memxor.c
+++ b/gl/memxor.c
@@ -22,7 +22,7 @@
 #include "memxor.h"
 
 void *
-memxor (void *restrict dest, const void *restrict src, size_t n)
+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n)
 {
   char const *s = src;
   char *d = dest;
diff --git a/libgsasl.pc.in b/libgsasl.pc.in
index b0c477d..d8d8ccc 100644
--- a/libgsasl.pc.in
+++ b/libgsasl.pc.in
@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/
 Version: @VERSION@
 Libs: -L${libdir} -lgsasl
 Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@
+Requires.private: nettle
 Cflags: -I${includedir}
-- 
1.7.7