summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2016-11-21 08:47:21 +0100
committerRémi Cardona <remi@gentoo.org>2016-11-21 08:47:21 +0100
commit718d926ecbdef169e5b3242f868ee30a20da07d1 (patch)
treec63bd5563160bc738b0cb30f4cbdc95ab2b96306 /gnome-base/gdm/files
parentdev-ruby/hoe: add 3.15.3 (diff)
downloadgentoo-718d926ecbdef169e5b3242f868ee30a20da07d1.tar.gz
gentoo-718d926ecbdef169e5b3242f868ee30a20da07d1.tar.bz2
gentoo-718d926ecbdef169e5b3242f868ee30a20da07d1.zip
gnome-base/gdm: install pam_gdm.so in correct location, bug #599714
Package-Manager: portage-2.3.2
Diffstat (limited to 'gnome-base/gdm/files')
-rw-r--r--gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch b/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch
new file mode 100644
index 000000000000..7dc4392e41cb
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch
@@ -0,0 +1,52 @@
+From 4fc9023bb86689f1391651fa744d9e63ee1d7bbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Mon, 21 Nov 2016 08:18:32 +0100
+Subject: [PATCH] pam_gdm: allow setting pam module dir at configure time
+
+Code taken almost verbatim from gnome-keyring.
+---
+ configure.ac | 10 +++++++++-
+ pam_gdm/Makefile.am | 2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd98992..e0074dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -476,7 +476,7 @@ dnl ---------------------------------------------------------------------------
+ dnl - Check for PAM stuff
+ dnl ---------------------------------------------------------------------------
+
+-dnl PAM prefix
++dnl PAM prefix (configuration files)
+ withval=""
+ AC_ARG_WITH(pam-prefix,
+ AS_HELP_STRING([--with-pam-prefix=<prefix>],
+@@ -492,6 +492,14 @@ else
+ fi
+ AC_SUBST(PAM_PREFIX)
+
++dnl PAM dir (dynamic modules)
++AC_ARG_WITH([pam-dir],
++ [AC_HELP_STRING([--with-pam-dir=DIR],
++ [directory to install pam modules in])],
++ [], [with_pam_dir='${libdir}/security'])
++PAM_DEST_DIR="$with_pam_dir"
++AC_SUBST(PAM_DEST_DIR)
++
+ have_pam=no
+ AC_CHECK_LIB(pam, pam_start, have_pam=yes)
+
+diff --git a/pam_gdm/Makefile.am b/pam_gdm/Makefile.am
+index 61d672b..980b31c 100644
+--- a/pam_gdm/Makefile.am
++++ b/pam_gdm/Makefile.am
+@@ -36,4 +36,4 @@ pam_gdm_LTLIBRARIES = \
+ pam_gdm.la \
+ $(END_OF_LIST)
+
+-pam_gdmdir = $(libdir)/security
++pam_gdmdir = $(PAM_DEST_DIR)
+--
+2.10.2
+