Update to libassuan-2.1.0.

security/libassuan/Makefile

@@ -1,29 +1,28 @@
-# $OpenBSD: Makefile,v 1.11 2013/03/21 08:48:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2013/03/23 13:44:44 ajacoutot Exp $
 
 COMMENT=	IPC library used by GnuPG and gpgme
 
-DISTNAME=	libassuan-2.0.3
-
-SHARED_LIBS +=  assuan            1.0      # 2.0
+DISTNAME=	libassuan-2.1.0
+EXTRACT_SUFX=	.tar.bz2
 
+SHARED_LIBS +=  assuan            1.1      # 2.0
 
 CATEGORIES=	security devel
 
 # LGPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/libassuan/
-EXTRACT_SUFX=		.tar.bz2
+WANTLIB += gpg-error
 
+MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 
-MODULES=		devel/gettext \
-			textproc/intltool
+MODULES=	devel/gettext \
+		textproc/intltool
 
-WANTLIB=		gpg-error
-LIB_DEPENDS=		security/libgpg-error
+LIB_DEPENDS=	security/libgpg-error
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=gnu
 
-CFLAGS+=		-fPIC
+CFLAGS+=	-fPIC
 
 .include <bsd.port.mk>

security/libassuan/distinfo

@@ -1,5 +1,2 @@
-MD5 (libassuan-2.0.3.tar.bz2) = F50ZGDJf25KMe9kLilFPxw==
-RMD160 (libassuan-2.0.3.tar.bz2) = JD0vWejY/0h1rLV/9uY6Rm8rdXQ=
-SHA1 (libassuan-2.0.3.tar.bz2) = K/Tro7WIdY40mXan656KUJlgw7U=
-SHA256 (libassuan-2.0.3.tar.bz2) = utVoI3THa8wKuxp6NMlVevaHSkd1AHSOZKfT3vecrBs=
-SIZE (libassuan-2.0.3.tar.bz2) = 529149
+SHA256 (libassuan-2.1.0.tar.bz2) = pMW9OgwnJui8wuqKOxX3quO9ktT4WWjzFf06ddEBwmc=
+SIZE (libassuan-2.1.0.tar.bz2) = 537489

security/libassuan/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.1 2010/10/18 07:43:08 dcoppa Exp $
---- configure.orig	Mon Aug  9 12:33:37 2010
-+++ configure	Thu Oct 14 11:29:50 2010
-@@ -13333,11 +13333,12 @@ if test "${assuan_cv_sys_so_peercred+set}" = set; then
+$OpenBSD: patch-configure,v 1.2 2013/03/23 13:44:44 ajacoutot Exp $
+--- configure.orig	Fri Feb 22 19:46:43 2013
++++ configure	Sat Mar 23 14:40:09 2013
+@@ -14354,11 +14354,12 @@ if ${assuan_cv_sys_so_peercred+:} false; then :
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */

security/libassuan/patches/patch-src_assuan-socket-server_c

@@ -1,12 +1,15 @@
-$OpenBSD: patch-src_assuan-socket-server_c,v 1.1 2010/10/18 07:43:08 dcoppa Exp $
---- src/assuan-socket-server.c.orig	Thu Oct 14 11:26:27 2010
-+++ src/assuan-socket-server.c	Thu Oct 14 11:27:15 2010
-@@ -51,7 +51,7 @@ accept_connection_bottom (assuan_context_t ctx)
+$OpenBSD: patch-src_assuan-socket-server_c,v 1.2 2013/03/23 13:44:44 ajacoutot Exp $
+--- src/assuan-socket-server.c.orig	Mon Nov 26 14:35:34 2012
++++ src/assuan-socket-server.c	Sat Mar 23 14:40:40 2013
+@@ -61,7 +61,11 @@ accept_connection_bottom (assuan_context_t ctx)
    ctx->peercred_valid = 0;
  #ifdef HAVE_SO_PEERCRED
    {
--    struct ucred cr; 
-+    struct sockpeercred cr; 
++#ifdef __OpenBSD__
++    struct sockpeercred cr;
++#else
+     struct ucred cr;
++#endif
      socklen_t cl = sizeof cr;
  
      if ( !getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl))

security/libassuan/pkg/PFRAG.shared

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2010/04/27 14:40:12 pea Exp $
-@lib lib/libassuan.so.${LIBassuan_VERSION}

security/libassuan/pkg/PLIST

@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/08/19 12:54:14 jasper Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.4 2013/03/23 13:44:44 ajacoutot Exp $
 bin/libassuan-config
 include/assuan.h
 @info info/assuan.info
 lib/libassuan.a
 lib/libassuan.la
+@lib lib/libassuan.so.${LIBassuan_VERSION}
 share/aclocal/libassuan.m4