[csw-devel] SF.net SVN: gar:[15129] csw/mgar/pkg/screen/trunk

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Tue Jul 19 23:49:52 CEST 2011 

Revision: 15129
          http://gar.svn.sourceforge.net/gar/?rev=15129&view=rev
Author:   chninkel
Date:     2011-07-19 21:49:52 +0000 (Tue, 19 Jul 2011)

Log Message:
-----------
screen: moved socket directory from /tmp/uscreens to /var/opt/csw/run/screen

Modified Paths:
--------------
    csw/mgar/pkg/screen/trunk/Makefile
    csw/mgar/pkg/screen/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch

Modified: csw/mgar/pkg/screen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/screen/trunk/Makefile	2011-07-19 21:38:57 UTC (rev 15128)
+++ csw/mgar/pkg/screen/trunk/Makefile	2011-07-19 21:49:52 UTC (rev 15129)
@@ -28,6 +28,10 @@
 
 CHECKPKG_OVERRIDES_CSWscrn += surplus-dependency|CSWterminfo
 
+# Default path referenced in documentation file, can be safely ignored
+CHECKPKG_OVERRIDES_CSWscrn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/screen/INSTALL
+
+
 PRESERVECONF = /etc/opt/csw/screenrc
 MIGRATE_FILES = screenrc
 
@@ -42,11 +46,16 @@
 # screen is not installed with setuid bit so we disable utmp update
 PATCHFILES += screen-utmp.patch
 
+# update of file paths referenced in documentation files to follow
+# opencsw policy
+PATCHFILES += opencsw_paths.patch
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-pam
 CONFIGURE_ARGS += --enable-telnet
 CONFIGURE_ARGS += --enable-colors256
 CONFIGURE_ARGS += --with-sys-screenrc=/etc$(prefix)/screenrc
+CONFIGURE_ARGS += --with-socket-dir=/var$(prefix)/run/screen
 
 TEST_TARGET = check
 
@@ -62,5 +71,6 @@
 	done
 	ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc.CSW
 	ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(NAME)/changelog.CSW
+	ginstall -m 777 -d $(PKGROOT)/var/$(prefix)/run/screens
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/screen/trunk/files/changelog.CSW	2011-07-19 21:38:57 UTC (rev 15128)
+++ csw/mgar/pkg/screen/trunk/files/changelog.CSW	2011-07-19 21:49:52 UTC (rev 15129)
@@ -1,3 +1,11 @@
+screen (4.0.3,REV=2011.07.19) unstable
+ 
+  * Moved socket directory from /tmp/uscreens to /var/opt/csw/run/screen for
+  security reasons.
+  * Fixed some screen files paths in documentation files.
+ 
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 19 Jul 2011 23:46:39 +0200
+
 screen (4.0.3,REV=2010.01.10) unstable
  
   * Now linked with opencsw libncurses.

Added: csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch
===================================================================
--- csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch	                        (rev 0)
+++ csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch	2011-07-19 21:49:52 UTC (rev 15129)
@@ -0,0 +1,126 @@
+From 9ad578b26aff7d81d413bae349294323f901d969 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Tue, 19 Jul 2011 23:30:44 +0200
+Subject: [PATCH] Update of file paths in documentation files
+
+---
+ doc/screen.1      |   16 +-
+ doc/screen.info-1 |    2 +-
+ doc/screen.info-5 |   10 +-
+ 5 files changed, 4432 insertions(+), 5458 deletions(-)
+
+diff --git a/doc/screen.1 b/doc/screen.1
+index 348d357..d7c9fdf 100644
+--- a/doc/screen.1
++++ b/doc/screen.1
+@@ -581,7 +581,7 @@ Show a listing of all currently attached displays.
+ 
+ .SH CUSTOMIZATION
+ The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
+-/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If
++/tmp/screens or preferably to /var/run/screens chosen at compile-time. If
+ .I screen
+ is installed setuid-root, then the administrator
+ should compile
+@@ -594,7 +594,7 @@ in the environment variable $SCREENDIR.
+ When
+ .I screen
+ is invoked, it executes initialization commands from the files
+-\*Q/usr/local/etc/screenrc\*U and
++\*Q/etc/opt/csw/screenrc\*U and
+ \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
+ defaults\*U that can be overridden in the following ways: for the
+ global screenrc file 
+@@ -1669,7 +1669,7 @@ and then compile the entry with
+ The echo command may be used to annoy 
+ .I screen
+ users with a 'message of the
+-day'. Typically installed in a global /local/etc/screenrc. 
++day'. Typically installed in a global /etc/opt/csw/screenrc. 
+ The option \*Q-n\*U may be used to suppress the line feed.
+ See also \*Qsleep\*U.
+ Echo is also useful for online checking of environment variables.
+@@ -4416,21 +4416,17 @@ Examples in the
+ .I screen
+ distribution package for private and global initialization files.
+ .IP $SYSSCREENRC 
+-.IP /usr/local/etc/screenrc
++.IP /etc/opt/csw/screenrc
+ .I screen
+ initialization commands
+ .IP $SCREENRC
+ .IP $HOME/.screenrc
+-Read in after /usr/local/etc/screenrc
++Read in after /etc/opt/csw/screenrc
+ .IP $SCREENDIR/S-<login>
+-.IP /local/screens/S-<login>
++.IP /var/run/screens/S-<login>
+ Socket directories (default)
+-.IP /usr/tmp/screens/S-<login>
+-Alternate socket directories.
+ .IP "<socket directory>/.termcap"
+ Written by the "termcap" output function
+-.IP /usr/tmp/screens/screen-exchange
+-or
+ .IP /tmp/screen-exchange
+ .I screen
+ `interprocess communication buffer'
+diff --git a/doc/screen.info-1 b/doc/screen.info-1
+index ece1aba..e2ef7d2 100644
+--- a/doc/screen.info-1
++++ b/doc/screen.info-1
+@@ -402,7 +402,7 @@ The `.screenrc' file
+ 
+    When `screen' is invoked, it executes initialization commands from
+ the files `.screenrc' in the user's home directory and
+-`/usr/local/etc/screenrc'.  These defaults can be overridden in the
++`/etc/opt/csw/screenrc'.  These defaults can be overridden in the
+ following ways: For the global screenrc file `screen' searches for the
+ environment variable `$SYSSCREENRC' (this override feature may be
+ disabled at compile-time).  The user specific screenrc file is searched
+diff --git a/doc/screen.info-5 b/doc/screen.info-5
+index fff18bd..1601db3 100644
+--- a/doc/screen.info-5
++++ b/doc/screen.info-5
+@@ -36,26 +36,22 @@ Files Referenced
+      global initialization files.
+ 
+ ``$SYSSCREENRC''
+-`/local/etc/screenrc'
++`/etc/opt/csw/screenrc'
+      `screen' initialization commands
+ 
+ ``$SCREENRC''
+ ``$HOME'/.iscreenrc'
+ ``$HOME'/.screenrc'
+-     Read in after /local/etc/screenrc
++     Read in after /etc/opt/csw/screenrc
+ 
+ ``$SCREENDIR'/S-LOGIN'
+ 
+-`/local/screens/S-LOGIN'
++`/var/opt/csw/run/screen/S-LOGIN'
+      Socket directories (default)
+ 
+-`/usr/tmp/screens/S-LOGIN'
+-     Alternate socket directories.
+-
+ `SOCKET DIRECTORY/.termcap'
+      Written by the `dumptermcap' command
+ 
+-`/usr/tmp/screens/screen-exchange or'
+ `/tmp/screen-exchange'
+      `screen' interprocess communication buffer
+ 
+@@ -248,7 +248,7 @@ Socket Directory
+ ================
+ 
+    The socket directory defaults either to `$HOME/.screen' or simply to
+-`/tmp/screens' or preferably to `/usr/local/screens' chosen at
++`/tmp/screens' or preferably to `/var/opt/csw/run/screen' chosen at
+ compile-time. If `screen' is installed setuid root, then the
+ administrator should compile screen with an adequate (not NFS mounted)
+ `SOCKDIR'. If `screen' is not running setuid-root, the user can specify
+-- 
+1.7.6
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list