From 551bf9b517e2cee162321179cf822a23383c55ed Mon Sep 17 00:00:00 2001 From: minskim Date: Fri, 15 Oct 2004 18:21:56 +0000 Subject: Update libgpg-error to 1.0. Patch submitted by shannonjr@ and slightly modified by me. Changes since 0.6: * Ported to Solaris 2.8. * Added a new error source GPG_ERR_SOURCE_GSTI, and new error codes GPG_ERR_PROTOCOL_VIOLATION and GPG_ERR_INV_MAC for this source. * Interface changes relative to the 0.7 release: GPG_ERR_SOURCE_GSTI NEW GPG_ERR_PROTOCOL_VIOLATION NEW GPG_ERR_INV_MAC NEW GPG_ERR_INV_REQUEST NEW * libgpg-error can be built on systems where the errno macros do not evaluate to plain numbers, but expressions. If you want to cross-compile, you might have to set CC_FOR_BUILD, though. * A new tool gpg-error to convert error numbers into symbols into strings is provided. * Interface changes relative to the 0.6 release: GPG_ERR_LOCALE_PROBLEM NEW GPG_ERR_NOT_LOCKED NEW --- security/libgpg-error/Makefile | 11 +++++++---- security/libgpg-error/PLIST | 4 +++- security/libgpg-error/buildlink3.mk | 4 +--- security/libgpg-error/distinfo | 11 +++++++---- security/libgpg-error/patches/patch-aa | 16 ++++++++-------- security/libgpg-error/patches/patch-ab | 13 +++++++++++++ security/libgpg-error/patches/patch-ac | 13 +++++++++++++ security/libgpg-error/patches/patch-ad | 14 ++++++++++++++ 8 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 security/libgpg-error/patches/patch-ab create mode 100644 security/libgpg-error/patches/patch-ac create mode 100644 security/libgpg-error/patches/patch-ad (limited to 'security/libgpg-error') diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index 2f31aed6e14..3fbb1a210cd 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2004/10/03 00:18:09 tv Exp $ +# $NetBSD: Makefile,v 1.7 2004/10/15 18:21:56 minskim Exp $ # -DISTNAME= libgpg-error-0.6 -PKGREVISION= 2 +DISTNAME= libgpg-error-1.0 CATEGORIES= security -MASTER_SITES= ftp://ftp.gnupg.org/GnuPG/alpha/libgpg-error/ +MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.gnupg.org/ @@ -16,6 +15,10 @@ USE_BUILDLINK3= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES +#USE_GNU_TOOLS+= awk + +MAKE_ENV+= LC_CTYPE="C" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/libgpg-error/PLIST b/security/libgpg-error/PLIST index d41a5e3ca72..c9d31d136d3 100644 --- a/security/libgpg-error/PLIST +++ b/security/libgpg-error/PLIST @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:52 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/10/15 18:21:56 minskim Exp $ +bin/gpg-error bin/gpg-error-config include/gpg-error.h lib/libgpg-error.la share/aclocal/gpg-error.m4 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgpg-error.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgpg-error.mo diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk index 4d27210fc70..4de3303b4d1 100644 --- a/security/libgpg-error/buildlink3.mk +++ b/security/libgpg-error/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:18:09 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/10/15 18:21:56 minskim Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGPG_ERROR_BUILDLINK3_MK:= ${LIBGPG_ERROR_BUILDLINK3_MK}+ @@ -16,6 +16,4 @@ BUILDLINK_RECOMMENDED.libgpg-error+= libgpg-error>=0.6nb2 BUILDLINK_PKGSRCDIR.libgpg-error?= ../../security/libgpg-error .endif # LIBGPG_ERROR_BUILDLINK3_MK -.include "../../devel/gettext-lib/buildlink3.mk" - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/libgpg-error/distinfo b/security/libgpg-error/distinfo index 97d89d55592..7b4318024e1 100644 --- a/security/libgpg-error/distinfo +++ b/security/libgpg-error/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.2 2003/12/14 14:57:40 wiz Exp $ +$NetBSD: distinfo,v 1.3 2004/10/15 18:21:56 minskim Exp $ -SHA1 (libgpg-error-0.6.tar.gz) = ad15b47b15621a1954d82fb90e427febee2d0d04 -Size (libgpg-error-0.6.tar.gz) = 294648 bytes -SHA1 (patch-aa) = c4d49983c0fe9ba58571ff9d3d192e6aa1ea0305 +SHA1 (libgpg-error-1.0.tar.gz) = 1c91787f208c30a91678ebb2f173308f8fab3d36 +Size (libgpg-error-1.0.tar.gz) = 323724 bytes +SHA1 (patch-aa) = 04f2918c2b61250693a279cd30a94a22fa4cad0a +SHA1 (patch-ab) = 43ccbcfc284735255111438a015837bc69dac938 +SHA1 (patch-ac) = add7f9971bd3a087db518d5e1ce12a14f2d84d6a +SHA1 (patch-ad) = ddb86ddf354cc9228eec28154d41f1fa62f474f3 diff --git a/security/libgpg-error/patches/patch-aa b/security/libgpg-error/patches/patch-aa index 60a25fd7f82..e022e7972e6 100644 --- a/security/libgpg-error/patches/patch-aa +++ b/security/libgpg-error/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1 2003/12/14 14:57:40 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2004/10/15 18:21:56 minskim Exp $ ---- src/gpg-error-config.in.orig 2003-09-04 08:56:45.000000000 +0200 +--- src/gpg-error-config.in.orig 2004-10-07 03:53:03.000000000 -0600 +++ src/gpg-error-config.in -@@ -60,7 +60,7 @@ while test $# -gt 0; do - output="$output -I$includedir" +@@ -63,7 +63,7 @@ while test $# -gt 0; do ;; --libs) -- output="$output -L$libdir -lgpg-error" -+ output="$output -Wl,-R$libdir -L$libdir -lgpg-error" + if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then +- output="$output -L$libdir" ++ output="$output -Wl,-R$libdir -L$libdir" + fi + output="$output -lgpg-error" ;; - *) - usage 1 1>&2 diff --git a/security/libgpg-error/patches/patch-ab b/security/libgpg-error/patches/patch-ab new file mode 100644 index 00000000000..bc634c7eb8d --- /dev/null +++ b/security/libgpg-error/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2004/10/15 18:21:56 minskim Exp $ + +--- configure.ac.orig 2004-07-30 06:48:04.000000000 -0600 ++++ configure.ac +@@ -69,7 +69,7 @@ AM_GNU_GETTEXT([external]) + + # Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([stdlib.h]) ++AC_CHECK_HEADERS([locale.h stdlib.h]) + AC_FUNC_STRERROR_R + AC_CHECK_FUNC([strerror_r], [], + AC_MSG_WARN([[Without strerror_r, gpg_strerror_r might not be thread-safe]])) diff --git a/security/libgpg-error/patches/patch-ac b/security/libgpg-error/patches/patch-ac new file mode 100644 index 00000000000..8586f7ce938 --- /dev/null +++ b/security/libgpg-error/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2004/10/15 18:21:56 minskim Exp $ + +--- configure.orig 2004-07-30 07:48:42.000000000 -0500 ++++ configure +@@ -10010,7 +10010,7 @@ _ACEOF + fi + + +-for ac_header in stdlib.h ++for ac_header in locale.h stdlib.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/security/libgpg-error/patches/patch-ad b/security/libgpg-error/patches/patch-ad new file mode 100644 index 00000000000..ce832da37b4 --- /dev/null +++ b/security/libgpg-error/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.1 2004/10/15 18:21:56 minskim Exp $ + +--- config.h.in.orig 2004-07-30 07:48:54.000000000 -0500 ++++ config.h.in +@@ -24,6 +24,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_INTTYPES_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_MEMORY_H + -- cgit v1.2.3