tags 325206 +patch
thanks

The following patch fixes the gcc-4.x compilation errors.  This patch,
along with the one at #394588 and the one at #355656 were used to
successfully build a rivet package in sid.

diff -Nru rivet-0.5.0.orig/src/rivetCore.c rivet-0.5.0/src/rivetCore.c
--- rivet-0.5.0.orig/src/rivetCore.c    2004-12-03 03:17:11.000000000 +0100
+++ rivet-0.5.0/src/rivetCore.c 2006-10-22 01:07:25.000000000 +0200
@@ -640,7 +640,7 @@
        if (TclWeb_UploadChannel(varname, &chan, globals->req) != TCL_OK) {
            return TCL_ERROR;
        }
-       (CONST84 char *)channelname = Tcl_GetChannelName(chan);
+       channelname = (char*)Tcl_GetChannelName(chan);
        Tcl_SetStringObj(result, channelname, -1);
        break;
     }
diff -Nru rivet-0.5.0.orig/src/TclWebapache.c rivet-0.5.0/src/TclWebapache.c
--- rivet-0.5.0.orig/src/TclWebapache.c 2004-12-03 03:17:10.000000000 +0100
+++ rivet-0.5.0/src/TclWebapache.c      2006-10-22 01:08:19.000000000 +0200
@@ -660,10 +660,10 @@
     TclWeb_InitEnvVars( req );

     /* Check to see if it's a header variable first. */
-    (const char *)val = ap_table_get( req->req->headers_in, key );
+    val = (char*)ap_table_get( req->req->headers_in, key );

     if( !val ) {
-       (const char *)val = ap_table_get( req->req->subprocess_env, key );
+       val = (char*)ap_table_get( req->req->subprocess_env, key );
     }

     return val;


At the very least you should also create a debian/compat, add a
dh_installdirs to the install target, and add etc/apache/conf.d to your
dirs file (or mkdir -p just before copying the rivet.conf).

Regards,
F. Moya

-- 
Francisco Moya Fernandez      Computer Architecture and Networks Group
Assistant Professor
[EMAIL PROTECTED]                      School of Computer Science
Fax:(+34 926) 29 53 54                University of Castilla-La Mancha
Tel:(+34 926) 29 54 83                      http://www.inf-cr.uclm.es/



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to