pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gdm: Make pam patch rely on OPENPAM rather than the __linux__ constant



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <cirnatdan%pkgsrc.org@localhost>
Pushed By:	cirnatdan
Date:		Wed Apr 21 12:53:12 2021 +0200
Changeset:	e791378cd14d270061d49d231e2d5e6841642612

Modified Files:
	gdm/distinfo
	gdm/patches/patch-pam__gdm_pam__gdm.c

Log Message:
gdm: Make pam patch rely on OPENPAM rather than the __linux__ constant

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e791378cd14d270061d49d231e2d5e6841642612

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gdm/distinfo                          | 2 +-
 gdm/patches/patch-pam__gdm_pam__gdm.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/gdm/distinfo b/gdm/distinfo
index 7e7cc3125d..50ec01582f 100644
--- a/gdm/distinfo
+++ b/gdm/distinfo
@@ -32,4 +32,4 @@ SHA1 (patch-data_meson.build) = 51a40a90618dc21f9f0955e590a45b4fe6370189
 SHA1 (patch-libgdm_gdm-user-switching_c) = 91ebba68b5496c1de00108e1609f47c6019eadcc
 SHA1 (patch-libgdm_meson.build) = 6341327da7925597c9f15370faeacfd88a686802
 SHA1 (patch-meson.build) = d2c5bfe7d65b753722409860afc807031f9ee336
-SHA1 (patch-pam__gdm_pam__gdm.c) = a2906c96c8c5dc49e2663123b6dcd39821c7b47d
+SHA1 (patch-pam__gdm_pam__gdm.c) = d136b1f89c935efd51c9f819d9710c9eb22ac2b6
diff --git a/gdm/patches/patch-pam__gdm_pam__gdm.c b/gdm/patches/patch-pam__gdm_pam__gdm.c
index 8b92215106..5645ba84df 100644
--- a/gdm/patches/patch-pam__gdm_pam__gdm.c
+++ b/gdm/patches/patch-pam__gdm_pam__gdm.c
@@ -2,20 +2,20 @@ $NetBSD$
 
 Include only supported pam headers
 
---- pam_gdm/pam_gdm.c.orig	2020-12-15 18:16:43.000000000 +0000
+--- pam_gdm/pam_gdm.c.orig	2021-03-30 13:25:30.000000000 +0000
 +++ pam_gdm/pam_gdm.c
 @@ -21,11 +21,13 @@
  
  #include <unistd.h>
  
-+#ifdef __linux__
++#include <security/pam_modules.h>
++#ifndef OPENPAM
  #include <security/_pam_macros.h>
  #include <security/pam_ext.h>
  #include <security/pam_misc.h>
 -#include <security/pam_modules.h>
  #include <security/pam_modutil.h>
 +#endif
-+#include <security/pam_modules.h>
  
  #ifdef HAVE_KEYUTILS
  #include <keyutils.h>


Home | Main Index | Thread Index | Old Index