svn commit: r314138 - in head/devel/fossil: . files

[Baptiste Daroussin]

Author: bapt
Date: Thu Mar 14 07:43:23 2013
New Revision: 314138
URL: http://svnweb.freebsd.org/changeset/ports/314138

Log:
  Add a patch to fix fossil scrub --private
  
  Obtained from:	fossil's upstream (http://www.fossil-scm.org/fossil/info/60acc2de34)

Added:
  head/devel/fossil/files/
  head/devel/fossil/files/patch-fix-srub-private   (contents, props changed)
Modified:
  head/devel/fossil/Makefile

Modified: head/devel/fossil/Makefile
==============================================================================
--- head/devel/fossil/Makefile	Thu Mar 14 07:34:30 2013	(r314137)
+++ head/devel/fossil/Makefile	Thu Mar 14 07:43:23 2013	(r314138)
@@ -2,6 +2,7 @@
 
 PORTNAME=	fossil
 PORTVERSION=	20130216000435
+POREREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://www.fossil-scm.org/download/

Added: head/devel/fossil/files/patch-fix-srub-private
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fossil/files/patch-fix-srub-private	Thu Mar 14 07:43:23 2013	(r314138)
@@ -0,0 +1,35 @@
+Index: src/db.c
+==================================================================
+--- src/db.c
++++ src/db.c
+@@ -882,10 +882,11 @@
+   lsize = file_size(zDbName);
+   if( lsize%1024!=0 || lsize<4096 ) return 0;
+   db_open_or_attach(zDbName, "localdb", 0);
+   zVFileDef = db_text(0, "SELECT sql FROM %s.sqlite_master"
+                          " WHERE name=='vfile'", db_name("localdb"));
++  if( zVFileDef==0 ) return 0;
+ 
+   /* If the "isexe" column is missing from the vfile table, then
+   ** add it now.   This code added on 2010-03-06.  After all users have
+   ** upgraded, this code can be safely deleted.
+   */
+
+Index: src/rebuild.c
+==================================================================
+--- src/rebuild.c
++++ src/rebuild.c
+@@ -785,10 +785,12 @@
+   int bVerily = find_option("verily",0,0)!=0;
+   int bForce = find_option("force", "f", 0)!=0;
+   int privateOnly = find_option("private",0,0)!=0;
+   int bNeedRebuild = 0;
+   db_find_and_open_repository(OPEN_ANY_SCHEMA, 2);
++  db_close(1);
++  db_open_repository(g.zRepositoryName);
+   if( !bForce ){
+     Blob ans;
+     char cReply;
+     blob_zero(&ans);
+     prompt_user(
+