svn commit: r317972 - head/www/websh/files

[Mikhail Teterin]

Author: mi
Date: Sun May 12 19:08:49 2013
New Revision: 317972
URL: http://svnweb.freebsd.org/changeset/ports/317972

Log:
  Add some more patches to satisfy increasingly picky compiler(s).
  
  Notified by:	itetcu

Modified:
  head/www/websh/files/patch-generic_interpool.c
  head/www/websh/files/patch-warnings

Modified: head/www/websh/files/patch-generic_interpool.c
==============================================================================
--- head/www/websh/files/patch-generic_interpool.c	Sun May 12 17:32:13 2013	(r317971)
+++ head/www/websh/files/patch-generic_interpool.c	Sun May 12 19:08:49 2013	(r317972)
@@ -1,11 +1,29 @@
---- ../generic/interpool.c.orig	2013-02-05 13:59:15.000000000 +0100
-+++ ../generic/interpool.c	2013-02-05 14:00:59.000000000 +0100
-@@ -573,7 +573,7 @@
- 			  Tcl_GetStringResult(conf->mainInterp));
+--- ../generic/interpool.c	2009-07-15 08:15:16.000000000 -0400
++++ ../generic/interpool.c	2013-05-12 15:00:06.000000000 -0400
+@@ -108,5 +108,4 @@
+ {
+ 
+-    int result = 0;
+     LogPlugIn *logtoap = NULL;
+     Tcl_Obj *code = NULL;
+@@ -135,5 +134,5 @@
+ 
+     /* now register here all websh modules */
+-    result = Tcl_Init(webInterp->interp);
++    Tcl_Init(webInterp->interp);
+     /* checkme: test result */
+ 
+@@ -143,5 +142,5 @@
+     Tcl_SetAssocData(webInterp->interp, WEB_APFUNCS_ASSOC_DATA, NULL, (ClientData *) apFuncs);
+ 
+-    result = Websh_Init(webInterp->interp);
++    Websh_Init(webInterp->interp);
+ 
+     /* also register the destrcutor, etc. functions, passing webInterp as
+@@ -574,5 +573,5 @@
  #else /* APACHE2 */
  	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0,
 -			 conf->server, Tcl_GetStringResult(conf->mainInterp));
 +			 conf->server, "%s", Tcl_GetStringResult(conf->mainInterp));
  #endif /* APACHE2 */
  	    return 0;
- 	}

Modified: head/www/websh/files/patch-warnings
==============================================================================
--- head/www/websh/files/patch-warnings	Sun May 12 17:32:13 2013	(r317971)
+++ head/www/websh/files/patch-warnings	Sun May 12 19:08:49 2013	(r317972)
@@ -19,7 +19,7 @@ Submitted to vendor:
        const char *pw = NULL;
        const char *user = NULL;
 --- ../generic/logutl.c	2009-09-14 11:11:40.000000000 -0400
-+++ ../generic/logutl.c	2010-02-24 22:53:36.000000000 -0500
++++ ../generic/logutl.c	2013-05-12 15:04:11.000000000 -0400
 @@ -87,5 +87,5 @@
  
      LogLevel *logLevel = NULL;
@@ -27,3 +27,97 @@ Submitted to vendor:
 +    int res = TCL_ERROR;
  
      if ((logData == NULL) || (levelStr == NULL) || (msg == NULL))
+@@ -465,7 +465,7 @@
+ 		case 'p':
+ #ifndef WIN32
+-		    sprintf(tmpStr, "%d", (int) getpid());
++		    sprintf(tmpStr, "%lu", (unsigned long)getpid());
+ #else
+-		    sprintf(tmpStr, "%d", (int) _getpid());
++		    sprintf(tmpStr, "%lu", (unsigned long)_getpid());
+ #endif
+ 		    Tcl_AppendToObj(fmsg, tmpStr, -1);
+@@ -473,5 +473,5 @@
+ 		case 't':
+ #ifdef TCL_THREADS
+-		    sprintf(tmpStr, "%d", (int) Tcl_GetCurrentThread());
++		    sprintf(tmpStr, "%lu", (unsigned long)(uintptr_t)Tcl_GetCurrentThread());
+ 		    Tcl_AppendToObj(fmsg, tmpStr, -1);
+ #else
+--- ../generic/nca_d.c	2009-09-14 11:11:40.000000000 -0400
++++ ../generic/nca_d.c	2013-05-12 14:55:21.000000000 -0400
+@@ -176,5 +176,4 @@
+ 
+     Tcl_Obj *key = NULL;
+-    unsigned char *keyBytes = NULL;
+     int keyLen = -1;
+     char *str = NULL;
+@@ -192,5 +191,5 @@
+     WebAssertData(interp, clientData, "web::decryptd", TCL_ERROR);
+     key = (Tcl_Obj *) clientData;
+-    keyBytes = Tcl_GetByteArrayFromObj(key, &keyLen);
++    Tcl_GetByteArrayFromObj(key, &keyLen);
+ 
+     if (keyLen < 1) {
+--- ../generic/formdata.c	2007-09-04 12:59:43.000000000 -0400
++++ ../generic/formdata.c	2013-05-12 14:56:59.000000000 -0400
+@@ -273,5 +273,4 @@
+     int isLast = TCL_ERROR;
+     long upLoadFileSize = 0;
+-    long bytesWritten = 0;
+     long bytesSkipped = 0;
+     Tcl_Obj *tmpFileName = NULL;
+@@ -353,5 +352,4 @@
+ 		}
+ 
+-		bytesWritten = 0;
+ 		bytesSkipped = 0;
+ 
+@@ -366,8 +364,7 @@
+ 		}
+ 
+-		bytesWritten =
+-		    readAndDumpBody(interp, channel, boundary, &isLast,
+-				    tmpFileName, upLoadFileSize,
+-				    requestData->filePermissions, &bytesSkipped);
++		readAndDumpBody(interp, channel, boundary, &isLast,
++				tmpFileName, upLoadFileSize,
++				requestData->filePermissions, &bytesSkipped);
+ 
+ 		if (fileNameLen > 0) {
+--- ../generic/log.c	2009-09-14 11:11:40.000000000 -0400
++++ ../generic/log.c	2013-05-12 14:58:45.000000000 -0400
+@@ -35,5 +35,4 @@
+     LogPlugIn *logtocmd = NULL;
+     LogPlugIn *logtosyslog = NULL;
+-    int ires = 0;
+ 
+     /* --------------------------------------------------------------------------
+@@ -86,5 +85,5 @@
+     logtochannel->handler = logToChannel;
+ 
+-    ires = registerLogPlugIn(interp, "channel", logtochannel);
++    registerLogPlugIn(interp, "channel", logtochannel);
+ 
+     /* --------------------------------------------------------------------------
+@@ -98,5 +97,5 @@
+     logtofile->handler = logToFile;
+ 
+-    ires = registerLogPlugIn(interp, "file", logtofile);
++    registerLogPlugIn(interp, "file", logtofile);
+ 
+     /* --------------------------------------------------------------------------
+@@ -110,5 +109,5 @@
+     logtocmd->handler = logToCmd;
+ 
+-    ires = registerLogPlugIn(interp, "command", logtocmd);
++    registerLogPlugIn(interp, "command", logtocmd);
+ 
+     /* --------------------------------------------------------------------------
+@@ -123,5 +122,5 @@
+     logtosyslog->handler = logToSyslog;
+ 
+-    ires = registerLogPlugIn(interp, "syslog", logtosyslog);
++    registerLogPlugIn(interp, "syslog", logtosyslog);
+ #endif
+     /* --------------------------------------------------------------------------