summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2009-06-18 08:54:21 +0000
committertron <tron@pkgsrc.org>2009-06-18 08:54:21 +0000
commit88484610202b68ba23a813325e4461cd2790fee9 (patch)
treecefcf4a00cbbb088f616a9bd19fe505016deec12
parent4066badb1e96896f586da4c5a63276f495c75e0b (diff)
downloadpkgsrc-88484610202b68ba23a813325e4461cd2790fee9.tar.gz
Pullup ticket #2800 - requested by hasso
kdelibs3: security patch Revisions pulled up: - x11/kdelibs3/Makefile 1.141 --- Module Name: pkgsrc Committed By: hasso Date: Tue Jun 16 16:09:36 UTC 2009 Modified Files: pkgsrc/x11/kdelibs3: Makefile Log Message: Fix a serious security issue for platforms using kgrantpty (NetBSD isn't such, but DragonFly is): ${SETUID_ROOT_PERMS} doesn't work for suid kgrantpty, because the locate() method used to find the path to the binary expects it to have a read permissions set.
-rw-r--r--x11/kdelibs3/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 5a46288c3c2..a9612954d29 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2008/08/27 12:02:31 markd Exp $
+# $NetBSD: Makefile,v 1.140.8.1 2009/06/18 08:54:21 tron Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -57,9 +58,12 @@ SUBST_FILES.kdemagic= kio/magic
SUBST_SED.kdemagic= -n -e 'p' -e 's:/usr/local/bin:${LOCALBASE}/bin:p'
SPECIAL_PERMS+= ${PREFIX}/bin/fileshareset ${SETUID_ROOT_PERMS}
-SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${SETUID_ROOT_PERMS}
SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS}
+# ${SETUID_ROOT_PERMS} doesn't work here because the locate() method used to
+# find the path to the kgrantpty expects it to have read permissions set.
+SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4555
+
.include "options.mk"
PLIST_VARS+= kded