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.
18672170 Update GNU screen to 4.2.1
authorLukas Rovensky <Lukas.Rovensky@oracle.com>
Tue, 02 Jun 2015 06:35:57 -0700
changeset 4417 be48076a4364
parent 4416 9a721d1b6b2e
child 4421 08e5b5171c20
18672170 Update GNU screen to 4.2.1 17447726 screen limits the length of the username to 20 characters
components/screen/Makefile file | annotate | diff | comparison | revisions
components/screen/patches/misc.c.patch file | annotate | diff | comparison | revisions
components/screen/screen.p5m file | annotate | diff | comparison | revisions 
--- a/components/screen/Makefile	Fri Jun 05 06:58:13 2015 -0700
+++ b/components/screen/Makefile	Tue Jun 02 06:35:57 2015 -0700
@@ -23,21 +23,26 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		screen
-COMPONENT_VERSION=	4.0.3
+COMPONENT_VERSION=	4.2.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:5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/screen/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/screen
 
-TPNO=			8940
+TPNO=			20744	
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+# We need to remove the following files to make sure that the generated ones
+# inside the build directory will be used
+#
+COMPONENT_PREP_ACTION=	(cd $(@D) ; rm config.h config.log config.status) 
+
 CONFIGURE_OPTIONS +=	--enable-colors256
 CONFIGURE_OPTIONS +=	--with-sys-screenrc=/etc/screenrc
 CONFIGURE_OPTIONS +=	--disable-socket-dir
--- a/components/screen/patches/misc.c.patch	Fri Jun 05 06:58:13 2015 -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
-@@ -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);
-
--- a/components/screen/screen.p5m	Fri Jun 05 06:58:13 2015 -0700
+++ b/components/screen/screen.p5m	Tue Jun 02 06:35:57 2015 -0700
@@ -38,11 +38,7 @@
     original_name=SUNWscreen:etc/screenrc preserve=renamenew
 file path=usr/bin/screen
 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
+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
 file path=usr/share/man/man1/screen.1
@@ -63,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