[SCM] libdvdread/master: debian/patches/: patchset updated
mfv at users.alioth.debian.org
mfv at users.alioth.debian.org
Sun Jan 21 20:44:37 UTC 2018
The following commit has been merged in the master branch:
commit fc8f797e3140224d78f4da7dfbe483d94d972a96
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Fri Jan 19 22:11:32 2018 +0100
debian/patches/: patchset updated
- 0001-libdvdcss.patch refreshed
- 0006-descriptor.patch renamed to #0002 and refreshed
- 0005-hurd.patch renamed to #0003 and refreshed
- 0007-segfault.patch renamed to #0004 and refreshed
diff --git a/debian/patches/0001-libdvdcss.patch b/debian/patches/0001-libdvdcss.patch
index 78ad091..d26e57a 100644
--- a/debian/patches/0001-libdvdcss.patch
+++ b/debian/patches/0001-libdvdcss.patch
@@ -7,9 +7,11 @@ Print information about the CSS README.
src/dvd_input.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
+diff --git a/src/dvd_input.c b/src/dvd_input.c
+index d28efe7..aa48d92 100644
--- a/src/dvd_input.c
+++ b/src/dvd_input.c
-@@ -366,7 +366,14 @@
+@@ -337,7 +337,14 @@ int dvdinput_setup(void)
return 1;
} else {
diff --git a/debian/patches/0006-descriptor.patch b/debian/patches/0002-descriptor.patch
similarity index 87%
rename from debian/patches/0006-descriptor.patch
rename to debian/patches/0002-descriptor.patch
index f0dbb10..7e979ab 100644
--- a/debian/patches/0006-descriptor.patch
+++ b/debian/patches/0002-descriptor.patch
@@ -25,9 +25,11 @@ Closes: #663512
src/dvd_udf.c | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
+diff --git a/src/dvd_udf.c b/src/dvd_udf.c
+index 5eb3d2b..e56588e 100644
--- a/src/dvd_udf.c
+++ b/src/dvd_udf.c
-@@ -82,6 +82,8 @@
+@@ -82,6 +82,8 @@ struct Partition {
uint32_t AccessType;
uint32_t Start;
uint32_t Length;
@@ -36,7 +38,7 @@ Closes: #663512
};
struct AD {
-@@ -101,6 +103,12 @@
+@@ -101,6 +103,12 @@ struct avdp_t {
struct extent_ad rvds;
};
@@ -49,7 +51,7 @@ Closes: #663512
struct pvd_t {
uint8_t VolumeIdentifier[32];
uint8_t VolumeSetIdentifier[128];
-@@ -427,6 +435,16 @@
+@@ -427,6 +435,16 @@ static int UDFLogVolume( uint8_t *data, char *VolumeDescriptor )
return 0;
}
@@ -66,7 +68,7 @@ Closes: #663512
static int UDFFileEntry( uint8_t *data, uint8_t *FileType,
struct Partition *partition, struct AD *ad )
{
-@@ -775,8 +793,18 @@
+@@ -775,8 +793,18 @@ static int UDFFindPartition( dvd_reader_t *device, int partnum,
/* Logical Volume Descriptor */
if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) {
/* TODO: sector size wrong! */
@@ -87,7 +89,7 @@ Closes: #663512
}
} while( ( lbnum <= MVDS_location + ( MVDS_length - 1 )
-@@ -818,7 +846,10 @@
+@@ -818,7 +846,10 @@ uint32_t UDFFindFile( dvd_reader_t *device, const char *filename,
SetUDFCache(device, PartitionCache, 0, &partition);
/* Find root dir ICB */
diff --git a/debian/patches/0005-hurd.patch b/debian/patches/0003-hurd.patch
similarity index 75%
rename from debian/patches/0005-hurd.patch
rename to debian/patches/0003-hurd.patch
index a42ea6a..4234080 100644
--- a/debian/patches/0005-hurd.patch
+++ b/debian/patches/0003-hurd.patch
@@ -1,5 +1,5 @@
From: Svante Signell <svante.signell at telia.com>
-Date: Tue, 22 Apr 2014 11:47:57 +0200
+Date: Fri, 19 Jan 2018 21:56:13 +0100
Subject: hurd
libdvdread FTBFS on hurd-i386 due to PATH_MAX usage,
@@ -8,12 +8,12 @@ The attached patch fixes these problems by using
dynamic buffer allocation.
Closes: #640803
-
-Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
- src/dvd_reader.c | 62 +++++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 48 insertions(+), 14 deletions(-)
+ src/dvd_reader.c | 63 ++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 48 insertions(+), 15 deletions(-)
+diff --git a/src/dvd_reader.c b/src/dvd_reader.c
+index 4e112d3..fe21684 100644
--- a/src/dvd_reader.c
+++ b/src/dvd_reader.c
@@ -29,6 +29,7 @@
@@ -24,7 +24,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
#include <unistd.h> /* chdir, getcwd */
#include <limits.h> /* PATH_MAX */
#include <dirent.h> /* opendir, readdir */
-@@ -452,6 +453,12 @@
+@@ -438,6 +439,12 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
if( chdir( path_copy ) == -1 ) {
goto DVDOpen_error;
}
@@ -37,7 +37,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
new_path = malloc(PATH_MAX+1);
if(!new_path) {
goto DVDOpen_error;
-@@ -459,6 +466,7 @@
+@@ -445,6 +452,7 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
if( getcwd( new_path, PATH_MAX ) == NULL ) {
goto DVDOpen_error;
}
@@ -45,7 +45,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
retval = fchdir( cdir );
close( cdir );
cdir = -1;
-@@ -703,17 +711,23 @@
+@@ -686,18 +694,24 @@ static dvd_file_t *DVDOpenFileUDF( dvd_reader_t *dvd, const char *filename,
* or -1 on file not found.
* or -2 on path not found.
*/
@@ -62,16 +62,18 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
while( ( ent = readdir( dir ) ) != NULL ) {
if( !strcasecmp( ent->d_name, file ) ) {
- sprintf( filename, "%s%s%s", path,
+- ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
+ *filename = malloc( strlen( path ) + 1 + strlen( ent->d_name ) + 1 );
+ if( *filename == NULL ) {
+ closedir(dir);
+ return -1;
+ }
+ sprintf( *filename, "%s%s%s", path,
- ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
++ ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
ent->d_name );
closedir(dir);
-@@ -724,7 +738,7 @@
+ return 0;
+@@ -707,7 +721,7 @@ static int findDirFile( const char *path, const char *file, char *filename )
return -1;
}
@@ -80,7 +82,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
{
const char *nodirfile;
int ret;
-@@ -738,9 +752,11 @@
+@@ -721,9 +735,11 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
ret = findDirFile( dvd->path_root, nodirfile, filename );
if( ret < 0 ) {
@@ -93,7 +95,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
-@@ -748,9 +764,11 @@
+@@ -731,9 +747,11 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
sprintf( video_path, "%s/video_ts/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
@@ -105,9 +107,9 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
}
return 1;
-@@ -761,20 +779,22 @@
+@@ -744,20 +762,22 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
*/
- static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
+ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, const char *filename )
{
- char full_path[ PATH_MAX + 1 ];
+ char *full_path = NULL;
@@ -130,15 +132,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
return NULL;
}
-@@ -782,6 +802,7 @@
- if( !dvd_file ) {
- fprintf( stderr, "libdvdread:DVDOpenFilePath:dvd_file malloc failed\n" );
- dvdinput_close(dev);
-+ free( full_path );
- return NULL;
- }
- dvd_file->dvd = dvd;
-@@ -794,6 +815,7 @@
+@@ -771,6 +791,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, const char *filename )
if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
@@ -146,7 +140,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
free( dvd_file );
dvdinput_close( dev );
return NULL;
-@@ -802,6 +824,7 @@
+@@ -779,6 +800,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, const char *filename )
dvd_file->title_devs[ 0 ] = dev;
dvd_file->filesize = dvd_file->title_sizes[ 0 ];
@@ -154,7 +148,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
return dvd_file;
}
-@@ -858,7 +881,7 @@
+@@ -831,7 +853,7 @@ static dvd_file_t *DVDOpenVOBUDF( dvd_reader_t *dvd, int title, int menu )
static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -163,7 +157,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
struct stat fileinfo;
dvd_file_t *dvd_file;
-@@ -881,13 +904,15 @@
+@@ -848,13 +870,15 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
} else {
sprintf( filename, "VTS_%02i_0.VOB", title );
}
@@ -180,7 +174,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
free( dvd_file );
return NULL;
}
-@@ -895,6 +920,7 @@
+@@ -862,6 +886,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
dvdinput_close(dev);
@@ -188,7 +182,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
free( dvd_file );
return NULL;
}
-@@ -909,7 +935,7 @@
+@@ -876,7 +901,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
for( i = 0; i < TITLES_MAX; ++i ) {
sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 );
@@ -197,7 +191,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
break;
}
-@@ -924,11 +950,13 @@
+@@ -891,11 +916,13 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
dvd_file->filesize += dvd_file->title_sizes[ i ];
}
if( !dvd_file->title_devs[ 0 ] ) {
@@ -211,7 +205,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
return dvd_file;
}
-@@ -1054,7 +1082,7 @@
+@@ -1021,7 +1048,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
int menu, dvd_stat_t *statbuf )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -220,7 +214,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
struct stat fileinfo;
off_t tot_size;
off_t parts_size[ 9 ];
-@@ -1066,11 +1094,14 @@
+@@ -1033,11 +1060,14 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
else
sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
@@ -236,7 +230,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
return -1;
}
-@@ -1082,7 +1113,7 @@
+@@ -1049,7 +1079,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
int cur;
for( cur = 2; cur < 10; cur++ ) {
sprintf( filename, "VTS_%02d_%d.VOB", title, cur );
@@ -245,7 +239,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
break;
if( stat( full_path, &fileinfo ) < 0 ) {
-@@ -1101,6 +1132,7 @@
+@@ -1068,6 +1098,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
for( n = 0; n < nr_parts; n++ )
statbuf->parts_size[ n ] = parts_size[ n ];
@@ -253,7 +247,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
return 0;
}
-@@ -1164,18 +1196,20 @@
+@@ -1131,18 +1162,20 @@ int DVDFileStat( dvd_reader_t *dvd, int titlenum,
return 0;
}
} else {
diff --git a/debian/patches/0007-segfault.patch b/debian/patches/0004-segfault.patch
similarity index 83%
rename from debian/patches/0007-segfault.patch
rename to debian/patches/0004-segfault.patch
index c992c39..e361537 100644
--- a/debian/patches/0007-segfault.patch
+++ b/debian/patches/0004-segfault.patch
@@ -1,18 +1,16 @@
From: Peter Van Eynde <pvaneynd at debian.org>
-Date: Tue, 22 Apr 2014 11:52:53 +0200
+Date: Fri, 19 Jan 2018 22:09:55 +0100
Subject: segfault
Fix miscompilation leading to a segfault.
Closes: #688574
-
-Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
---
src/dvd_reader.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/dvd_reader.c b/src/dvd_reader.c
-index fbdabb0..4db135d 100644
+index fe21684..c0d089e 100644
--- a/src/dvd_reader.c
+++ b/src/dvd_reader.c
@@ -30,6 +30,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index b2b6d71..a20fe39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
0001-libdvdcss.patch
-0005-hurd.patch
-0006-descriptor.patch
-0007-segfault.patch
+0002-descriptor.patch
+0003-hurd.patch
+0004-segfault.patch
--
libdvdread packaging
More information about the pkg-multimedia-commits
mailing list