Update devel/libdvdread 6.0.1 -> 6.0.2
Update multimedia/libdvdnav 6.0.0 -> 6.0.1 Add patch to converters/libdvdcss to squelch potential buffer overflow warning. From Brad Smith (maintainer)
This commit is contained in:
kmos
parent
04d4adf571
commit
60221cdf45
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2019/07/14 00:39:35 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2020/03/21 18:58:06 kmos Exp $
|
||||
|
||||
COMMENT= descramble scrambled DVDs
|
||||
|
||||
VER= 1.4.2
|
||||
REVISION= 0
|
||||
REVISION= 1
|
||||
DISTNAME= libdvdcss-${VER}
|
||||
CATEGORIES= converters
|
||||
MASTER_SITES= https://download.videolan.org/pub/videolan/libdvdcss/${VER}/
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
$OpenBSD: patch-src_css_c,v 1.5 2015/04/27 12:16:02 ajacoutot Exp $
|
||||
--- src/css.c.orig Tue Jan 27 08:56:05 2015
|
||||
+++ src/css.c Tue Feb 10 14:33:01 2015
|
||||
@@ -230,10 +230,13 @@ int dvdcss_title ( dvdcss_t dvdcss, int i_block )
|
||||
$OpenBSD: patch-src_css_c,v 1.6 2020/03/21 18:58:07 kmos Exp $
|
||||
|
||||
Index: src/css.c
|
||||
--- src/css.c.orig
|
||||
+++ src/css.c
|
||||
@@ -231,10 +231,13 @@ int dvdcss_title ( dvdcss_t dvdcss, int i_block )
|
||||
{
|
||||
char psz_key[PSZ_KEY_SIZE];
|
||||
unsigned int k0, k1, k2, k3, k4;
|
||||
@ -17,7 +19,7 @@ $OpenBSD: patch-src_css_c,v 1.5 2015/04/27 12:16:02 ajacoutot Exp $
|
||||
&& sscanf( psz_key, "%x:%x:%x:%x:%x",
|
||||
&k0, &k1, &k2, &k3, &k4 ) == 5 )
|
||||
{
|
||||
@@ -247,9 +250,12 @@ int dvdcss_title ( dvdcss_t dvdcss, int i_block )
|
||||
@@ -248,9 +251,12 @@ int dvdcss_title ( dvdcss_t dvdcss, int i_block )
|
||||
/* Don't try to save it again */
|
||||
b_cache = 0;
|
||||
i_ret = 1;
|
||||
@ -32,7 +34,7 @@ $OpenBSD: patch-src_css_c,v 1.5 2015/04/27 12:16:02 ajacoutot Exp $
|
||||
}
|
||||
}
|
||||
|
||||
@@ -263,6 +269,15 @@ int dvdcss_title ( dvdcss_t dvdcss, int i_block )
|
||||
@@ -264,6 +270,15 @@ int dvdcss_title ( dvdcss_t dvdcss, int i_block )
|
||||
{
|
||||
print_error( dvdcss, "fatal error in Video Title Set (VTS) "
|
||||
"Content Scrambling System (CSS) key" );
|
||||
|
||||
28
converters/libdvdcss/patches/patch-src_libdvdcss_c
Normal file
28
converters/libdvdcss/patches/patch-src_libdvdcss_c
Normal file
@ -0,0 +1,28 @@
|
||||
$OpenBSD: patch-src_libdvdcss_c,v 1.1 2020/03/21 18:58:07 kmos Exp $
|
||||
|
||||
Squelch potential buffer overflow warning
|
||||
|
||||
Index: src/libdvdcss.c
|
||||
--- src/libdvdcss.c.orig
|
||||
+++ src/libdvdcss.c
|
||||
@@ -320,7 +320,19 @@ static int init_cache_dir( dvdcss_t dvdcss )
|
||||
return -1;
|
||||
}
|
||||
|
||||
- sprintf( psz_tagfile, "%s/" CACHE_TAG_NAME, dvdcss->psz_cachefile );
|
||||
+ i_ret = snprintf( psz_tagfile, PATH_MAX, "%s/" CACHE_TAG_NAME,
|
||||
+ dvdcss->psz_cachefile );
|
||||
+ if ( i_ret < 0 || i_ret >= PATH_MAX)
|
||||
+ {
|
||||
+ if ( i_ret < 0)
|
||||
+ print_error( dvdcss, "failed to compose cache directory tag path");
|
||||
+ else
|
||||
+ print_error( dvdcss, "cache directory tag path too long: %s/" CACHE_TAG_NAME,
|
||||
+ dvdcss->psz_cachefile );
|
||||
+ dvdcss->psz_cachefile[0] = '\0';
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
i_fd = open( psz_tagfile, O_RDWR|O_CREAT, 0644 );
|
||||
if( i_fd >= 0 )
|
||||
{
|
||||
@ -1,14 +1,14 @@
|
||||
#$OpenBSD: Makefile,v 1.30 2019/07/12 20:44:38 sthen Exp $
|
||||
#$OpenBSD: Makefile,v 1.31 2020/03/21 18:58:07 kmos Exp $
|
||||
|
||||
COMMENT = accessing DVD files
|
||||
|
||||
VER = 6.0.1
|
||||
VER = 6.0.2
|
||||
DISTNAME = libdvdread-${VER}
|
||||
CATEGORIES = devel
|
||||
MASTER_SITES = https://download.videolan.org/pub/videolan/libdvdread/${VER}/
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
|
||||
SHARED_LIBS = dvdread 7.0
|
||||
SHARED_LIBS = dvdread 8.0
|
||||
|
||||
HOMEPAGE = http://dvdnav.mplayerhq.hu/
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (libdvdread-6.0.1.tar.bz2) = KM5PAGOIPKTTff1AovZoVQPWebyn2I1Y4E7oESOC1b0=
|
||||
SIZE (libdvdread-6.0.1.tar.bz2) = 404512
|
||||
SHA256 (libdvdread-6.0.2.tar.bz2) = +RQBryE7IZzd4ktGxQpX8pMB/rf5ZWePHX7UYyzG/rA=
|
||||
SIZE (libdvdread-6.0.2.tar.bz2) = 405298
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2019/07/12 20:47:56 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.27 2020/03/21 18:58:07 kmos Exp $
|
||||
|
||||
COMMENT= DVD navigation library
|
||||
|
||||
VER= 6.0.0
|
||||
VER= 6.0.1
|
||||
DISTNAME= libdvdnav-${VER}
|
||||
EPOCH= 0
|
||||
CATEGORIES= multimedia
|
||||
@ -16,9 +16,9 @@ HOMEPAGE= http://dvdnav.mplayerhq.hu/
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB= dvdread>=7.0 pthread
|
||||
WANTLIB= dvdread>=8.0 pthread
|
||||
|
||||
LIB_DEPENDS= devel/libdvdread>=6.0.1
|
||||
LIB_DEPENDS= devel/libdvdread>=6.0.2
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (libdvdnav-6.0.0.tar.bz2) = 8KJxGwigIXWXkvjrFLuC/4o8kpv4jDO2T/zdqieTVhg=
|
||||
SIZE (libdvdnav-6.0.0.tar.bz2) = 369605
|
||||
SHA256 (libdvdnav-6.0.1.tar.bz2) = 5WajlvGVABcIi/12A5WwVl20QjQZWtpUEzZsnSOSZzM=
|
||||
SIZE (libdvdnav-6.0.1.tar.bz2) = 378491
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
$OpenBSD: patch-misc_dvdnav_pc_in,v 1.3 2012/09/05 08:09:27 ajacoutot Exp $
|
||||
--- misc/dvdnav.pc.in.orig Sun Sep 2 22:29:45 2012
|
||||
+++ misc/dvdnav.pc.in Sun Sep 2 22:30:17 2012
|
||||
$OpenBSD: patch-misc_dvdnav_pc_in,v 1.4 2020/03/21 18:58:07 kmos Exp $
|
||||
|
||||
Index: misc/dvdnav.pc.in
|
||||
--- misc/dvdnav.pc.in.orig
|
||||
+++ misc/dvdnav.pc.in
|
||||
@@ -9,4 +9,5 @@ Version: @VERSION@
|
||||
|
||||
Requires.private: dvdread >= 4.1.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user