!32 社区回合补丁

From: @noodlesland 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

0001-DBD-SQLite-1.62-Remove-bundled-source-extentions.patch

@@ -0,0 +1,100 @@
+From 244f130b8f918cc80b1c2165877102fe56d6611f Mon Sep 17 00:00:00 2001
+From: Jitka Plesnikova <jplesnik@redhat.com>
+Date: Wed, 2 Jan 2019 13:34:31 +0100
+Subject: [PATCH] Remove bundled source extentions
+
+Conflict:NA
+Reference:https://src.fedoraproject.org/rpms/perl-DBD-SQLite/blob/rawhide/f/DBD-SQLite-1.62-Remove-bundled-source-extentions.patch
+
+Signed-off-by: Jitka Plesnikova <jplesnik@redhat.com>
+---
+ README            | 30 ------------------------------
+ lib/DBD/SQLite.pm | 31 -------------------------------
+ 2 files changed, 61 deletions(-)
+
+diff --git a/README b/README
+index 34973a3..069cdeb 100644
+--- a/README
++++ b/README
+@@ -1439,36 +1439,6 @@ VIRTUAL TABLES IMPLEMENTED IN PERL
+   Other Perl virtual tables may also be published separately on
+   CPAN.
+ 
+-FOR DBD::SQLITE EXTENSION AUTHORS
+-  Since 1.30_01, you can retrieve the bundled SQLite C source and/or
+-  header like this:
+-
+-    use File::ShareDir 'dist_dir';
+-    use File::Spec::Functions 'catfile';
+-  
+-    # the whole sqlite3.h header
+-    my $sqlite3_h = catfile(dist_dir('DBD-SQLite'), 'sqlite3.h');
+-  
+-    # or only a particular header, amalgamated in sqlite3.c
+-    my $what_i_want = 'parse.h';
+-    my $sqlite3_c = catfile(dist_dir('DBD-SQLite'), 'sqlite3.c');
+-    open my $fh, '<', $sqlite3_c or die $!;
+-    my $code = do { local $/; <$fh> };
+-    my ($parse_h) = $code =~ m{(
+-      /\*+[ ]Begin[ ]file[ ]$what_i_want[ ]\*+
+-      .+?
+-      /\*+[ ]End[ ]of[ ]$what_i_want[ ]\*+/
+-    )}sx;
+-    open my $out, '>', $what_i_want or die $!;
+-    print $out $parse_h;
+-    close $out;
+-
+-  You usually want to use this in your extension's "Makefile.PL",
+-  and you may want to add DBD::SQLite to your extension's
+-  "CONFIGURE_REQUIRES" to ensure your extension users use the same C
+-  source/header they use to build DBD::SQLite itself (instead of the
+-  ones installed in their system).
+-
+ TO DO
+   The following items remain to be done.
+ 
+diff --git a/lib/DBD/SQLite.pm b/lib/DBD/SQLite.pm
+index 67d2e2b..004e381 100644
+--- a/lib/DBD/SQLite.pm
++++ b/lib/DBD/SQLite.pm
+@@ -2679,37 +2679,6 @@ sources, etc.
+ 
+ Other Perl virtual tables may also be published separately on CPAN.
+ 
+-=head1 FOR DBD::SQLITE EXTENSION AUTHORS
+-
+-Since 1.30_01, you can retrieve the bundled SQLite C source and/or
+-header like this:
+-
+-  use File::ShareDir 'dist_dir';
+-  use File::Spec::Functions 'catfile';
+-  
+-  # the whole sqlite3.h header
+-  my $sqlite3_h = catfile(dist_dir('DBD-SQLite'), 'sqlite3.h');
+-  
+-  # or only a particular header, amalgamated in sqlite3.c
+-  my $what_i_want = 'parse.h';
+-  my $sqlite3_c = catfile(dist_dir('DBD-SQLite'), 'sqlite3.c');
+-  open my $fh, '<', $sqlite3_c or die $!;
+-  my $code = do { local $/; <$fh> };
+-  my ($parse_h) = $code =~ m{(
+-    /\*+[ ]Begin[ ]file[ ]$what_i_want[ ]\*+
+-    .+?
+-    /\*+[ ]End[ ]of[ ]$what_i_want[ ]\*+/
+-  )}sx;
+-  open my $out, '>', $what_i_want or die $!;
+-  print $out $parse_h;
+-  close $out;
+-
+-You usually want to use this in your extension's C<Makefile.PL>,
+-and you may want to add DBD::SQLite to your extension's C<CONFIGURE_REQUIRES>
+-to ensure your extension users use the same C source/header they use
+-to build DBD::SQLite itself (instead of the ones installed in their
+-system).
+-
+ =head1 TO DO
+ 
+ The following items remain to be done.
+-- 
+2.19.1
+

0002-perl-DBD-SQLite-bz543982.patch

@@ -0,0 +1,29 @@
+From 9620e4a29586df3421f789df0945709e94ae6ce6 Mon Sep 17 00:00:00 2001
+From: Jitka Plesnikova <jplesnik@redhat.com>
+Date: Wed, 7 Apr 2021 19:14:32 +0800
+Subject: [PATCH] perl-DBD-SQLite-bz543982
+
+Conflict:NA
+Reference:https://src.fedoraproject.org/rpms/perl-DBD-SQLite/blob/rawhide/f/perl-DBD-SQLite-bz543982.patch
+
+Signed-off-by: yanglongkang <yanglongkang@huawei.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 5c832af..5f308ab 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -129,7 +129,7 @@ SCOPE: {
+ # a system sqlite is also sophisticated enough to have a patching system
+ # that can change the if ( 0 ) to if ( 1 )
+ my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
+-if ( 0 ) {
++if ( 1 ) {
+ 	require File::Spec;
+ 	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
+ 		$sqlite_base =~ /=(.*)/;
+-- 
+2.19.1
+

perl-DBD-SQLite.spec

@@ -1,11 +1,14 @@
 Name:           perl-DBD-SQLite
 Version:        1.74
-Release:        1
+Release:        2
 Summary:        DBD::SQLite embeds SQLite database engine into a DBD driver
 License:        (GPL-1.0-or-later or Artistic-1.0) and Public Domain
 URL:            https://metacpan.org/release/DBD-SQLite
 Source0:        https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-%{version}.tar.gz
 
+Patch0001:	0001-DBD-SQLite-1.62-Remove-bundled-source-extentions.patch
+Patch0002:	0002-perl-DBD-SQLite-bz543982.patch
+
 BuildRequires:  sqlite-devel coreutils findutils
 BuildRequires:  gcc make perl-devel
 BuildRequires:  perl-generators perl-interpreter perl(:VERSION) >= 5.6
@@ -66,6 +69,9 @@ make test
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Sat Oct 12 2024 wangmian <wangmian19@h-partners.com> - 1.74-2
+- add patch to fix bug
+
 * Mon Mar 18 2024 wangshuo <wangshuo@kylinos.cn> - 1.74-1
 - Update to 1.74