<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cfb7200a702f63a69c4302d62a7c9074218796a2">https://github.com/macports/macports-ports/commit/cfb7200a702f63a69c4302d62a7c9074218796a2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new cfb7200 xdm: update to 1.1.12
</span>cfb7200 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cfb7200a702f63a69c4302d62a7c9074218796a2
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Mar 7 20:14:42 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> xdm: update to 1.1.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add mode line, use modern checksums
</span>---
x11/xdm/Portfile | 17 +++---
...ok-for-pam-in-both-pam-and-security-paths.patch | 61 ----------------------
2 files changed, 8 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xdm/Portfile b/x11/xdm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b483b0d..09808f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name xdm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11
license X11 BSD
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +19,9 @@ homepage https://www.x.org/
</span> master_sites xorg:individual/app/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 64a1af1f7eb69feae12e75d4cc3aaf19 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 8195a8e17d71d18cb89813d04b69a3750e9e818e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 574b5bda0b46a43d0df474279d03e49fa93c9a92
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 63bf363980062847a6546225cf9ef74377d4bce7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 512074
</span>
depends_build port:pkgconfig \
port:xorg-util-macros
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,17 +29,13 @@ depends_build port:pkgconfig \
</span> depends_lib port:xorg-libXinerama \
port:xorg-libXaw
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-Look-for-pam-in-both-pam-and-security-paths.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- socket.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_autoreconf yes
autoreconf.args -fvi
configure.args --disable-silent-rules
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- RAWCPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RAWCPP=${configure.cpp}
</span>
livecheck.type regex
livecheck.regex ${name}-(\[\\d.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xdm/files/0001-Look-for-pam-in-both-pam-and-security-paths.patch b/x11/xdm/files/0001-Look-for-pam-in-both-pam-and-security-paths.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 30eadab..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdm/files/0001-Look-for-pam-in-both-pam-and-security-paths.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fa8adede758e2b1e8ae38c84d032b354f0250f49 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 24 Jan 2013 10:11:28 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Look for pam in both pam/ and security/ paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- greeter/verify.c | 1 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/dm.h | 8 +++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 11 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d20ae28..f0ea150 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,6 +120,10 @@ AC_ARG_WITH(pam, AS_HELP_STRING([--with-pam],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [Use PAM for authentication (default is autodetected)]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [USE_PAM=$withval], [USE_PAM=auto])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$USE_PAM" != "xno" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_HEADERS([security/pam_appl.h pam/pam_appl.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [found=yes ; break ;], [found=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AS_IF([test "x$USE_PAM" = "xyes" -a "x$found" = "xno"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_MSG_ERROR([PAM support requested, but we could not find the pam headers.])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SEARCH_LIBS([pam_open_session], [pam],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_CHECK_FUNC([pam_open_session],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/greeter/verify.c b/greeter/verify.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1221874..db3cb7d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/greeter/verify.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/greeter/verify.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,6 @@ from The Open Group.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pwd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(USE_PAM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_GETSPNAM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <shadow.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/dm.h b/include/dm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2512e37..cd60f4b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/dm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/dm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,7 +105,13 @@ typedef union wait waitType;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif /* X_NOT_POSIX */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef USE_PAM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef HAVE_SECURITY_PAM_APPL_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif defined(HAVE_PAM_PAM_APPL_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <pam/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# error "Unable to determine pam headers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef CSRG_BASED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1.8.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>