[libmusicbrainz-discid-perl] 04/10: Drop patches, all applied upstream.
gregor herrmann
gregoa at debian.org
Tue Jan 2 19:04:53 UTC 2018
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libmusicbrainz-discid-perl.
commit eabfd83df81d93730d562af1aec5e45fe1297815
Author: gregor herrmann <gregoa at debian.org>
Date: Tue Jan 2 19:58:34 2018 +0100
Drop patches, all applied upstream.
---
debian/patches/pod-encoding.patch | 19 --------
debian/patches/series | 3 --
debian/patches/stack-corruption-discid_put.patch | 57 ------------------------
debian/patches/url.patch | 23 ----------
4 files changed, 102 deletions(-)
diff --git a/debian/patches/pod-encoding.patch b/debian/patches/pod-encoding.patch
deleted file mode 100644
index 6b05ae5..0000000
--- a/debian/patches/pod-encoding.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: use plain ascii apostrophe
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=85212
-Bug-Debian: https://bugs.debian.org/708079
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=85212
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-05-13
-
---- a/lib/MusicBrainz/DiscID.pm
-+++ b/lib/MusicBrainz/DiscID.pm
-@@ -156,7 +156,7 @@
- Construct a new DiscID object.
-
- As an optional argument the name of the device to read the ID from may
--be given. If you don�t specify a device here you can later read the ID with
-+be given. If you don't specify a device here you can later read the ID with
- the read method.
-
- =item $discid->error_msg()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 80152e0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-pod-encoding.patch
-url.patch
-stack-corruption-discid_put.patch
diff --git a/debian/patches/stack-corruption-discid_put.patch b/debian/patches/stack-corruption-discid_put.patch
deleted file mode 100644
index b42941a..0000000
--- a/debian/patches/stack-corruption-discid_put.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: stack corruption in discid_put
- This patch fixes two ways to corrupt the stack. One is by supplying
- more that 99 offset arguments. The offsets array is declared with space
- for 100 elements, but the first is reserved for the sectors argument.
- The patch addresses this by limitting the filling of offsets[] to 99 elements
- (plus the sectors argument which is in offsets[0]). It relies on libdiscid
- to return false if the request was for more than 99 offsets.
- .
- The second stack corruption is because of a typo in the initialization
- for loop. Because of that, the for loop is essentially reduced to
- "i=100" and the following line (not part of the loop) sets
- offsets[100], which is beyond the allocated space for the array. Using
- memset is safer and probably faster.
-Author: Damyan Ivanov <dmn at debian.org>
-Bug-Debian: https://bugs.debian.org/758216
-Bug: https://rt.cpan.org/Ticket/Display.html?id=98179
-
---- a/lib/MusicBrainz/DiscID.xs
-+++ b/lib/MusicBrainz/DiscID.xs
-@@ -124,12 +124,13 @@ discid_put( disc, first_track, sectors,
- DiscId *disc
- int first_track
- int sectors
-+ int n_items = items;
- PREINIT:
- int i, last_track, offsets[100];
- CODE:
-- for (i=0;i<100;i++);
-- offsets[i] = 0;
-- for (i=3; i<items; i++) {
-+ memset(offsets, 0, sizeof(offsets));
-+ if (items > 102 ) n_items = 102; // rely on discid_put to return error
-+ for (i=3; i<n_items; i++) {
- offsets[i-2] = (int)SvIV(ST(i));
- }
- offsets[0] = sectors;
---- a/t/10discid.t
-+++ b/t/10discid.t
-@@ -5,7 +5,7 @@ use strict;
- use Test::More;
-
- # use a BEGIN block so we print our plan before modules are loaded
--BEGIN { plan tests => 54 }
-+BEGIN { plan tests => 56 }
-
- # load modules
- use MusicBrainz::DiscID;
-@@ -16,6 +16,9 @@ my $disc = new MusicBrainz::DiscID();
- ok( $disc );
- is(ref $disc, 'MusicBrainz::DiscID');
-
-+ok( !$disc->put( 1, 140, 1 .. 100 ) );
-+
-+is( $disc->error_msg, "Illegal track limits" );
-
- ok( $disc->put( 1, 303602,
- 150, 9700, 25887, 39297, 53795, 63735, 77517, 94877, 107270,
diff --git a/debian/patches/url.patch b/debian/patches/url.patch
deleted file mode 100644
index 09b45f3..0000000
--- a/debian/patches/url.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: libdiscid 0.6.x has updated the URLs
- modify test to accept old and new ones
-Origin: vendor
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=89285
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=89285
-Bug-Debian: https://bugs.debian.org/725584
-Author: gregor herrmann <gregoa at debian.org>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-11-26
-
---- a/t/10discid.t
-+++ b/t/10discid.t
-@@ -28,8 +28,8 @@
- is( $disc->freedb_id, '370fce16');
- is( $disc->last_track_num, 22);
- is( $disc->sectors, 303602);
--is( $disc->submission_url, 'http://mm.musicbrainz.org/bare/cdlookup.html?id=xUp1F2NkfP8s8jaeFn_Av3jNEI4-&tracks=22&toc=1+22+303602+150+9700+25887+39297+53795+63735+77517+94877+107270+123552+135522+148422+161197+174790+192022+205545+218010+228700+239590+255470+266932+288750');
--is( $disc->webservice_url, 'http://mm.musicbrainz.org/ws/1/release?type=xml&discid=xUp1F2NkfP8s8jaeFn_Av3jNEI4-&toc=1+22+303602+150+9700+25887+39297+53795+63735+77517+94877+107270+123552+135522+148422+161197+174790+192022+205545+218010+228700+239590+255470+266932+288750');
-+like( $disc->submission_url, qr{http://(mm\.musicbrainz\.org/bare/cdlookup\.html|musicbrainz\.org/cdtoc/attach)\?id=xUp1F2NkfP8s8jaeFn_Av3jNEI4-&tracks=22&toc=1\+22\+303602\+150\+9700\+25887\+39297\+53795\+63735\+77517\+94877\+107270\+123552\+135522\+148422\+161197\+174790\+192022\+205545\+218010\+228700\+239590\+255470\+266932\+288750});
-+like( $disc->webservice_url, qr{http://(mm\.)?musicbrainz\.org/ws/1/release\?type=xml&discid=xUp1F2NkfP8s8jaeFn_Av3jNEI4-&toc=1\+22\+303602\+150\+9700\+25887\+39297\+53795\+63735\+77517\+94877\+107270\+123552\+135522\+148422\+161197\+174790\+192022\+205545\+218010\+228700\+239590\+255470\+266932\+288750});
-
- is( $disc->track_offset(1), 150);
- is( $disc->track_offset(2), 9700);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmusicbrainz-discid-perl.git
More information about the Pkg-perl-cvs-commits
mailing list