Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Jan 2020 22:08:28 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r521884 - branches/2020Q1/Mk/Uses
Message-ID:  <202001022208.002M8SsL098726@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Thu Jan  2 22:08:28 2020
New Revision: 521884
URL: https://svnweb.freebsd.org/changeset/ports/521884

Log:
  MFH: r521876
  
  Fix up file permissions in Qt ports.
  
  Because qt-dist.mk sets EXTRACT_AFTER_ARGS, the framework-standard
  --no-same-owner and --no-same-permissions aren't added. That means
  that the files end up in packages with the permissions from the tarball,
  and in particular that official packages contain group-writable (wheel)
  includes (C++ headers) and other files.
  
  This was reported in
  	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227027
  and fixed in 465911 (18 months ago) but the move from bsd.qt.mk
  to Uses/qt-dist.mk lost those settings again. Re-add them to
  the Uses/ file to improve package security.
  
  (The problem does not seem to be present in my local poudriere builds)
  
  PR:		227027
  Reported by:	grarpamp@gmail.com
  Reviewed by:	tcberner
  Approved by:	tcberner
  Differential Revision:	https://reviews.freebsd.org/D22999
  
  Approved by:	portmgr (joneum)

Modified:
  branches/2020Q1/Mk/Uses/qt-dist.mk
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/Mk/Uses/qt-dist.mk
==============================================================================
--- branches/2020Q1/Mk/Uses/qt-dist.mk	Thu Jan  2 22:06:28 2020	(r521883)
+++ branches/2020Q1/Mk/Uses/qt-dist.mk	Thu Jan  2 22:08:28 2020	(r521884)
@@ -110,7 +110,8 @@ EXTRACT_SUFX?=		.tar.xz
 # Other ports from other Qt modules will automatically build examples and
 # tests if the directories exist because of mkspecs/features/qt_parts.prf.
 EXTRACT_AFTER_ARGS?=	${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
-			${DISTNAME:S,$,/tests,:S,^,--exclude ,}
+			${DISTNAME:S,$,/tests,:S,^,--exclude ,} \
+			--no-same-owner --no-same-permissions
 .  endif # ! ${_QT_VER:M5}
 
 CONFIGURE_ENV+=		MAKE="${MAKE:T}"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001022208.002M8SsL098726>