开源软件构建与测试

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 3

_service:tar_scm:perl-Time-HiRes.spec Changed

@@ -2,14 +2,14 @@
 %define mod_name Time-HiRes
 Name:            perl-%{mod_name}
 Epoch:           4
-Version:         1.9767
-Release:         3
+Version:         1.9775
+Release:         1
 Summary:         High resolution time, sleep, and alarm for perl
 License:         GPL+ or Artistic
 URL:             https://metacpan.org/release/%{mod_name}
 Source0:         https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/%{mod_name}-%{base_version}.tar.gz
 
-Patch6000:       backport-Time-HiRes-1.9764-Upgrade-to-1.9767.patch
+Patch6000:       backport-Time-HiRes-1.9764-Upgrade-to-1.9775.patch
 
 BuildRequires:   findutils gcc make perl-devel perl-generators perl-interpreter perl(Config)
 BuildRequires:   perl(ExtUtils::Constant) perl(ExtUtils::MakeMaker) >= 6.76 perl(File::Spec) perl(strict)
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 18 2024 hongjinghao <hongjinghao@huawei.com> - 4:1.9775-1
+- upgrade version to 1.9775
+
 * Mon Oct 24 2022 hongjinghao <hongjinghao@huawei.com> 4:1.9767-3
 - add mod_name marco

_service:tar_scm:backport-Time-HiRes-1.9764-Upgrade-to-1.9767.patch -> _service:tar_scm:backport-Time-HiRes-1.9764-Upgrade-to-1.9775.patch Changed

@@ -1,31 +1,48 @@
-From b731ad9a903192762bbd6f53fb454b114c841cae Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Wed, 22 Dec 2021 11:38:30 +0800
-Subject: PATCH 1.9767
+From 06d1d3c914663189850941ed3805ce78d36fe94c Mon Sep 17 00:00:00 2001
+From: hongjinghao <hongjinghao@huawei.com>
+Date: Thu, 18 Jan 2024 20:02:27 +0800
+Subject: PATCH Upgrade 1.9764 to 1.9775. Generated by the differences 
+ between Perl 5.32.0 and 5.38.0
 
 ---
- Changes   |   3 +
- HiRes.pm  |   2 +-
- HiRes.xs  | 204 +++---------------------------------------------------
- t/utime.t |   6 ++
- 4 files changed, 18 insertions(+), 197 deletions(-)
+ Changes       |  16 +++
+ HiRes.pm      |   2 +-
+ HiRes.xs      | 225 +++-------------------------------
+ Makefile.PL   |  44 +++++--
+ t/Watchdog.pm |  12 +-
+ t/stat.t      |  66 ++++++----
+ t/utime.t     |   6 +
+ 7 files changed, 119 insertions(+), 252 deletions(-)
 
 diff --git a/Changes b/Changes
-index a9b91a0..96f058a 100644
+index a9b91a0253..2b681e9225 100644
 --- a/Changes
 +++ b/Changes
-@@ -2,6 +2,9 @@ Revision history for the Perl extension Time::HiRes.
+@@ -2,6 +2,22 @@ Revision history for the Perl extension Time::HiRes.
  
  {{NEXT}}
  
 + - Remove obsolete vms code
 + - Use core version compare
++ - Use GIMME_V instead of the deprecated GIMME
++ - t/utime.t: dragonflybsd has only microsecond precision
++ - t/utime.t: dragonflybsd is noatime by default
++ - t/stat.t: skip testing access times on HaikuOS, it doesn't support
++   atime
++ - darwin: make sure the compiler can find the system perl headers
++   https://github.com/Perl/perl5/issues/20362
++ - darwin: make sure PERL_DARWIN is defined on darwin.
++ - don't compare stat and lstat atime if PERL_FILE_ATIME_CHANGES is set in
++   the environment.
++   https://github.com/Perl/perl5/issues/19321
++ - don't use C++ guards around the perl header files, it caused C++
++   build failures with MSVC.
 +
  1.9764 2020-08-10
   - Fix a bunch of repeated-word typos
   - Fix compilation with Visual C++ 2013 and older
 diff --git a/HiRes.pm b/HiRes.pm
-index 433ca31..9377c34 100644
+index 433ca31a05..b8cd263c3e 100644
 --- a/HiRes.pm
 +++ b/HiRes.pm
 @@ -50,7 +50,7 @@ our @EXPORT_OK = qw (usleep sleep ualarm alarm gettimeofday time tv_interval
@@ -33,36 +50,52 @@
                  );
  
 -our $VERSION = '1.9764';
-+our $VERSION = '1.9767';
++our $VERSION = '1.9775';
  our $XS_VERSION = $VERSION;
  $VERSION = eval $VERSION;
  
 diff --git a/HiRes.xs b/HiRes.xs
-index 8002472..1b97962 100644
+index 8002472866..7320cb8fb5 100644
 --- a/HiRes.xs
 +++ b/HiRes.xs
-@@ -18,6 +18,7 @@ extern "C" {
+@@ -11,16 +11,15 @@
+  * it under the same terms as Perl itself.
+  */
+ 
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+ #define PERL_NO_GET_CONTEXT
  #include "EXTERN.h"
  #include "perl.h"
  #include "XSUB.h"
+-#ifdef USE_PPPORT_H
+-#  include "ppport.h"
 +#include "reentr.h"
- #ifdef USE_PPPORT_H
- #  include "ppport.h"
++#if !defined(IS_SAFE_PATHNAME) && defined(TIME_HIRES_UTIME) && defined(HAS_UTIMENSAT)
++#define NEED_ck_warner
  #endif
-@@ -42,12 +43,6 @@ extern "C" {
- }
++#include "ppport.h"
+ #if defined(__CYGWIN__) && defined(HAS_W32API_WINDOWS_H)
+ #  include <w32api/windows.h>
+ #  define CYGWIN_WITH_W32API
+@@ -38,15 +37,6 @@ extern "C" {
+ #if defined(TIME_HIRES_CLOCK_GETTIME_SYSCALL) || defined(TIME_HIRES_CLOCK_GETRES_SYSCALL)
+ #  include <syscall.h>
  #endif
- 
+-#ifdef __cplusplus
+-}
+-#endif
+-
 -#define PERL_VERSION_DECIMAL(r,v,s) (r*1000000 + v*1000 + s)
 -#define PERL_DECIMAL_VERSION \
 -        PERL_VERSION_DECIMAL(PERL_REVISION,PERL_VERSION,PERL_SUBVERSION)
 -#define PERL_VERSION_GE(r,v,s) \
 -        (PERL_DECIMAL_VERSION >= PERL_VERSION_DECIMAL(r,v,s))
--
+ 
  #ifndef GCC_DIAG_IGNORE
  #  define GCC_DIAG_IGNORE(x)
- #  define GCC_DIAG_RESTORE
-@@ -139,8 +134,12 @@ typedef struct {
+@@ -139,8 +129,12 @@ typedef struct {
      unsigned __int64 reset_time;
  } my_cxt_t;
  
@@ -77,7 +110,16 @@
  struct timespec {
      time_t tv_sec;
      long   tv_nsec;
-@@ -323,193 +322,6 @@ _clock_getres(clockid_t clock_id, struct timespec *tp)
+@@ -263,8 +257,6 @@ _gettimeofday(pTHX_ struct timeval *tp, void *not_used)
+ static int
+ _clock_gettime(pTHX_ clockid_t clock_id, struct timespec *tp)
+ {
+-    FT_t ft;
+-
+     switch (clock_id) {
+     case CLOCK_REALTIME: {
+         FT_t ft;
+@@ -323,193 +315,6 @@ _clock_getres(clockid_t clock_id, struct timespec *tp)
  
  #endif /* #if defined(WIN32) || defined(CYGWIN_WITH_W32API) */
  
@@ -271,7 +313,7 @@
   /* Do not use H A S _ N A N O S L E E P
    * so that Perl Configure doesn't scan for it (and pull in -lrt and
    * the like which are not usually good ideas for the default Perl).
-@@ -1086,7 +898,7 @@ nsec_without_unslept(struct timespec *sleepfor,
+@@ -1086,7 +891,7 @@ nsec_without_unslept(struct timespec *sleepfor,
  /* In case Perl and/or Devel::PPPort are too old, minimally emulate
   * IS_SAFE_PATHNAME() (which looks for zero bytes in the pathname). */
  #ifndef IS_SAFE_PATHNAME
@@ -280,8 +322,308 @@
  #    ifdef WARN_SYSCALLS
  #      define WARNEMUCAT WARN_SYSCALLS /* 5.22.0 -> */
  #    else
+@@ -1380,7 +1185,7 @@ gettimeofday()
+         int status;
+         status = gettimeofday (&Tp, NULL);
+         if (status == 0) {
+-            if (GIMME == G_ARRAY) {
++            if (GIMME_V == G_LIST) {
+                 EXTEND(sp, 2);
+                 PUSHs(sv_2mortal(newSViv(Tp.tv_sec)));
+                 PUSHs(sv_2mortal(newSViv(Tp.tv_usec)));
+@@ -1437,7 +1242,7 @@ setitimer(which, seconds, interval = 0)
+         if (setitimer(which, &newit, &oldit) == 0) {
+             EXTEND(sp, 1);
+             PUSHs(sv_2mortal(newSVnv(TV2NV(oldit.it_value))));
+-            if (GIMME == G_ARRAY) {
++            if (GIMME_V == G_LIST) {
+                 EXTEND(sp, 1);
+                 PUSHs(sv_2mortal(newSVnv(TV2NV(oldit.it_interval))));
+             }
+@@ -1457,7 +1262,7 @@ getitimer(which)
+         if (getitimer(which, &nowit) == 0) {
+             EXTEND(sp, 1);
+             PUSHs(sv_2mortal(newSVnv(TV2NV(nowit.it_value))));
+-            if (GIMME == G_ARRAY) {
++            if (GIMME_V == G_LIST) {
+                 EXTEND(sp, 1);
+                 PUSHs(sv_2mortal(newSVnv(TV2NV(nowit.it_interval))));
+             }
+@@ -1710,7 +1515,7 @@ PROTOTYPE: ;$
+         Zero(&fakeop, 1, OP);
+         fakeop.op_type = ix ? OP_LSTAT : OP_STAT;
+         fakeop.op_ppaddr = PL_ppaddrfakeop.op_type;
+-        fakeop.op_flags = GIMME_V == G_ARRAY ? OPf_WANT_LIST :
++        fakeop.op_flags = GIMME_V == G_LIST ? OPf_WANT_LIST :
+             GIMME_V == G_SCALAR ? OPf_WANT_SCALAR : OPf_WANT_VOID;
+         PL_op = &fakeop;
+         (void)fakeop.op_ppaddr(aTHX);
+diff --git a/Makefile.PL b/Makefile.PL
+index c918cd1454..ac56d8df27 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -68,11 +68,20 @@ __EOD__
+             }
+         }
+

_service Changed