svn commit: r417201 - in head/sysutils/screen: . files
Cy Schubert
cy at FreeBSD.org
Tue Jun 21 11:20:50 UTC 2016
Author: cy
Date: Tue Jun 21 11:20:48 2016
New Revision: 417201
URL: https://svnweb.freebsd.org/changeset/ports/417201
Log:
Update 4.3.1 --> 4.4.0
Deleted:
head/sysutils/screen/files/patch-CVE-2015-6806
Modified:
head/sysutils/screen/Makefile
head/sysutils/screen/distinfo
head/sysutils/screen/files/patch-os.h
head/sysutils/screen/files/patch-utmp.c
Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile Tue Jun 21 11:03:07 2016 (r417200)
+++ head/sysutils/screen/Makefile Tue Jun 21 11:20:48 2016 (r417201)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= screen
-PORTVERSION= 4.3.1
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= sysutils
MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \
ftp://ftp.gnu.org/gnu/screen/ \
Modified: head/sysutils/screen/distinfo
==============================================================================
--- head/sysutils/screen/distinfo Tue Jun 21 11:03:07 2016 (r417200)
+++ head/sysutils/screen/distinfo Tue Jun 21 11:20:48 2016 (r417201)
@@ -1,2 +1,3 @@
-SHA256 (screen-4.3.1.tar.gz) = fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63
-SIZE (screen-4.3.1.tar.gz) = 845958
+TIMESTAMP = 1466506261
+SHA256 (screen-4.4.0.tar.gz) = ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b
+SIZE (screen-4.4.0.tar.gz) = 846010
Modified: head/sysutils/screen/files/patch-os.h
==============================================================================
--- head/sysutils/screen/files/patch-os.h Tue Jun 21 11:03:07 2016 (r417200)
+++ head/sysutils/screen/files/patch-os.h Tue Jun 21 11:20:48 2016 (r417201)
@@ -1,6 +1,17 @@
---- os.h.orig 2014-04-26 03:58:35.000000000 -0700
-+++ os.h 2014-04-29 19:16:31.730773575 -0700
-@@ -524,6 +528,6 @@
+--- os.h.orig 2016-06-19 12:41:03.000000000 -0700
++++ os.h 2016-06-21 04:13:47.509485000 -0700
+@@ -252,7 +252,9 @@
+ #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
+ # if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
+ # include <utmpx.h>
+-# define UTMPFILE UTMPX_FILE
++# ifdef UTMPX_FILE /* GNU extension */
++# define UTMPFILE UTMPX_FILE
++# endif
+ # define utmp utmpx
+ # define getutent getutxent
+ # define getutid getutxid
+@@ -524,6 +526,6 @@
/* Changing those you won't be able to attach to your old sessions
* when changing those values in official tree don't forget to bump
* MSG_VERSION */
Modified: head/sysutils/screen/files/patch-utmp.c
==============================================================================
--- head/sysutils/screen/files/patch-utmp.c Tue Jun 21 11:03:07 2016 (r417200)
+++ head/sysutils/screen/files/patch-utmp.c Tue Jun 21 11:20:48 2016 (r417201)
@@ -1,5 +1,5 @@
---- utmp.c.orig 2015-06-28 14:37:40.000000000 -0700
-+++ utmp.c 2015-07-02 13:22:34.463948044 -0700
+--- utmp.c.orig 2016-06-19 12:41:03.000000000 -0700
++++ utmp.c 2016-06-21 04:10:22.500131000 -0700
@@ -26,6 +26,7 @@
****************************************************************
*/
@@ -88,10 +88,11 @@
/* must use temp variable because of NetBSD/sparc64, where
* ut_xtime is long(64) but time_t is int(32) */
(void)time(&now);
+- u->ut_time = now;
+#if defined(__FreeBSD_version) && __FreeBSD_version < 900000
+ u->ut_time = now;
+#else
- u->ut_tv.tv_sec = now;
++ u->ut_tv.tv_sec = now;
+#endif
}
@@ -100,10 +101,11 @@
strncpy(u->ut_line, line, sizeof(u->ut_line));
strncpy(u->ut_name, user, sizeof(u->ut_name));
(void)time(&now);
+- u->ut_time = now;
+#if defined(__FreeBSD_version) && __FreeBSD_version < 900000
+ u->ut_time = now;
+#else
- u->ut_tv.tv_sec = now;
++ u->ut_tv.tv_sec = now;
+#endif
}
More information about the svn-ports-head
mailing list