[gentoo-commits] repo/gentoo:master commit in: sys-auth/pambase/files/

[gentoo-commits] repo/gentoo:master commit in: sys-auth/pambase/files/

[Pacho Ramos]

commit:     01caa8f12c0de2d8a50db3e9a2ca7bd3f465e213
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 19:34:24 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 19:34:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01caa8f1

sys-auth/pambase: Commit forgotten patch

Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../files/pambase-20150213-gnome-keyring.patch     | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/sys-auth/pambase/files/pambase-20150213-gnome-keyring.patch b/sys-auth/pambase/files/pambase-20150213-gnome-keyring.patch
new file mode 100644
index 00000000000..57c204e4420
--- /dev/null
+++ b/sys-auth/pambase/files/pambase-20150213-gnome-keyring.patch
@@ -0,0 +1,48 @@
+diff -urN a/passwd.in b/passwd.in
+--- a/passwd.in	2015-02-14 06:57:45.000000000 +0300
++++ b/passwd.in	2018-04-02 12:33:08.304214918 +0300
+@@ -1,6 +1,7 @@
+-auth       sufficient   pam_rootok.so
+-auth       include	system-auth
++auth		sufficient	pam_rootok.so
++auth		include		system-auth
+ 
+-account    include	system-auth
++account		include		system-auth
+ 
+-password   include	system-auth
++password	include		system-auth
++-password	optional	pam_gnome_keyring.so UNIX_AUTHTOK
+diff -urN a/system-login.in b/system-login.in
+--- a/system-login.in	2015-02-14 06:57:45.000000000 +0300
++++ b/system-login.in	2018-04-02 12:33:01.272010095 +0300
+@@ -8,9 +8,6 @@
+ auth		required	pam_nologin.so DEBUG_NOLOGIN
+ #endif
+ auth		include		system-auth
+-#if HAVE_GNOME_KEYRING
+-auth		optional	pam_gnome_keyring.so
+-#endif
+ 
+ #if HAVE_ACCESS
+ account		required	pam_access.so DEBUG
+@@ -27,9 +24,6 @@
+ #endif
+ 
+ password	include		system-auth
+-#if HAVE_GNOME_KEYRING
+-password	optional	pam_gnome_keyring.so
+-#endif
+ 
+ #if HAVE_LOGINUID
+ session         optional        pam_loginuid.so
+@@ -51,9 +45,6 @@
+ # Note: modules that run in the user's context must come after this line.
+ session		required	pam_selinux.so multiple open
+ #endif
+-#if HAVE_GNOME_KEYRING
+-session		optional	pam_gnome_keyring.so auto_start
+-#endif
+ #if HAVE_MOTD
+ session		optional	pam_motd.so motd=/etc/motd
+ #endif

[gentoo-commits] repo/gentoo:master commit in: sys-auth/pambase/files/

[Aaron Bauman]

commit:     5dab4d15221db6d3f5d8bacb4489883be6022285
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Feb 18 17:31:36 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 05:35:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dab4d15

sys-auth/pambase: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11097
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/pambase-20120417-lastlog-silent.patch    | 20 ---------------
 .../files/pambase-20120417-systemd-auth.patch      | 26 -------------------
 .../pambase/files/pambase-20120417-systemd.patch   | 29 ----------------------
 3 files changed, 75 deletions(-)

diff --git a/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch b/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch
deleted file mode 100644
index 79266a740b6..00000000000
--- a/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pambase-20120417/login.in.orig	2012-11-21 14:31:49.031948988 +0100
-+++ pambase-20120417/login.in	2012-11-21 14:32:41.172330601 +0100
-@@ -3,4 +3,6 @@
- 
- account    include	system-local-login
- password   include	system-local-login
-+
-+session    optional pam_lastlog.so DEBUG
- session    include	system-local-login
---- pambase-20120417/system-login.in.orig	2012-11-21 14:31:42.232160039 +0100
-+++ pambase-20120417/system-login.in	2012-11-21 14:35:20.738025880 +0100
-@@ -41,7 +41,7 @@
- session		required	pam_env.so DEBUG
- #endif
- #if HAVE_LASTLOG
--session		optional	pam_lastlog.so DEBUG
-+session		optional	pam_lastlog.so silent DEBUG
- #endif
- session		include		system-auth
- #if HAVE_CONSOLEKIT

diff --git a/sys-auth/pambase/files/pambase-20120417-systemd-auth.patch b/sys-auth/pambase/files/pambase-20120417-systemd-auth.patch
deleted file mode 100644
index 99c38e78477..00000000000
--- a/sys-auth/pambase/files/pambase-20120417-systemd-auth.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u pambase-20120417.old/system-auth.in pambase-20120417/system-auth.in
---- pambase-20120417.old/system-auth.in	2013-10-27 15:58:21.766193297 +0100
-+++ pambase-20120417/system-auth.in	2013-10-27 16:01:10.614555766 +0100
-@@ -35,3 +35,7 @@
- session		optional	pam_ssh.so
- #endif
- #include "system-session.inc"
-+
-+#if HAVE_SYSTEMD
-+-session        optional        pam_systemd.so
-+#endif
-Sólo en pambase-20120417: system-auth.in~
-diff -u pambase-20120417.old/system-login.in pambase-20120417/system-login.in
---- pambase-20120417.old/system-login.in	2013-10-27 15:58:21.766193297 +0100
-+++ pambase-20120417/system-login.in	2013-10-27 15:59:42.032316285 +0100
-@@ -47,9 +47,6 @@
- #if HAVE_CONSOLEKIT
- -session	optional	pam_ck_connector.so nox11
- #endif
--#if HAVE_SYSTEMD
---session	optional	pam_systemd.so
--#endif
- #if HAVE_GNOME_KEYRING
- session		optional	pam_gnome_keyring.so auto_start
- #endif
-Sólo en pambase-20120417: system-login.in~

diff --git a/sys-auth/pambase/files/pambase-20120417-systemd.patch b/sys-auth/pambase/files/pambase-20120417-systemd.patch
deleted file mode 100644
index 047fb41c859..00000000000
--- a/sys-auth/pambase/files/pambase-20120417-systemd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/372229
-
---- Makefile
-+++ Makefile
-@@ -28,6 +28,10 @@
- PAMFLAGS += -DHAVE_CONSOLEKIT=1
- endif
- 
-+ifeq "$(SYSTEMD)" "yes"
-+PAMFLAGS += -DHAVE_SYSTEMD=1
-+endif
-+
- ifeq "$(GNOME_KEYRING)" "yes"
- PAMFLAGS += -DHAVE_GNOME_KEYRING=1
- endif
---- system-login.in
-+++ system-login.in
-@@ -45,7 +45,10 @@
- #endif
- session		include		system-auth
- #if HAVE_CONSOLEKIT
--session		optional	pam_ck_connector.so nox11
-+-session	optional	pam_ck_connector.so nox11
-+#endif
-+#if HAVE_SYSTEMD
-+-session	optional	pam_systemd.so
- #endif
- #if HAVE_GNOME_KEYRING
- session		optional	pam_gnome_keyring.so auto_start