开源软件构建与测试

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-Unicode-Normalize.spec Changed

@@ -1,15 +1,14 @@
 %global base_version 1.26
 %define mod_name Unicode-Normalize
 Name:            perl-%{mod_name}
-Version:         1.28
-Release:         2
+Version:         1.32
+Release:         1
 Summary:         Unicode Normalization Forms
 License:         GPL+ or Artistic
 URL:             https://metacpan.org/release/%{mod_name}
 Source0:         https://cpan.metacpan.org/authors/id/K/KH/KHW/%{mod_name}-%{base_version}.tar.gz
 
-Patch6000:	backport-Update-1.27.patch	 
-Patch6001:	backport-Update-1.28.patch 
+Patch6000:	backport-1.26-Update-to-1.32.path	 
 
 BuildRequires:   gcc findutils make perl-devel perl-generators perl-interpreter perl-libs
 BuildRequires:   perl(Carp) perl(constant) perl(ExtUtils::MakeMaker) >= 6.76 perl(File::Spec)
@@ -26,6 +25,10 @@
 %prep
 %autosetup -n %{mod_name}-%{base_version} -p1
 
+# Generate ppport.h which is used since 1.32
+perl -MDevel::PPPort \
+    -e 'Devel::PPPort::WriteFile() or die "Could not generate ppport.h: $!"'
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="%{optflags}"
 %make_build
@@ -55,6 +58,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 28 2023 hongjinghao <hongjinghao@huawei.com> - 1.32-1
+- Upgrade to 1.32
+
 * Mon Oct 24 2022 yangmingtai <yangmingtai@huawei.com> - 1.28-2
 - define mod_name to opitomize the specfile

_service:tar_scm:backport-Update-1.27.patch Deleted

@@ -1,59 +0,0 @@
-From dec44613883434fd522845393f1686514eb4dc83 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Mon, 27 Dec 2021 17:55:49 +0800
-Subject: PATCH 1.27
-
----
- Normalize.pm | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Normalize.pm b/Normalize.pm
-index adf3db5..d06fb8b 100644
---- a/Normalize.pm
-+++ b/Normalize.pm
-@@ -16,7 +16,7 @@ use Carp;
- 
- no warnings 'utf8';
- 
--our $VERSION = '1.26';
-+our $VERSION = '1.27';
- our $PACKAGE = __PACKAGE__;
- 
- our @EXPORT = qw( NFC NFD NFKC NFKD );
-@@ -606,27 +606,27 @@ and/or modify it under the same terms as Perl itself.
- 
- =over 4
- 
--=item http://www.unicode.org/reports/tr15/
-+=item L<http://www.unicode.org/reports/tr15/>
- 
- Unicode Normalization Forms - UAX #15
- 
--=item http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt
-+=item L<http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt>
- 
- Composition Exclusion Table
- 
--=item http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt
-+=item L<http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt>
- 
- Derived Normalization Properties
- 
--=item http://www.unicode.org/Public/UNIDATA/NormalizationCorrections.txt
-+=item L<http://www.unicode.org/Public/UNIDATA/NormalizationCorrections.txt>
- 
- Normalization Corrections
- 
--=item http://www.unicode.org/review/pr-29.html
-+=item L<http://www.unicode.org/review/pr-29.html>
- 
- Public Review Issue #29: Normalization Issue
- 
--=item http://www.unicode.org/notes/tn5/
-+=item L<http://www.unicode.org/notes/tn5/>
- 
- Canonical Equivalence in Applications - UTN #5
- 
--- 
-2.27.0
-

_service:tar_scm:backport-Update-1.28.patch Deleted

@@ -1,84 +0,0 @@
-From 99f15055f38ca3efeedc4c372d1f62100cfe58a1 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Mon, 27 Dec 2021 17:56:59 +0800
-Subject: PATCH 1.28
-
----
- Makefile.PL  | 22 ++++++++++++----------
- Normalize.pm |  2 +-
- Normalize.xs |  2 +-
- 3 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 18bc2e2..a848b0d 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -1,4 +1,6 @@
--require 5.006001;
-+use strict;
-+use warnings;
-+
- use ExtUtils::MakeMaker;
- 
- my $clean = {};
-@@ -6,7 +8,7 @@ my $clean = {};
- my $mm_ver = ExtUtils::MakeMaker->VERSION;
- 
- if (-f "Normalize.xs") {
--    print STDERR "Making header files for XS...\n";
-+    print "Making header files for XS...\n";
- 
-     do './mkheader' or die $@ || "mkheader: $!";
- 
-@@ -29,14 +31,14 @@ WriteMakefile(
-     'clean'             => $clean,
-     'depend'            => { 'Normalize.o' => '$(H_FILES)' },
-     'PREREQ_PM'         => {
--        Carp            => 0,
--        constant        => 0,
--        DynaLoader      => 0,
--        Exporter        => 0,
--        File::Spec      => 0,
--        strict          => 0,
--        warnings        => 0,
--        SelectSaver     => 0,
-+        'Carp'          => 0,
-+        'constant'      => 0,
-+        'DynaLoader'    => 0,
-+        'Exporter'      => 0,
-+        'File::Spec'    => 0,
-+        'strict'        => 0,
-+        'warnings'      => 0,
-+        'SelectSaver'   => 0,
-     },
-     ($mm_ver < 6.48 ? () : MIN_PERL_VERSION => 5.6.0),
-     ($mm_ver < 6.46 ? () : (META_MERGE => {
-diff --git a/Normalize.pm b/Normalize.pm
-index d06fb8b..fd6f1cb 100644
---- a/Normalize.pm
-+++ b/Normalize.pm
-@@ -16,7 +16,7 @@ use Carp;
- 
- no warnings 'utf8';
- 
--our $VERSION = '1.27';
-+our $VERSION = '1.28';
- our $PACKAGE = __PACKAGE__;
- 
- our @EXPORT = qw( NFC NFD NFKC NFKD );
-diff --git a/Normalize.xs b/Normalize.xs
-index 4acff7f..0c151b7 100644
---- a/Normalize.xs
-+++ b/Normalize.xs
-@@ -23,7 +23,7 @@
- /* The generated normalization tables since v5.20 are in native character set
-  * terms.  Prior to that, they were in Unicode terms.  So we use 'uvchr' for
-  * later perls, and redefine that to be 'uvuni' for earlier ones */
--#if PERL_VERSION < 20
-+#if PERL_VERSION_LT(5,20,0)
- #   undef uvchr_to_utf8
- #   ifdef uvuni_to_utf8
- #       define uvchr_to_utf8   uvuni_to_utf8
--- 
-2.27.0
-

_service Changed

_service:tar_scm:backport-1.26-Update-to-1.32.path Added

@@ -0,0 +1,926 @@
+From 0850dba96e3cb8ee37fe405b0cf76d7f910e90e4 Mon Sep 17 00:00:00 2001
+From: Jitka Plesnikova <jplesnik@redhat.com>
+Date: Thu, 18 May 2023 21:02:00 +0200
+Subject: PATCH Upgrade to 1.32
+ 
+---
+ Makefile.PL  | 22 +++++++-------
+ Normalize.pm | 81 +++++++++++++++++++++++++++++++++++++---------------
+ Normalize.xs | 71 ++++++++++++++-------------------------------
+ mkheader     | 20 +++----------
+ t/fcdc.t     | 22 ++------------
+ t/form.t     | 20 +------------
+ t/func.t     | 22 ++------------
+ t/illegal.t  | 22 ++------------
+ t/norm.t     | 24 ++--------------
+ t/null.t     | 11 -------
+ t/partial1.t | 20 +------------
+ t/partial2.t | 24 ++--------------
+ t/proto.t    | 20 +------------
+ t/split.t    | 24 ++--------------
+ t/test.t     | 24 ++--------------
+ t/tie.t      | 20 +------------
+ 16 files changed, 118 insertions(+), 329 deletions(-)
+ 
+diff --git a/Makefile.PL b/Makefile.PL
+index 18bc2e2..a848b0d 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,4 +1,6 @@
+-require 5.006001;
++use strict;
++use warnings;
++
+ use ExtUtils::MakeMaker;
+ 
+ my $clean = {};
+@@ -6,7 +8,7 @@ my $clean = {};
+ my $mm_ver = ExtUtils::MakeMaker->VERSION;
+ 
+ if (-f "Normalize.xs") {
+-    print STDERR "Making header files for XS...\n";
++    print "Making header files for XS...\n";
+ 
+     do './mkheader' or die $@ || "mkheader: $!";
+ 
+@@ -29,14 +31,14 @@ WriteMakefile(
+     'clean'             => $clean,
+     'depend'            => { 'Normalize.o' => '$(H_FILES)' },
+     'PREREQ_PM'         => {
+-        Carp            => 0,
+-        constant        => 0,
+-        DynaLoader      => 0,
+-        Exporter        => 0,
+-        File::Spec      => 0,
+-        strict          => 0,
+-        warnings        => 0,
+-        SelectSaver     => 0,
++        'Carp'          => 0,
++        'constant'      => 0,
++        'DynaLoader'    => 0,
++        'Exporter'      => 0,
++        'File::Spec'    => 0,
++        'strict'        => 0,
++        'warnings'      => 0,
++        'SelectSaver'   => 0,
+     },
+     ($mm_ver < 6.48 ? () : MIN_PERL_VERSION => 5.6.0),
+     ($mm_ver < 6.46 ? () : (META_MERGE => {
+diff --git a/Normalize.pm b/Normalize.pm
+index adf3db5..c8053f7 100644
+--- a/Normalize.pm
++++ b/Normalize.pm
+@@ -1,14 +1,5 @@
+ package Unicode::Normalize;
+ 
+-BEGIN {
+-    unless ('A' eq pack('U', 0x41)) {
+-	die "Unicode::Normalize cannot stringify a Unicode code point\n";
+-    }
+-    unless (0x41 == unpack('U', 'A')) {
+-	die "Unicode::Normalize cannot get Unicode code point\n";
+-    }
+-}
+-
+ use 5.006;
+ use strict;
+ use warnings;
+@@ -16,7 +7,7 @@ use Carp;
+ 
+ no warnings 'utf8';
+ 
+-our $VERSION = '1.26';
++our $VERSION = '1.32';
+ our $PACKAGE = __PACKAGE__;
+ 
+ our @EXPORT = qw( NFC NFD NFKC NFKD );
+@@ -40,16 +31,58 @@ our %EXPORT_TAGS = (
+ ## utilities for tests
+ ##
+ 
+-sub pack_U {
+-    return pack('U*', @_);
++                             # No EBCDIC support on early perls
++*to_native = ($::IS_ASCII || $ < 5.008)
++             ? sub { return shift }
++             : sub { utf8::unicode_to_native(shift) };
++
++*from_native = ($::IS_ASCII || $ < 5.008)
++             ? sub { return shift }
++             : sub { utf8::native_to_unicode(shift) };
++
++# The .t files are all in terms of Unicode, so xlate to/from native
++sub dot_t_pack_U {
++    return pack('U*', map { to_native($_) } @_);
+ }
+ 
+-sub unpack_U {
++sub dot_t_unpack_U {
+ 
+     # The empty pack returns an empty UTF-8 string, so the effect is to force
+     # the shifted parameter into being UTF-8.  This allows this to work on
+     # Perl 5.6, where there is no utf8::upgrade().
+-    return unpack('U*', shift(@_).pack('U*'));
++    return map { from_native($_) } unpack('U*', shift(@_).pack('U*'));
++}
++
++sub get_printable_string ($) {
++    use bytes;
++    my $s = shift;
++
++    # DeMorgan's laws cause this to mean ascii printables
++    return $s if $s =~ /^:^ascii::^print:/;
++
++    return join " ", map { sprintf "\\x%02x", ord $_ } split "", $s;
++}
++
++sub ok ($$;$) {
++    my $count_ref = shift;  # Test number in caller
++    my $p = my $r = shift;
++    my $x;
++    if (@_) {
++        $x = shift;
++        $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x;
++    }
++
++    print $p ? "ok" : "not ok", ' ', ++$$count_ref, "\n";
++
++    return if $p;
++
++    my (undef, $file, $line) = caller(1);
++    print STDERR "# Failed test $$count_ref at $file line $line\n";
++
++    return unless defined $x;
++
++    print STDERR "#      got ", get_printable_string($r), "\n";
++    print STDERR "# expected ", get_printable_string($x), "\n";
+ }
+ 
+ require Exporter;
+@@ -343,7 +376,7 @@ Note that C<$unprocessed> will be modified as a side-effect.
+ 
+ =head2 Quick Check
+ 
+-(see Annex 8, UAX #15; and F<DerivedNormalizationProps.txt>)
++(see Annex 8, UAX #15; and F<lib/unicore/DerivedNormalizationProps.txt>)
+ 
+ The following functions check whether the string is in that normalization form.
+ 
+@@ -571,8 +604,10 @@ so one could cause Unicode 3.2 to be used in any perl version starting with
+ 
+ In older Unicode versions, a small number of characters (all of which are
+ CJK compatibility ideographs as far as they have been found) may have
+-an erroneous decomposition mapping (see F<NormalizationCorrections.txt>).
+-Anyhow, this module will neither refer to F<NormalizationCorrections.txt>
++an erroneous decomposition mapping (see
++F<lib/unicore/NormalizationCorrections.txt>).
++Anyhow, this module will neither refer to
++F<lib/unicore/NormalizationCorrections.txt>
+ nor provide any specific version of normalization. Therefore this module
+ running on an older perl with an older Unicode database may use
+ the erroneous decomposition mapping blindly conforming to the Unicode database.
+@@ -606,27 +641,27 @@ and/or modify it under the same terms as Perl itself.
+ 
+ =over 4
+ 
+-=item http://www.unicode.org/reports/tr15/
++=item L<http://www.unicode.org/reports/tr15/>
+ 
+ Unicode Normalization Forms - UAX #15
+ 
+-=item http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt
++=item L<http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt>
+ 
+ Composition Exclusion Table
+ 
+-=item http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt
++=item L<http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt>
+ 
+ Derived Normalization Properties