From ca1880218188d937e8e90e67e998f32fb49b655c Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Thu, 12 Feb 2015 11:56:40 +0100 Subject: [PATCH] libgpg-error: Updated (1.12 -> 1.17) also updated pkgconfig.patch --- base/musl/pkg/libgpg-error/libgpg-error.conf | 20 +++ security/libgpg-error/libgpg-error.desc | 6 +- security/libgpg-error/pkgconfig.patch | 136 ++++++++++++++++--- 3 files changed, 137 insertions(+), 25 deletions(-) create mode 100644 base/musl/pkg/libgpg-error/libgpg-error.conf diff --git a/base/musl/pkg/libgpg-error/libgpg-error.conf b/base/musl/pkg/libgpg-error/libgpg-error.conf new file mode 100644 index 000000000..d7a02dbf1 --- /dev/null +++ b/base/musl/pkg/libgpg-error/libgpg-error.conf @@ -0,0 +1,20 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../libgpg-error/libgpg-error.conf +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +if atstage cross; then + var_append confopt ' ' '--disable-nls' + confflags="--host=$($CC -dumpmachine | sed 's/musl/gnu/' | sed 's/unknown/pc/')" + var_append confopt ' ' "$confflags" +fi + diff --git a/security/libgpg-error/libgpg-error.desc b/security/libgpg-error/libgpg-error.desc index 541eba51e..df58c4d42 100644 --- a/security/libgpg-error/libgpg-error.desc +++ b/security/libgpg-error/libgpg-error.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../libgpg-error/libgpg-error.desc -[COPY] Copyright (C) 2006 - 2013 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2015 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -30,7 +30,7 @@ [L] GPL [S] Stable -[V] 1.12 +[V] 1.17 [P] X -?---5---9 108.800 -[D] 3823485810 libgpg-error-1.12.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +[D] 1805195263 libgpg-error-1.17.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgpg-error/ diff --git a/security/libgpg-error/pkgconfig.patch b/security/libgpg-error/pkgconfig.patch index d6bca6065..b8c5b9b19 100644 --- a/security/libgpg-error/pkgconfig.patch +++ b/security/libgpg-error/pkgconfig.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../libgpg-error/pkgconfig.patch -# Copyright (C) 2013 - 2014 The OpenSDE Project +# Copyright (C) 2015 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,8 +14,6 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -Imported from: -http://git.yoctoproject.org/cgit/cgit.cgi/poky/plain/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch # # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher @@ -23,23 +21,23 @@ http://git.yoctoproject.org/cgit/cgit.cgi/poky/plain/meta/recipes-support/libgpg Upstream-Status: Pending -Index: libgpg-error-1.8/configure.ac +Index: libgpg-error-1.17/configure.ac =================================================================== ---- libgpg-error-1.8.orig/configure.ac 2010-05-06 06:01:08.000000000 -0700 -+++ libgpg-error-1.8/configure.ac 2010-07-21 02:20:20.923261305 -0700 -@@ -140,6 +140,7 @@ - AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) - AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER) +--- libgpg-error-1.17.orig/configure.ac ++++ libgpg-error-1.17/configure.ac +@@ -521,6 +521,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make + AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) + AC_CONFIG_FILES([src/versioninfo.rc]) AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) +AC_CONFIG_FILES([src/gpg-error.pc]) + AC_OUTPUT - # Special defines for certain platforms -Index: libgpg-error-1.8/src/Makefile.am +Index: libgpg-error-1.17/src/Makefile.am =================================================================== ---- libgpg-error-1.8.orig/src/Makefile.am 2010-04-14 02:16:44.000000000 -0700 -+++ libgpg-error-1.8/src/Makefile.am 2010-07-21 02:22:36.655012496 -0700 -@@ -37,13 +37,15 @@ +--- libgpg-error-1.17.orig/src/Makefile.am ++++ libgpg-error-1.17/src/Makefile.am +@@ -74,13 +74,15 @@ nodist_include_HEADERS = gpg-error.h bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal m4data_DATA = gpg-error.m4 @@ -49,25 +47,119 @@ Index: libgpg-error-1.8/src/Makefile.am EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ - mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ + mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ -- gpg-error.def.in versioninfo.rc.in -+ gpg-error.def.in versioninfo.rc.in gpg-error.pc.in +- gpg-error.vers gpg-error.def.in versioninfo.rc.in \ ++ gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \ + $(lock_obj_pub) BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ - err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \ -Index: libgpg-error-1.8/src/gpg-error.pc.in +Index: libgpg-error-1.17/src/gpg-error.pc.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgpg-error-1.8/src/gpg-error.pc.in 2010-07-21 02:20:20.923261305 -0700 -@@ -0,0 +1,10 @@ +--- /dev/null ++++ libgpg-error-1.17/src/gpg-error.pc.in +@@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ ++host=@GPG_ERROR_CONFIG_HOST@ + +Name: gpg-error +Description: a library that defines common error values for all GnuPG components +Version: @VERSION@ +Libs: -L${libdir} -lgpg-error +Cflags: -I${includedir} +Index: libgpg-error-1.17/src/gpg-error.m4 +=================================================================== +--- libgpg-error-1.17.orig/src/gpg-error.m4 ++++ libgpg-error-1.17/src/gpg-error.m4 +@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa + dnl + AC_DEFUN([AM_PATH_GPG_ERROR], + [ AC_REQUIRE([AC_CANONICAL_HOST]) +- gpg_error_config_prefix="" +- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, +- dnl since that is consistent with how our three siblings use the directory/ +- dnl package name in --with-$dir_name-prefix=PFX. +- AC_ARG_WITH(libgpg-error-prefix, +- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], +- [prefix where GPG Error is installed (optional)]), +- [gpg_error_config_prefix="$withval"]) +- +- dnl Accept --with-gpg-error-prefix and make it work the same as +- dnl --with-libgpg-error-prefix above, for backwards compatibility, +- dnl but do not document this old, inconsistently-named option. +- AC_ARG_WITH(gpg-error-prefix,, +- [gpg_error_config_prefix="$withval"]) ++ min_gpg_error_version=ifelse([$1], ,0.0,$1) + +- if test x"${GPG_ERROR_CONFIG}" = x ; then +- if test x"${gpg_error_config_prefix}" != x ; then +- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" +- else +- case "${SYSROOT}" in +- /*) +- if test -x "${SYSROOT}/bin/gpg-error-config" ; then +- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" +- fi +- ;; +- '') +- ;; +- *) +- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) +- ;; +- esac +- fi +- fi ++ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) + +- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) +- min_gpg_error_version=ifelse([$1], ,0.0,$1) +- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) +- ok=no +- if test "$GPG_ERROR_CONFIG" != "no" \ +- && test -f "$GPG_ERROR_CONFIG" ; then +- req_major=`echo $min_gpg_error_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_gpg_error_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` +- major=`echo $gpg_error_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- minor=`echo $gpg_error_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- if test "$major" -gt "$req_major"; then +- ok=yes +- else +- if test "$major" -eq "$req_major"; then +- if test "$minor" -ge "$req_minor"; then +- ok=yes +- fi +- fi +- fi +- fi + if test $ok = yes; then +- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` +- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` +- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` +- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` +- AC_MSG_RESULT([yes ($gpg_error_config_version)]) + ifelse([$2], , :, [$2]) +- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` ++ gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error` + if test x"$gpg_error_config_host" != xnone ; then + if test x"$gpg_error_config_host" != x"$host" ; then + AC_MSG_WARN([[ +@@ -107,11 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], + fi + fi + else +- GPG_ERROR_CFLAGS="" +- GPG_ERROR_LIBS="" +- GPG_ERROR_MT_CFLAGS="" +- GPG_ERROR_MT_LIBS="" +- AC_MSG_RESULT(no) + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GPG_ERROR_CFLAGS)