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: 27-Sep-2006 11:39:11
Branch: HEAD Handle: 2006092710391100
Modified files:
openpkg-src/cvstrac cvstrac.cgi cvstrac.patch cvstrac.spec
Log:
add support for Git; commit pending undisclosure patches
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-src/cvstrac/cvstrac.cgi
1.10 +54 -17 openpkg-src/cvstrac/cvstrac.patch
1.47 +20 -23 openpkg-src/cvstrac/cvstrac.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.cgi
============================================================================
$ cvs diff -u -r1.2 -r1.3 cvstrac.cgi
--- openpkg-src/cvstrac/cvstrac.cgi 6 Aug 2002 18:18:29 -0000 1.2
+++ openpkg-src/cvstrac/cvstrac.cgi 27 Sep 2006 09:39:11 -0000 1.3
@@ -1,3 +1,3 @@
#!/bin/sh
PATH="@l_prefix@/bin:$PATH"; export PATH
-exec @l_prefix@/bin/cvstrac cgi @l_prefix@/var/cvstrac
+exec @l_prefix@/bin/@[EMAIL PROTECTED] cgi @l_prefix@/var/cvstrac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 cvstrac.patch
--- openpkg-src/cvstrac/cvstrac.patch 26 Sep 2006 20:41:12 -0000 1.9
+++ openpkg-src/cvstrac/cvstrac.patch 27 Sep 2006 09:39:11 -0000 1.10
@@ -1,11 +1,18 @@
Index: attach.c
--- attach.c.orig 2006-05-26 16:20:28 +0200
-+++ attach.c 2006-09-26 22:35:36 +0200
-@@ -215,12 +215,14 @@
++++ attach.c 2006-09-27 11:32:39 +0200
+@@ -210,17 +210,20 @@
+ }
+
+ static int output_attachment_callback(
+- int *nGot, /* Set if we got results */
++ void *_nGot, /* Set if we got results */
+ int nArg, /* Number of columns in this result row */
char **azArg, /* Text of data in all columns */
char **azName /* Names of the columns */
){
- if( nArg != 4 ) return 0;
++ int *nGot = (int *)_nGot;
+ if( nArg != 5 ) return 0;
(*nGot) ++;
cgi_set_content_type(azArg[1]);
@@ -17,7 +24,7 @@
cgi_append_content(azArg[2], atoi(azArg[0]));
g.isConst = 1;
return 0;
-@@ -235,7 +237,7 @@
+@@ -235,7 +238,7 @@
*/
int got = 0;
db_callback_query( output_attachment_callback, &got,
@@ -28,7 +35,7 @@
if( !got ){
Index: browse.c
--- browse.c.orig 2006-05-26 16:20:28 +0200
-+++ browse.c 2006-09-26 22:35:36 +0200
++++ browse.c 2006-09-27 11:30:07 +0200
@@ -503,6 +503,13 @@
){
int set = (zFld==zField[0]);
@@ -170,7 +177,7 @@
}
Index: cgi.c
--- cgi.c.orig 2006-05-26 16:20:28 +0200
-+++ cgi.c 2006-09-26 22:35:36 +0200
++++ cgi.c 2006-09-27 11:30:07 +0200
@@ -382,7 +382,7 @@
continue;
}
@@ -182,7 +189,7 @@
}
Index: common.c
--- common.c.orig 2006-05-26 16:20:28 +0200
-+++ common.c 2006-09-26 22:35:36 +0200
++++ common.c 2006-09-27 11:30:07 +0200
@@ -394,7 +394,10 @@
}
@ </small>
@@ -197,7 +204,7 @@
}
Index: db.c
--- db.c.orig 2006-05-26 16:20:28 +0200
-+++ db.c 2006-09-26 22:35:36 +0200
++++ db.c 2006-09-27 11:30:07 +0200
@@ -1044,12 +1044,13 @@
@ FROM ticket");
@
----------------------------------------------------------------------------
@@ -220,7 +227,7 @@
@ SELECT
Index: setup.c
--- setup.c.orig 2006-05-26 16:20:28 +0200
-+++ setup.c 2006-09-26 22:35:36 +0200
++++ setup.c 2006-09-27 11:30:07 +0200
@@ -499,7 +499,7 @@
@ <form action="%s(g.zPath)" method="POST">
@ Select a user to whom new tickets will be assigned by default:</p><p>
@@ -232,7 +239,7 @@
@
Index: throttle.c
--- throttle.c.orig 2006-05-26 16:20:28 +0200
-+++ throttle.c 2006-09-26 22:35:36 +0200
++++ throttle.c 2006-09-27 11:30:07 +0200
@@ -165,7 +165,7 @@
}
@@ -244,7 +251,7 @@
lockout();
Index: ticket.c
--- ticket.c.orig 2006-05-26 16:20:28 +0200
-+++ ticket.c 2006-09-26 22:39:38 +0200
++++ ticket.c 2006-09-27 11:30:07 +0200
@@ -388,7 +388,7 @@
@ <tr>
@ <td align="right"><nobr>
@@ -254,31 +261,40 @@
cgi_v_optionmenu(0, "w", zWho, (const char **)az);
db_query_free(az);
@ </nobr></td>
-@@ -823,7 +823,11 @@
+@@ -397,6 +397,8 @@
+ @ </td>
+ @ </tr>
+ @
++ }
++ if (1) {
+ az = db_query("SELECT '', '' UNION ALL "
+ "SELECT name, value FROM enums WHERE type='subsys'");
+ if( az[0] && az[1] && az[2] ){
+@@ -823,7 +825,11 @@
@ </tr>
@ <tr>
@ <td align="right">Assigned To:</td>
+ if( strchr(az[10], '@') && g.isAnon ){
-+ @ <td bgcolor="%h(BG3)" class="bkgnd3"><b>(undisclosed) </b></td>
++ @ <td bgcolor="%h(BG3)" class="bkgnd3"><i>undisclosed</i> </td>
+ } else {
@ <td bgcolor="%h(BG3)" class="bkgnd3"><b>%h(az[6]) </b></td>
+ }
@ <td> </td>
@ <td align="right">Derived From:</td>
@ <td bgcolor="%h(BG3)" class="bkgnd3"><b>
-@@ -838,7 +842,11 @@
+@@ -838,7 +844,11 @@
@ </tr>
@ <tr>
@ <td align="right">Creator:</td>
+ if( strchr(az[10], '@') && !g.okWrite ){
-+ @ <td bgcolor="%h(BG3)" class="bkgnd3">(undisclosed) </td>
++ @ <td bgcolor="%h(BG3)" class="bkgnd3"><i>undisclosed</i> </td>
+ } else {
@ <td bgcolor="%h(BG3)" class="bkgnd3"><b>%h(az[10]) </b></td>
+ }
if( g.okWrite && !g.isAnon ){
@ <td> </td>
@ <td align="right">Contact:</td>
-@@ -1323,7 +1331,7 @@
+@@ -1323,7 +1333,7 @@
@ <nobr>
@ Assigned To:
azUsers = (const char**)db_query(
@@ -287,7 +303,7 @@
cgi_v_optionmenu(0, "a", aParm[4].zNew, azUsers);
@ </nobr>
@
-@@ -1475,6 +1483,10 @@
+@@ -1475,6 +1485,10 @@
strftime(zDate, sizeof(zDate), "%Y-%b-%d %H:%M:%S", pTm);
if( isspace(zText[0]) && isspace(zText[1]) ) zSpacer = "\n\n";
if( zOrig[0]==0 ) zHLine = "";
@@ -300,7 +316,7 @@
db_execute(
Index: timeline.c
--- timeline.c.orig 2006-05-26 16:20:28 +0200
-+++ timeline.c 2006-09-26 22:35:36 +0200
++++ timeline.c 2006-09-27 11:30:07 +0200
@@ -1105,6 +1105,9 @@
z = db_short_query("SELECT date FROM chng WHERE cn=%d",cn);
if( z ) cgi_modified_since(atoi(z));
@@ -311,3 +327,24 @@
/* patchsets are raw output based one what are supposed to be unchanging
file
** revisions.
*/
+Index: wiki.c
+--- wiki.c.orig 2006-05-26 16:20:28 +0200
++++ wiki.c 2006-09-27 11:30:07 +0200
+@@ -310,12 +310,17 @@
+
+ char *format_user(const char* zUser){
+ if( zUser!=0 ){
++ if( strchr(zUser, '@') && !g.okWrite ){
++ return mprintf("<i>undisclosed</i>");
++ }
++ else {
+ if( g.okRdWiki && is_user_page(zUser) ){
+ return mprintf("<a href=\"wiki?p=%t\">%h</a>", zUser, zUser);
+ }else{
+ return mprintf("%h",zUser);
+ }
+ }
++ }
+ return 0;
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 cvstrac.spec
--- openpkg-src/cvstrac/cvstrac.spec 26 Sep 2006 20:09:37 -0000 1.46
+++ openpkg-src/cvstrac/cvstrac.spec 27 Sep 2006 09:39:11 -0000 1.47
@@ -33,7 +33,7 @@
Group: SCM
License: GPL
Version: 2.0.0
-Release: 20060926
+Release: 20060927
# list of sources
Source0: http://www.cvstrac.org/cvstrac-%{version}.tar.gz
@@ -51,10 +51,11 @@
AutoReqProv: no
%description
- CVSTrac is bug tracking system for use with CVS appropriate for use
- on projects with up to a few hundred developers. CVSTrac is designed
- for low-ceremony development - it provides mechanisms for tracking
- changes and bugs without unnecessary restrictions.
+ CVSTrac is bug tracking system for use with the CVS, Subversion
+ and Git SCMs, appropriate for use on projects with up to a few
+ hundred developers. CVSTrac is designed for low-ceremony development
+ -- it provides mechanisms for tracking changes and bugs without
+ unnecessary restrictions.
%track
prog cvstrac = {
@@ -72,18 +73,14 @@
case "%{l_platform -t}" in
*-sunos* ) libs="$libs -lrt -lsocket -lnsl" ;;
esac
- %{l_make} %{l_mflags} -f main.mk \
- SRCDIR=`pwd` \
- BCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
- TCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
- LIBSQLITE="%{l_ldflags} $libs" \
- E=""
- %{l_make} %{l_mflags} -f main.mk \
- SRCDIR=`pwd` \
- BCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
- TCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
- LIBSQLITE="%{l_ldflags} $libs" \
- APPNAME="svntrac" E=""
+ for scm in cvs svn git; do
+ %{l_make} %{l_mflags} -f main.mk \
+ SRCDIR=`pwd` \
+ BCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
+ TCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
+ LIBSQLITE="%{l_ldflags} $libs" \
+ APPNAME="${scm}trac" E=""
+ done
%install
rm -rf $RPM_BUILD_ROOT
@@ -92,12 +89,12 @@
$RPM_BUILD_ROOT%{l_prefix}/cgi \
$RPM_BUILD_ROOT%{l_prefix}/var/cvstrac
%{l_shtool} install -c -s -m 755 \
- cvstrac svntrac $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 755 %{l_value -s -a} \
- %{SOURCE cvstrac.cgi} $RPM_BUILD_ROOT%{l_prefix}/cgi/cvstrac
- %{l_shtool} install -c -m 755 %{l_value -s -a} \
- -e 's;bin/cvstrac;bin/svntrac;g' \
- %{SOURCE cvstrac.cgi} $RPM_BUILD_ROOT%{l_prefix}/cgi/svntrac
+ cvstrac svntrac gittrac $RPM_BUILD_ROOT%{l_prefix}/bin/
+ for scm in cvs svn git; do
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ -e "s;@l_scm@;${scm};g" \
+ %{SOURCE cvstrac.cgi} $RPM_BUILD_ROOT%{l_prefix}/cgi/${scm}trac
+ done
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/cvstrac'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
