<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e1a5c0e093558bf8522522f4ac0898129ab54548">https://github.com/macports/macports-ports/commit/e1a5c0e093558bf8522522f4ac0898129ab54548</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 e1a5c0e userinfo: update to 2.5, nomaintainer
</span>e1a5c0e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e1a5c0e093558bf8522522f4ac0898129ab54548
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 12 07:21:30 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> userinfo: update to 2.5, nomaintainer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also update homepage, set license, install docs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59578
</span>---
sysutils/userinfo/Portfile | 33 +++++++++++++++++++--------
sysutils/userinfo/files/login.c.patch | 11 +++++++++
sysutils/userinfo/files/src_Makefile.in.patch | 11 +++++++++
sysutils/userinfo/files/ui.c.patch | 29 +++++++++++++++++++++++
4 files changed, 75 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/userinfo/Portfile b/sysutils/userinfo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79b2df6..6bbefa7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/userinfo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/userinfo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,34 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name userinfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.10a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories sysutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers mac.com:thomasv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories sysutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span> description Userinfo displays information about a local user.
long_description Userinfo displays as much information about local \
users as possible, which may be useful in shell \
scripts. It's sort of a mixture of tools rolled into \
program. It can display mail, login and password \
information with some other options.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://arbornet.org/~bjk/${name}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 f6845f0c25a4ce90750a93b39e5e63cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gitlab.com/bjk/userinfo/wikis/home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 b66284665f7853f3117a6d5b4a09630a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 0f561de8fd1a0361da856e861ca77f1ed1a373f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6baaed6ac4a3376fe7e007897668bdee7b91e4d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles login.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src_Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/src/ui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Homepage gone; temporary fetching alternative:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.gnu-darwin.org/distfiles/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${worksrcpath} -m 644 COPYING NEWS README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/userinfo/files/login.c.patch b/sysutils/userinfo/files/login.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ae97a5a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/userinfo/files/login.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/login.c.orig 2015-01-15 12:35:26.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/login.c 2019-11-12 06:18:09.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,7 +387,7 @@ static void last_strings(char *str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_GETLASTLOGX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char *lastlogin(const struct passwd *pw, char *tf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct lastlogx *last = getlastlogx(_PATH_LASTLOGX, pw->pw_uid, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct lastlogx *last = getlastlogx(pw->pw_uid, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char buf[LINE_MAX];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!last)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/userinfo/files/src_Makefile.in.patch b/sysutils/userinfo/files/src_Makefile.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4736e50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/userinfo/files/src_Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig 2015-01-19 04:24:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2019-11-12 06:39:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -331,7 +331,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS = modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_SOURCES = ui.c ui.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_CFLAGS = -Imodules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@SOLARIS_FALSE@ui_LDFLAGS = -R$(pkglibdir) -Wl,--export-dynamic @DLOPEN_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@SOLARIS_FALSE@ui_LDFLAGS = -Wl,-export_dynamic @DLOPEN_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @SOLARIS_TRUE@ui_LDFLAGS = -R$(pkglibdir) @DLOPEN_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_ui_SOURCES = err.c strsep.c safe_strncat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: all-recursive
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/userinfo/files/ui.c.patch b/sysutils/userinfo/files/ui.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..980c159
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/userinfo/files/ui.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ui.c.orig 2015-01-15 12:35:26.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ui.c 2019-11-12 07:13:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -685,7 +685,7 @@ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (opt) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'd':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (open_module("passwd.so", &mod) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (open_module("__PREFIX__/lib/userinfo/passwd.so", &mod) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (init_module_options(1, NULL, mod))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ want_help = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -694,7 +694,7 @@ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (open_module("mail.so", &mod) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (open_module("__PREFIX__/lib/userinfo/mail.so", &mod) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (init_module_options(1, NULL, mod))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ want_help = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -703,7 +703,7 @@ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (open_module("login.so", &mod) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (open_module("__PREFIX__/lib/userinfo/login.so", &mod) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (init_module_options(1, NULL, mod))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ want_help = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>