pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

i3lock: Use PAM and do not enable setuid root



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Fri Mar 18 02:36:14 2016 +0100
Changeset:	fc8a8504d132002f49749620e04905389cc5736c

Modified Files:
	i3lock/Makefile
	i3lock/PLIST

Log Message:
i3lock: Use PAM and do not enable setuid root

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fc8a8504d132002f49749620e04905389cc5736c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 i3lock/Makefile | 11 +++++++----
 i3lock/PLIST    |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs:
diff --git a/i3lock/Makefile b/i3lock/Makefile
index e4ad75f..f9a090b 100644
--- a/i3lock/Makefile
+++ b/i3lock/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=	i3lock-2.7
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://i3wm.org/i3lock/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,13 +18,15 @@ USE_LANGUAGES=	c99
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	SYSCONFDIR=${PKG_SYSCONFDIR}
 
-SPECIAL_PERMS+=	bin/i3lock ${SETUID_ROOT_PERMS}
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/${PKGBASE} ${EGDIR}
+CONF_FILES+=		${EGDIR}/pam.d/i3lock /etc/pam.d/i3lock
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/i3lock ${DESTDIR}${PREFIX}/bin/
+EGDIR=	${PREFIX}/share/examples/${PKGBASE}
+
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/i3lock.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/pam.d ${DESTDIR}${EGDIR}
 
 .include "../../devel/libev/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/i3lock/PLIST b/i3lock/PLIST
index 5265c0d..c69e93b 100644
--- a/i3lock/PLIST
+++ b/i3lock/PLIST
@@ -2,3 +2,4 @@
 bin/i3lock
 man/man1/i3lock.1
 share/doc/i3lock/LICENSE
+share/examples/i3lock/pam.d/i3lock


Home | Main Index | Thread Index | Old Index