diff options
| author | drochner <drochner> | 2007-01-09 14:44:11 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2007-01-09 14:44:11 +0000 |
| commit | babcd8c72d69f5a5a4afaddd7d3d2c9daed9e58b (patch) | |
| tree | c895fb947bb0584fab2a1d8d1d202bfde9fa76cc | |
| parent | 3abdd73775862d821f7bb56a6efabe7064ff5008 (diff) | |
| download | pkgsrc-babcd8c72d69f5a5a4afaddd7d3d2c9daed9e58b.tar.gz | |
-avoid file descriptor leak
-advance buffer pointer correctly on short reads
from an unnamed contributor
bump PKGREVISION
| -rw-r--r-- | multimedia/libdvdnav/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/libdvdnav/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libdvdnav/patches/patch-ac | 17 | ||||
| -rw-r--r-- | multimedia/libdvdnav/patches/patch-ad | 12 |
4 files changed, 34 insertions, 2 deletions
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile index 97c49d8b555..0209a60daf6 100644 --- a/multimedia/libdvdnav/Makefile +++ b/multimedia/libdvdnav/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:14 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/09 14:44:11 drochner Exp $ # DISTNAME= libdvdnav-0.1.10 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvd/} diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo index e2a3d1a81f3..37172c4c431 100644 --- a/multimedia/libdvdnav/distinfo +++ b/multimedia/libdvdnav/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2006/01/03 14:35:32 joerg Exp $ +$NetBSD: distinfo,v 1.5 2007/01/09 14:44:11 drochner Exp $ SHA1 (libdvdnav-0.1.10.tar.gz) = 22289cb8f297664ce36551b818c0083e936632a7 RMD160 (libdvdnav-0.1.10.tar.gz) = 75e7878ab6fd99294b5a1c8fca1391bdbf113616 Size (libdvdnav-0.1.10.tar.gz) = 539803 bytes SHA1 (patch-aa) = d8170dcb91c08384a6f77f69d3d960e8144686cd SHA1 (patch-ab) = cd8a866df5c037b2f882939048ed1e368d55a384 +SHA1 (patch-ac) = 7c9e28af8ed74ab6d1a31923556aa3aefa32510e +SHA1 (patch-ad) = f4b42e53b8e955dc926b458b2a38a549b562ad00 diff --git a/multimedia/libdvdnav/patches/patch-ac b/multimedia/libdvdnav/patches/patch-ac new file mode 100644 index 00000000000..19a6b4a3998 --- /dev/null +++ b/multimedia/libdvdnav/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.1 2007/01/09 14:44:11 drochner Exp $ + +--- src/dvdread/dvd_reader.c.orig 2007-01-09 00:15:00.000000000 +0100 ++++ src/dvdread/dvd_reader.c +@@ -585,10 +585,12 @@ static int findDirFile( const char *path + sprintf( filename, "%s%s%s", path, + ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ), + ent->d_name ); ++ closedir( dir ); + return 0; + } + } + ++ closedir( dir ); + return -1; + } + diff --git a/multimedia/libdvdnav/patches/patch-ad b/multimedia/libdvdnav/patches/patch-ad new file mode 100644 index 00000000000..6d139c7f515 --- /dev/null +++ b/multimedia/libdvdnav/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2007/01/09 14:44:11 drochner Exp $ + +--- src/dvdread/dvd_input.c.orig 2007-01-09 00:16:53.000000000 +0100 ++++ src/dvdread/dvd_input.c +@@ -246,6 +246,7 @@ static int file_read(dvd_input_t dev, vo + return (int) (bytes / DVD_VIDEO_LB_LEN); + } + ++ buffer += ret; + len -= ret; + } + |