Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24354445 update libgpg-error to version 1.24 s11u3-sru
authorIvo Raisr <ivo.raisr@oracle.com>
Mon, 19 Dec 2016 21:16:50 -0800
branchs11u3-sru
changeset 7532 7c3747a0f6b1
parent 7531 b8c58c63924b
child 7533 d7ad80926fea
24354445 update libgpg-error to version 1.24
components/libgpg-error/Makefile file | annotate | diff | comparison | revisions
components/libgpg-error/Solaris/gpg-error-config.1 file | annotate | diff | comparison | revisions
components/libgpg-error/libgpg-error.p5m file | annotate | diff | comparison | revisions
components/libgpg-error/patches/10_gen-posix-lock-obj.patch file | annotate | diff | comparison | revisions 
--- a/components/libgpg-error/Makefile	Wed Jan 04 13:54:58 2017 -0800
+++ b/components/libgpg-error/Makefile	Mon Dec 19 21:16:50 2016 -0800
@@ -25,16 +25,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libgpg-error
-COMPONENT_VERSION=	1.12
+COMPONENT_VERSION=	1.24
 COMPONENT_PROJECT_URL=  ftp://ftp.gnupg.org/gcrypt/$(COMPONENT_NAME)
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH= \
-    sha256:cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f
+    sha256:9268e1cc487de5e6e4460fca612a06e4f383072ac43ae90603e5e46783d3e540
 COMPONENT_ARCHIVE_URL=  ftp://ftp.gnupg.org/gcrypt/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libgpg-error
 
-TPNO=			7588
+TPNO=			30304
 
 COMPONENT_BUILD_TARGETS = all info
 
@@ -45,6 +45,7 @@
 
 CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
 CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
+CONFIGURE_OPTIONS += --enable-threads=posix
 CONFIGURE_OPTIONS.64 += CC="$(CC) -m64"
 
 ASLR_MODE = $(ASLR_ENABLE)
--- a/components/libgpg-error/Solaris/gpg-error-config.1	Wed Jan 04 13:54:58 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-'\" te
-.\" Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
-.TH gpg-error-config 1 "10 Jan 2008" "SunOS 5.11" "User Commands"
-.SH "NAME"
-gpg-error-config \- helper script for building with \fBlibgpg-error\fR
-.SH "SYNOPSIS"
-.PP
-\fBgpg-error-config\fR [-\fB-version\fR] [-\fB-prefix=\fIdir\fR\fR] [-\fB-cflags\fR] [-\fB-libs\fR] [-\fB-exec-prefix=\fIdir\fR\fR]
-.SH "DESCRIPTION"
-.PP
-The \fBgpg-error-config\fR tool is used to determine the compiler
-and linker flags that should be used to compile and link programs that use
-the \fBlibgpg-error\fR library\&.
-.SH "OPTIONS"
-.PP
-The following options are supported:
-.sp
-.ne 2
-.mk
-\fB-\fB-cflags\fR\fR
-.in +24n
-.rt
-Print the compiler flags that are necessary to compile a program
-using the specified library\&.
-.sp
-.sp 1
-.in -24n
-.sp
-.ne 2
-.mk
-\fB-\fB-exec-prefix=\fIdir\fR\fR\fR
-.in +24n
-.rt
-If specified, use \fIdir\fR instead of
-the \fBexec\fR installation prefix that the library was built
-with, when computing the output for the -\fB-cflags\fR and -\fB-libs\fR options\&. This option must be specified before any -\fB-libs\fR or -\fB-cflags\fR options\&.
-.sp
-.sp 1
-.in -24n
-.sp
-.ne 2
-.mk
-\fB-\fB-libs\fR\fR
-.in +24n
-.rt
-Print the
-linker flags that are necessary to link with the specified library\&.
-.sp
-.sp 1
-.in -24n
-.sp
-.ne 2
-.mk
-\fB-\fB-prefix=\fIdir\fR\fR\fR
-.in +24n
-.rt
-If specified, use \fIdir\fR instead of
-the installation prefix that the library was built with, when computing the
-output for the -\fB-cflags\fR and -\fB-libs\fR options\&.
-This option must be specified before any -\fB-libs\fR or -\fB-cflags\fR options\&. This option is also used for the \fBexec\fR
-prefix if the -\fB-exec-prefix\fR option is not specified\&.
-.sp
-.sp 1
-.in -24n
-.sp
-.ne 2
-.mk
-\fB-\fB-version\fR\fR
-.in +24n
-.rt
-Print
-the currently installed version of the library on the standard output\&.
-.sp
-.sp 1
-.in -24n
-.SH "EXAMPLES"
-.PP
-\fBExample 1: Getting the libgpg-error library version\fR
-.PP
-.PP
-.nf
-example% \fBgpg-error-config --version\fR
-.fi
-.PP
-\fBExample 2: Determining the libraries required to link
-with the libgpg-error library\fR
-.PP
-.PP
-.nf
-example% \fBgpg-error-config --libs\fR
-.fi
-.SH "EXIT STATUS"
-.PP
-The following exit values are returned:
-.sp
-.ne 2
-.mk
-\fB\fB0\fR\fR
-.in +9n
-.rt
-Application exited successfully
-.sp
-.sp 1
-.in -9n
-.sp
-.ne 2
-.mk
-\fB\fB>0\fR\fR
-.in +9n
-.rt
-Application
-exited with failure
-.sp
-.sp 1
-.in -9n
-.SH "FILES"
-.PP
-The following files are used by this application:
-.sp
-.ne 2
-.mk
-\fB\fB/usr/bin/gpg-error-config\fR \fR
-.in +32n
-.rt
-Executable for \fBlibgpg-error\fR helper
-script
-.sp
-.SH "SEE ALSO"
-.PP
-\fBgpg-error\fR(1),
-\fBlibgpg-error\fR(3),
-\fBpkg-config\fR(1),
-\fBattributes\fR(5)
-.SH ""
-.PP
--- a/components/libgpg-error/libgpg-error.p5m	Wed Jan 04 13:54:58 2017 -0800
+++ b/components/libgpg-error/libgpg-error.p5m	Mon Dec 19 21:16:50 2016 -0800
@@ -41,33 +41,39 @@
 file usr/bin/$(MACH64)/gpg-error path=usr/bin/gpg-error
 file path=usr/bin/gpg-error-config
 file path=usr/include/gpg-error.h
-link path=usr/lib/$(MACH64)/libgpg-error.so target=libgpg-error.so.0.10.0
-link path=usr/lib/$(MACH64)/libgpg-error.so.0 target=libgpg-error.so.0.10.0
-file path=usr/lib/$(MACH64)/libgpg-error.so.0.10.0
-link path=usr/lib/libgpg-error.so target=libgpg-error.so.0.10.0
-link path=usr/lib/libgpg-error.so.0 target=libgpg-error.so.0.10.0
-file path=usr/lib/libgpg-error.so.0.10.0
+link path=usr/lib/$(MACH64)/libgpg-error.so target=libgpg-error.so.0.19.1
+link path=usr/lib/$(MACH64)/libgpg-error.so.0 target=libgpg-error.so.0.19.1
+file path=usr/lib/$(MACH64)/libgpg-error.so.0.19.1
+link path=usr/lib/libgpg-error.so target=libgpg-error.so.0.19.1
+link path=usr/lib/libgpg-error.so.0 target=libgpg-error.so.0.19.1
+file path=usr/lib/libgpg-error.so.0.19.1
 file path=usr/share/aclocal/gpg-error.m4
 file path=usr/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
 file path=usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp
 file path=usr/share/common-lisp/source/gpg-error/gpg-error.asd
 file path=usr/share/common-lisp/source/gpg-error/gpg-error.lisp
+file path=usr/share/info/gpgrt.info
 file path=usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/man/man1/gpg-error-config.1
 file Solaris/gpg-error.1 path=usr/share/man/man1/gpg-error.1
-file Solaris/gpg-error-config.1 path=usr/share/man/man1/gpg-error-config.1
 file Solaris/libgpg-error.3 path=usr/share/man/man3/libgpg-error.3
 license COPYING license=GPLv2
 license COPYING.LIB license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libgpg-error/patches/10_gen-posix-lock-obj.patch	Mon Dec 19 21:16:50 2016 -0800
@@ -0,0 +1,58 @@
+This patch fixes gen-posix-lock-obj used during library build process to
+generate gpg-error.h.  libgpg-error package delivers the gpg-error.h
+header file to the target system. When built on Solaris, the updated
+part of the code generates definition of the gpgrt_lock_t so that it
+respects the required alignment on SPARCv7 (32bit).
+
+The fix can be tested using 'gmake test' in the libgcrypt component. If
+not applied, the t-lock and random tests fail consistently. For more
+information see: https://bugs.gnupg.org/gnupg/issue2378
+
+The fix was created internally and offered for integration to the
+upstream.  It has not been accepted yet.
+
+--- ./src/gen-posix-lock-obj.c.orig	Mon Jun 13 08:07:53 2016
++++ ./src/gen-posix-lock-obj.c	Mon Jun 13 08:08:40 2016
[email protected]@ -42,21 +42,8 @@
+ #endif
+ #endif
+ 
+-/* Special requirements for certain platforms.  */
+-# define USE_LONG_DOUBLE_FOR_ALIGNMENT 0
+-#if defined(__sun) && !defined (__LP64__) && !defined(_LP64)
+-/* Solaris on 32-bit architecture.  */
+-# define USE_DOUBLE_FOR_ALIGNMENT 1
+-#else
+-# define USE_DOUBLE_FOR_ALIGNMENT 0
+-#endif
+-#if defined(__hppa__)
+-# define USE_16BYTE_ALIGNMENT 1
+-#else
+-# define USE_16BYTE_ALIGNMENT 0
+-#endif
+ 
+-#if USE_16BYTE_ALIGNMENT && !HAVE_GCC_ATTRIBUTE_ALIGNED
++#if defined(__hppa__) && !HAVE_GCC_ATTRIBUTE_ALIGNED
+ # error compiler is not able to enforce a 16 byte alignment
+ #endif
+ 
[email protected]@ -122,12 +109,14 @@
+           "\n"
+           "#define GPGRT_LOCK_INITIALIZER {%d,{{",
+           SIZEOF_PTHREAD_MUTEX_T,
+-# if USE_16BYTE_ALIGNMENT
++/* Special requirements for certain platforms. */
++# ifdef (__hppa__)
+           "    int _x16_align __attribute__ ((aligned (16)));\n",
+-# elif USE_DOUBLE_FOR_ALIGNMENT
+-          "    double _xd_align;\n",
+-# elif USE_LONG_DOUBLE_FOR_ALIGNMENT
+-          "    long double _xld_align;\n",
++# elif defined(__sun)
++	  "#if (defined(__sparc) || defined(__sparc__)) && \\\n"
++	  "    !defined (__LP64__) && !defined(_LP64)\n"
++          "    double _xd_align;\n"
++	  "#endif\n",
+ # else
+           "",
+ # endif
upstream/oracle/userland-gate