Mercurial > vanilla

changeset 548:b1d040632d36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: enable PAM when possible
author David Demelier <markand@malikania.fr>
date Tue, 16 Apr 2019 20:01:00 +0200
parents 9a75d1292ca8
children bad483aace64
files network/inetutils/inetutils.sh x11/xdm/xdm.sh
diffstat 2 files changed, 31 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/network/inetutils/inetutils.sh	Fri Apr 12 11:01:03 2019 +0200
+++ b/network/inetutils/inetutils.sh	Tue Apr 16 20:01:00 2019 +0200
@@ -21,6 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="GNU network programs"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
+PKGOPTIONS="PAM"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -28,6 +29,14 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
+: ${PAM:=yes}
+
+if [ "$PAM" = "yes" ]; then
+	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	with_pam="--with-pam"
+else
+	with_pam="--without-pam"
+fi
 
 build()
 {
@@ -35,6 +44,9 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
 	pushd $PKGNAME-$PKGVERSION
 
+	# --disable-rcp: does not build with musl.
+	# --disable-rlogin: does not build with musl.
+	# --disable-rsh: does not build with musl.
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
@@ -43,14 +55,10 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/ \
-		--without-pam \
 		--disable-rcp \
 		--disable-rlogin \
-		--disable-rlogind \
 		--disable-rsh \
-		--disable-rshd \
-		--disable-talk \
-		--disable-talkd
+		$with_pam
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xdm/xdm.sh	Fri Apr 12 11:01:03 2019 +0200
+++ b/x11/xdm/xdm.sh	Tue Apr 16 20:01:00 2019 +0200
@@ -31,6 +31,7 @@
             x11/libxt
             x11/util-macros:build
             x11/xorgproto:build"
+PKGOPTIONS="PAM SELINUX"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -38,6 +39,20 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
+: ${PAM:=yes}
+
+if [ "$PAM" = "yes" ]; then
+	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	with_pam="--with-pam"
+else
+	with_pam="--without-pam"
+fi
+
+if [ "$SELINUX" = "yes" ]; then
+	with_selinux="--with-selinux"
+else
+	with_selinux="--without-selinux"
+fi
 
 build()
 {
@@ -53,9 +68,9 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/ \
-		--without-selinux \
-		--without-pam \
-		--without-systemd-daemon
+		--without-systemd-daemon \
+		$with_pam \
+		$with_selinux
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/X11/xdm/libXdmGreet.la