From owner-svn-ports-all@freebsd.org Tue Jan 8 21:50:23 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8F0B148CABA; Tue, 8 Jan 2019 21:50:22 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 80188819CF; Tue, 8 Jan 2019 21:50:22 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73FAF5D0F; Tue, 8 Jan 2019 21:50:22 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x08LoMML049149; Tue, 8 Jan 2019 21:50:22 GMT (envelope-from martymac@FreeBSD.org) Received: (from martymac@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x08LoLQY049146; Tue, 8 Jan 2019 21:50:21 GMT (envelope-from martymac@FreeBSD.org) Message-Id: <201901082150.x08LoLQY049146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: martymac set sender to martymac@FreeBSD.org using -f From: Ganael LAPLANCHE Date: Tue, 8 Jan 2019 21:50:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489743 - in head/multimedia/libdvdread: . files X-SVN-Group: ports-head X-SVN-Commit-Author: martymac X-SVN-Commit-Paths: in head/multimedia/libdvdread: . files X-SVN-Commit-Revision: 489743 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 80188819CF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2019 21:50:23 -0000 Author: martymac Date: Tue Jan 8 21:50:21 2019 New Revision: 489743 URL: https://svnweb.freebsd.org/changeset/ports/489743 Log: Use statfs(2) instead of getfsfile(3) to get device name from a mount point. PR: 234694 Submitted by: tijl Added: head/multimedia/libdvdread/files/patch-src-dvd_reader.c (contents, props changed) Modified: head/multimedia/libdvdread/Makefile head/multimedia/libdvdread/distinfo Modified: head/multimedia/libdvdread/Makefile ============================================================================== --- head/multimedia/libdvdread/Makefile Tue Jan 8 21:42:57 2019 (r489742) +++ head/multimedia/libdvdread/Makefile Tue Jan 8 21:50:21 2019 (r489743) @@ -3,6 +3,7 @@ PORTNAME= libdvdread PORTVERSION= 6.0.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/libdvdread/${PORTVERSION}/ \ http://dvdnav.mplayerhq.hu/releases/ \ Modified: head/multimedia/libdvdread/distinfo ============================================================================== --- head/multimedia/libdvdread/distinfo Tue Jan 8 21:42:57 2019 (r489742) +++ head/multimedia/libdvdread/distinfo Tue Jan 8 21:50:21 2019 (r489743) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516309125 +TIMESTAMP = 1546990033 SHA256 (libdvdread-6.0.0.tar.bz2) = b33b1953b4860545b75f6efc06e01d9849e2ea4f797652263b0b4af6dd10f935 SIZE (libdvdread-6.0.0.tar.bz2) = 394627 Added: head/multimedia/libdvdread/files/patch-src-dvd_reader.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libdvdread/files/patch-src-dvd_reader.c Tue Jan 8 21:50:21 2019 (r489743) @@ -0,0 +1,50 @@ +Use statfs() instead of getfsfile() to get device name from a mount point. + +(getfsfile() requires an entry in the fstab file which is often not the case +for removable media) + +--- src/dvd_reader.c.orig 2018-01-17 21:35:39 UTC ++++ src/dvd_reader.c +@@ -64,7 +64,7 @@ static inline int _private_gettimeofday( struct timeva + # include + # include + #elif defined(SYS_BSD) +-# include ++# include + #elif defined(__linux__) + # include + # include +@@ -420,7 +420,7 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath, + } else if( S_ISDIR( fileinfo.st_mode ) ) { + dvd_reader_t *auth_drive = 0; + #if defined(SYS_BSD) +- struct fstab* fe; ++ struct statfs fs; + #elif defined(__sun) || defined(__linux__) + FILE *mntfile; + #endif +@@ -511,14 +511,16 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath, + } + } + #elif defined(SYS_BSD) +- if( ( fe = getfsfile( path_copy ) ) ) { +- dev_name = bsd_block2char( fe->fs_spec ); +- fprintf( stderr, +- "libdvdread: Attempting to use device %s" +- " mounted on %s for CSS authentication\n", +- dev_name, +- fe->fs_file ); +- auth_drive = DVDOpenImageFile( dev_name, NULL, NULL, have_css ); ++ if( statfs( path_copy, &fs ) == 0 ) { ++ if( !strcmp( path_copy, fs.f_mntonname ) ) { ++ dev_name = bsd_block2char( fs.f_mntfromname ); ++ fprintf( stderr, ++ "libdvdread: Attempting to use device %s" ++ " mounted on %s for CSS authentication\n", ++ dev_name, ++ fs.f_mntonname ); ++ auth_drive = DVDOpenImageFile( dev_name, NULL, NULL, have_css ); ++ } + } + #elif defined(__sun) + mntfile = fopen( MNTTAB, "r" );