diff --git a/debian/apertis/component b/debian/apertis/component new file mode 100644 index 0000000000000000000000000000000000000000..23e318506b8d96d928cff167a0a8c97024e6a0a9 --- /dev/null +++ b/debian/apertis/component @@ -0,0 +1 @@ +development diff --git a/debian/apertis/copyright b/debian/apertis/copyright new file mode 100644 index 0000000000000000000000000000000000000000..cf1e40f889ec0d6071ec7659b38a27db1ae01531 --- /dev/null +++ b/debian/apertis/copyright @@ -0,0 +1,15 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ + +Files: * +Copyright: no-info-found +License: Artistic + +Files: debian/* +Copyright: no-info-found +License: Artistic or GPL-1+ + +Files: Makefile.PL +Copyright: 1998-2004, Jochen Wiedmann <jwied@cpan.org> + 2004-2009, Jeff Zucker <jeff@vpservices.com> + 2009-2018, H.Merijn Brand <h.m.brand@xs4all.nl> +License: Artistic or GPL-1+ diff --git a/debian/changelog b/debian/changelog index 544b99cee219846047fb393ee0ac538b17dfbe03..8362953385bad4d0868d372cf7189aeff1da82f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libdbd-csv-perl (0.5300-1+deb10u1co1) apertis; urgency=medium + + * Sync updates from Debian Buster + * Add d/apertis/component file pointing to development + + -- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com> Mon, 22 Feb 2021 13:49:57 +0530 + +libdbd-csv-perl (0.5300-1+deb10u1) buster; urgency=medium + + * Team upload. + + [ Dominic Hargreaves ] + * Fix test failure with libdbi-perl 1.642-1+deb10u2 (Closes: #974134) + + -- Salvatore Bonaccorso <carnil@debian.org> Thu, 14 Jan 2021 22:56:01 +0100 + libdbd-csv-perl (0.5300-1) unstable; urgency=medium * Import upstream version 0.53 diff --git a/debian/patches/0001-f_dir-should-exist.patch b/debian/patches/0001-f_dir-should-exist.patch new file mode 100644 index 0000000000000000000000000000000000000000..035735f556154bb0c2ff29c105ffad8a36b4465f --- /dev/null +++ b/debian/patches/0001-f_dir-should-exist.patch @@ -0,0 +1,38 @@ +From 88c3ca044a3881eab62d6d2d38490351fd421386 Mon Sep 17 00:00:00 2001 +From: "H.Merijn Brand - Tux" <linux@tux.freedom.nl> +Date: Wed, 28 Oct 2020 15:56:53 +0100 +Subject: [PATCH] f_dir should exist + +From a CVE fix in DBI-1.644 / DBD::File-0.45 +--- + t/11_dsnlist.t | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/t/11_dsnlist.t b/t/11_dsnlist.t +index 8370976..3e97d45 100644 +--- a/t/11_dsnlist.t ++++ b/t/11_dsnlist.t +@@ -24,9 +24,19 @@ ok (@dsn >= 2, "more than one"); + ok ($dbh->disconnect, "disconnect"); + + # Try different DSN's +-foreach my $d (qw( . example lib t )) { ++foreach my $d (qw( . examples lib t )) { + ok (my $dns = Connect ("dbi:CSV:f_dir=$d"), "use $d as f_dir"); + ok ($dbh->disconnect, "disconnect"); + } + ++if ($DBD::File::VERSION ge "0.45") { ++ my @err; ++ is (eval { ++ local $SIG{__WARN__} = sub { push @err => @_ }; ++ local $SIG{__DIE__} = sub { push @err => @_ }; ++ Connect ("dbi:CSV:f_dir=d/non/exist/here"); ++ }, undef, "f_dir = nonexting dir"); ++ like ("@err", qr{d/non/exist/here}, "Error caught"); ++ } ++ + done_testing (); +-- +2.20.1 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000000000000000000000000000000000..79fadaa8b14f358004999991826af2eb5ce7d25e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-f_dir-should-exist.patch