r52263 - in /desktop/unstable/gdm3/debian: changelog gdm3.install patches/pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch patches/series rules

Thu Mar 16 20:46:40 UTC 2017

Author: biebl
Date: Thu Mar 16 20:46:40 2017
New Revision: 52263

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52263
Log:
Use --with-pam-mod-dir configure switch to set the location of the pam
module directory instead of moving the .so file around manually.

Added:
    desktop/unstable/gdm3/debian/patches/pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/gdm3.install
    desktop/unstable/gdm3/debian/patches/series
    desktop/unstable/gdm3/debian/rules

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=52263&op=diff
==============================================================================

--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Thu Mar 16 20:46:40 2017
@@ -5,6 +5,8 @@
   * Add Build-Depends on libxcb1-dev. Upstream switched from xlib to xcb for
     the main gdm process to be more robust in cases where the display
     connection has gone away.
+  * Use --with-pam-mod-dir configure switch to set the location of the pam
+    module directory instead of moving the .so file around manually.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 16 Mar 2017 19:54:29 +0100
 

Modified: desktop/unstable/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.install?rev=52263&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.install	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.install	[utf-8] Thu Mar 16 20:46:40 2017
@@ -1,5 +1,6 @@
 etc/*
-lib
+lib/systemd/
+lib/*/security/*.so
 usr/bin/gdm-screenshot
 usr/lib/gdm3/gdm-*
 # gets renamed to gdm3 in binary-install

Added: desktop/unstable/gdm3/debian/patches/pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch?rev=52263&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch	(added)
+++ desktop/unstable/gdm3/debian/patches/pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch	[utf-8] Thu Mar 16 20:46:40 2017
@@ -0,0 +1,63 @@
+From 5ed388af0ab4c62dc51efbb4cf3345d8fa634fca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi at 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.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=774776
+(cherry picked from commit c6633b311f7ed8560a5c6847110d872d017672a6)
+---
+ configure.ac        | 11 ++++++++++-
+ pam_gdm/Makefile.am |  2 +-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6613097b..e09831ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -487,7 +487,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>],
+@@ -503,6 +503,14 @@ else
+ fi
+ AC_SUBST(PAM_PREFIX)
+ 
++dnl PAM dir (dynamic modules)
++AC_ARG_WITH([pam-mod-dir],
++            [AS_HELP_STRING([--with-pam-mod-dir=DIR],
++                            [directory to install pam modules in])],
++            [], [with_pam_mod_dir='${libdir}/security'])
++PAM_MOD_DIR="$with_pam_mod_dir"
++AC_SUBST(PAM_MOD_DIR)
++
+ have_pam=no
+ AC_CHECK_LIB(pam, pam_start, have_pam=yes)
+ 
+@@ -1592,6 +1600,7 @@ echo "
+ 
+         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
+         PAM prefix:               ${PAM_PREFIX}
++        PAM module dir:           ${PAM_MOD_DIR}
+         PAM config:               ${with_default_pam_config}
+         X server:                 ${X_SERVER}
+ "
+diff --git a/pam_gdm/Makefile.am b/pam_gdm/Makefile.am
+index 61d672b4..6b92cfcf 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_MOD_DIR)
+-- 
+2.11.0
+

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=52263&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Thu Mar 16 20:46:40 2017
@@ -5,3 +5,4 @@
 92_systemd_unit.patch
 94_retain_xorg_log.patch
 Hack-D-Bus-messages-from-Debian-8-libgdm-to-work-wit.patch
+pam_gdm-allow-setting-pam-module-dir-at-configure-ti.patch

Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=52263&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules	[utf-8] Thu Mar 16 20:46:40 2017
@@ -61,6 +61,7 @@
 		--with-xauth-dir=/var/run/gdm3 \
 		--with-pid-file=/var/run/gdm3.pid \
 		--with-log-dir=/var/log/gdm3 \
+		--with-pam-mod-dir=/lib/$(DEB_HOST_MULTIARCH)/security \
 		--with-screenshot-dir=/var/run/gdm3/greeter \
 		--with-defaults-conf=/usr/share/gdm/defaults.conf \
 		--with-user=Debian-gdm --with-group=Debian-gdm \
@@ -86,8 +87,6 @@
 	rm -rf debian/gdm3/var/run
 	rm -rf debian/gdm3/usr/include
 	rm -rf debian/gdm3/usr/lib/pkgconfig
-	mkdir -p debian/gdm3/lib/$(DEB_HOST_MULTIARCH)/security/
-	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/security/pam_gdm.so debian/gdm3/lib/$(DEB_HOST_MULTIARCH)/security/
 
 override_dh_installinit:
 	dh_installinit --noscripts


