openpkg-packages/cvstrac/cvstrac.patch

Index: format.c
--- format.c.orig	2007-01-28 23:50:24 +0100
+++ format.c	2007-01-29 14:20:44 +0100
@@ -778,7 +778,7 @@
       if( az && az[0] && az[1] ){
         cgi_printf("<a href=\"%z\" title=\"%h\">",zLink,az[0]);
         /* FIXME: should use a <span> with the ticket status as a class */
-        if( az[1][0] == 'n' || az[1][0] == 'a' ){
+        if( az[1][0] != 'c' ){
           cgi_printf("#%d",tn);
         }else{
           cgi_printf("<strike>#%d</strike>",tn);
Index: makeheaders.c
--- makeheaders.c.orig	2006-12-14 01:35:46 +0100
+++ makeheaders.c	2007-01-29 14:20:44 +0100
@@ -2136,7 +2136,7 @@
       zArg++;
     }
     if( *zArg==0 || *zArg=='\n' ){ return 0; }
-    nArg = pToken->nText + (int)pToken->zText - (int)zArg;
+    nArg = pToken->nText + pToken->zText - zArg;
     if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){
       PushIfMacro(0,0,0,pToken->nLine,PS_Interface);
     }else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){
@@ -2155,7 +2155,7 @@
       zArg++;
     }
     if( *zArg==0 || *zArg=='\n' ){ return 0; }
-    nArg = pToken->nText + (int)pToken->zText - (int)zArg;
+    nArg = pToken->nText + pToken->zText - zArg;
     PushIfMacro("defined",zArg,nArg,pToken->nLine,0);
   }else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){
     /*
@@ -2166,7 +2166,7 @@
       zArg++;
     }
     if( *zArg==0 || *zArg=='\n' ){ return 0; }
-    nArg = pToken->nText + (int)pToken->zText - (int)zArg;
+    nArg = pToken->nText + pToken->zText - zArg;
     PushIfMacro("!defined",zArg,nArg,pToken->nLine,0);
   }else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){
     /*
@@ -2792,7 +2792,7 @@
     fprintf(stderr,
        "%s: Can't overwrite this file because it wasn't previously\n"
        "%*s  generated by 'makeheaders'.\n",
-       pFile->zHdr, strlen(pFile->zHdr), "");
+       pFile->zHdr, (int)strlen(pFile->zHdr), "");
     nErr++;
   }else if( strcmp(zOldVersion,zNewVersion)!=0 ){
     if( report ) fprintf(report,"updated\n");
@@ -2951,10 +2951,10 @@
        pDecl->zName,
        zLabel,
        pDecl->zFile,
-       pDecl->pComment ? (int)pDecl->pComment/sizeof(Token) : 0,
+       pDecl->pComment ? /* TOTALLY BOGUS: (int)pDecl->pComment/sizeof(Token) */ 0 : 0,
        pDecl->pComment ? pDecl->pComment->nText+1 : 0,
-       pDecl->zIf ? strlen(pDecl->zIf)+1 : 0,
-       zDecl ? strlen(zDecl) : 0,
+       pDecl->zIf ? (int)strlen(pDecl->zIf)+1 : 0,
+       zDecl ? (int)strlen(zDecl) : 0,
        pDecl->pComment ? pDecl->pComment->nLine : 0,
        pDecl->tokenCode.nText ? pDecl->tokenCode.nText+1 : 0
     );
Index: ticket.c
--- ticket.c.orig	2006-12-14 01:33:31 +0100
+++ ticket.c	2007-01-29 14:47:31 +0100
@@ -392,7 +392,7 @@
     @ <tr>
     @   <td align="right"><nobr>
     @     Assigned To:
-    az = db_query("SELECT id FROM user UNION SELECT '' ORDER BY id");
+    az = db_query("SELECT id FROM user WHERE capabilities LIKE '%%w%%' UNION SELECT '' ORDER BY id");
     cgi_v_optionmenu(0, "w", zWho, (const char **)az);
     db_query_free(az);
     @   </nobr></td>
@@ -1335,7 +1335,7 @@
   @ <nobr>
   @ Assigned To: 
   azUsers = (const char**)db_query(
-              "SELECT id FROM user UNION SELECT '' ORDER BY id");
+              "SELECT id FROM user WHERE capabilities LIKE '%%w%%' UNION SELECT '' ORDER BY id");
   cgi_v_optionmenu(0, "a", aParm[4].zNew, azUsers);
   @ </nobr>
   @ &nbsp;&nbsp;&nbsp;
@@ -1463,14 +1463,16 @@
   const char *zTn;
   char *zErrMsg = 0;
   char *zTktTitle;
+  const char *zOwner;
 
   login_check_credentials();
-  if( !g.okWrite ){ login_needed(); return; }
   throttle(1,1);
   tn = rn = 0;
   zTn = PD("tn","");
   sscanf(zTn, "%d,%d", &tn, &rn);
   if( tn<=0 ){ cgi_redirect("index"); return; }
+  zOwner = db_short_query("SELECT owner FROM ticket WHERE tn=%d", tn);
+  if( !g.okWrite && !(zOwner != NULL && strcmp(zOwner, g.zUser) == 0) ){ login_needed(); return; }
   bprintf(zPage,sizeof(zPage),"%d",tn);
   doPreview = P("pre")!=0;
   doSubmit = P("submit")!=0;