[53026] trunk/dports/shells/rootsh

[toby at macports.org]

Revision: 53026
          http://trac.macports.org/changeset/53026
Author:   toby at macports.org
Date:     2009-06-28 03:26:21 -0700 (Sun, 28 Jun 2009)
Log Message:
-----------
rootsh 1.5.3

Modified Paths:
--------------
    trunk/dports/shells/rootsh/Portfile
    trunk/dports/shells/rootsh/files/patch-src__rootsh.c

Modified: trunk/dports/shells/rootsh/Portfile
===================================================================
--- trunk/dports/shells/rootsh/Portfile	2009-06-28 10:03:26 UTC (rev 53025)
+++ trunk/dports/shells/rootsh/Portfile	2009-06-28 10:26:21 UTC (rev 53026)
@@ -2,9 +2,9 @@
 
 PortSystem 1.0
 name             rootsh
-version          1.5.2
+version          1.5.3
 categories       shells
-maintainers      nomaintainer
+maintainers      toby
 description      logging wrapper for shells
 long_description \
 	Rootsh is a wrapper for shells which logs all echoed \
@@ -15,7 +15,9 @@
 homepage         http://rootsh.sourceforge.net/
 platforms        darwin
 master_sites     sourceforge
-checksums        md5 39e3a876b991fe235af3150335d1a0f8
+checksums        md5 af62e6140338c9b2e8e8f6e828fda1ac \
+                 sha1 fa0049002b853a3d18b567dd60e4e714f9db2222 \
+                 rmd160 1e5083c37a89b7c00606b4ca7367b90bc4ad58cb
 
 patchfiles       patch-Makefile.in \
                  patch-configure \

Modified: trunk/dports/shells/rootsh/files/patch-src__rootsh.c
===================================================================
--- trunk/dports/shells/rootsh/files/patch-src__rootsh.c	2009-06-28 10:03:26 UTC (rev 53025)
+++ trunk/dports/shells/rootsh/files/patch-src__rootsh.c	2009-06-28 10:26:21 UTC (rev 53026)
@@ -1,24 +1,23 @@
---- src/rootsh.c.orig	Thu Mar 24 08:08:20 2005
-+++ src/rootsh.c	Sun Mar 27 00:38:09 2005
-@@ -42,6 +42,9 @@
- #include <sys/stat.h>
+--- src/rootsh.c.orig	2009-06-28 03:19:08.000000000 -0700
++++ src/rootsh.c	2009-06-28 03:24:41.000000000 -0700
+@@ -43,6 +43,8 @@
  #include <dirent.h>
  #include <regex.h>
-+#include <sys/aio.h>
+ #include <wordexp.h>
 +#include <sys/ioctl.h>
 +#include <util.h>
  #if HAVE_SYS_SELECT_H
  #  include <sys/select.h>
  #endif
-@@ -177,7 +180,6 @@
+@@ -180,7 +182,6 @@
  //  
  */
  extern char **environ;
 -extern int errno;
  
- static char progName[MAXPATHLEN];
- static char sessionId[MAXPATHLEN + 11];
-@@ -235,7 +237,7 @@
+ volatile sig_atomic_t sigwinch_received;
+ 
+@@ -242,7 +243,7 @@
    //  
    //  long_options	Used by getopt_long.
    */
@@ -27,3 +26,35 @@
    char *sucmd = SUCMD;
    static char sessionIdEnv[sizeof(sessionId) + 17];
    fd_set readmask;
+@@ -296,7 +297,9 @@
+         version();
+         break;
+       case 'c':
++	/*
+ 	// if they supply a -c somewhere and it isn't the first arg, then the command is no good
++	*/
+ 	if ( strcmp("-c", argv[1]) ) usage ();
+ 	doscp = 1;
+ 	break;
+@@ -339,10 +342,10 @@
+   // The user requested a SCP command
+   */
+   if (doscp) {
++	  int i;
+ 	  if (! beginlogging()) {
+ 		  exit(EXIT_FAILURE);
+ 	  }
+-	  int i;
+ 	  for ( i = 0; i < argc; i++ ) {
+ 		  dologging(argv[i], sizeof(argv[i]));
+ 		  dologging("\n", sizeof("\n"));
+@@ -834,7 +837,8 @@
+         */
+         msglen = snprintf(msgbuf, (sizeof(msgbuf) - 1),
+             "*** USER TRIED TO DELETE AND RECREATE THIS FILE ***\r\n");
+-        unlink(logFileName) && rmdir(logFileName);
++        if (unlink(logFileName))
++          rmdir(logFileName);
+       } else {
+         if (fstat(logFile, &statBuf) == -1) {
+           /*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090628/9fc5cd52/attachment.html>