Here is an update to libdvdread 6.0.2 / libdvdnav 6.0.1 and rolling in
an snprintf conversion for libdvdcss from upstream.
Index: devel/libdvdread/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/libdvdread/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- devel/libdvdread/Makefile 12 Jul 2019 20:44:38 -0000 1.30
+++ devel/libdvdread/Makefile 3 Nov 2019 00:58:15 -0000
@@ -2,13 +2,13 @@
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/
Index: devel/libdvdread/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/libdvdread/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- devel/libdvdread/distinfo 1 May 2019 03:51:17 -0000 1.12
+++ devel/libdvdread/distinfo 26 Oct 2019 00:51:13 -0000
@@ -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
Index: multimedia/libdvdnav/Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/libdvdnav/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- multimedia/libdvdnav/Makefile 12 Jul 2019 20:47:56 -0000 1.26
+++ multimedia/libdvdnav/Makefile 26 Oct 2019 00:53:32 -0000
@@ -2,7 +2,7 @@
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
Index: multimedia/libdvdnav/distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/libdvdnav/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- multimedia/libdvdnav/distinfo 1 May 2019 03:51:17 -0000 1.10
+++ multimedia/libdvdnav/distinfo 26 Oct 2019 00:53:19 -0000
@@ -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
Index: multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
===================================================================
RCS file: /home/cvs/ports/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-misc_dvdnav_pc_in
--- multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in 5 Sep 2012
08:09:27 -0000 1.3
+++ multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in 26 Oct 2019
00:54:01 -0000
@@ -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
+
+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
Index: converters/libdvdcss/Makefile
===================================================================
RCS file: /home/cvs/ports/converters/libdvdcss/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- converters/libdvdcss/Makefile 14 Jul 2019 00:39:35 -0000 1.30
+++ converters/libdvdcss/Makefile 26 Oct 2019 00:58:51 -0000
@@ -3,7 +3,7 @@
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}/
Index: converters/libdvdcss/patches/patch-src_css_c
===================================================================
RCS file: /home/cvs/ports/converters/libdvdcss/patches/patch-src_css_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_css_c
--- converters/libdvdcss/patches/patch-src_css_c 27 Apr 2015 12:16:02
-0000 1.5
+++ converters/libdvdcss/patches/patch-src_css_c 26 Oct 2019 00:59:27
-0000
@@ -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 )
+
+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/
&& 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/
}
}
-@@ -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" );
Index: converters/libdvdcss/patches/patch-src_libdvdcss_c
===================================================================
RCS file: converters/libdvdcss/patches/patch-src_libdvdcss_c
diff -N converters/libdvdcss/patches/patch-src_libdvdcss_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/libdvdcss/patches/patch-src_libdvdcss_c 26 Oct 2019 01:02:44
-0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+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 )
+ {
