cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r562095 r562120

Browse Source 
Fix potential buffer overflow.

Along the way improve port Makefile

PR:	252321
Submitted by:	daniel.engberg.lists@pyret.net

multimedia/libdvdcss: unbreak wit recent doxygen

With hat:	ports-secteam
PR:		252848
Suggested by:	VVD in PR 252321
This commit is contained in:
Dima Panov 2021-01-20 08:51:39 +00:00
parent 1c64ee8c71
commit a12a99487d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2021Q1/; revision=562121
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multimedia/libdvdcss/Makefile
View File

@ -2,9 +2,10 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= libdvdcss PORTNAME= libdvdcss
PORTVERSION= 1.4.2 DISTVERSION= 1.4.2
PORTREVISION= 2
CATEGORIES= multimedia CATEGORIES= multimedia
MASTER_SITES= http://download.videolan.org/pub/${PORTNAME}/${PORTVERSION}/ MASTER_SITES= https://download.videolan.org/pub/${PORTNAME}/${DISTVERSION}/
MAINTAINER= jpaetzel@FreeBSD.org MAINTAINER= jpaetzel@FreeBSD.org
COMMENT= Portable abstraction library for DVD decryption COMMENT= Portable abstraction library for DVD decryption
@ -12,9 +13,10 @@ COMMENT= Portable abstraction library for DVD decryption
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool pathfix tar:bzip2
RESTRICTED= CSS code may violate the DMCA RESTRICTED= CSS code may violate the DMCA
USES= gmake libtool pathfix tar:bzip2
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_LDCONFIG= yes USE_LDCONFIG= yes
INSTALL_TARGET= install-strip INSTALL_TARGET= install-strip
@ -24,6 +26,8 @@ PORTDOCS= *
OPTIONS_DEFINE= DOXYGEN DOCS OPTIONS_DEFINE= DOXYGEN DOCS
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_CONFIGURE_ENABLE= doc
DOXYGEN_USES= gmake
post-install-DOXYGEN-on: post-install-DOXYGEN-on:
${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR}

23
multimedia/libdvdcss/files/patch-src_libdvdcss.c Normal file
View File

@ -0,0 +1,23 @@
--- src/libdvdcss.c.orig 2018-03-02 15:44:29 UTC
+++ 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 )
{