Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 2 Apr 2007 18:20:25 +0200 (CEST)
From:      Norbert Koch <nkoch@demig.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/111145: [patch] cvstrac version -> 2.0.0
Message-ID:  <200704021620.l32GKP8U058916@entw-pr.demig.intra>
Resent-Message-ID: <200704021650.l32Go0et079707@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         111145
>Category:       ports
>Synopsis:       [patch] cvstrac version -> 2.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 02 16:50:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Norbert Koch
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD entw-pr.demig.intra 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon Sep 5 08:51:16 CEST 2005 root@entw-pr.demig:/usr/obj/usr/src/sys/ENTW-PR i386

>Description:
	I'd like to have cvstrac updated to 2.0.0.
        It works for me with the additional patch (see below) in db.c.
        But I'd suggest someone else should confirm that.
        SHA256 is missing, as I run this under 4.11.
        So this needs to be added.

        Perhaps pkg-descr should mention that cvstrac's
        database may have to be upgraded from sqlite2 to sqlite3
        like e.g.:
          mv cvstrac.db cvstrac_2.db &&
            sqlite cvstrac_2.db .dump | sqlite3 cvstrac.db

>How-To-Repeat:
	
>Fix:

diff -Pur cvstrac/Makefile cvstrac20/Makefile
--- cvstrac/Makefile	Sun Jun  4 22:30:29 2006
+++ cvstrac20/Makefile	Mon Apr  2 17:20:54 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvstrac
-PORTVERSION=	1.2.1
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cvstrac.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -15,7 +15,7 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web-Based Bug And Patch-Set Tracking System For CVS
 
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=	sqlite.3:${PORTSDIR}/databases/sqlite3
 
 USE_GMAKE=	yes
 
diff -Pur cvstrac/distinfo cvstrac20/distinfo
--- cvstrac/distinfo	Sun Jun  4 22:30:29 2006
+++ cvstrac20/distinfo	Wed Dec 27 08:54:33 2006
@@ -1,3 +1,2 @@
-MD5 (cvstrac-1.2.1.tar.gz) = 8659529167f022a7e0df2c5a1ef30a34
-SHA256 (cvstrac-1.2.1.tar.gz) = 6b2b105b2f284632be648a5d96bc487f3b2f1fdff891b74a89a9f7a609b2ba0c
-SIZE (cvstrac-1.2.1.tar.gz) = 221447
+MD5 (cvstrac-2.0.0.tar.gz) = 434b7c19a2990e8a3d6b17e3e97f1668
+SIZE (cvstrac-2.0.0.tar.gz) = 283011

diff -Pur cvstrac/files/patch-Makefile cvstrac20/files/patch-Makefile
--- cvstrac/files/patch-Makefile	Wed Jan 12 17:21:50 2005
+++ cvstrac20/files/patch-Makefile	Wed Dec 27 10:25:54 2006
@@ -25,7 +25,7 @@
 +
 +#### Extra arguments for linking against SQLite
 +#
-+LIBSQLITE = -L$(LOCALBASE)/lib -lsqlite -lcrypt
++LIBSQLITE = -L$(LOCALBASE)/lib -lsqlite3 -lcrypt
 +
 +#### Installation directory
 +#

diff -Pur cvstrac/files/patch-db.c cvstrac20/files/patch-db.c
--- cvstrac/files/patch-db.c	Thu Jan  1 01:00:00 1970
+++ cvstrac20/files/patch-db.c	Wed Dec 27 11:16:00 2006
@@ -0,0 +1,11 @@
+--- db.c.org	Wed Dec 27 11:14:31 2006
++++ db.c	Wed Dec 27 11:15:09 2006
+@@ -107,6 +107,8 @@
+   extern int sqlite3StrICmp(const char*, const char*);
+   if( type==SQLITE_SELECT ){
+     return SQLITE_OK;
++  }else if( type==SQLITE_FUNCTION ){
++    return SQLITE_OK;
+   }else if( type==SQLITE_READ ){
+     if( sqlite3StrICmp(zArg1,"user")==0 ){
+       if( sqlite3StrICmp(zArg2,"passwd")==0 || sqlite3StrICmp(zArg2,"email")==0 ){


-- 
***********************************************************************
*    demig Prozessautomatisierung GmbH  *  demig Anlagentechnik GmbH  *
*                                       *                             *
* Anschrift:          Haardtstrasse 40  *  Haardtstrasse 40           *
*                       D-57076 Siegen  *  D-57076 Siegen             *
* Registergericht:     Siegen HRB 2819  *  Siegen HRB 5532            *
* Geschaeftsfuehrer:   Joachim Herbst,  *  Joachim Herbst,            *
*                        Winfried Held  *  Winfried Held              *
* Telefon:              +49 271 772020  *  +49 271 772020             *
* Telefax:              +49 271 74704   *  +49 271 74704              *
* E-Mail:                info@demig.de  *  at@demig.de                *
*                  http://www.demig.de  *  http://www.demig.de        *
***********************************************************************

>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704021620.l32GKP8U058916>