OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Mar-2007 11:37:04
Branch: HEAD Handle: 2007030410370400
Modified files:
openpkg-src/cvstrac cvstrac.patch cvstrac.spec
Log:
apply a bunch of upstream patches
Summary:
Revision Changes Path
1.23 +70 -3 openpkg-src/cvstrac/cvstrac.patch
1.55 +1 -1 openpkg-src/cvstrac/cvstrac.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.patch
============================================================================
$ cvs diff -u -r1.22 -r1.23 cvstrac.patch
--- openpkg-src/cvstrac/cvstrac.patch 29 Jan 2007 13:54:46 -0000 1.22
+++ openpkg-src/cvstrac/cvstrac.patch 4 Mar 2007 10:37:04 -0000 1.23
@@ -1,6 +1,46 @@
+Index: common.c
+--- common.c.orig 2006-12-14 01:29:24 +0100
++++ common.c 2007-03-04 11:35:11 +0100
+@@ -397,7 +397,7 @@
+ /* We don't want to be redirected back to captcha page, but ratehr to
+ ** one from which we were redirected to captcha in the first place.
+ */
+- const char *zUri = (P("cnxp")!=0) ? P("cnxp") : getenv("REQUEST_URI");
++ const char *zUri = (P("nxp")!=0) ? P("nxp") : getenv("REQUEST_URI");
+ @ <a href="honeypot"><small><notatag arg="meaningless"></small></a>
+ @ <small><a href="login?nxp=%T(zUri)" title="Log in">Not logged
in</a></small>
+ }
+Index: db.c
+--- db.c.orig 2007-01-28 19:40:07 +0100
++++ db.c 2007-03-04 11:35:11 +0100
+@@ -154,13 +154,13 @@
+ }else if( (!g.okWrite || g.isAnon) && sqlite3StrICmp(zArg1,"ticket")==0
+ && sqlite3StrICmp(zArg2,"contact")==0){
+ return SQLITE_IGNORE;
+- }else if( !g.okCheckout && sqlite3StrICmp(zArg1,"chng")==0 ){
++ }else if( !g.okRead && sqlite3StrICmp(zArg1,"chng")==0 ){
+ return SQLITE_IGNORE;
+ }else if( !g.okCheckout && sqlite3StrICmp(zArg1,"filechng")==0 ){
+ return SQLITE_IGNORE;
+ }else if( !g.okCheckout && sqlite3StrICmp(zArg1,"file")==0 ){
+ return SQLITE_IGNORE;
+- }else if( !g.okCheckout && sqlite3StrICmp(zArg1,"inspect")==0 ){
++ }else if( !g.okRead && sqlite3StrICmp(zArg1,"inspect")==0 ){
+ return SQLITE_IGNORE;
+ }else if( !g.okRead && sqlite3StrICmp(zArg1,"ticket")==0 ){
+ return SQLITE_IGNORE;
+@@ -2020,7 +2020,7 @@
+ */
+ static void f_decode(sqlite3_context *context, int argc, sqlite3_value
**argv){
+ if( argc==2 ) {
+- const char *zIn = (const char*)sqlite3_value_text(argv[0]);
++ const char *zIn = (const char*)sqlite3_value_blob(argv[0]);
+ int nBytes = sqlite3_value_int(argv[1]);
+ if( zIn && zIn[0] && nBytes>0 ){
+ char *zOut = calloc(nBytes,1);
Index: format.c
--- format.c.orig 2007-01-28 23:50:24 +0100
-+++ format.c 2007-01-29 14:20:44 +0100
++++ format.c 2007-03-04 11:35:11 +0100
@@ -778,7 +778,7 @@
if( az && az[0] && az[1] ){
cgi_printf("<a href=\"%z\" title=\"%h\">",zLink,az[0]);
@@ -12,7 +52,7 @@
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
++++ makeheaders.c 2007-03-04 11:35:11 +0100
@@ -2136,7 +2136,7 @@
zArg++;
}
@@ -63,9 +103,36 @@
pDecl->pComment ? pDecl->pComment->nLine : 0,
pDecl->tokenCode.nText ? pDecl->tokenCode.nText+1 : 0
);
+Index: svn.c
+--- svn.c.orig 2006-12-14 01:27:25 +0100
++++ svn.c 2007-03-04 11:35:11 +0100
+@@ -205,7 +205,10 @@
+ * If there's no repository defined, bail and wait until the admin sets
one.
+ */
+ zRoot = db_config("cvsroot","");
+- if( zRoot[0]==0 ) return 1;
++ if( zRoot[0]==0 ) {
++ db_execute("COMMIT");
++ return 1;
++ }
+ nBaseRevision = atoi(db_config("historysize","0"));
+
+ if( nBaseRevision
+Index: throttle.c
+--- throttle.c.orig 2006-05-25 10:20:24 +0200
++++ throttle.c 2007-03-04 11:35:11 +0100
+@@ -165,7 +165,7 @@
+ }
+
+ if( zUrl==0 ) zUrl = "index";
+- cgi_redirect(mprintf("captcha?cnxp=%T", zUrl));
++ cgi_redirect(mprintf("captcha?nxp=%T", zUrl));
+ }else if( overload && exitOnOverload ){
+ /* Just block the client */
+ lockout();
Index: ticket.c
--- ticket.c.orig 2006-12-14 01:33:31 +0100
-+++ ticket.c 2007-01-29 14:47:31 +0100
++++ ticket.c 2007-03-04 11:35:11 +0100
@@ -392,7 +392,7 @@
@ <tr>
@ <td align="right"><nobr>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 cvstrac.spec
--- openpkg-src/cvstrac/cvstrac.spec 14 Feb 2007 07:58:30 -0000 1.54
+++ openpkg-src/cvstrac/cvstrac.spec 4 Mar 2007 10:37:04 -0000 1.55
@@ -33,7 +33,7 @@
Group: SCM
License: GPL
Version: 2.0.1
-Release: 20070214
+Release: 20070304
# package options
%option with_cvs yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
