From 1ad2edf0c8fca8672183ab3636f25bd60a2c4448 Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Tue, 17 Feb 2015 15:41:15 +0100 Subject: [PATCH] Update some recipes to get closer from Q4 incoming release Change-Id: Ie50170c0186e069589753a46d55fe7878832d128 Signed-off-by: Xavier Roche --- .../capi-network-bluetooth.inc | 1 + .../message-port/message-port_git.bb | 2 +- .../nfc-manager-neard/nfc-manager-neard_git.bb | 2 +- .../tizen-platform-config_git.bb | 2 +- .../recipes-extended/pam/pam.inc | 1 + .../recipes-extended/pam/pam_git.bb | 2 +- .../recipes-security/gpg2/gpg2-extraconf.inc | 3 +- .../gpg2/gpg2/0001-Fix-libassuandependency.patch | 105 ++++++++ .../gpg2/gpg2/0001-Update-autoconf-macros.patch | 268 ++++++++------------- .../0002-Do-not-set-gcrypt-thread-callback.patch | 92 ------- ...ove-obsolete-function-gcry_md_start_debug.patch | 178 -------------- .../recipes-security/gpg2/gpg2_git.bb | 2 +- 12 files changed, 215 insertions(+), 443 deletions(-) create mode 100644 meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Fix-libassuandependency.patch delete mode 100644 meta-tizen-common-base/recipes-security/gpg2/gpg2/0002-Do-not-set-gcrypt-thread-callback.patch delete mode 100644 meta-tizen-common-base/recipes-security/gpg2/gpg2/0003-Remove-obsolete-function-gcry_md_start_debug.patch diff --git a/meta-tizen-common-base/recipes-application-framework/capi-network-bluetooth/capi-network-bluetooth.inc b/meta-tizen-common-base/recipes-application-framework/capi-network-bluetooth/capi-network-bluetooth.inc index 10f5de3..7f4027d 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-network-bluetooth/capi-network-bluetooth.inc +++ b/meta-tizen-common-base/recipes-application-framework/capi-network-bluetooth/capi-network-bluetooth.inc @@ -120,6 +120,7 @@ PACKAGES += " capi-network-bluetooth " capi-network-bluetooth-dev_files = "" capi-network-bluetooth-dev_files += "${prefix}/include/network/bluetooth.h" +capi-network-bluetooth-dev_files += "${prefix}/include/network/bluetooth_type.h" capi-network-bluetooth-dev_files += "${prefix}/lib/pkgconfig/capi-network-bluetooth.pc" capi-network-bluetooth-dev_files += "${prefix}/lib/libcapi-network-bluetooth.so" MANIFESTFILES_${PN}-dev = "capi-network-bluetooth-devel.manifest" diff --git a/meta-tizen-common-base/recipes-application-framework/message-port/message-port_git.bb b/meta-tizen-common-base/recipes-application-framework/message-port/message-port_git.bb index 7dd2a1d..53b3595 100644 --- a/meta-tizen-common-base/recipes-application-framework/message-port/message-port_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/message-port/message-port_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/message-port-dbus;tag=b95c605d610b89486ce93e74461df0ac09e3e837;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/message-port-dbus;tag=a32937b52205b0878b9f20f01ed2cee73c2cd53a;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_git.bb b/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_git.bb index 4e8c07a..cb9f133 100644 --- a/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_git.bb +++ b/meta-tizen-common-base/recipes-connectivity/nfc-manager-neard/nfc-manager-neard_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/connectivity/nfc-manager-neard;tag=45f2831a6d738c5df32b065c6853636fea85f42a;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/connectivity/nfc-manager-neard;tag=9dd33b9924fd8bd477b2c416a44d9f9f2fd83ca1;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-core/tizen-platform-config/tizen-platform-config_git.bb b/meta-tizen-common-base/recipes-core/tizen-platform-config/tizen-platform-config_git.bb index 0580dd7..f5f8319 100644 --- a/meta-tizen-common-base/recipes-core/tizen-platform-config/tizen-platform-config_git.bb +++ b/meta-tizen-common-base/recipes-core/tizen-platform-config/tizen-platform-config_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/tizen-platform-config;tag=5652a12582a0fa73e780f0635da6ebf8c516093f;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/tizen-platform-config;tag=0f8c9309ac0243b78cd18e9dff5025dc0fd91685;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-extended/pam/pam.inc b/meta-tizen-common-base/recipes-extended/pam/pam.inc index a6fea89..2e6625b 100644 --- a/meta-tizen-common-base/recipes-extended/pam/pam.inc +++ b/meta-tizen-common-base/recipes-extended/pam/pam.inc @@ -35,6 +35,7 @@ RDEPENDS_${PN}-modules-extra += "pam" #RDEPENDS of pam (${PN}) RDEPENDS_${PN} += "coreutils" RDEPENDS_${PN} += "glibc" +RDEPENDS_${PN} += "flex" #RDEPENDS of pam-dev (${PN}-dev) RDEPENDS_${PN}-dev += "pam" diff --git a/meta-tizen-common-base/recipes-extended/pam/pam_git.bb b/meta-tizen-common-base/recipes-extended/pam/pam_git.bb index 3b97e8f..227b714 100644 --- a/meta-tizen-common-base/recipes-extended/pam/pam_git.bb +++ b/meta-tizen-common-base/recipes-extended/pam/pam_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/upstream/pam;tag=523d88f2bf88a131d6b4a334e85d2666d505dc48;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/pam;tag=8e4294bb11020f6ba798fb1fdc460beaf0a47c31;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-security/gpg2/gpg2-extraconf.inc b/meta-tizen-common-base/recipes-security/gpg2/gpg2-extraconf.inc index b92b6f0..5d1b582 100644 --- a/meta-tizen-common-base/recipes-security/gpg2/gpg2-extraconf.inc +++ b/meta-tizen-common-base/recipes-security/gpg2/gpg2-extraconf.inc @@ -1,6 +1,5 @@ SRC_URI += " file://0001-Update-autoconf-macros.patch " -SRC_URI += " file://0002-Do-not-set-gcrypt-thread-callback.patch " -SRC_URI += " file://0003-Remove-obsolete-function-gcry_md_start_debug.patch " +SRC_URI += " file://0001-Fix-libassuandependency.patch " gpg2_files += "/usr/lib/*" diff --git a/meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Fix-libassuandependency.patch b/meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Fix-libassuandependency.patch new file mode 100644 index 0000000..e18be8c --- /dev/null +++ b/meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Fix-libassuandependency.patch @@ -0,0 +1,105 @@ +From ad0f01ef6e3bb5b29a77e21bae757e620635a470 Mon Sep 17 00:00:00 2001 +From: Xavier Roche +Date: Tue, 17 Feb 2015 15:36:27 +0100 +Subject: [PATCH] Fix libassuan dependency + +Signed-off-by: Xavier Roche +--- + agent/Makefile.am | 4 ++-- + common/Makefile.am | 2 +- + g10/Makefile.am | 2 +- + scd/Makefile.am | 2 +- + sm/Makefile.am | 2 +- + tools/Makefile.am | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/agent/Makefile.am b/agent/Makefile.am +index 55c374c..75b46bf 100644 +--- a/agent/Makefile.am ++++ b/agent/Makefile.am +@@ -58,7 +58,7 @@ gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) + gpg_agent_LDADD = $(commonpth_libs) \ + $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \ + $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ +- $(resource_objs) ++ $(resource_objs) -lassuan + + gpg_protect_tool_SOURCES = \ + protect-tool.c \ +@@ -67,7 +67,7 @@ gpg_protect_tool_SOURCES = \ + + gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) + gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \ +- $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) ++ $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) -lassuan + + gpg_preset_passphrase_SOURCES = \ + preset-passphrase.c +diff --git a/common/Makefile.am b/common/Makefile.am +index 337e246..a13f8dc 100644 +--- a/common/Makefile.am ++++ b/common/Makefile.am +@@ -130,7 +130,7 @@ module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil t-exechelp \ + module_maint_tests = t-helpfile t-b64 + + t_common_ldadd = libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a \ +- $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) ++ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) -lassuan + + t_convert_LDADD = $(t_common_ldadd) + t_percent_LDADD = $(t_common_ldadd) +diff --git a/g10/Makefile.am b/g10/Makefile.am +index efa427d..6f99299 100644 +--- a/g10/Makefile.am ++++ b/g10/Makefile.am +@@ -123,7 +123,7 @@ LDADD = $(needed_libs) ../common/libgpgrl.a \ + $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \ + $(LIBINTL) $(CAPLIBS) $(NETLIBS) + gpg2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ +- $(LIBICONV) $(resource_objs) ++ $(LIBICONV) $(resource_objs) -lassuan + gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBICONV) $(resource_objs) + +diff --git a/scd/Makefile.am b/scd/Makefile.am +index e883180..2a2c9b8 100644 +--- a/scd/Makefile.am ++++ b/scd/Makefile.am +@@ -51,7 +51,7 @@ scdaemon_SOURCES = \ + scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \ + $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \ +- $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs) ++ $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs) -lassuan + + # Removed for now: We need to decide whether it makes sense to + # continue it at all, given that gpg has now all required +diff --git a/sm/Makefile.am b/sm/Makefile.am +index 8e1dc97..e2a7fc7 100644 +--- a/sm/Makefile.am ++++ b/sm/Makefile.am +@@ -64,7 +64,7 @@ common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \ + gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ + $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) \ +- $(LIBICONV) $(resource_objs) ++ $(LIBICONV) $(resource_objs) -lassuan + + # Make sure that all libs are build before we use them. This is + # important for things like make -j2. +diff --git a/tools/Makefile.am b/tools/Makefile.am +index e5c16a2..62ca18f 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -94,7 +94,7 @@ gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c + gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \ + $(LIBASSUAN_LIBS) $(PTH_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ +- $(resource_objs) ++ $(resource_objs) -lassuan + + gpgkey2ssh_SOURCES = gpgkey2ssh.c + gpgkey2ssh_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS) +-- +1.9.1 + diff --git a/meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Update-autoconf-macros.patch b/meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Update-autoconf-macros.patch index e54b6b5..7937030 100644 --- a/meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Update-autoconf-macros.patch +++ b/meta-tizen-common-base/recipes-security/gpg2/gpg2/0001-Update-autoconf-macros.patch @@ -1,38 +1,22 @@ -From f0c66acf9dd638463c05c88c1068b4b902a4404f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= -Date: Tue, 2 Sep 2014 14:15:27 +0200 -Subject: [PATCH] Update autoconf macros -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From aa84890d473ccbe673603a6cdea3a54d3f761742 Mon Sep 17 00:00:00 2001 +From: Xavier Roche +Date: Tue, 17 Feb 2015 14:51:37 +0100 +Subject: [PATCH] Update-autoconf-macros -* libpth -* libgpg-error -* libksba -* libassuan -* libgcrypt - -Signed-off-by: Kévin THIERRY +Signed-off-by: Xavier Roche --- - m4/gnupg-pth.m4 | 55 ++++--------------------- - m4/gpg-error.m4 | 58 ++++++++------------------ - m4/ksba.m4 | 72 ++++++++------------------------ - m4/libassuan.m4 | 124 ++++++++++---------------------------------------------- - m4/libgcrypt.m4 | 73 +++++++++------------------------ - 5 files changed, 86 insertions(+), 296 deletions(-) + m4/gnupg-pth.m4 | 50 ++++------------------ + m4/gpg-error.m4 | 55 ++----------------------- + m4/ksba.m4 | 55 +------------------------ + m4/libassuan.m4 | 126 +++++++++++--------------------------------------------- + m4/libgcrypt.m4 | 57 ++----------------------- + 5 files changed, 41 insertions(+), 302 deletions(-) diff --git a/m4/gnupg-pth.m4 b/m4/gnupg-pth.m4 -index 6dc9e0e..374bc87 100644 +index 712d6e8..b549add 100644 --- a/m4/gnupg-pth.m4 +++ b/m4/gnupg-pth.m4 -@@ -11,39 +11,15 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - - # GNUPG_PTH_VERSION_CHECK(REQUIRED) --# -+# - # If the version is sufficient, HAVE_PTH will be set to yes. - # +@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # Taken and modified from the m4 macros which come with Pth. AC_DEFUN([GNUPG_PTH_VERSION_CHECK], [ @@ -80,32 +64,23 @@ index 6dc9e0e..374bc87 100644 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [[ pth_init ();]])], -@@ -69,7 +45,7 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], - AC_MSG_RESULT($gnupg_cv_pth_is_sane) - else - AC_MSG_RESULT(no) -- fi -+ fi - ]) - - -@@ -80,26 +56,13 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], +@@ -80,24 +56,12 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], # PTH_CLFAGS and PTH_LIBS are AS_SUBST. # AC_DEFUN([GNUPG_PATH_PTH], -[ AC_ARG_WITH(pth-prefix, - AC_HELP_STRING([--with-pth-prefix=PFX], -- [prefix where GNU Pth is installed (optional)]), +- [prefix where GNU Pth is installed]), - pth_config_prefix="$withval", pth_config_prefix="") - if test x$pth_config_prefix != x ; then - PTH_CONFIG="$pth_config_prefix/bin/pth-config" - fi - AC_PATH_PROG(PTH_CONFIG, pth-config, no) -+[ ++[ tmp=ifelse([$1], ,1.3.7,$1) - if test "$PTH_CONFIG" != "no"; then - GNUPG_PTH_VERSION_CHECK($tmp) -- if test $have_pth = yes; then +- if test $have_pth = yes; then - PTH_CFLAGS=`$PTH_CONFIG --cflags` - PTH_LIBS=`$PTH_CONFIG --ldflags` - PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`" @@ -117,39 +92,48 @@ index 6dc9e0e..374bc87 100644 fi AC_SUBST(PTH_CFLAGS) AC_SUBST(PTH_LIBS) - ]) -- diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 -index 9d96d16..0ec6f13 100644 +index feb963c..816c52c 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 @@ -1,5 +1,5 @@ # gpg-error.m4 - autoconf macro to detect libgpg-error. --# Copyright (C) 2002, 2003, 2004 g10 Code GmbH -+# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH +-# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH ++# # Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without -@@ -14,52 +14,30 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS +@@ -15,56 +15,12 @@ dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS dnl AC_DEFUN([AM_PATH_GPG_ERROR], --[ AC_ARG_WITH(gpg-error-prefix, -- AC_HELP_STRING([--with-gpg-error-prefix=PFX], -- [prefix where GPG Error is installed (optional)]), -- gpg_error_config_prefix="$withval", gpg_error_config_prefix="") + [ 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"]) +- - if test x$gpg_error_config_prefix != x ; then - if test x${GPG_ERROR_CONFIG+set} != xset ; then - GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config - fi - fi -+[ AC_REQUIRE([AC_CANONICAL_HOST]) - -- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) +- +- AC_PATH_TOOL(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" ; then +- 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 | \ @@ -161,7 +145,7 @@ index 9d96d16..0ec6f13 100644 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` - if test "$major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$major" -eq "$req_major"; then - if test "$minor" -ge "$req_minor"; then - ok=yes @@ -169,27 +153,19 @@ index 9d96d16..0ec6f13 100644 - fi - fi - fi -+ ++ + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) -+ ++ 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` - AC_MSG_RESULT([yes ($gpg_error_config_version)]) ifelse([$2], , :, [$2]) -+ 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([[ -+*** -+*** The config script $GPG_ERROR_CONFIG was -+*** built for $gpg_error_config_host and thus may not match the -+*** used host $host. -+*** You may want to use the configure option --with-gpg-error-prefix -+*** to specify a matching config script. -+***]]) -+ fi -+ fi + gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` + if test x"$gpg_error_config_host" != xnone ; then +@@ -80,9 +36,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], + fi + fi else - GPG_ERROR_CFLAGS="" - GPG_ERROR_LIBS="" @@ -197,25 +173,15 @@ index 9d96d16..0ec6f13 100644 ifelse([$3], , :, [$3]) fi AC_SUBST(GPG_ERROR_CFLAGS) - AC_SUBST(GPG_ERROR_LIBS) - ]) -- diff --git a/m4/ksba.m4 b/m4/ksba.m4 -index 1100387..b65c4ba 100644 +index 73b2e26..0bb89e0 100644 --- a/m4/ksba.m4 +++ b/m4/ksba.m4 -@@ -15,24 +15,14 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS - dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed - dnl with the API version to also check the API compatibility. Example: --dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed -+dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed - dnl version of libksba is at least 1.0.7 *and* the API number is 1. Using - dnl this features allows to prevent build against newer versions of libksba - dnl with a changed API. +@@ -22,18 +22,7 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], --[ AC_ARG_WITH(ksba-prefix, + [AC_REQUIRE([AC_CANONICAL_HOST]) +- AC_ARG_WITH(ksba-prefix, - AC_HELP_STRING([--with-ksba-prefix=PFX], - [prefix where KSBA is installed (optional)]), - ksba_config_prefix="$withval", ksba_config_prefix="") @@ -225,15 +191,16 @@ index 1100387..b65c4ba 100644 - KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config - fi - fi -+[AC_REQUIRE([AC_CANONICAL_HOST]) - AC_PATH_PROG(KSBA_CONFIG, ksba-config, no) tmp=ifelse([$1], ,1:1.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -42,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -42,49 +31,13 @@ AC_DEFUN([AM_PATH_KSBA], + req_ksba_api=0 min_ksba_version="$tmp" fi ++ PKG_CHECK_MODULES(KSBA, [ksba >= $min_ksba_version], [ok=yes], [ok=no]) - AC_MSG_CHECKING(for KSBA - version >= $min_ksba_version) - ok=no @@ -253,7 +220,7 @@ index 1100387..b65c4ba 100644 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes @@ -272,8 +239,6 @@ index 1100387..b65c4ba 100644 - else - AC_MSG_RESULT(no) - fi -+ PKG_CHECK_MODULES(KSBA, [ksba >= $min_ksba_version], [ok=yes], [ok=no]) -+ if test $ok = yes; then # Even if we have a recent libksba, we should check that the # API is compatible. @@ -283,26 +248,18 @@ index 1100387..b65c4ba 100644 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([KSBA API version]) if test "$req_ksba_api" -eq "$tmp" ; then -@@ -96,12 +51,21 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -97,8 +50,6 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then - KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags` - KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs` ifelse([$2], , :, [$2]) -+ libksba_config_host=`$PKG_CONFIG --variable=host ksba` -+ if test x"$libksba_config_host" != xnone ; then -+ if test x"$libksba_config_host" != x"$host" ; then -+ AC_MSG_WARN([[ -+*** -+*** The config script $LIBKSBA_CONFIG was -+*** built for $libksba_config_host and thus may not match the -+*** used host $host. -+*** You may want to use the configure option --with-libksba-prefix -+*** to specify a matching config script. -+***]]) -+ fi -+ fi + libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none` + if test x"$libksba_config_host" != xnone ; then +@@ -114,8 +65,6 @@ AC_DEFUN([AM_PATH_KSBA], + fi + fi else - KSBA_CFLAGS="" - KSBA_LIBS="" @@ -310,7 +267,7 @@ index 1100387..b65c4ba 100644 fi AC_SUBST(KSBA_CFLAGS) diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 -index 004eee3..2bde244 100644 +index 004eee3..72425c5 100644 --- a/m4/libassuan.m4 +++ b/m4/libassuan.m4 @@ -1,5 +1,5 @@ @@ -339,10 +296,11 @@ index 004eee3..2bde244 100644 tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -@@ -35,55 +25,14 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -34,56 +24,15 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], + req_libassuan_api=0 min_libassuan_version="$tmp" fi - +- - if test "$LIBASSUAN_CONFIG" != "no" ; then - libassuan_version=`$LIBASSUAN_CONFIG --version` - fi @@ -386,8 +344,10 @@ index 004eee3..2bde244 100644 - else - AC_MSG_RESULT(no) - fi +- ++ + PKG_CHECK_MODULES(LIBASSUAN, [libassuan >= $min_libassuan_version], [ok=yes], [ok=no]) - ++ if test $ok = yes; then if test "$req_libassuan_api" -gt 0 ; then tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` @@ -398,10 +358,12 @@ index 004eee3..2bde244 100644 if test "$req_libassuan_api" -eq "$tmp" ; then AC_MSG_RESULT(okay) else -@@ -94,6 +43,23 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -93,7 +42,24 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], + fi fi fi - +- ++ + if test $ok = yes; then + if test x"$host" != x ; then + libassuan_config_host=`$PKG_CONFIG --variable=host libassuan` @@ -422,23 +384,19 @@ index 004eee3..2bde244 100644 ]) dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION, -@@ -120,56 +86,10 @@ dnl - AC_DEFUN([AM_PATH_LIBASSUAN], - [ _AM_PATH_LIBASSUAN_COMMON($1) - if test $ok = yes; then -- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` -- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` - ifelse([$2], , :, [$2]) - else -- LIBASSUAN_CFLAGS="" -- LIBASSUAN_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(LIBASSUAN_CFLAGS) - AC_SUBST(LIBASSUAN_LIBS) +@@ -111,8 +77,6 @@ AC_DEFUN([AM_CHECK_LIBASSUAN], ]) + + - - + dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION, + dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) + dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS +@@ -133,43 +97,3 @@ AC_DEFUN([AM_PATH_LIBASSUAN], + ]) + + -dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS @@ -480,28 +438,14 @@ index 004eee3..2bde244 100644 -]) - diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 -index 854eaaa..38d9a82 100644 +index 6cf482f..784a0d7 100644 --- a/m4/libgcrypt.m4 +++ b/m4/libgcrypt.m4 -@@ -1,5 +1,5 @@ - dnl Autoconf macros for libgcrypt --dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. -+dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. - dnl - dnl This file is free software; as a special exception the author gives - dnl unlimited permission to copy and/or distribute it, with or without -@@ -15,23 +15,14 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. - dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed - dnl with the API version to also check the API compatibility. Example: --dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed - dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using - dnl this features allows to prevent build against newer versions of libgcrypt - dnl with a changed API. +@@ -22,17 +22,6 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_LIBGCRYPT], --[ AC_ARG_WITH(libgcrypt-prefix, + [ AC_REQUIRE([AC_CANONICAL_HOST]) +- AC_ARG_WITH(libgcrypt-prefix, - AC_HELP_STRING([--with-libgcrypt-prefix=PFX], - [prefix where LIBGCRYPT is installed (optional)]), - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") @@ -510,16 +454,16 @@ index 854eaaa..38d9a82 100644 - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config - fi - fi -+[ AC_REQUIRE([AC_CANONICAL_HOST]) - -- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) +- +- AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) tmp=ifelse([$1], ,1:1.2.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -41,48 +32,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], +@@ -41,49 +30,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + req_libgcrypt_api=0 min_libgcrypt_version="$tmp" fi - +- - AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) - ok=no - if test "$LIBGCRYPT_CONFIG" != "no" ; then @@ -538,7 +482,7 @@ index 854eaaa..38d9a82 100644 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes @@ -558,7 +502,7 @@ index 854eaaa..38d9a82 100644 - AC_MSG_RESULT(no) - fi + PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= $min_libgcrypt_version], [ok=yes], [ok=no]) -+ ++ if test $ok = yes; then # If we have a recent libgcrypt, we should also check that the # API is compatible @@ -568,26 +512,18 @@ index 854eaaa..38d9a82 100644 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBGCRYPT API version]) if test "$req_libgcrypt_api" -eq "$tmp" ; then -@@ -95,12 +51,21 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], +@@ -96,8 +49,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], fi fi if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ifelse([$2], , :, [$2]) -+ libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt` -+ if test x"$libgcrypt_config_host" != xnone ; then -+ if test x"$libgcrypt_config_host" != x"$host" ; then -+ AC_MSG_WARN([[ -+*** -+*** The config script $LIBGCRYPT_CONFIG was -+*** built for $libgcrypt_config_host and thus may not match the -+*** used host $host. -+*** You may want to use the configure option --with-libgcrypt-prefix -+*** to specify a matching config script. -+***]]) -+ fi -+ fi + libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` + if test x"$libgcrypt_config_host" != xnone ; then +@@ -113,8 +64,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + fi + fi else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" @@ -595,5 +531,5 @@ index 854eaaa..38d9a82 100644 fi AC_SUBST(LIBGCRYPT_CFLAGS) -- -1.8.1.4 +1.9.1 diff --git a/meta-tizen-common-base/recipes-security/gpg2/gpg2/0002-Do-not-set-gcrypt-thread-callback.patch b/meta-tizen-common-base/recipes-security/gpg2/gpg2/0002-Do-not-set-gcrypt-thread-callback.patch deleted file mode 100644 index 9c12dba..0000000 --- a/meta-tizen-common-base/recipes-security/gpg2/gpg2/0002-Do-not-set-gcrypt-thread-callback.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 398602cad11b96025552e981f210f93c6ce03218 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= -Date: Tue, 2 Sep 2014 16:04:25 +0200 -Subject: [PATCH] Do not set gcrypt thread callback -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Setting gcrypt thread callback is only for older versions of gcrypt -which is not our case. - -Related patch on gnupg project: -https://gitorious.org/gnupg/mainline/commit/a2d9e48fcca6cfc2dfadef6dbd3579a30314676b - -Signed-off-by: Kévin THIERRY ---- - agent/gpg-agent.c | 17 ----------------- - scd/scdaemon.c | 16 ---------------- - 2 files changed, 33 deletions(-) - -diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c -index b00d899..2634016 100644 ---- a/agent/gpg-agent.c -+++ b/agent/gpg-agent.c -@@ -277,12 +277,6 @@ static int check_for_running_agent (int silent, int mode); - /* Pth wrapper function definitions. */ - ASSUAN_SYSTEM_PTH_IMPL; - --GCRY_THREAD_OPTION_PTH_IMPL; --static int fixed_gcry_pth_init (void) --{ -- return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0; --} -- - - #ifndef PTH_HAVE_PTH_THREAD_ID - static unsigned long pth_thread_id (void) -@@ -592,17 +586,6 @@ main (int argc, char **argv ) - init_common_subsystems (); - - -- /* Libgcrypt requires us to register the threading model first. -- Note that this will also do the pth_init. */ -- gcry_threads_pth.init = fixed_gcry_pth_init; -- err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); -- if (err) -- { -- log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", -- gpg_strerror (err)); -- } -- -- - /* Check that the libraries are suitable. Do it here because - the option parsing may need services of the library. */ - if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) -diff --git a/scd/scdaemon.c b/scd/scdaemon.c -index 064d342..320e2c7 100644 ---- a/scd/scdaemon.c -+++ b/scd/scdaemon.c -@@ -205,12 +205,6 @@ static void handle_connections (int listen_fd); - /* Pth wrapper function definitions. */ - ASSUAN_SYSTEM_PTH_IMPL; - --GCRY_THREAD_OPTION_PTH_IMPL; --static int fixed_gcry_pth_init (void) --{ -- return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0; --} -- - - - static char * -@@ -407,16 +401,6 @@ main (int argc, char **argv ) - init_common_subsystems (); - - -- /* Libgcrypt requires us to register the threading model first. -- Note that this will also do the pth_init. */ -- gcry_threads_pth.init = fixed_gcry_pth_init; -- err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); -- if (err) -- { -- log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", -- gpg_strerror (err)); -- } -- - /* Check that the libraries are suitable. Do it here because - the option parsing may need services of the library */ - if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) --- -1.8.1.4 - diff --git a/meta-tizen-common-base/recipes-security/gpg2/gpg2/0003-Remove-obsolete-function-gcry_md_start_debug.patch b/meta-tizen-common-base/recipes-security/gpg2/gpg2/0003-Remove-obsolete-function-gcry_md_start_debug.patch deleted file mode 100644 index fb4eb60..0000000 --- a/meta-tizen-common-base/recipes-security/gpg2/gpg2/0003-Remove-obsolete-function-gcry_md_start_debug.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 6e44dd396029ed403dceeca5a5e1a60bbb427f74 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= -Date: Tue, 2 Sep 2014 16:20:16 +0200 -Subject: [PATCH] Remove obsolete function gcry_md_start_debug() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Kévin THIERRY ---- - g10/cipher.c | 2 -- - g10/encr-data.c | 2 -- - g10/mainproc.c | 10 ---------- - g10/sign.c | 6 ------ - sm/certcheck.c | 2 -- - sm/certreqgen.c | 2 -- - sm/sign.c | 4 ---- - sm/verify.c | 4 ---- - 8 files changed, 32 deletions(-) - -diff --git a/g10/cipher.c b/g10/cipher.c -index f0dc577..2bbacb5 100644 ---- a/g10/cipher.c -+++ b/g10/cipher.c -@@ -60,8 +60,6 @@ write_header( cipher_filter_context_t *cfx, IOBUF a ) - if( cfx->dek->use_mdc ) { - ed.mdc_method = DIGEST_ALGO_SHA1; - gcry_md_open (&cfx->mdc_hash, DIGEST_ALGO_SHA1, 0); -- if ( DBG_HASHING ) -- gcry_md_start_debug (cfx->mdc_hash, "creatmdc"); - } - - { -diff --git a/g10/encr-data.c b/g10/encr-data.c -index 602ae55..2f0fac1 100644 ---- a/g10/encr-data.c -+++ b/g10/encr-data.c -@@ -118,8 +118,6 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek ) - { - if (gcry_md_open (&dfx->mdc_hash, ed->mdc_method, 0 )) - BUG (); -- if ( DBG_HASHING ) -- gcry_md_start_debug (dfx->mdc_hash, "checkmdc"); - } - - rc = openpgp_cipher_open (&dfx->cipher_hd, dek->algo, -diff --git a/g10/mainproc.c b/g10/mainproc.c -index c7df113..9679d8f 100644 ---- a/g10/mainproc.c -+++ b/g10/mainproc.c -@@ -698,11 +698,6 @@ proc_plaintext( CTX c, PACKET *pkt ) - if ( gcry_md_open (&c->mfx.md2, DIGEST_ALGO_MD5, 0) ) - BUG (); - } -- if ( DBG_HASHING ) { -- gcry_md_start_debug ( c->mfx.md, "verify" ); -- if ( c->mfx.md2 ) -- gcry_md_start_debug ( c->mfx.md2, "verify2" ); -- } - - rc=0; - -@@ -2137,11 +2132,6 @@ proc_tree( CTX c, KBNODE node ) - */ - /* c->mfx.md2? 0 :(sig->sig_class == 0x01) */ - #endif -- if ( DBG_HASHING ) { -- gcry_md_start_debug( c->mfx.md, "verify" ); -- if ( c->mfx.md2 ) -- gcry_md_start_debug( c->mfx.md2, "verify2" ); -- } - if( c->sigs_only ) { - if (c->signed_data.used && c->signed_data.data_fd != -1) - rc = hash_datafile_by_fd (c->mfx.md, c->mfx.md2, -diff --git a/g10/sign.c b/g10/sign.c -index 8d280ed..163cbb5 100644 ---- a/g10/sign.c -+++ b/g10/sign.c -@@ -816,8 +816,6 @@ sign_file( strlist_t filenames, int detached, strlist_t locusr, - - if ( gcry_md_open (&mfx.md, 0, 0) ) - BUG (); -- if (DBG_HASHING) -- gcry_md_start_debug (mfx.md, "sign"); - - /* If we're encrypting and signing, it is reasonable to pick the - hash algorithm to use out of the recepient key prefs. This is -@@ -1165,8 +1163,6 @@ clearsign_file( const char *fname, strlist_t locusr, const char *outfile ) - PKT_secret_key *sk = sk_rover->sk; - gcry_md_enable (textmd, hash_for(sk)); - } -- if ( DBG_HASHING ) -- gcry_md_start_debug ( textmd, "clearsign" ); - - copy_clearsig_text( out, inp, textmd, !opt.not_dash_escaped, - opt.escape_from, (old_style && only_md5) ); -@@ -1287,8 +1283,6 @@ sign_symencrypt_file (const char *fname, strlist_t locusr) - iobuf_push_filter (inp, text_filter, &tfx); - if ( gcry_md_open (&mfx.md, 0, 0) ) - BUG (); -- if ( DBG_HASHING ) -- gcry_md_start_debug (mfx.md, "symc-sign"); - - for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next) { - PKT_secret_key *sk = sk_rover->sk; -diff --git a/sm/certcheck.c b/sm/certcheck.c -index 51a809b..8477a06 100644 ---- a/sm/certcheck.c -+++ b/sm/certcheck.c -@@ -250,8 +250,6 @@ gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert) - log_error ("md_open failed: %s\n", gpg_strerror (rc)); - return rc; - } -- if (DBG_HASHING) -- gcry_md_start_debug (md, "hash.cert"); - - rc = ksba_cert_hash (cert, 1, HASH_FNC, md); - if (rc) -diff --git a/sm/certreqgen.c b/sm/certreqgen.c -index 49b2b92..067f0f7 100644 ---- a/sm/certreqgen.c -+++ b/sm/certreqgen.c -@@ -617,8 +617,6 @@ create_request (ctrl_t ctrl, - log_error ("md_open failed: %s\n", gpg_strerror (rc)); - goto leave; - } -- if (DBG_HASHING) -- gcry_md_start_debug (md, "cr.cri"); - - ksba_certreq_set_hash_function (cr, HASH_FNC, md); - ksba_certreq_set_writer (cr, outctrl->writer); -diff --git a/sm/sign.c b/sm/sign.c -index fd7c4ff..8f7a469 100644 ---- a/sm/sign.c -+++ b/sm/sign.c -@@ -534,8 +534,6 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist, - log_error ("md_open failed: %s\n", gpg_strerror (rc)); - goto leave; - } -- if (DBG_HASHING) -- gcry_md_start_debug (data_md, "sign.data"); - - for (i=0; (algoid=ksba_cms_get_digest_algo_list (cms, i)); i++) - { -@@ -668,8 +666,6 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist, - log_error ("md_open failed: %s\n", gpg_strerror (rc)); - goto leave; - } -- if (DBG_HASHING) -- gcry_md_start_debug (md, "sign.attr"); - ksba_cms_set_hash_function (cms, HASH_FNC, md); - for (cl=signerlist,signer=0; cl; cl = cl->next, signer++) - { -diff --git a/sm/verify.c b/sm/verify.c -index c8663e3..f444faa 100644 ---- a/sm/verify.c -+++ b/sm/verify.c -@@ -159,8 +159,6 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp) - log_error ("md_open failed: %s\n", gpg_strerror (rc)); - goto leave; - } -- if (DBG_HASHING) -- gcry_md_start_debug (data_md, "vrfy.data"); - - audit_log (ctrl->audit, AUDIT_SETUP_READY); - -@@ -495,8 +493,6 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp) - audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "error"); - goto next_signer; - } -- if (DBG_HASHING) -- gcry_md_start_debug (md, "vrfy.attr"); - - ksba_cms_set_hash_function (cms, HASH_FNC, md); - rc = ksba_cms_hash_signed_attrs (cms, signer); --- -1.8.1.4 - diff --git a/meta-tizen-common-base/recipes-security/gpg2/gpg2_git.bb b/meta-tizen-common-base/recipes-security/gpg2/gpg2_git.bb index 205e13d..c645b1a 100644 --- a/meta-tizen-common-base/recipes-security/gpg2/gpg2_git.bb +++ b/meta-tizen-common-base/recipes-security/gpg2/gpg2_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/upstream/gpg2;tag=fd45bba47cfbab680118e8154c47993549dfbad6;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/gpg2;tag=94fab32e997ce870c424af01aa702c93743a0e2e;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4