- Add 0004-PAM_EXTERN-isn-t-needed-anymore-but-don-t-remove-it-.patch

- readd PAM_EXTERN for external PAM modules

OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=155

0002-Remove-enable-static-modules-option-and-support-from.patch

@@ -1,7 +1,7 @@
-From dfffaec4953f1271963b1a3a9761289c757bf347 Mon Sep 17 00:00:00 2001
+From a684595c0bbd88df71285f43fb27630e3829121e Mon Sep 17 00:00:00 2001
 From: Thorsten Kukuk <kukuk@thkukuk.de>
-Date: Wed, 23 Mar 2016 11:25:53 +0100
+Date: Tue, 29 Mar 2016 14:14:03 +0200
-Subject: [PATCH] Remove "--enable-static-modules" option and support from
+Subject: [PATCH 1/2] Remove "--enable-static-modules" option and support from 
  Linux-PAM. It was never official supported and was broken since years.
 
 * configure.ac: Remove --enable-static-modules option.
@@ -144,7 +144,7 @@ Subject: [PATCH] Remove "--enable-static-modules" option and support from
  delete mode 100644 modules/pam_unix/pam_unix_static.h
 
 diff --git a/configure.ac b/configure.ac
-index f33b959..d5cc644 100644
+index a20c502..534194d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -61,23 +61,8 @@ dnl This should be called before any macros that run the C compiler.
@@ -2883,7 +2883,7 @@ index 863f038..ab49064 100644
 -
  /* end of module definition */
 diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
-index 56ed591..ab0d55a 100644
+index 88e6125..56df178 100644
 --- a/modules/pam_unix/Makefile.am
 +++ b/modules/pam_unix/Makefile.am
 @@ -34,8 +34,7 @@ pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \

0004-PAM_EXTERN-isn-t-needed-anymore-but-don-t-remove-it-.patch

@@ -0,0 +1,28 @@
+From 6b12a20c527cb6ced5b8911ea0f1dcdfc6e6f30c Mon Sep 17 00:00:00 2001
+From: Thorsten Kukuk <kukuk@thkukuk.de>
+Date: Tue, 29 Mar 2016 14:17:34 +0200
+Subject: [PATCH 2/2] PAM_EXTERN isn't needed anymore, but don't remove it to
+ not break lot of external code using it.
+
+* libpam/include/security/pam_modules.h: Readd PAM_EXTERN for compatibility
+---
+ libpam/include/security/pam_modules.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libpam/include/security/pam_modules.h b/libpam/include/security/pam_modules.h
+index 37568e9..ec65e3e 100644
+--- a/libpam/include/security/pam_modules.h
++++ b/libpam/include/security/pam_modules.h
+@@ -75,6 +75,9 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
+ 
+ #define PAM_DATA_REPLACE   0x20000000     /* used when replacing a data item */
+ 
++/* PAM_EXTERN isn't needed anymore, but don't remove it to not break
++   lot of external code using it. */
++#define PAM_EXTERN extern
+ 
+ /* take care of any compatibility issues */
+ #include <security/_pam_compat.h>
+-- 
+1.8.5.6
+

pam.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 29 14:25:02 CEST 2016 - kukuk@suse.de
+
+- Add 0004-PAM_EXTERN-isn-t-needed-anymore-but-don-t-remove-it-.patch
+  - readd PAM_EXTERN for external PAM modules
+
 -------------------------------------------------------------------
 Wed Mar 23 11:21:16 CET 2016 - kukuk@suse.de
 

pam.spec

@@ -57,6 +57,7 @@ Patch3:         encryption_method_nis.diff
 Patch4:         0001-Remove-YP-dependencies-from-pam_access-they-were-nev.patch
 Patch5:         0002-Remove-enable-static-modules-option-and-support-from.patch
 Patch6:         0003-fix-nis-checks.patch
+Patch7:         0004-PAM_EXTERN-isn-t-needed-anymore-but-don-t-remove-it-.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Remove with next version update:
 BuildRequires:  autoconf
@@ -110,6 +111,7 @@ building both PAM-aware applications and modules for use with PAM.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 autoreconf -fiv