Compare commits
11 Commits
5e7cf77fc2
...
140f1d1758
| Author | SHA1 | Date | |
|---|---|---|---|
|
140f1d1758 | ||
|
|
11423e57d0 | ||
|
|
4db5c7ccfe | ||
|
|
ca1fcd9657 | ||
|
|
0e49126e59 | ||
|
|
1bb9f21abb | ||
|
|
ec87f0e2f2 | ||
|
|
35736c460d | ||
|
|
212828d290 | ||
|
|
58797675bd | ||
|
|
322d0ff5e7 |
@ -1,159 +0,0 @@
|
||||
From 7e06ec1a1c263dd673bccdb3dfd766eac5145e74 Mon Sep 17 00:00:00 2001
|
||||
From: h00465007 <hexiujun1@huawei.com>
|
||||
Date: Tue, 14 Jan 2020 23:44:16 +0800
|
||||
Subject: [PATCH] fix unknown regexp buildin namespace error in gawk
|
||||
|
||||
---
|
||||
lang/cl/mkerrcodes.awk | 2 +-
|
||||
src/Makefile.am | 2 +-
|
||||
src/Makefile.in | 2 +-
|
||||
src/mkerrcodes.awk | 2 +-
|
||||
src/mkerrcodes1.awk | 2 +-
|
||||
src/mkerrcodes2.awk | 2 +-
|
||||
src/mkerrnos.awk | 2 +-
|
||||
src/mkstrtable.awk | 10 +++++-----
|
||||
8 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
|
||||
index ae29043..9a1fc18 100644
|
||||
--- a/lang/cl/mkerrcodes.awk
|
||||
+++ b/lang/cl/mkerrcodes.awk
|
||||
@@ -122,7 +122,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index ce1b882..f2590cb 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
|
||||
|
||||
errnos-sym.h: Makefile mkstrtable.awk errnos.in
|
||||
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
|
||||
- -v prefix=GPG_ERR_ -v namespace=errnos_ \
|
||||
+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
|
||||
$(srcdir)/errnos.in >$@
|
||||
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index e893436..38cc93c 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -1615,7 +1615,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
|
||||
|
||||
errnos-sym.h: Makefile mkstrtable.awk errnos.in
|
||||
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
|
||||
- -v prefix=GPG_ERR_ -v namespace=errnos_ \
|
||||
+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
|
||||
$(srcdir)/errnos.in >$@
|
||||
|
||||
mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile
|
||||
diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
|
||||
index 46d436c..e9c857c 100644
|
||||
--- a/src/mkerrcodes.awk
|
||||
+++ b/src/mkerrcodes.awk
|
||||
@@ -85,7 +85,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
|
||||
index a771a73..4578e29 100644
|
||||
--- a/src/mkerrcodes1.awk
|
||||
+++ b/src/mkerrcodes1.awk
|
||||
@@ -81,7 +81,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
|
||||
index ea58503..188f7a4 100644
|
||||
--- a/src/mkerrcodes2.awk
|
||||
+++ b/src/mkerrcodes2.awk
|
||||
@@ -91,7 +91,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
|
||||
index f79df66..15b1aad 100644
|
||||
--- a/src/mkerrnos.awk
|
||||
+++ b/src/mkerrnos.awk
|
||||
@@ -83,7 +83,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
|
||||
index c9de9c1..285e45f 100644
|
||||
--- a/src/mkstrtable.awk
|
||||
+++ b/src/mkstrtable.awk
|
||||
@@ -77,7 +77,7 @@
|
||||
#
|
||||
# The variable prefix can be used to prepend a string to each message.
|
||||
#
|
||||
-# The variable namespace can be used to prepend a string to each
|
||||
+# The variable pkg_namespace can be used to prepend a string to each
|
||||
# variable and macro name.
|
||||
|
||||
BEGIN {
|
||||
@@ -102,7 +102,7 @@ header {
|
||||
print "/* The purpose of this complex string table is to produce";
|
||||
print " optimal code with a minimum of relocations. */";
|
||||
print "";
|
||||
- print "static const char " namespace "msgstr[] = ";
|
||||
+ print "static const char " pkg_namespace "msgstr[] = ";
|
||||
header = 0;
|
||||
}
|
||||
else
|
||||
@@ -110,7 +110,7 @@ header {
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
@@ -150,7 +150,7 @@ END {
|
||||
else
|
||||
print " gettext_noop (\"" last_msgstr "\");";
|
||||
print "";
|
||||
- print "static const int " namespace "msgidx[] =";
|
||||
+ print "static const int " pkg_namespace "msgidx[] =";
|
||||
print " {";
|
||||
for (i = 0; i < coded_msgs; i++)
|
||||
print " " pos[i] ",";
|
||||
@@ -158,7 +158,7 @@ END {
|
||||
print " };";
|
||||
print "";
|
||||
print "static GPG_ERR_INLINE int";
|
||||
- print namespace "msgidxof (int code)";
|
||||
+ print pkg_namespace "msgidxof (int code)";
|
||||
print "{";
|
||||
print " return (0 ? 0";
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
94
backport-make-lib-version-work.patch
Normal file
94
backport-make-lib-version-work.patch
Normal file
@ -0,0 +1,94 @@
|
||||
From e0dab4843ded8af172c2566b4d7313a1a13e7e26 Mon Sep 17 00:00:00 2001
|
||||
From: Werner Koch <wk@gnupg.org>
|
||||
Date: Wed, 5 Aug 2020 12:19:56 +0200
|
||||
Subject: [PATCH] Make --lib-version work again.
|
||||
|
||||
* src/gpg-error.c (main): Add printing code.
|
||||
--
|
||||
|
||||
This was lost while changing to the included option parser back in
|
||||
2018. The new code also does some prettying of the output.
|
||||
|
||||
Fixes-commit: 11ce9bc3d6fe75859e18112824ae7ec3ca0fc8df
|
||||
Signed-off-by: Werner Koch <wk@gnupg.org>
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://github.com/gpg/libgpg-error/commit/e0dab4843ded8af172c2566b4d7313a1a13e7e26
|
||||
---
|
||||
src/gpg-error.c | 39 ++++++++++++++++++++++++++++++++++++---
|
||||
1 file changed, 36 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/gpg-error.c b/src/gpg-error.c
|
||||
index cc92c10..4e8bd8b 100644
|
||||
--- a/src/gpg-error.c
|
||||
+++ b/src/gpg-error.c
|
||||
@@ -571,9 +571,11 @@ main (int argc, char *argv[])
|
||||
gpgrt_argparse_t pargs = { &argc, &argv };
|
||||
|
||||
int i;
|
||||
+ int libversion = 0;
|
||||
int listmode = 0;
|
||||
int localemode = 0;
|
||||
int desc = 0;
|
||||
+ const char *s, *s2;
|
||||
const char *source_sym;
|
||||
const char *error_sym;
|
||||
gpg_error_t err;
|
||||
@@ -588,7 +590,7 @@ main (int argc, char *argv[])
|
||||
{
|
||||
switch (pargs.r_opt)
|
||||
{
|
||||
- case CMD_LIB_VERSION: break;
|
||||
+ case CMD_LIB_VERSION: libversion = 1; break;
|
||||
case CMD_LIST: listmode = 1; break;
|
||||
case CMD_DEFINES: listmode = 2; break;
|
||||
case CMD_LOCALE: localemode = 1; break;
|
||||
@@ -598,7 +600,12 @@ main (int argc, char *argv[])
|
||||
}
|
||||
gpgrt_argparse (NULL, &pargs, NULL); /* Free internal memory. */
|
||||
|
||||
- if (localemode)
|
||||
+ if (libversion)
|
||||
+ {
|
||||
+ if (argc)
|
||||
+ gpgrt_usage (1);
|
||||
+ }
|
||||
+ else if (localemode)
|
||||
{
|
||||
if (argc > 1)
|
||||
gpgrt_usage (1);
|
||||
@@ -606,7 +613,33 @@ main (int argc, char *argv[])
|
||||
else if ((argc && listmode) || (!argc && !listmode))
|
||||
gpgrt_usage (1);
|
||||
|
||||
- if (localemode)
|
||||
+
|
||||
+ if (libversion)
|
||||
+ {
|
||||
+ argc--; argv++;
|
||||
+ printf ("Version from header: %s (0x%06x)\n",
|
||||
+ GPG_ERROR_VERSION, GPG_ERROR_VERSION_NUMBER);
|
||||
+ printf ("Version from binary: %s\n", gpg_error_check_version (NULL));
|
||||
+ s = gpg_error_check_version ("\x01\x01");
|
||||
+ while (*s && *s == '\n')
|
||||
+ s++;
|
||||
+ fputs ("Copyright blurb ...: ", stdout);
|
||||
+ for (; *s; s++)
|
||||
+ {
|
||||
+ if (*s == '\n')
|
||||
+ {
|
||||
+ for (s2=s+1; *s2 == '\n'; s2++)
|
||||
+ ;
|
||||
+ if (!*s2)
|
||||
+ break; /* Cut off trailing LFs. */
|
||||
+ fputs ("\n ", stdout);
|
||||
+ }
|
||||
+ else
|
||||
+ putc (*s, stdout);
|
||||
+ }
|
||||
+ putc ('\n', stdout);
|
||||
+ }
|
||||
+ else if (localemode)
|
||||
{
|
||||
#if HAVE_W32_SYSTEM
|
||||
if (argc)
|
||||
54
bugfix-corss-build-detec-hosts-objdump.patch
Normal file
54
bugfix-corss-build-detec-hosts-objdump.patch
Normal file
@ -0,0 +1,54 @@
|
||||
From ce97528fa3dcc58d86e18d4d8820f210a624f63d Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Thu, 11 Jun 2020 10:19:15 +0900
|
||||
Subject: [PATCH] build: On cross build, detect host's objdump.
|
||||
|
||||
* configure.ac [*-*-linux*] (CROSS_HOST_OBJDUMP): New.
|
||||
|
||||
--
|
||||
|
||||
To support widely, we could also use objdump configured for multiple
|
||||
archs which supports host's format (instead of $host_alias-objdump),
|
||||
like objdump in binutils-multiarch of Debian, but it's not that easy
|
||||
to maintain the code to determine format name from $host_alias.
|
||||
|
||||
Or we could use eu-size in elfutils.
|
||||
|
||||
GnuPG-bug-id: 4973
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
---
|
||||
configure.ac | 21 +++++++++++++--------
|
||||
1 file changed, 13 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1dd6489..d5fa4b0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -597,14 +597,19 @@ fi
|
||||
if test x$cross_compiling = xyes; then
|
||||
case $host in
|
||||
*-*-linux*)
|
||||
- lock_obj_h_generated=yes
|
||||
- mkdir src
|
||||
- LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
|
||||
- CC=$CC OBJDUMP=$host_alias-objdump \
|
||||
- ac_ext=$ac_ext ac_objext=$ac_objext \
|
||||
- AWK=$AWK $srcdir/src/gen-lock-obj.sh \
|
||||
- >src/lock-obj-pub.native.h
|
||||
- AC_MSG_NOTICE([generated src/lock-obj-pub.native.h])
|
||||
+ AC_CHECK_PROG(CROSS_HOST_OBJDUMP, [$host_alias-objdump], [yes])
|
||||
+ if test "$CROSS_HOST_OBJDUMP" = "yes" ; then
|
||||
+ lock_obj_h_generated=yes
|
||||
+ if test ! -d src; then mkdir src; fi
|
||||
+ LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
|
||||
+ CC=$CC OBJDUMP=$host_alias-objdump \
|
||||
+ ac_ext=$ac_ext ac_objext=$ac_objext \
|
||||
+ AWK=$AWK $srcdir/src/gen-lock-obj.sh \
|
||||
+ >src/lock-obj-pub.native.h
|
||||
+ AC_MSG_NOTICE([generated src/lock-obj-pub.native.h using $host_alias-objdump and $AWK])
|
||||
+ else
|
||||
+ force_use_syscfg=yes
|
||||
+ fi
|
||||
;;
|
||||
*)
|
||||
force_use_syscfg=yes
|
||||
41
bugfix-corss-build-into-a-seperate-build-dir.patch
Normal file
41
bugfix-corss-build-into-a-seperate-build-dir.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From 013720333c6ec1d38791689bc49ba039d98e16b3 Mon Sep 17 00:00:00 2001
|
||||
From: David Michael <fedora.dm0@gmail.com>
|
||||
Date: Mon, 1 Jun 2020 10:24:53 -0400
|
||||
Subject: [PATCH] build: Fix cross-compiling into a separate build dir.
|
||||
|
||||
* configure.ac: Create the src directory before writing into it.
|
||||
* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh.
|
||||
|
||||
--
|
||||
|
||||
Signed-off-by: David Michael <fedora.dm0@gmail.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
src/Makefile.am | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6bd634b..1dd6489 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then
|
||||
case $host in
|
||||
*-*-linux*)
|
||||
lock_obj_h_generated=yes
|
||||
+ mkdir src
|
||||
LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
|
||||
CC=$CC OBJDUMP=$host_alias-objdump \
|
||||
ac_ext=$ac_ext ac_objext=$ac_objext \
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 7e36d69..b2bffd2 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
|
||||
gpg-error.vers gpg-error.def.in \
|
||||
versioninfo.rc.in gpg-error.w32-manifest.in \
|
||||
gpg-error-config-test.sh gpg-error.pc.in \
|
||||
- $(lock_obj_pub)
|
||||
+ gen-lock-obj.sh $(lock_obj_pub)
|
||||
|
||||
BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
|
||||
code-to-errno.h code-from-errno.h \
|
||||
122
libgpg-error-1.29-multilib.patch
Normal file
122
libgpg-error-1.29-multilib.patch
Normal file
@ -0,0 +1,122 @@
|
||||
diff -up libgpg-error-1.29/configure.ac.multilib libgpg-error-1.29/configure.ac
|
||||
--- libgpg-error-1.29/configure.ac.multilib 2018-04-11 14:41:10.479019981 +0200
|
||||
+++ libgpg-error-1.29/configure.ac 2018-04-11 14:43:31.288394113 +0200
|
||||
@@ -215,13 +215,13 @@ GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
|
||||
|
||||
|
||||
# Find a 64 bit integer type to be used instead of off_t. We prefer
|
||||
-# the standard integer types over int64_t and finally try long long.
|
||||
-if test "$ac_cv_sizeof_int" = "8"; then
|
||||
+# int64_t and finally try long long.
|
||||
+if test "$ac_cv_header_stdint_h" = yes; then
|
||||
+ replacement_for_off_t="int64_t"
|
||||
+elif test "$ac_cv_sizeof_int" = "8"; then
|
||||
replacement_for_off_t="int"
|
||||
elif test "$ac_cv_sizeof_long" = "8"; then
|
||||
replacement_for_off_t="long"
|
||||
-elif test "$ac_cv_header_stdint_h" = yes; then
|
||||
- replacement_for_off_t="int64_t"
|
||||
elif test "$ac_cv_sizeof_long_long" = "8"; then
|
||||
replacement_for_off_t="long long"
|
||||
else
|
||||
diff -up libgpg-error-1.29/configure.multilib libgpg-error-1.29/configure
|
||||
--- libgpg-error-1.29/configure.multilib 2018-04-11 09:34:30.000000000 +0200
|
||||
+++ libgpg-error-1.29/configure 2018-04-11 14:41:10.481020028 +0200
|
||||
@@ -11301,7 +11301,7 @@ shlibpath_var=
|
||||
shlibpath_overrides_runpath=unknown
|
||||
version_type=none
|
||||
dynamic_linker="$host_os ld.so"
|
||||
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
||||
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64 /usr/lib64"
|
||||
need_lib_prefix=unknown
|
||||
hardcode_into_libs=no
|
||||
|
||||
@@ -11775,7 +11775,7 @@ fi
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
+ sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64 /usr/lib64 $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
@@ -15879,12 +15879,12 @@ fi
|
||||
|
||||
# Find a 64 bit integer type to be used instead of off_t. We prefer
|
||||
# the standard integer types over int64_t and finally try long long.
|
||||
-if test "$ac_cv_sizeof_int" = "8"; then
|
||||
+if test "$ac_cv_header_stdint_h" = yes; then
|
||||
+ replacement_for_off_t="int64_t"
|
||||
+elif test "$ac_cv_sizeof_int" = "8"; then
|
||||
replacement_for_off_t="int"
|
||||
elif test "$ac_cv_sizeof_long" = "8"; then
|
||||
replacement_for_off_t="long"
|
||||
-elif test "$ac_cv_header_stdint_h" = yes; then
|
||||
- replacement_for_off_t="int64_t"
|
||||
elif test "$ac_cv_sizeof_long_long" = "8"; then
|
||||
replacement_for_off_t="long long"
|
||||
else
|
||||
diff -up libgpg-error-1.29/src/gen-posix-lock-obj.c.multilib libgpg-error-1.29/src/gen-posix-lock-obj.c
|
||||
--- libgpg-error-1.29/src/gen-posix-lock-obj.c.multilib 2016-11-16 13:22:03.000000000 +0100
|
||||
+++ libgpg-error-1.29/src/gen-posix-lock-obj.c 2018-04-11 14:41:10.481020028 +0200
|
||||
@@ -72,6 +72,7 @@ main (void)
|
||||
#ifdef USE_POSIX_THREADS
|
||||
unsigned char *p;
|
||||
int i;
|
||||
+ int initidx = 0;
|
||||
#endif
|
||||
struct {
|
||||
long vers;
|
||||
@@ -111,11 +112,12 @@ main (void)
|
||||
|
||||
/* To force a probably suitable alignment of the structure we use a
|
||||
union and include a long and a pointer to a long. */
|
||||
- printf ("typedef struct\n"
|
||||
+ printf ("#include <pthread.h>\n"
|
||||
+ "typedef struct\n"
|
||||
"{\n"
|
||||
" long _vers;\n"
|
||||
" union {\n"
|
||||
- " volatile char _priv[%d];\n"
|
||||
+ " volatile char _priv[sizeof(pthread_mutex_t)];\n"
|
||||
"%s"
|
||||
" long _x_align;\n"
|
||||
" long *_xp_align;\n"
|
||||
@@ -123,7 +125,6 @@ main (void)
|
||||
"} gpgrt_lock_t;\n"
|
||||
"\n"
|
||||
"#define GPGRT_LOCK_INITIALIZER {%d,{{",
|
||||
- SIZEOF_PTHREAD_MUTEX_T,
|
||||
# if USE_16BYTE_ALIGNMENT
|
||||
" int _x16_align __attribute__ ((aligned (16)));\n",
|
||||
# elif USE_DOUBLE_FOR_ALIGNMENT
|
||||
@@ -137,10 +138,16 @@ main (void)
|
||||
p = (unsigned char *)&mtx;
|
||||
for (i=0; i < sizeof mtx; i++)
|
||||
{
|
||||
+ if (p[i] != 0)
|
||||
+ initidx = i;
|
||||
+ }
|
||||
+
|
||||
+ for (i=0; i <= initidx; i++)
|
||||
+ {
|
||||
if (i && !(i % 8))
|
||||
printf (" \\\n%*s", 36, "");
|
||||
printf ("%u", p[i]);
|
||||
- if (i < sizeof mtx - 1)
|
||||
+ if (i < initidx)
|
||||
putchar (',');
|
||||
}
|
||||
fputs ("}}}\n", stdout);
|
||||
diff -up libgpg-error-1.29/src/gpg-error.h.in.multilib libgpg-error-1.29/src/gpg-error.h.in
|
||||
--- libgpg-error-1.29/src/gpg-error.h.in.multilib 2018-04-11 14:41:10.481020028 +0200
|
||||
+++ libgpg-error-1.29/src/gpg-error.h.in 2018-04-11 14:45:28.184203566 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
* License along with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
* SPDX-License-Identifier: LGPL-2.1+
|
||||
*
|
||||
- * @configure_input@
|
||||
+ * Do not edit. Generated from gpg-error.h.in.
|
||||
*/
|
||||
|
||||
/* The GnuPG project consists of many components. Error codes are
|
||||
Binary file not shown.
Binary file not shown.
BIN
libgpg-error-1.38.tar.gz
Normal file
BIN
libgpg-error-1.38.tar.gz
Normal file
Binary file not shown.
BIN
libgpg-error-1.38.tar.gz.sig
Normal file
BIN
libgpg-error-1.38.tar.gz.sig
Normal file
Binary file not shown.
@ -1,15 +1,18 @@
|
||||
Name: libgpg-error
|
||||
Version: 1.35
|
||||
Version: 1.38
|
||||
Release: 3
|
||||
Summary: Library for common error values and messages in GnuPG components.
|
||||
License: LGPLv2+
|
||||
URL: https://www.gnupg.org/ftp/gcrypt/libgpg-error
|
||||
Source0: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.gz
|
||||
Source1: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.gz.sig
|
||||
Source1: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.gz.sig
|
||||
|
||||
Patch0: 0001-fix-regexp-and-buildin-namespace-error-in-gawk.patch
|
||||
Patch6000: libgpg-error-1.29-multilib.patch
|
||||
Patch6001: bugfix-corss-build-into-a-seperate-build-dir.patch
|
||||
Patch6002: bugfix-corss-build-detec-hosts-objdump.patch
|
||||
Patch6003: backport-make-lib-version-work.patch
|
||||
|
||||
BuildRequires: gawk, gettext, autoconf, automake, gettext-devel, libtool, texinfo, gettext-autopoint
|
||||
BuildRequires: gcc gawk, gettext, autoconf, automake, gettext-devel, libtool, texinfo, gettext-autopoint hostname
|
||||
|
||||
%description
|
||||
The libgpg-error package contains a library that originally defines common error values for all GnuPG components.
|
||||
@ -17,10 +20,8 @@ Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, Pinen
|
||||
Because Libgpg-error is a common dependency all GnuPG components, more features will be added to this library.
|
||||
|
||||
%package devel
|
||||
Summary:Development files for libgpg-error
|
||||
Requires:%{name}%{?_isa} = %{version}-%{release}
|
||||
Requires(pre): /sbin/install-info
|
||||
Requires(post): /sbin/install-info
|
||||
Summary: Development files for libgpg-error
|
||||
Requires: %{name} = %{version}-%{release} pkgconfig
|
||||
|
||||
%description devel
|
||||
Contains header files and development libraries for libgpg-error.
|
||||
@ -30,7 +31,10 @@ Contains header files and development libraries for libgpg-error.
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
autoreconf -f
|
||||
|
||||
sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g;s|@GPG_ERROR_CONFIG_HOST@|none|g' src/gpg-error-config.in
|
||||
sed -i -e '/--variable=host/d' src/gpg-error-config-test.sh.in
|
||||
sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
|
||||
|
||||
%build
|
||||
@ -39,28 +43,17 @@ sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spe
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%delete_la
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%ldconfig_post
|
||||
%ldconfig_postun
|
||||
|
||||
%post devel
|
||||
[ -f %{_infodir}/gpgrt.info.gz ] && /sbin/install-info %{_infodir}/gpgrt.info.gz %{_infodir}/dir
|
||||
exit 0
|
||||
|
||||
%preun devel
|
||||
if [ $1 = 0 -a -f %{_infodir}/gpgrt.info.gz ]; then
|
||||
/sbin/install-info --delete %{_infodir}/gpgrt.info.gz %{_infodir}/dir
|
||||
fi
|
||||
exit 0
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING COPYING.LIB
|
||||
%doc AUTHORS README NEWS ChangeLog
|
||||
%{_bindir}/gpg-error
|
||||
@ -77,13 +70,36 @@ exit 0
|
||||
%{_infodir}/gpgrt.info*
|
||||
%exclude %{_bindir}/gpg-error
|
||||
%exclude %{_infodir}/dir
|
||||
%exclude %{_libdir}/*.la
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
%{_mandir}/*
|
||||
|
||||
%changelog
|
||||
* Fri Jan 05 2024 yanglu <yanglu72@h-partners.com> - 1.38-3
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- DESC:make the lib-version option work
|
||||
|
||||
* Thu Sep 30 2021 zhanzhimin <zhanzhimin@huawei.com> - 1.38-2
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- DESC:fix libgpg-error-devel install-info warning
|
||||
|
||||
* Sat Aug 29 2020 xiaqirong <xiaqirong1@huawei.com> - 1.38-1
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- update to 1.38
|
||||
|
||||
* Wed Apr 15 2020 songnannan <songnannan2@huawei.com> - 1.37-1
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- update to 1.37
|
||||
|
||||
* Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.35-3
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
@ -105,5 +121,5 @@ exit 0
|
||||
* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.31-4
|
||||
- add Requires
|
||||
|
||||
* Thu Sep 14 2019 chenzhenyu <chenzhenyu13@huawei.com> - 1.31-3
|
||||
* Mon Sep 30 2019 chenzhenyu <chenzhenyu13@huawei.com> - 1.31-3
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user