CVS commit: pkgsrc/x11/libgdm

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Wed Apr 21 12:23:21 UTC 2021

Modified Files:
        pkgsrc/x11/libgdm: distinfo
        pkgsrc/x11/libgdm/patches: patch-pam__gdm_pam__gdm.c

Log Message:
libgdm: Fix building with OpenPAM on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libgdm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libgdm/patches/patch-pam__gdm_pam__gdm.c

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

Modified files:

Index: pkgsrc/x11/libgdm/distinfo
diff -u pkgsrc/x11/libgdm/distinfo:1.1 pkgsrc/x11/libgdm/distinfo:1.2
--- pkgsrc/x11/libgdm/distinfo:1.1      Fri Apr 16 13:57:52 2021
+++ pkgsrc/x11/libgdm/distinfo  Wed Apr 21 12:23:21 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2021/04/16 13:57:52 cirnatdan Exp $
+$NetBSD: distinfo,v 1.2 2021/04/21 12:23:21 cirnatdan Exp $
 
 SHA1 (gdm-40.0.tar.gz) = f16d102b1052ff3ae0b64cac47dd3910b9b2ae74
 RMD160 (gdm-40.0.tar.gz) = aef9fa9d25f92b671166b9b2a56f9f5811e912cc
@@ -32,4 +32,4 @@ SHA1 (patch-data_meson.build) = 51a40a90
 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

Index: pkgsrc/x11/libgdm/patches/patch-pam__gdm_pam__gdm.c
diff -u pkgsrc/x11/libgdm/patches/patch-pam__gdm_pam__gdm.c:1.1 pkgsrc/x11/libgdm/patches/patch-pam__gdm_pam__gdm.c:1.2
--- pkgsrc/x11/libgdm/patches/patch-pam__gdm_pam__gdm.c:1.1     Fri Apr 16 13:57:52 2021
+++ pkgsrc/x11/libgdm/patches/patch-pam__gdm_pam__gdm.c Wed Apr 21 12:23:21 2021
@@ -1,21 +1,21 @@
-$NetBSD: patch-pam__gdm_pam__gdm.c,v 1.1 2021/04/16 13:57:52 cirnatdan Exp $
+$NetBSD: patch-pam__gdm_pam__gdm.c,v 1.2 2021/04/21 12:23:21 cirnatdan Exp $
 
 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>