Patchwork [meta-networking,v2] cyrus-sasl: ensure size_t is defined for use by sasl.h

login
register
mail settings
Submitter Mark Asselstine
Date Oct. 30, 2013, 6:45 p.m.
Message ID <1383158754-446-1-git-send-email-mark.asselstine@windriver.com>
Download mbox | patch
Permalink /patch/60821/
State Accepted, archived
Commit 82d1ec9d612a0d1300efa912dd01e20068016705
Headers show

Comments

Mark Asselstine - Oct. 30, 2013, 6:45 p.m.
While making use of the cyrus-sasl library an external application
will most likely include sasl.h which will cause compilation failures
if steps haven't been taken to define size_t. This should not be the
responsibility of the application building against the sasl library
but rather handled already in sasl.h. Here we ensure sasl.h has the
proper includes to have size_t defined before it is used.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---

v2 changes:
* using upstream patch. Posix I believe says to use sys/types.h
  but in any case stddef.h works fine.

* removed PR addition + bump

* added upstream status line

 ...l.h-include-stddef.h-for-size_t-on-NetBSD.patch | 31 ++++++++++++++++++++++
 .../cyrus-sasl/cyrus-sasl_2.1.26.bb                |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
Joe MacDonald - Nov. 1, 2013, 2:27 p.m.
Merged, thanks.
-J.

[[meta-networking][PATCH v2] cyrus-sasl: ensure size_t is defined for use by sasl.h] On 13.10.30 (Wed 14:45) Mark Asselstine wrote:

> While making use of the cyrus-sasl library an external application
> will most likely include sasl.h which will cause compilation failures
> if steps haven't been taken to define size_t. This should not be the
> responsibility of the application building against the sasl library
> but rather handled already in sasl.h. Here we ensure sasl.h has the
> proper includes to have size_t defined before it is used.
> 
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---
> 
> v2 changes:
> * using upstream patch. Posix I believe says to use sys/types.h
>   but in any case stddef.h works fine.
> 
> * removed PR addition + bump
> 
> * added upstream status line
> 
>  ...l.h-include-stddef.h-for-size_t-on-NetBSD.patch | 31 ++++++++++++++++++++++
>  .../cyrus-sasl/cyrus-sasl_2.1.26.bb                |  1 +
>  2 files changed, 32 insertions(+)
>  create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
> 
> diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
> new file mode 100644
> index 0000000..ecbab84
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
> @@ -0,0 +1,31 @@
> +From 92d72789c811b0d55f624a8bac5ccc4412f5996e Mon Sep 17 00:00:00 2001
> +From: Ken Murchison <murch@andrew.cmu.edu>
> +Date: Thu, 20 Dec 2012 18:14:50 -0500
> +Subject: [PATCH] sasl.h: #include <stddef.h> for size_t on NetBSD
> +
> +This patch was imported from git://git.cyrusimap.org/cyrus-sasl
> +commit 67a188693796a14e3a76ac603104807fbbfddfc4
> +
> +Upstream-Status: Backport
> +
> +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> +---
> + include/sasl.h | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/include/sasl.h b/include/sasl.h
> +index fef4d51..8b8a63f 100755
> +--- a/include/sasl.h
> ++++ b/include/sasl.h
> +@@ -121,6 +121,8 @@
> + #ifndef SASL_H
> + #define SASL_H 1
> + 
> ++#include <stddef.h>  /* For size_t */
> ++
> + /* Keep in sync with win32/common.mak */
> + #define SASL_VERSION_MAJOR 2
> + #define SASL_VERSION_MINOR 1
> +-- 
> +1.8.3.2
> +
> diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
> index f05ab85..2abaee2 100644
> --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
> +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
> @@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \
>  	   file://Fix-hardcoded-libdir.patch \
>  	   file://debian_patches_0009_sasldb_al.diff \
>  	   file://debian_patches_0014_avoid_pic_overwrite.diff \
> +	   file://sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch \
>  	   "
>  
>  inherit autotools pkgconfig useradd

Patch

diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
new file mode 100644
index 0000000..ecbab84
--- /dev/null
+++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
@@ -0,0 +1,31 @@ 
+From 92d72789c811b0d55f624a8bac5ccc4412f5996e Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@andrew.cmu.edu>
+Date: Thu, 20 Dec 2012 18:14:50 -0500
+Subject: [PATCH] sasl.h: #include <stddef.h> for size_t on NetBSD
+
+This patch was imported from git://git.cyrusimap.org/cyrus-sasl
+commit 67a188693796a14e3a76ac603104807fbbfddfc4
+
+Upstream-Status: Backport
+
+Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+---
+ include/sasl.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/sasl.h b/include/sasl.h
+index fef4d51..8b8a63f 100755
+--- a/include/sasl.h
++++ b/include/sasl.h
+@@ -121,6 +121,8 @@
+ #ifndef SASL_H
+ #define SASL_H 1
+ 
++#include <stddef.h>  /* For size_t */
++
+ /* Keep in sync with win32/common.mak */
+ #define SASL_VERSION_MAJOR 2
+ #define SASL_VERSION_MINOR 1
+-- 
+1.8.3.2
+
diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
index f05ab85..2abaee2 100644
--- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
+++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
@@ -9,6 +9,7 @@  SRC_URI = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \
 	   file://Fix-hardcoded-libdir.patch \
 	   file://debian_patches_0009_sasldb_al.diff \
 	   file://debian_patches_0014_avoid_pic_overwrite.diff \
+	   file://sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch \
 	   "
 
 inherit autotools pkgconfig useradd