Date: Fri, 13 Sep 2013 19:31:56 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327181 - in head/multimedia/linux_dvbwrapper-kmod: . files Message-ID: <201309131931.r8DJVudB013628@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Fri Sep 13 19:31:56 2013 New Revision: 327181 URL: http://svnweb.freebsd.org/changeset/ports/327181 Log: - Fix build on recent head. (cap_rights_t type change in r255219) [1] - Convert Makefile header. Reported by: beefy2 via pkg-fallout [1] Modified: head/multimedia/linux_dvbwrapper-kmod/Makefile (contents, props changed) head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c (contents, props changed) Modified: head/multimedia/linux_dvbwrapper-kmod/Makefile ============================================================================== --- head/multimedia/linux_dvbwrapper-kmod/Makefile Fri Sep 13 19:27:05 2013 (r327180) +++ head/multimedia/linux_dvbwrapper-kmod/Makefile Fri Sep 13 19:31:56 2013 (r327181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: linux_dvbwrapper-kmod -# Date created: Thu Apr 21 17:34:08 CEST 2011 -# Whom: nox@FreeBSD.org -# +# Created by: nox@FreeBSD.org # $FreeBSD$ -# PORTNAME= linux_dvbwrapper-kmod PORTVERSION= 1.0 Modified: head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c ============================================================================== --- head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c Fri Sep 13 19:27:05 2013 (r327180) +++ head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c Fri Sep 13 19:31:56 2013 (r327181) @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: /tmp/pcvs/ports/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c,v 1.3 2012-06-28 17:49:51 nox Exp $"); +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> @@ -192,6 +192,9 @@ linux_ioctl_dvb(struct thread *td, struc struct dtv_property *vp, *p; size_t l_propsiz, propsiz; vm_offset_t uvp; +#if __FreeBSD_version > 1000051 + cap_rights_t rights; +#endif l_vp = NULL; vp = NULL; @@ -299,7 +302,11 @@ linux_ioctl_dvb(struct thread *td, struc goto out2; copyout(vp, (void *)uvp, propsiz); -#if __FreeBSD_version > 900040 +#if __FreeBSD_version > 1000051 + error = fget(td, args->fd, + cap_rights_init(&rights, CAP_IOCTL), &fp); + if (error != 0) +#elif __FreeBSD_version > 900040 if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) #else if ((error = fget(td, args->fd, &fp)) != 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309131931.r8DJVudB013628>