Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
25414933 Upgrade screen to version 4.5.1 s11u3-sru
authorLukas Rovensky <Lukas.Rovensky@oracle.com>
Thu, 27 Apr 2017 11:41:45 -0700
branchs11u3-sru
changeset 7961 58f46f117aca
parent 7958 a40f2d0e1531
25414933 Upgrade screen to version 4.5.1 25637014 problem in UTILITY/SCREEN
components/screen/Makefile file | annotate | diff | comparison | revisions
components/screen/patches/misc.c.patch file | annotate | diff | comparison | revisions
components/screen/patches/screen.texinfo.patch file | annotate | diff | comparison | revisions
components/screen/patches/socket.patch file | annotate | diff | comparison | revisions
components/screen/patches/terminfo.patch file | annotate | diff | comparison | revisions
components/screen/screen.p5m file | annotate | diff | comparison | revisions 
--- a/components/screen/Makefile	Tue May 02 04:07:24 2017 -0700
+++ b/components/screen/Makefile	Thu Apr 27 11:41:45 2017 -0700
@@ -18,21 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		screen
-COMPONENT_VERSION=	4.0.3
+COMPONENT_VERSION=	4.5.1
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/screen/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77
+    sha256:97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/screen/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/screen
 
-TPNO=			8940
+TPNO=			34130
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -44,6 +44,9 @@
 CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 
+# Enable aslr for this component
+ASLR_MODE = $(ASLR_ENABLE)
+
 PROTOTERMINFODIR=$(PROTOUSRSHAREDIR)/lib/terminfo
 
 $(PROTOTERMINFODIR):
--- a/components/screen/patches/misc.c.patch	Tue May 02 04:07:24 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- screen-4.0.2/misc.c	2003-12-05 19:15:41.000000000 +0530
-+++ screen-4.0.2/misc.c	2006-04-03 16:46:19.150133000 +0530
[email protected]@ -613,7 +613,7 @@
-    */
- # endif /* NEEDSETENV */
- #else /* USESETENV */
--# if defined(linux) || defined(__convex__) || (BSD >= 199103)
-+# if defined(linux) || defined(__convex__) || (BSD >= 199103) || (__sun)
-   setenv(var, value, 1);
- # else
-   setenv(var, value);
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/screen/patches/screen.texinfo.patch	Thu Apr 27 11:41:45 2017 -0700
@@ -0,0 +1,17 @@
+Home brewed.
+This is to fix info syntax for two e-mail addresses.
+Will be sent up-stream.
+
+--- screen-4.5.1/doc/screen.texinfo.orig	2017-03-09 00:59:43.320053794 -0800
++++ screen-4.5.1/doc/screen.texinfo	2017-03-09 01:00:16.444567600 -0800
[email protected]@ -5796,8 +5796,8 @@
+ ============
+ 
+ @example
+-     Thomas Renninger <[email protected]>,
+-     Axel Beckert <[email protected]>,
++     Thomas Renninger <[email protected]@suse.com>,
++     Axel Beckert <[email protected]@deuxchevaux.org>,
+      Ken Beal <[email protected]@amber.ssd.csd.harris.com>,
+      Rudolf Koenig <[email protected]@informatik.uni-erlangen.de>,
+      Toerless Eckert <[email protected]@informatik.uni-erlangen.de>,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/screen/patches/socket.patch	Thu Apr 27 11:41:45 2017 -0700
@@ -0,0 +1,16 @@
+Home brewed.
+Created for the FOSS evaluation project to get screen built also on S11.3 FCS.
+Will not be sent upstream.
+
+--- screen-4.3.1/socket.c.~1~	2015-09-28 13:59:32.049275138 -0700
++++ screen-4.3.1/socket.c	2015-09-28 13:59:47.162984046 -0700
[email protected]@ -30,6 +30,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++
++#define _XPG4_2
++
+ #if !defined(NAMEDPIPE)
+ # include <sys/socket.h>
+ # ifdef _OpenBSD_
--- a/components/screen/patches/terminfo.patch	Tue May 02 04:07:24 2017 -0700
+++ b/components/screen/patches/terminfo.patch	Thu Apr 27 11:41:45 2017 -0700
@@ -1,14 +1,18 @@
---- screen-4.0.3/Makefile.in.orig	Thu Feb 10 05:16:01 2011
-+++ screen-4.0.3/Makefile.in	Thu Feb 10 05:18:17 2011
[email protected]@ -84,9 +84,10 @@
+Home brewed patch.
+Use Solaris specific location of terminfo.
+Will not be sent upstream.
+ 
+--- screen-4.5.1/Makefile.in.orig	2017-03-08 12:14:04.424391216 -0800
++++ screen-4.5.1/Makefile.in	2017-03-08 12:19:09.486329848 -0800
[email protected]@ -96,9 +96,10 @@
  ###############################################################################
  install: installdirs install_bin
  	cd doc ; $(MAKE) install
--	-if [ -d /usr/lib/terminfo ]; then \
+-	-if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \
 +	-if [ -d $(DESTDIR)/usr/share/lib/terminfo ]; then \
-+		TERMINFO=$(DESTDIR)/usr/share/lib/terminfo \
++	  TERMINFO=$(DESTDIR)/usr/share/lib/terminfo \
  		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
--		chmod 644 /usr/lib/terminfo/s/screen*; \
+-		chmod 644 $(DESTDIR)/usr/lib/terminfo/s/screen*; \
 +		chmod 644 $(DESTDIR)/usr/share/lib/terminfo/s/screen*; \
  	fi
  # Better do this by hand. E.g. under RCS...
--- a/components/screen/screen.p5m	Tue May 02 04:07:24 2017 -0700
+++ b/components/screen/screen.p5m	Thu Apr 27 11:41:45 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -34,30 +34,14 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/413
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=etc
 file etc/etcscreenrc path=etc/screenrc group=sys mode=0644 \
     original_name=SUNWscreen:etc/screenrc preserve=renamenew
-dir  path=usr
-dir  path=usr/bin
 file path=usr/bin/screen
-dir  path=usr/share
-dir  path=usr/share/info
 file path=usr/share/info/screen.info
-file path=usr/share/info/screen.info-1
-file path=usr/share/info/screen.info-2
-file path=usr/share/info/screen.info-3
-file path=usr/share/info/screen.info-4
-file path=usr/share/info/screen.info-5
-dir  path=usr/share/lib
-dir  path=usr/share/lib/terminfo
-dir  path=usr/share/lib/terminfo/s
+file path=usr/share/lib/terminfo/s/screen-256color
 file path=usr/share/lib/terminfo/s/screen-bce
 file path=usr/share/lib/terminfo/s/screen-s
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
 file path=usr/share/man/man1/screen.1
-dir  path=usr/share/screen
-dir  path=usr/share/screen/utf8encodings
 file path=usr/share/screen/utf8encodings/01
 file path=usr/share/screen/utf8encodings/02
 file path=usr/share/screen/utf8encodings/03
@@ -75,4 +59,4 @@
 file path=usr/share/screen/utf8encodings/cc
 file path=usr/share/screen/utf8encodings/cd
 file path=usr/share/screen/utf8encodings/d6
-license COPYING license=GPLv2
+license COPYING license=GPLv3
upstream/oracle/userland-gate