开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:extract_file:libgpg-error.spec Deleted

@@ -1,128 +0,0 @@
-Name:           libgpg-error
-Version:        1.43
-Release:        1
-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
-
-Patch0:         libgpg-error-1.29-multilib.patch
-
-BuildRequires:  gcc gawk, gettext, autoconf, automake, gettext-devel, libtool,  texinfo, gettext-autopoint
-
-%description
-The libgpg-error package contains a library that originally defines common error values for all GnuPG components.
-Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SCdaemon.
-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} = %{version}-%{release} pkgconfig
-
-%description    devel
-Contains header files and development libraries for libgpg-error.
-
-%package_help
-
-%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
-%configure --disable-static --disable-rpath --disable-languages
-%make_build
-
-%install
-%make_install
-%delete_la
-
-%find_lang %{name}
-
-%check
-make check
-
-%ldconfig_scriptlets
-
-%files -f %{name}.lang
-%defattr(-,root,root)
-%license COPYING COPYING.LIB
-%doc AUTHORS README NEWS ChangeLog
-%{_bindir}/gpg-error
-%{_libdir}/libgpg-error.so.0*
-%{_datadir}/libgpg-error
-
-%files devel
-%defattr(-,root,root)
-%{_bindir}/*
-%{_libdir}/libgpg-error.so
-%{_libdir}/pkgconfig/gpg-error.pc
-%{_includedir}/gpg*.h
-%{_datadir}/aclocal/gpg*.m4
-%{_infodir}/gpgrt.info*
-%exclude %{_bindir}/gpg-error
-%exclude %{_infodir}/dir
-
-%files help
-%defattr(-,root,root)
-%{_mandir}/*
-
-%changelog
-* Mon Mar 21 2022 yanglu <yanglu72@h-partners.com> - 1.43-1
-- Type:requirements
-- Id:NA
-- SUG:NA
-- DESC:update libgpg-error to 1.43
-
-* Thu Sep 30 2021 zhanzhimin <zhanzhimin@huawei.com> - 1.41-2
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:fix libgpg-error-devel install-info warning
-
-* Sat Jan 30 2021 xihaochen <xihaochen@huawei.com> - 1.41-1
-- Type:requirements
-- Id:NA
-- SUG:NA
-- DESC:update libgpg-error to 1.41
-
-* Mon Jul 27 2020 yuboyun <yuboyun@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
-- SUG:NA
-- DESC:fix gawk error
-
-* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.35-2
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:remove the gpg-error from devel package
-
-* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.35-1
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:updtae to 1.35
-
-* 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
-- Package init

_service:tar_scm:libgpg-error.spec Added

@@ -0,0 +1,134 @@
+Name:           libgpg-error
+Version:        1.43
+Release:        2
+Summary:        Library for common error values and messages in GnuPG components.
+License:        LGPLv2+
+URL:            https://www.gnupg.org/related_software/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
+
+Patch0:         libgpg-error-1.29-multilib.patch
+
+BuildRequires:  gcc gawk, gettext, autoconf, automake, gettext-devel, libtool,  texinfo, gettext-autopoint
+
+%description
+The libgpg-error package contains a library that originally defines common error values for all GnuPG components.
+Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SCdaemon.
+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} = %{version}-%{release} pkgconfig
+
+%description    devel
+Contains header files and development libraries for libgpg-error.
+
+%package_help
+
+%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
+%configure --disable-static --disable-rpath --disable-languages
+%make_build
+
+%install
+%make_install
+%delete_la
+
+%find_lang %{name}
+
+%check
+make check
+
+%ldconfig_scriptlets
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%license COPYING COPYING.LIB
+%doc AUTHORS README NEWS ChangeLog
+%{_bindir}/gpg-error
+%{_libdir}/libgpg-error.so.0*
+%{_datadir}/libgpg-error
+
+%files devel
+%defattr(-,root,root)
+%{_bindir}/*
+%{_libdir}/libgpg-error.so
+%{_libdir}/pkgconfig/gpg-error.pc
+%{_includedir}/gpg*.h
+%{_datadir}/aclocal/gpg*.m4
+%{_infodir}/gpgrt.info*
+%exclude %{_bindir}/gpg-error
+%exclude %{_infodir}/dir
+
+%files help
+%defattr(-,root,root)
+%{_mandir}/*
+
+%changelog
+* Wed Oct 19 2022 yanglu <yanglu72@h-partners.com> - 1.43-2
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:fix URL
+
+* Mon Mar 21 2022 yanglu <yanglu72@h-partners.com> - 1.43-1
+- Type:requirements
+- Id:NA
+- SUG:NA
+- DESC:update libgpg-error to 1.43
+
+* Thu Sep 30 2021 zhanzhimin <zhanzhimin@huawei.com> - 1.41-2
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:fix libgpg-error-devel install-info warning
+
+* Sat Jan 30 2021 xihaochen <xihaochen@huawei.com> - 1.41-1
+- Type:requirements
+- Id:NA
+- SUG:NA
+- DESC:update libgpg-error to 1.41
+
+* Mon Jul 27 2020 yuboyun <yuboyun@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
+- SUG:NA
+- DESC:fix gawk error
+
+* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.35-2
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:remove the gpg-error from devel package
+
+* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.35-1
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:updtae to 1.35
+
+* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.31-4
+- add Requires
+
+* Mon Sep 30 2019 chenzhenyu <chenzhenyu13@huawei.com> - 1.31-3
+- Package init

_service:extract_file:libgpg-error-1.29-multilib.patch Deleted

@@ -1,122 +0,0 @@
-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 _privsizeof(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 (pi != 0)
-+        initidx = i;
-+    }
-+
-+  for (i=0; i <= initidx; i++)
-+    {
-       if (i && !(i % 8))
-         printf (" \\\n%*s", 36, "");
-       printf ("%u", pi);
--      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

_service:tar_scm:libgpg-error-1.29-multilib.patch Added

@@ -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 _privsizeof(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 (pi != 0)
++        initidx = i;
++    }
++
++  for (i=0; i <= initidx; i++)
++    {
+       if (i && !(i % 8))
+         printf (" \\\n%*s", 36, "");
+       printf ("%u", pi);
+-      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

_service Changed

_service:extract_file:libgpg-error-1.43.tar.gz Deleted

_service:extract_file:libgpg-error-1.43.tar.gz.sig Deleted

_service:extract_file:libgpg-error.yaml Deleted

_service:tar_scm:libgpg-error-1647936669.b295c45.tar -> _service:tar_scm:libgpg-error-1.43.tar.gz Changed

_service:tar_scm:libgpg-error-1.43.tar.gz.sig Added

_service:tar_scm:libgpg-error.yaml Added