[Astlinux-commits] SF.net SVN: astlinux:[7309] branches/1.0/package/fossil

[<abe...@us...>]

Revision: 7309
          http://sourceforge.net/p/astlinux/code/7309
Author:   abelbeck
Date:     2015-11-02 23:34:30 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
fossil, version bump to 1.34

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil-0001-proxy-base.patch
    branches/1.0/package/fossil/fossil-0002-tmp-file.patch
    branches/1.0/package/fossil/fossil.mk

Removed Paths:
-------------
    branches/1.0/package/fossil/fossil-reports-segfault-fix.patch

Modified: branches/1.0/package/fossil/fossil-0001-proxy-base.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2015-11-02 23:34:30 UTC (rev 7309)
@@ -15,7 +15,7 @@
    for(i=0; zToken[i] && zToken[i]!='?'; i++){}
 --- fossil-1.33/src/main.c.orig	2015-08-17 10:47:53.000000000 -0500
 +++ fossil-1.33/src/main.c	2015-08-17 11:19:43.000000000 -0500
-@@ -1331,8 +1331,8 @@
+@@ -1387,8 +1387,8 @@
      zCur = PD("SCRIPT_NAME","/");
      i = strlen(zCur);
      while( i>0 && zCur[i-1]=='/' ) i--;
@@ -28,7 +28,7 @@
      }else{
 --- fossil-1.33/src/login.c.orig	2015-08-17 23:35:08.000000000 -0500
 +++ fossil-1.33/src/login.c	2015-08-17 23:47:02.000000000 -0500
-@@ -1249,9 +1249,9 @@
+@@ -1251,9 +1251,9 @@
      Blob redir;
      blob_init(&redir, 0, 0);
      if( login_wants_https_redirect() ){

Modified: branches/1.0/package/fossil/fossil-0002-tmp-file.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0002-tmp-file.patch	2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil-0002-tmp-file.patch	2015-11-02 23:34:30 UTC (rev 7309)
@@ -1,6 +1,6 @@
 --- fossil-1.33/src/sqlite3.c.orig	2015-08-17 12:26:08.000000000 -0500
 +++ fossil-1.33/src/sqlite3.c	2015-08-17 12:34:29.000000000 -0500
-@@ -30883,8 +30883,8 @@
+@@ -32061,8 +32061,8 @@
       0,
       0,
       0,

Deleted: branches/1.0/package/fossil/fossil-reports-segfault-fix.patch
===================================================================
--- branches/1.0/package/fossil/fossil-reports-segfault-fix.patch	2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil-reports-segfault-fix.patch	2015-11-02 23:34:30 UTC (rev 7309)
@@ -1,29 +0,0 @@
-Index: src/statrep.c
-==================================================================
---- fossil-1.33/src/statrep.c
-+++ fossil-1.33/src/statrep.c
-@@ -691,10 +691,11 @@
-   HQuery url;                        /* URL for various branch links */
-   const char *zView = P("view");     /* Which view/report to show. */
-   int eType = RPT_NONE;              /* Numeric code for view/report to show */
-   int i;                             /* Loop counter */
-   const char *zUserName;             /* Name of user */
-+  const char *azView[16];            /* Drop-down menu of view types */
-   const struct {
-     const char *zName;  /* Name of view= screen type */
-     const char *zVal;   /* Value of view= query parameter */
-     int eType;          /* Corresponding RPT_* define */
-   } aViewType[] = {
-@@ -731,11 +732,10 @@
-   }
-   url_initialize(&url, "reports");
-   cgi_query_parameters_to_url(&url);
-   if( eType!=RPT_NONE ){
-     int nView = 0;                     /* Slots used in azView[] */
--    const char *azView[16];            /* Drop-down menu of view types */
-     for(i=0; i<ArraySize(aViewType); i++){
-       azView[nView++] = aViewType[i].zVal;
-       azView[nView++] = aViewType[i].zName;
-     }
-     if( eType!=RPT_BYFILE ){
-

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil.mk	2015-11-02 23:34:30 UTC (rev 7309)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FOSSIL_VERSION = 1.33
+FOSSIL_VERSION = 1.34
 FOSSIL_SOURCE = fossil-src-$(FOSSIL_VERSION).tar.gz
 FOSSIL_SITE = http://www.fossil-scm.org/download
 FOSSIL_DEPENDENCIES = zlib openssl

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.