[139440] trunk/dports/sysutils/screen
ionic at macports.org
ionic at macports.org
Mon Aug 17 11:47:34 PDT 2015
Revision: 139440
https://trac.macports.org/changeset/139440
Author: ionic at macports.org
Date: 2015-08-17 11:47:34 -0700 (Mon, 17 Aug 2015)
Log Message:
-----------
screen: update to 4.3.1. Patch provided by (new) maintainer. Fixes: #48583.
Modified Paths:
--------------
trunk/dports/sysutils/screen/Portfile
Added Paths:
-----------
trunk/dports/sysutils/screen/files/patch-Makefile.in.diff
trunk/dports/sysutils/screen/files/patch-configure-libelf.diff
trunk/dports/sysutils/screen/files/patch-utmp.c.diff
trunk/dports/sysutils/screen/files/patch-windowsize.diff
Removed Paths:
-------------
trunk/dports/sysutils/screen/files/patch-Makefile.in
trunk/dports/sysutils/screen/files/patch-configure-libelf
trunk/dports/sysutils/screen/files/patch-windowsize
Modified: trunk/dports/sysutils/screen/Portfile
===================================================================
--- trunk/dports/sysutils/screen/Portfile 2015-08-17 18:47:19 UTC (rev 139439)
+++ trunk/dports/sysutils/screen/Portfile 2015-08-17 18:47:34 UTC (rev 139440)
@@ -4,7 +4,7 @@
PortSystem 1.0
name screen
-version 4.2.1
+version 4.3.1
homepage http://www.gnu.org/software/screen/
description Screen manager with VT100/ANSI terminal emulation
long_description \
@@ -29,8 +29,8 @@
distfiles-append 18:encoding
checksums ${distname}${extract.suffix} \
- rmd160 20ddf4a33f91e60a42a31f02aa2a30a9c5cba9b5 \
- sha256 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 \
+ rmd160 9de183f86e36b211d56c35e58598728f332faec9 \
+ sha256 fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63 \
18 \
rmd160 bd143058417e1d4c040a2589fdfbf8f9203f0b4c \
sha256 4d4b674a61dab6bac9b4207307c5f020fa670fc3948c39e7ea93c7fb9dfb5174 \
@@ -38,10 +38,9 @@
rmd160 ea1fb112d58a168c581ee58e761c26f7caed40ec \
sha256 dcd2786d82865fb10542c20e97d7052110f7ca9a551f2ab5628c607f20e2bb2f
-patchfiles patch-maxargs \
- patch-windowsize \
- patch-Makefile.in \
- patch-process.c-fix-bogus-strncpy-size.diff
+patchfiles patch-utmp.c.diff \
+ patch-windowsize.diff \
+ patch-Makefile.in.diff
depends_lib port:ncurses
extract.only ${distname}${extract.suffix}
@@ -62,7 +61,7 @@
}
platform darwin {
- patchfiles-append patch-configure-libelf
+ patchfiles-append patch-configure-libelf.diff
}
platform darwin 9 {
Deleted: trunk/dports/sysutils/screen/files/patch-Makefile.in
===================================================================
--- trunk/dports/sysutils/screen/files/patch-Makefile.in 2015-08-17 18:47:19 UTC (rev 139439)
+++ trunk/dports/sysutils/screen/files/patch-Makefile.in 2015-08-17 18:47:34 UTC (rev 139440)
@@ -1,11 +0,0 @@
---- Makefile.in 2014-04-26 12:58:35.000000000 +0200
-+++ Makefile.in 2014-05-01 21:36:54.000000000 +0200
-@@ -134,7 +134,7 @@
- sh $(srcdir)/tty.sh tty.c
-
- comm.h: comm.c comm.sh config.h
-- AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
-+ AWK=$(AWK) CC="$(CC)" srcdir=${srcdir} sh $(srcdir)/comm.sh
-
- osdef.h: osdef.sh config.h osdef.h.in
- CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
Copied: trunk/dports/sysutils/screen/files/patch-Makefile.in.diff (from rev 139439, trunk/dports/sysutils/screen/files/patch-Makefile.in)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-Makefile.in.diff 2015-08-17 18:47:34 UTC (rev 139440)
@@ -0,0 +1,11 @@
+--- Makefile.in 2014-04-26 12:58:35.000000000 +0200
++++ Makefile.in 2014-05-01 21:36:54.000000000 +0200
+@@ -134,7 +134,7 @@
+ sh $(srcdir)/tty.sh tty.c
+
+ comm.h: comm.c comm.sh config.h
+- AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
++ AWK=$(AWK) CC="$(CC)" srcdir=${srcdir} sh $(srcdir)/comm.sh
+
+ osdef.h: osdef.sh config.h osdef.h.in
+ CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
Deleted: trunk/dports/sysutils/screen/files/patch-configure-libelf
===================================================================
--- trunk/dports/sysutils/screen/files/patch-configure-libelf 2015-08-17 18:47:19 UTC (rev 139439)
+++ trunk/dports/sysutils/screen/files/patch-configure-libelf 2015-08-17 18:47:34 UTC (rev 139440)
@@ -1,10 +0,0 @@
---- configure.orig 2014-04-26 05:58:46.000000000 -0500
-+++ configure 2014-05-02 03:15:16.000000000 -0500
-@@ -4155,7 +4155,6 @@
-
-
- oldlibs="$LIBS"
--LIBS="$LIBS -lelf"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking SVR4..." >&5
- $as_echo "$as_me: checking SVR4..." >&6;}
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Copied: trunk/dports/sysutils/screen/files/patch-configure-libelf.diff (from rev 139439, trunk/dports/sysutils/screen/files/patch-configure-libelf)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-configure-libelf.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-configure-libelf.diff 2015-08-17 18:47:34 UTC (rev 139440)
@@ -0,0 +1,10 @@
+--- configure.orig 2014-04-26 05:58:46.000000000 -0500
++++ configure 2014-05-02 03:15:16.000000000 -0500
+@@ -4155,7 +4155,6 @@
+
+
+ oldlibs="$LIBS"
+-LIBS="$LIBS -lelf"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking SVR4..." >&5
+ $as_echo "$as_me: checking SVR4..." >&6;}
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Added: trunk/dports/sysutils/screen/files/patch-utmp.c.diff
===================================================================
--- trunk/dports/sysutils/screen/files/patch-utmp.c.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-utmp.c.diff 2015-08-17 18:47:34 UTC (rev 139440)
@@ -0,0 +1,134 @@
+--- utmp.c.orig 2015-08-15 01:22:46.000000000 -0400
++++ utmp.c 2015-08-15 01:23:20.000000000 -0400
+@@ -26,6 +26,7 @@
+ ****************************************************************
+ */
+
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -151,7 +152,7 @@
+ * how = 0 try to withdraw a utmp slot.
+ *
+ * w_slot = -1 window not logged in.
+- * w_slot = 0 window not logged in, but should be logged in.
++ * w_slot = 0 window not logged in, but should be logged in.
+ * (unable to write utmp, or detached).
+ */
+
+@@ -400,7 +401,7 @@
+ * down the name of his terminal line; else he is remote and we keep
+ * the hostname here. The letter S and the window id will be appended.
+ * A saved utmp entry in wi->w_savut serves as a template, usually.
+- */
++ */
+
+ int
+ SetUtmp(wi)
+@@ -409,12 +410,6 @@
+ register slot_t slot;
+ struct utmp u;
+ int saved_ut;
+-#ifdef UTHOST
+- char *p;
+- char host[sizeof(D_loginhost) + 15];
+-#else
+- char *host = 0;
+-#endif /* UTHOST */
+
+ wi->w_slot = (slot_t)0;
+ if (!utmpok || wi->w_type != W_TYPE_PTY)
+@@ -435,51 +430,12 @@
+ makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid);
+
+ #ifdef UTHOST
+- host[sizeof(host) - 15] = '\0';
+- if (display)
+- {
+- strncpy(host, D_loginhost, sizeof(host) - 15);
+- if (D_loginslot != (slot_t)0 && D_loginslot != (slot_t)-1 && host[0] != '\0')
+- {
+- /*
+- * we want to set our ut_host field to something like
+- * ":ttyhf:s.0" or
+- * "faui45:s.0" or
+- * "132.199.81.4:s.0" (even this may hurt..), but not
+- * "faui45.informati"......:s.0
+- * HPUX uses host:0.0, so chop at "." and ":" (Eric Backus)
+- */
+- for (p = host; *p; p++)
+- if ((*p < '0' || *p > '9') && (*p != '.'))
+- break;
+- if (*p)
+- {
+- for (p = host; *p; p++)
+- if (*p == '.' || (*p == ':' && p != host))
+- {
+- *p = '\0';
+- break;
+- }
+- }
+- }
+- else
+- {
+- strncpy(host + 1, stripdev(D_usertty), sizeof(host) - 15 - 1);
+- host[0] = ':';
+- }
+- }
+- else
+- strncpy(host, "local", sizeof(host) - 15);
+-
+- sprintf(host + strlen(host), ":S.%d", wi->w_number);
+- debug1("rlogin hostname: '%s'\n", host);
+-
+ # if !defined(_SEQUENT_) && !defined(sequent)
+- strncpy(u.ut_host, host, sizeof(u.ut_host));
++ strncpy(u.ut_host, D_loginhost, sizeof(u.ut_host));
+ # endif
+ #endif /* UTHOST */
+
+- if (pututslot(slot, &u, host, wi) == 0)
++ if (pututslot(slot, &u, D_loginhost, wi) == 0)
+ {
+ Msg(errno,"Could not write %s", UtmpName);
+ UT_CLOSE;
+@@ -598,7 +554,7 @@
+ struct utmp *u;
+ {
+ u->ut_type = DEAD_PROCESS;
+-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__)
++#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) && !defined(__Darwin__)
+ u->ut_exit.e_termination = 0;
+ u->ut_exit.e_exit = 0;
+ #endif
+@@ -631,7 +587,11 @@
+ /* must use temp variable because of NetBSD/sparc64, where
+ * ut_xtime is long(64) but time_t is int(32) */
+ (void)time(&now);
++#if defined(__Darwin_version) && __Darwin_version < 900000
++ u->ut_time = now;
++#else
+ u->ut_tv.tv_sec = now;
++#endif
+ }
+
+ static slot_t
+@@ -743,7 +703,11 @@
+ strncpy(u->ut_line, line, sizeof(u->ut_line));
+ strncpy(u->ut_name, user, sizeof(u->ut_name));
+ (void)time(&now);
+- u->ut_tv.tv_sec = now;
++#if defined(__Darwin_version) && __Darwin_version < 900000
++ u->ut_time = now;
++#else
++ u->ut_time = now;
++#endif
+ }
+
+ static slot_t
+@@ -890,4 +854,3 @@
+ return u->ut_type == u2->ut_type ? u : 0;
+ }
+ #endif
+-
Deleted: trunk/dports/sysutils/screen/files/patch-windowsize
===================================================================
--- trunk/dports/sysutils/screen/files/patch-windowsize 2015-08-17 18:47:19 UTC (rev 139439)
+++ trunk/dports/sysutils/screen/files/patch-windowsize 2015-08-17 18:47:34 UTC (rev 139440)
@@ -1,20 +0,0 @@
---- resize.c 2014-04-26 12:58:35.000000000 +0200
-+++ resize.c 2014-05-01 21:36:54.000000000 +0200
-@@ -678,6 +678,17 @@
- he = 1000;
- }
-
-+ if (wi > 1000)
-+ {
-+ Msg(0, "Window width too large, truncated");
-+ wi = 1000;
-+ }
-+ if (he > 1000)
-+ {
-+ Msg(0, "Window height too large, truncated");
-+ he = 1000;
-+ }
-+
- if (p->w_width == wi && p->w_height == he && p->w_histheight == hi)
- {
- debug("ChangeWindowSize: No change.\n");
Copied: trunk/dports/sysutils/screen/files/patch-windowsize.diff (from rev 139439, trunk/dports/sysutils/screen/files/patch-windowsize)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-windowsize.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-windowsize.diff 2015-08-17 18:47:34 UTC (rev 139440)
@@ -0,0 +1,20 @@
+--- resize.c 2014-04-26 12:58:35.000000000 +0200
++++ resize.c 2014-05-01 21:36:54.000000000 +0200
+@@ -678,6 +678,17 @@
+ he = 1000;
+ }
+
++ if (wi > 1000)
++ {
++ Msg(0, "Window width too large, truncated");
++ wi = 1000;
++ }
++ if (he > 1000)
++ {
++ Msg(0, "Window height too large, truncated");
++ he = 1000;
++ }
++
+ if (p->w_width == wi && p->w_height == he && p->w_histheight == hi)
+ {
+ debug("ChangeWindowSize: No change.\n");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150817/cd918ac1/attachment-0001.html>
More information about the macports-changes
mailing list