Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Dec 2012 17:26:56 -0800 (PST)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        ume@FreeBSD.org
Subject:   ports/174692: [PATCH] security/cyrus-sasl2: Add upstream commit to define size_t in sasl.h
Message-ID:  <50d900e0.747a980a.118b.690c@mx.google.com>
Resent-Message-ID: <201212250130.qBP1U0rl026811@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         174692
>Category:       ports
>Synopsis:       [PATCH] security/cyrus-sasl2: Add upstream commit to define size_t in sasl.h
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 25 01:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Raphael Kubo da Costa
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
FreeBSD Project
>Environment:
System: FreeBSD gibbon 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #60: Mon Dec 24 04:06:01 EET 2012
>Description:
Upstream commit b4744a25ebc11687def101ebbef8c82d3241d2a5 [1], part of 2.1.26,
has broken kdepimlibs' build here because the compiler (gcc 4.6) says size_t is
not defined by the time sasl.h is included.

This is later fixed by upstream commit 67a188693796a14e3a76ac603104807fbbfddfc4
[2], which would be good to have in ports.

[1] http://git.cyrusimap.org/cyrus-sasl/commit/include/sasl.h?id=b4744a25ebc11687def101ebbef8c82d3241d2a5
[2] http://git.cyrusimap.org/cyrus-sasl/commit/include/sasl.h?id=67a188693796a14e3a76ac603104807fbbfddfc4

Added file(s):
- files/patch-include::sasl.h

Port maintainer (ume@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- cyrus-sasl-2.1.26_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/cyrus-sasl2/Makefile ./Makefile
--- /usr/ports/security/cyrus-sasl2/Makefile	2012-12-16 11:19:52.000000000 +0200
+++ ./Makefile	2012-12-25 02:58:03.000000000 +0200
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	2.1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/
 
diff -ruN --exclude=CVS /usr/ports/security/cyrus-sasl2/files/patch-include::sasl.h ./files/patch-include::sasl.h
--- /usr/ports/security/cyrus-sasl2/files/patch-include::sasl.h	1970-01-01 02:00:00.000000000 +0200
+++ ./files/patch-include::sasl.h	2012-12-25 02:55:21.000000000 +0200
@@ -0,0 +1,23 @@
+From 67a188693796a14e3a76ac603104807fbbfddfc4 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@andrew.cmu.edu>
+Date: Thu, 20 Dec 2012 23:14:50 +0000
+Subject: sasl.h: #include <stddef.h> for size_t on NetBSD
+
+---
+(limited to 'include/sasl.h')
+
+diff --git a/include/sasl.h b/include/sasl.h
+index fef4d51..8b8a63f 100755
+--- include/sasl.h
++++ 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
+--
+cgit v0.9.0.2
--- cyrus-sasl-2.1.26_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50d900e0.747a980a.118b.690c>