astlinux-commits — Commits to the AstLinux SVN repository

[Astlinux-commits] SF.net SVN: astlinux:[7220] branches/1.0/package/fossil/ fossil-reports-segfault-fix.patch

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

Revision: 7220
          http://sourceforge.net/p/astlinux/code/7220
Author:   abelbeck
Date:     2015-08-23 20:38:24 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
fossil, add upstream patch to fix an obscure gcc optimization related to /reports
Ref: https://www.fossil-scm.org/xfer/vinfo/8184f39d803f9ad6

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

Added: branches/1.0/package/fossil/fossil-reports-segfault-fix.patch
===================================================================
--- branches/1.0/package/fossil/fossil-reports-segfault-fix.patch	                        (rev 0)
+++ branches/1.0/package/fossil/fossil-reports-segfault-fix.patch	2015-08-23 20:38:24 UTC (rev 7220)
@@ -0,0 +1,29 @@
+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 ){
+

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

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

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

Revision: 7219
          http://sourceforge.net/p/astlinux/code/7219
Author:   abelbeck
Date:     2015-08-23 15:08:39 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
fossil, fossil-commit script, display the latest timeline entry after the commit

Modified Paths:
--------------
    branches/1.0/package/fossil/scripts/fossil-commit

Modified: branches/1.0/package/fossil/scripts/fossil-commit
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-commit	2015-08-23 14:50:14 UTC (rev 7218)
+++ branches/1.0/package/fossil/scripts/fossil-commit	2015-08-23 15:08:39 UTC (rev 7219)
@@ -66,6 +66,8 @@
 fossil commit --no-warnings -m "$message"
 rtn=$?
 
+fossil timeline -n 1 | grep -v 'entry limit'
+
 fossil close --force
 
 rm -f "$LOCKFILE"

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

[Astlinux-commits] SF.net SVN: astlinux:[7218] branches/1.0/package/webinterface/altweb/admin

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

Revision: 7218
          http://sourceforge.net/p/astlinux/code/7218
Author:   abelbeck
Date:     2015-08-23 14:50:14 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
web interface, add 'Fossil Commands' sub-tab referenced via the Edit tab

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/edit.php

Added Paths:
-----------
    branches/1.0/package/webinterface/altweb/admin/fossilcmd.php

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2015-08-21 23:43:37 UTC (rev 7217)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2015-08-23 14:50:14 UTC (rev 7218)
@@ -187,6 +187,9 @@
         $result = 3;
       }
     }
+  } elseif (isset($_POST['submit_fossil'])) {
+    header('Location: /admin/fossilcmd.php');
+    exit;
   } elseif (isset($_POST['submit_reload'])) {
     $result = 99;
     $process = $_POST['reload_restart'];
@@ -673,6 +676,10 @@
   putHtml('</select>');
   putHtml('</td><td width="20">&nbsp;</td><td style="text-align: left;">');
   putHtml('<input type="submit" class="formbtn" value="&gt;&gt;&nbsp;Open File" name="submit_open" />');
+  if (getPREFdef($global_prefs, 'tab_fossil_show') === 'yes') {
+    putHtml('<br /><br />');
+    putHtml('<input type="submit" class="formbtn" value="Fossil Commands" name="submit_fossil" />');
+  }
   putHtml('</td></tr></table>');
 
   if (($shortcut_str = getPREFdef($global_prefs, 'edit_text_shortcut_cmdstr')) !== '') {

Added: branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/fossilcmd.php	                        (rev 0)
+++ branches/1.0/package/webinterface/altweb/admin/fossilcmd.php	2015-08-23 14:50:14 UTC (rev 7218)
@@ -0,0 +1,149 @@
+<?php
+
+// Copyright (C) 2008-2015 Lonnie Abelbeck
+// This is free software, licensed under the GNU General Public License
+// version 3 as published by the Free Software Foundation; you can
+// redistribute it and/or modify it under the terms of the GNU
+// General Public License; and comes with ABSOLUTELY NO WARRANTY.
+
+// fossilcmd.php for AstLinux
+// 08-23-2015
+//
+
+require_once '../common/functions.php';
+
+$action_menu = array (
+  'status' => 'fossil-status',
+  'diff' => 'fossil-diff',
+  'commit' => 'fossil-commit',
+  'revert' => 'fossil-revert'
+);
+
+// Function: multi_args
+//
+function multi_args($args) {
+  $str = '';
+
+  if ($args == '') {
+    return($str);
+  }
+
+  $strtokens = explode(' ', $args);
+  foreach ($strtokens as $value) {
+    if ($value !== '') {
+      $str .= ' "'.$value.'"';
+    }
+  }
+  return($str);
+}
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+  $result = 1;
+  if (! $global_admin) {
+    $result = 999;                                 
+  } elseif (isset($_POST['submit_action'])) {
+    $result = 10;
+    $action = $_POST['fossil_action'];
+    $arg = isset($_POST['fossil_arg']) ? tuq($_POST['fossil_arg']) : '';
+    header('Location: '.$myself.'?action='.$action.'&arg='.rawurlencode($arg).'&result='.$result);
+    exit;
+  }
+  header('Location: '.$myself.'?result='.$result);
+  exit;
+} else { // Start of HTTP GET
+$ACCESS_RIGHTS = 'admin';
+require_once '../common/header.php';
+
+  $action = isset($_GET['action']) ? $_GET['action'] : '';
+  $arg = isset($_GET['arg']) ? rawurldecode($_GET['arg']) : '';
+  
+  if ($action === 'status') {
+    $arg_str = '';
+  } elseif ($action === 'diff') {
+    $arg_str = multi_args($arg);
+  } elseif ($action === 'commit') {
+    $arg_str = ($arg !== '') ? '"'.$arg.'"' : '';
+  } elseif ($action === 'revert') {
+    $arg_str = multi_args($arg);
+  } else {
+    $action = '';
+    $arg_str = '';
+  }
+
+  putHtml("<center>");
+  if (isset($_GET['result'])) {
+    $result = $_GET['result'];
+    if ($result == 10 && $action !== '') {
+      putHtml('<p style="color: green;">Fossil Command: fossil-'.$action.' '.htmlspecialchars($arg_str).'</p>');
+    } elseif ($result == 99) {
+      putHtml('<p style="color: red;">Action Failed.</p>');
+    } elseif ($result == 999) {
+      putHtml('<p style="color: red;">Permission denied for user "'.$global_user.'".</p>');
+    } else {
+      putHtml('<p style="color: orange;">No Action.</p>');
+    }
+  } else {
+    putHtml('<p>&nbsp;</p>');
+  }
+  putHtml("</center>");
+?>
+  <center>
+  <table width="100%" class="layout"><tr><td><center>
+  <form method="post" action="<?php echo $myself;?>" enctype="multipart/form-data">
+  <table width="100%" class="stdtable">
+  <tr><td style="text-align: center;" colspan="2">
+  <h2>Fossil Commands:</h2>
+  </td></tr>
+<?php
+
+if (is_file('/var/run/fossil.pid')) {
+  putHtml('<tr><td style="text-align: center;" colspan="2">');
+  putHtml('<select name="fossil_action">');
+  foreach ($action_menu as $key => $value) {
+    putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+  }
+  putHtml('</select>');
+  putHtml('<input type="text" size="48" maxlength="256" name="fossil_arg" value="" />');
+  putHtml('&ndash;');
+  putHtml('<input type="submit" value="Fossil Command" name="submit_action" />');
+  putHtml('</td></tr>');
+} else {
+  putHtml('<tr><td style="text-align: center;" colspan="2">');
+  putHtml('<p style="color: red;">The Fossil Server is not running, enable via the Network Tab.</p>');
+  putHtml('</td></tr>');
+}
+  putHtml('</table>');
+  putHtml('</form>');
+
+  putHtml("</center></td></tr></table>");
+  putHtml("</center>");
+
+if (is_file('/var/run/fossil.pid')) {
+  if ($action !== '') {
+    putHtml("<pre>");
+    $tmpfile = tempnam("/tmp", "PHP_");
+    @exec('cd /root;FOSSIL_HOME="/mnt/kd/fossil" fossil-'.$action.' '.$arg_str.' >'.$tmpfile.' 2>&1');
+    if (($fp = @fopen($tmpfile, "rb")) !== FALSE) {
+      $max = 250000;
+      $stat = fstat($fp);
+      if ($stat['size'] > $max) {
+        @fseek($fp, -$max, SEEK_END);
+        fgets($fp, 1024);
+        echo "<strong>----- File too large to display, showing the end of the file -----</strong>\n";
+      }
+      while (! feof($fp)) {                   
+        if ($line = fgets($fp, 1024)) {      
+          echo htmlspecialchars($line);
+        }                
+      }                                    
+      fclose($fp);
+    }
+    @unlink($tmpfile);
+    putHtml("</pre>");
+  }
+}
+
+} // End of HTTP GET
+require_once '../common/footer.php';
+
+?>


Property changes on: branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7217] branches/1.0/package/webinterface/altweb/admin/ fossil.php

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

Revision: 7217
          http://sourceforge.net/p/astlinux/code/7217
Author:   abelbeck
Date:     2015-08-21 23:43:37 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
web interface, Fossil tab, only show Timeline check-in's by default, Thanks Michael

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/fossil.php

Modified: branches/1.0/package/webinterface/altweb/admin/fossil.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/fossil.php	2015-08-21 21:22:05 UTC (rev 7216)
+++ branches/1.0/package/webinterface/altweb/admin/fossil.php	2015-08-21 23:43:37 UTC (rev 7217)
@@ -57,7 +57,7 @@
 
   putHtml('<table class="stdtable" width="100%"><tr><td style="text-align: center;">');
   if (is_file('/var/run/fossil.pid')) {
-    echo '<iframe id="fossil" src="/admin/fossil/timeline" frameborder="1" width="100%" onload="setIFheight();">';
+    echo '<iframe id="fossil" src="/admin/fossil/timeline?y=ci" frameborder="1" width="100%" onload="setIFheight();">';
     putHtml('</iframe>');
   } elseif (! is_file('/etc/init.d/fossil')) {
     putHtml('<p style="color: red;">Fossil is not available on your AstLinux image.</p>');

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

[Astlinux-commits] SF.net SVN: astlinux:[7216] branches/1.0/package/webinterface/altweb/admin/ fossil.php

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

Revision: 7216
          http://sourceforge.net/p/astlinux/code/7216
Author:   abelbeck
Date:     2015-08-21 21:22:05 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
web interface, Fossil tab now goes to /timeline by default

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/fossil.php

Modified: branches/1.0/package/webinterface/altweb/admin/fossil.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/fossil.php	2015-08-21 21:14:23 UTC (rev 7215)
+++ branches/1.0/package/webinterface/altweb/admin/fossil.php	2015-08-21 21:22:05 UTC (rev 7216)
@@ -57,7 +57,7 @@
 
   putHtml('<table class="stdtable" width="100%"><tr><td style="text-align: center;">');
   if (is_file('/var/run/fossil.pid')) {
-    echo '<iframe id="fossil" src="/admin/fossil/" frameborder="1" width="100%" onload="setIFheight();">';
+    echo '<iframe id="fossil" src="/admin/fossil/timeline" frameborder="1" width="100%" onload="setIFheight();">';
     putHtml('</iframe>');
   } elseif (! is_file('/etc/init.d/fossil')) {
     putHtml('<p style="color: red;">Fossil is not available on your AstLinux image.</p>');

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

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

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

Revision: 7215
          http://sourceforge.net/p/astlinux/code/7215
Author:   abelbeck
Date:     2015-08-21 21:14:23 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
fossil, rename the helper script fossil-update to fossil-commit

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.mk
    branches/1.0/package/fossil/scripts/fossil-close
    branches/1.0/package/fossil/scripts/fossil-diff
    branches/1.0/package/fossil/scripts/fossil-open
    branches/1.0/package/fossil/scripts/fossil-revert
    branches/1.0/package/fossil/scripts/fossil-status

Added Paths:
-----------
    branches/1.0/package/fossil/scripts/fossil-commit

Removed Paths:
-------------
    branches/1.0/package/fossil/scripts/fossil-update

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-21 20:38:24 UTC (rev 7214)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-21 21:14:23 UTC (rev 7215)
@@ -31,7 +31,7 @@
 	$(INSTALL) -m 0755 -D $(@D)/fossil $(TARGET_DIR)/usr/bin/fossil
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-open $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-close $(TARGET_DIR)/usr/bin/
-	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-update $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-commit $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-revert $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-diff $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-status $(TARGET_DIR)/usr/bin/
@@ -44,7 +44,7 @@
 	rm -f $(TARGET_DIR)/usr/bin/fossil
 	rm -f $(TARGET_DIR)/usr/bin/fossil-open
 	rm -f $(TARGET_DIR)/usr/bin/fossil-close
-	rm -f $(TARGET_DIR)/usr/bin/fossil-update
+	rm -f $(TARGET_DIR)/usr/bin/fossil-commit
 	rm -f $(TARGET_DIR)/usr/bin/fossil-revert
 	rm -f $(TARGET_DIR)/usr/bin/fossil-diff
 	rm -f $(TARGET_DIR)/usr/bin/fossil-status

Modified: branches/1.0/package/fossil/scripts/fossil-close
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-close	2015-08-21 20:38:24 UTC (rev 7214)
+++ branches/1.0/package/fossil/scripts/fossil-close	2015-08-21 21:14:23 UTC (rev 7215)
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-LOCKFILE="/var/lock/fossil-update.lock"
+LOCKFILE="/var/lock/fossil-commit.lock"
 
 if ! cd /mnt/kd; then
   exit 1
 fi
 
 if [ -f "$LOCKFILE" ]; then
-  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  echo "fossil-commit: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
   exit 9
 fi
 

Copied: branches/1.0/package/fossil/scripts/fossil-commit (from rev 7214, branches/1.0/package/fossil/scripts/fossil-update)
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-commit	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-commit	2015-08-21 21:14:23 UTC (rev 7215)
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+. /etc/rc.conf
+
+export FOSSIL_HOME="/mnt/kd/fossil"
+
+message="${1:-auto commit via cron}"
+
+REPO="/mnt/kd/fossil/astlinux.fossil"
+
+LOCKFILE="/var/lock/fossil-commit.lock"
+
+if [ ! -f $REPO ]; then
+  echo "Fossil repository not found: $REPO" >&2
+  exit 1
+fi
+
+if ! cd /mnt/kd; then
+  exit 1
+fi
+
+# Robust 'bash' method of creating/testing for a lockfile
+if ! ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
+  echo "fossil-commit: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
+trap 'rm -f "$LOCKFILE"; exit $?' INT TERM EXIT
+
+fossil open $REPO --keep >/dev/null
+fossil status
+
+## Check for locally added files in selected directories, add them to the repo
+
+if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
+  dirs="$FOSSIL_DEFAULT_DIRS"
+else
+  dirs="rc.conf.d arno-iptables-firewall/plugins monit/monit.d openvpn/ccd"
+  if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
+    dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
+  fi
+fi
+
+files="${FOSSIL_DEFAULT_FILES:-rc.elocal rc.local rc.local.stop dnsmasq.static}"
+
+unset IFS
+for dir in $dirs $FOSSIL_INCLUDE_DIRS; do
+  if [ "$dir" != "/mnt/kd" -a "$dir" != "/mnt/kd/" -a -d "$dir" ]; then
+    fossil add --ignore '*.bak,*.db' --force "$dir"
+  fi
+done
+
+for file in $files $FOSSIL_INCLUDE_FILES; do
+  if [ -f "$file" ]; then
+    if ! fossil ls "${file#/mnt/kd/}" | grep -q "${file#/mnt/kd/}"; then
+      fossil add --force "$file"
+    fi
+  fi
+done
+
+## Check for locally deleted files, remove them from the repo
+if fossil changes | grep -q '^MISSING'; then
+  fossil changes | awk '/^MISSING/ { print $2; }' | xargs fossil forget
+fi
+
+fossil commit --no-warnings -m "$message"
+rtn=$?
+
+fossil close --force
+
+rm -f "$LOCKFILE"
+trap - INT TERM EXIT
+
+exit $rtn

Modified: branches/1.0/package/fossil/scripts/fossil-diff
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-diff	2015-08-21 20:38:24 UTC (rev 7214)
+++ branches/1.0/package/fossil/scripts/fossil-diff	2015-08-21 21:14:23 UTC (rev 7215)
@@ -4,7 +4,7 @@
 
 REPO="/mnt/kd/fossil/astlinux.fossil"
 
-LOCKFILE="/var/lock/fossil-update.lock"
+LOCKFILE="/var/lock/fossil-commit.lock"
 
 if [ ! -f $REPO ]; then
   echo "Fossil repository not found: $REPO" >&2
@@ -16,7 +16,7 @@
 fi
 
 if [ -f "$LOCKFILE" ]; then
-  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  echo "fossil-commit: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
   exit 9
 fi
 

Modified: branches/1.0/package/fossil/scripts/fossil-open
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-open	2015-08-21 20:38:24 UTC (rev 7214)
+++ branches/1.0/package/fossil/scripts/fossil-open	2015-08-21 21:14:23 UTC (rev 7215)
@@ -2,7 +2,7 @@
 
 REPO="/mnt/kd/fossil/astlinux.fossil"
 
-LOCKFILE="/var/lock/fossil-update.lock"
+LOCKFILE="/var/lock/fossil-commit.lock"
 
 if [ ! -f $REPO ]; then
   echo "Fossil repository not found: $REPO" >&2
@@ -14,7 +14,7 @@
 fi
 
 if [ -f "$LOCKFILE" ]; then
-  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  echo "fossil-commit: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
   exit 9
 fi
 

Modified: branches/1.0/package/fossil/scripts/fossil-revert
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-revert	2015-08-21 20:38:24 UTC (rev 7214)
+++ branches/1.0/package/fossil/scripts/fossil-revert	2015-08-21 21:14:23 UTC (rev 7215)
@@ -2,7 +2,7 @@
 
 REPO="/mnt/kd/fossil/astlinux.fossil"
 
-LOCKFILE="/var/lock/fossil-update.lock"
+LOCKFILE="/var/lock/fossil-commit.lock"
 
 file="$1"
 
@@ -30,7 +30,7 @@
 fi
 
 if [ -f "$LOCKFILE" ]; then
-  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  echo "fossil-commit: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
   exit 9
 fi
 

Modified: branches/1.0/package/fossil/scripts/fossil-status
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-status	2015-08-21 20:38:24 UTC (rev 7214)
+++ branches/1.0/package/fossil/scripts/fossil-status	2015-08-21 21:14:23 UTC (rev 7215)
@@ -2,7 +2,7 @@
 
 REPO="/mnt/kd/fossil/astlinux.fossil"
 
-LOCKFILE="/var/lock/fossil-update.lock"
+LOCKFILE="/var/lock/fossil-commit.lock"
 
 if [ ! -f $REPO ]; then
   echo "Fossil repository not found: $REPO" >&2
@@ -14,7 +14,7 @@
 fi
 
 if [ -f "$LOCKFILE" ]; then
-  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  echo "fossil-commit: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
   exit 9
 fi
 

Deleted: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update	2015-08-21 20:38:24 UTC (rev 7214)
+++ branches/1.0/package/fossil/scripts/fossil-update	2015-08-21 21:14:23 UTC (rev 7215)
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-
-export FOSSIL_HOME="/mnt/kd/fossil"
-
-message="${1:-auto commit via cron}"
-
-REPO="/mnt/kd/fossil/astlinux.fossil"
-
-LOCKFILE="/var/lock/fossil-update.lock"
-
-if [ ! -f $REPO ]; then
-  echo "Fossil repository not found: $REPO" >&2
-  exit 1
-fi
-
-if ! cd /mnt/kd; then
-  exit 1
-fi
-
-# Robust 'bash' method of creating/testing for a lockfile
-if ! ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
-  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
-  exit 9
-fi
-
-trap 'rm -f "$LOCKFILE"; exit $?' INT TERM EXIT
-
-fossil open $REPO --keep >/dev/null
-fossil status
-
-## Check for locally added files in selected directories, add them to the repo
-
-if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
-  dirs="$FOSSIL_DEFAULT_DIRS"
-else
-  dirs="rc.conf.d arno-iptables-firewall/plugins monit/monit.d openvpn/ccd"
-  if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
-    dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
-  fi
-fi
-
-files="${FOSSIL_DEFAULT_FILES:-rc.elocal rc.local rc.local.stop dnsmasq.static}"
-
-unset IFS
-for dir in $dirs $FOSSIL_INCLUDE_DIRS; do
-  if [ "$dir" != "/mnt/kd" -a "$dir" != "/mnt/kd/" -a -d "$dir" ]; then
-    fossil add --ignore '*.bak,*.db' --force "$dir"
-  fi
-done
-
-for file in $files $FOSSIL_INCLUDE_FILES; do
-  if [ -f "$file" ]; then
-    if ! fossil ls "${file#/mnt/kd/}" | grep -q "${file#/mnt/kd/}"; then
-      fossil add --force "$file"
-    fi
-  fi
-done
-
-## Check for locally deleted files, remove them from the repo
-if fossil changes | grep -q '^MISSING'; then
-  fossil changes | awk '/^MISSING/ { print $2; }' | xargs fossil forget
-fi
-
-fossil commit --no-warnings -m "$message"
-rtn=$?
-
-fossil close --force
-
-rm -f "$LOCKFILE"
-trap - INT TERM EXIT
-
-exit $rtn

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

[Astlinux-commits] SF.net SVN: astlinux:[7214] branches/1.0

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

Revision: 7214
          http://sourceforge.net/p/astlinux/code/7214
Author:   abelbeck
Date:     2015-08-21 20:38:24 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
default builds, enable fossil for now for testing, we can decide later if we want to revert this

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-08-21 17:46:16 UTC (rev 7213)
+++ branches/1.0/astlinux-ast11.config	2015-08-21 20:38:24 UTC (rev 7214)
@@ -266,7 +266,7 @@
 # BR2_PACKAGE_CVS is not set
 # BR2_PACKAGE_DISTCC is not set
 BR2_PACKAGE_FLEX=y
-# BR2_PACKAGE_FOSSIL is not set
+BR2_PACKAGE_FOSSIL=y
 # BR2_PACKAGE_GMP is not set
 # BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_MAKE is not set

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-08-21 17:46:16 UTC (rev 7213)
+++ branches/1.0/astlinux-ast13.config	2015-08-21 20:38:24 UTC (rev 7214)
@@ -266,7 +266,7 @@
 # BR2_PACKAGE_CVS is not set
 # BR2_PACKAGE_DISTCC is not set
 BR2_PACKAGE_FLEX=y
-# BR2_PACKAGE_FOSSIL is not set
+BR2_PACKAGE_FOSSIL=y
 # BR2_PACKAGE_GMP is not set
 # BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_MAKE is not set

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-08-21 17:46:16 UTC (rev 7213)
+++ branches/1.0/astlinux18.config	2015-08-21 20:38:24 UTC (rev 7214)
@@ -266,7 +266,7 @@
 # BR2_PACKAGE_CVS is not set
 # BR2_PACKAGE_DISTCC is not set
 BR2_PACKAGE_FLEX=y
-# BR2_PACKAGE_FOSSIL is not set
+BR2_PACKAGE_FOSSIL=y
 # BR2_PACKAGE_GMP is not set
 # BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_MAKE is not set

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

[Astlinux-commits] SF.net SVN: astlinux:[7213] branches/1.0/package/webinterface/altweb

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

Revision: 7213
          http://sourceforge.net/p/astlinux/code/7213
Author:   abelbeck
Date:     2015-08-21 17:46:16 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
web interface, add support for Fossil

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/admin/network.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/common/header.php
    branches/1.0/package/webinterface/altweb/common/license-packages.txt

Added Paths:
-----------
    branches/1.0/package/webinterface/altweb/admin/fossil.php

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2015-08-21 12:55:21 UTC (rev 7212)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2015-08-21 17:46:16 UTC (rev 7213)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2014 Lonnie Abelbeck
+// Copyright (C) 2008-2015 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -28,6 +28,7 @@
   'openvpnclient' => 'Restart OpenVPN Client',
   'racoon' => 'Restart IPsec VPN',
   'pptpd' => 'Restart PPTP VPN Server',
+  'fossil' => 'Restart Fossil Server',
   'ldap' => 'Reload LDAP Client',
   'slapd' => 'Restart LDAP Server',
   'monit' => 'Restart Monit Monitor',
@@ -250,6 +251,8 @@
         $result = restartPROCESS($process, 45, $result, 'init');
       } elseif ($process === 'monit') {
         $result = restartPROCESS($process, 46, $result, 'init');
+      } elseif ($process === 'fossil') {
+        $result = restartPROCESS($process, 47, $result, 'init');
       } elseif ($process === 'cron') {
         $result = updateCRON('root', 30, $result);
       }
@@ -384,6 +387,8 @@
       putHtml('<p style="color: green;">Kamailio SIP Server'.statusPROCESS('kamailio').'.</p>');
     } elseif ($result == 46) {
       putHtml('<p style="color: green;">Monit Monitoring'.statusPROCESS('monit').'.</p>');
+    } elseif ($result == 47) {
+      putHtml('<p style="color: green;">Fossil Server'.statusPROCESS('fossil').'.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {

Added: branches/1.0/package/webinterface/altweb/admin/fossil.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/fossil.php	                        (rev 0)
+++ branches/1.0/package/webinterface/altweb/admin/fossil.php	2015-08-21 17:46:16 UTC (rev 7213)
@@ -0,0 +1,73 @@
+<?php
+
+// Copyright (C) 2015 Lonnie Abelbeck
+// This is free software, licensed under the GNU General Public License
+// version 3 as published by the Free Software Foundation; you can
+// redistribute it and/or modify it under the terms of the GNU
+// General Public License; and comes with ABSOLUTELY NO WARRANTY.
+
+// fossil.php for AstLinux
+// 08-21-2015
+//
+
+$myself = $_SERVER['PHP_SELF'];
+
+require_once '../common/functions.php';
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+  $result = 1;
+  if (! $global_admin) {
+    $result = 999;                                 
+  }
+  header('Location: '.$myself.'?result='.$result);
+  exit;
+} else { // Start of HTTP GET
+$ACCESS_RIGHTS = 'admin';
+require_once '../common/header.php';
+
+  putHtml("<center>");
+  putHtml('<p>&nbsp;</p>');
+  putHtml("</center>");
+?>
+  <script language="JavaScript" type="text/javascript">
+  //<![CDATA[
+
+  function setIFheight() {
+    var iframe = document.getElementById("fossil");
+    var winH = 460;
+    if (document.documentElement && document.documentElement.offsetHeight) {
+      winH = document.documentElement.offsetHeight;
+    }
+    if (window.innerHeight) {
+      winH = window.innerHeight;
+    }
+    var offset = 160;
+    if (iframe.getBoundingClientRect) {
+      offset = iframe.getBoundingClientRect().top + 22;
+    }
+
+    iframe.height = winH - offset;
+    window.onresize = setIFheight;
+  }
+  //]]>
+  </script>
+  <center>
+  <table class="layoutNOpad" width="100%"><tr><td><center>
+<?php
+
+  putHtml('<table class="stdtable" width="100%"><tr><td style="text-align: center;">');
+  if (is_file('/var/run/fossil.pid')) {
+    echo '<iframe id="fossil" src="/admin/fossil/" frameborder="1" width="100%" onload="setIFheight();">';
+    putHtml('</iframe>');
+  } elseif (! is_file('/etc/init.d/fossil')) {
+    putHtml('<p style="color: red;">Fossil is not available on your AstLinux image.</p>');
+  } else {
+    putHtml('<p style="color: red;">The Fossil Server is not running, enable via the Network Tab.</p>');
+  }
+  putHtml('</td></tr></table>');
+  putHtml("</center></td></tr></table>");
+  putHtml("</center>");
+} // End of HTTP GET
+require_once '../common/footer.php';
+
+?>


Property changes on: branches/1.0/package/webinterface/altweb/admin/fossil.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2015-08-21 12:55:21 UTC (rev 7212)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2015-08-21 17:46:16 UTC (rev 7213)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2014 Lonnie Abelbeck
+// Copyright (C) 2008-2015 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -35,6 +35,7 @@
 // 10-21-2013, Added LDAP server support
 // 01-04-2014, Added NUT UPS Monitoring support
 // 12-16-2014, Added Monit Monitoring support
+// 08-21-2015, Added Fossil - Software Configuration Management
 //
 // System location of rc.conf file
 $CONFFILE = '/etc/rc.conf';
@@ -647,6 +648,14 @@
   $value = 'UPS_KILL_POWER="'.$_POST['ups_kill_power'].'"';
   fwrite($fp, $value."\n");
   
+  fwrite($fp, "### Fossil - Software Configuration Management\n");
+  $value = 'FOSSIL_SERVER="'.$_POST['fossil_server'].'"';
+  fwrite($fp, $value."\n");
+  $value = 'FOSSIL_INCLUDE_DIRS="'.tuq($_POST['fossil_include_dirs']).'"';
+  fwrite($fp, $value."\n");
+  $value = 'FOSSIL_INCLUDE_FILES="'.tuq($_POST['fossil_include_files']).'"';
+  fwrite($fp, $value."\n");
+
   $value = 'ADNAME=""';
   fwrite($fp, "### Disable Bonjour Broadcasts\n".$value."\n");
   fwrite($fp, "### gui.network.conf - end ###\n");
@@ -1030,6 +1039,8 @@
         $result = restartPROCESS($process, 45, $result, 'init');
       } elseif ($process === 'monit') {
         $result = restartPROCESS($process, 46, $result, 'init');
+      } elseif ($process === 'fossil') {
+        $result = restartPROCESS($process, 47, $result, 'init');
       }
     } else {
       $result = 2;
@@ -1118,6 +1129,8 @@
       putHtml('<p style="color: green;">Kamailio SIP Server'.statusPROCESS('kamailio').'.</p>');
     } elseif ($result == 46) {
       putHtml('<p style="color: green;">Monit Monitoring'.statusPROCESS('monit').'.</p>');
+    } elseif ($result == 47) {
+      putHtml('<p style="color: green;">Fossil Server'.statusPROCESS('fossil').'.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 100) {
@@ -1193,6 +1206,8 @@
   putHtml('<option value="racoon"'.$sel.'>Restart IPsec VPN</option>');
   $sel = ($reboot_restart === 'pptpd') ? ' selected="selected"' : '';
   putHtml('<option value="pptpd"'.$sel.'>Restart PPTP VPN Server</option>');
+  $sel = ($reboot_restart === 'fossil') ? ' selected="selected"' : '';
+  putHtml('<option value="fossil"'.$sel.'>Restart Fossil Server</option>');
   $sel = ($reboot_restart === 'ldap') ? ' selected="selected"' : '';
   putHtml('<option value="ldap"'.$sel.'>Reload LDAP Client</option>');
   $sel = ($reboot_restart === 'slapd') ? ' selected="selected"' : '';
@@ -2058,8 +2073,30 @@
   
   putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
   
+if (is_file('/etc/init.d/fossil')) {
   putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
   
+  putHtml('<strong>Fossil &ndash; Software Configuration Management:</strong>');
+  putHtml('</td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  putHtml('Fossil Server:');
+  putHtml('<select name="fossil_server">');
+  putHtml('<option value="no">disabled</option>');
+  $sel = (getVARdef($db, 'FOSSIL_SERVER', $cur_db) === 'yes') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>enabled</option>');
+  putHtml('</select></td></tr>');
+
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  $value = getVARdef($db, 'FOSSIL_INCLUDE_DIRS', $cur_db);
+  putHtml('Fossil Include Dirs:&nbsp;<input type="text" size="82" maxlength="256" value="'.$value.'" name="fossil_include_dirs" /></td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  $value = getVARdef($db, 'FOSSIL_INCLUDE_FILES', $cur_db);
+  putHtml('Fossil Include Files:<input type="text" size="82" maxlength="256" value="'.$value.'" name="fossil_include_files" /></td></tr>');
+
+  putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
+}
+  putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
+  
   putHtml('<strong>Advanced Configuration:</strong>');
   putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-08-21 12:55:21 UTC (rev 7212)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-08-21 17:46:16 UTC (rev 7213)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2014 Lonnie Abelbeck
+// Copyright (C) 2008-2015 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -19,6 +19,7 @@
 // 09-06-2013, Added Edit Tab Shortcut support
 // 09-04-2014, Added Show Kamailio SIP Server Status
 // 12-16-2014, Added Show Monit Tab
+// 08-12-2015, Added Show Fossil Tab
 //
 
 $myself = $_SERVER['PHP_SELF'];
@@ -504,6 +505,10 @@
       $value = 'tab_monit_show = yes';
       fwrite($fp, $value."\n");
     }
+    if (isset($_POST['tab_fossil'])) {
+      $value = 'tab_fossil_show = yes';
+      fwrite($fp, $value."\n");
+    }
     if (! isset($_POST['tab_staff'])) {
       $value = 'tab_staff_disable_staff = yes';
       fwrite($fp, $value."\n");
@@ -1201,6 +1206,10 @@
   putHtml('<input type="checkbox" value="tab_cli" name="tab_cli"'.$sel.' /></td><td colspan="5">Show CLI Tab</td></tr>');
   
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
+  $sel = (getPREFdef($global_prefs, 'tab_fossil_show') === 'yes') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="tab_fossil" name="tab_fossil"'.$sel.' /></td><td colspan="5">Show Fossil Tab</td></tr>');
+
+  putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'tab_staff_disable_staff') !== 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="tab_staff" name="tab_staff"'.$sel.' /></td><td colspan="5">Show Staff Tab for &quot;staff&quot; user</td></tr>');
   

Modified: branches/1.0/package/webinterface/altweb/common/header.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/header.php	2015-08-21 12:55:21 UTC (rev 7212)
+++ branches/1.0/package/webinterface/altweb/common/header.php	2015-08-21 17:46:16 UTC (rev 7213)
@@ -1,6 +1,6 @@
 <?php session_manual_gc();
 
-// Copyright (C) 2008-2014 Lonnie Abelbeck
+// Copyright (C) 2008-2015 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -270,6 +270,9 @@
       if ($global_admin && (getPREFdef($global_prefs, 'tab_cli_show') === 'yes')) {
         putHtml('<li><a href="/admin/cli.php"><span>CLI</span></a></li>');
       }
+      if ($global_admin && (getPREFdef($global_prefs, 'tab_fossil_show') === 'yes')) {
+        putHtml('<li><a href="/admin/fossil.php"><span>Fossil</span></a></li>');
+      }
       if ($global_admin && (getPREFdef($global_prefs, 'tab_prefs_show') !== 'no')) {
         putHtml('<li><a href="/admin/prefs.php"><span>Prefs</span></a></li>');
       }

Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt	2015-08-21 12:55:21 UTC (rev 7212)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt	2015-08-21 17:46:16 UTC (rev 7213)
@@ -54,3 +54,4 @@
 Monit~Copyright (c) 2001-2015, Tildeslash. All rights reserved
 sqlite~Copyright (c) 1995-2015, SQLite Consortium
 sqliteodbc~Copyright (c) 2001-2015, Christian Werner
+Fossil~Copyright (c) 2007-2015 D. Richard Hipp. All rights reserved.

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

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

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

Revision: 7212
          http://sourceforge.net/p/astlinux/code/7212
Author:   abelbeck
Date:     2015-08-21 12:55:21 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
fossil, add AIF plugins conf directory to the defaults, allow arguments to fossil-diff

Modified Paths:
--------------
    branches/1.0/package/fossil/scripts/fossil-diff
    branches/1.0/package/fossil/scripts/fossil-update

Modified: branches/1.0/package/fossil/scripts/fossil-diff
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-diff	2015-08-20 23:45:52 UTC (rev 7211)
+++ branches/1.0/package/fossil/scripts/fossil-diff	2015-08-21 12:55:21 UTC (rev 7212)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+ARGS="$@"
+
 REPO="/mnt/kd/fossil/astlinux.fossil"
 
 LOCKFILE="/var/lock/fossil-update.lock"
@@ -20,7 +22,7 @@
 
 fossil open $REPO --keep >/dev/null
 
-fossil diff
+fossil diff $ARGS
 rtn=$?
 
 fossil close --force

Modified: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update	2015-08-20 23:45:52 UTC (rev 7211)
+++ branches/1.0/package/fossil/scripts/fossil-update	2015-08-21 12:55:21 UTC (rev 7212)
@@ -35,7 +35,7 @@
 if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
   dirs="$FOSSIL_DEFAULT_DIRS"
 else
-  dirs="rc.conf.d monit/monit.d openvpn/ccd"
+  dirs="rc.conf.d arno-iptables-firewall/plugins monit/monit.d openvpn/ccd"
   if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
     dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
   fi

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

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

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

Revision: 7211
          http://sourceforge.net/p/astlinux/code/7211
Author:   abelbeck
Date:     2015-08-20 23:45:52 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add another helper script fossil-status

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.mk

Added Paths:
-----------
    branches/1.0/package/fossil/scripts/fossil-status

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-20 22:59:43 UTC (rev 7210)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-20 23:45:52 UTC (rev 7211)
@@ -34,6 +34,7 @@
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-update $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-revert $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-diff $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-status $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/fossil.init $(TARGET_DIR)/etc/init.d/fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/K15fossil
@@ -46,6 +47,7 @@
 	rm -f $(TARGET_DIR)/usr/bin/fossil-update
 	rm -f $(TARGET_DIR)/usr/bin/fossil-revert
 	rm -f $(TARGET_DIR)/usr/bin/fossil-diff
+	rm -f $(TARGET_DIR)/usr/bin/fossil-status
 	rm -f $(TARGET_DIR)/etc/init.d/fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/K15fossil

Added: branches/1.0/package/fossil/scripts/fossil-status
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-status	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-status	2015-08-20 23:45:52 UTC (rev 7211)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+REPO="/mnt/kd/fossil/astlinux.fossil"
+
+LOCKFILE="/var/lock/fossil-update.lock"
+
+if [ ! -f $REPO ]; then
+  echo "Fossil repository not found: $REPO" >&2
+  exit 1
+fi
+
+if ! cd /mnt/kd; then
+  exit 1
+fi
+
+if [ -f "$LOCKFILE" ]; then
+  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
+fossil open $REPO --keep >/dev/null
+
+fossil status
+rtn=$?
+
+fossil close --force
+
+exit $rtn


Property changes on: branches/1.0/package/fossil/scripts/fossil-status
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 7210
          http://sourceforge.net/p/astlinux/code/7210
Author:   abelbeck
Date:     2015-08-20 22:59:43 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add FOSSIL_HOME to fossil.init, keeps '/.fossil' from being created

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.init

Modified: branches/1.0/package/fossil/fossil.init
===================================================================
--- branches/1.0/package/fossil/fossil.init	2015-08-20 22:21:15 UTC (rev 7209)
+++ branches/1.0/package/fossil/fossil.init	2015-08-20 22:59:43 UTC (rev 7210)
@@ -2,6 +2,8 @@
 
 . /etc/rc.conf
 
+export FOSSIL_HOME="/mnt/kd/fossil"
+
 PIDFILE="/var/run/fossil.pid"
 
 TMPDIR="/mnt/kd/fossil/tmp"

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

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

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

Revision: 7209
          http://sourceforge.net/p/astlinux/code/7209
Author:   abelbeck
Date:     2015-08-20 22:21:15 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add another helper script fossil-diff and rework fossil-revert

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.mk
    branches/1.0/package/fossil/scripts/fossil-revert

Added Paths:
-----------
    branches/1.0/package/fossil/scripts/fossil-diff

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-20 19:13:16 UTC (rev 7208)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-20 22:21:15 UTC (rev 7209)
@@ -33,6 +33,7 @@
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-close $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-update $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-revert $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-diff $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/fossil.init $(TARGET_DIR)/etc/init.d/fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/K15fossil
@@ -44,6 +45,7 @@
 	rm -f $(TARGET_DIR)/usr/bin/fossil-close
 	rm -f $(TARGET_DIR)/usr/bin/fossil-update
 	rm -f $(TARGET_DIR)/usr/bin/fossil-revert
+	rm -f $(TARGET_DIR)/usr/bin/fossil-diff
 	rm -f $(TARGET_DIR)/etc/init.d/fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/K15fossil

Added: branches/1.0/package/fossil/scripts/fossil-diff
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-diff	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-diff	2015-08-20 22:21:15 UTC (rev 7209)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+REPO="/mnt/kd/fossil/astlinux.fossil"
+
+LOCKFILE="/var/lock/fossil-update.lock"
+
+if [ ! -f $REPO ]; then
+  echo "Fossil repository not found: $REPO" >&2
+  exit 1
+fi
+
+if ! cd /mnt/kd; then
+  exit 1
+fi
+
+if [ -f "$LOCKFILE" ]; then
+  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
+fossil open $REPO --keep >/dev/null
+
+fossil diff
+rtn=$?
+
+fossil close --force
+
+exit $rtn


Property changes on: branches/1.0/package/fossil/scripts/fossil-diff
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/fossil/scripts/fossil-revert
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-revert	2015-08-20 19:13:16 UTC (rev 7208)
+++ branches/1.0/package/fossil/scripts/fossil-revert	2015-08-20 22:21:15 UTC (rev 7209)
@@ -4,12 +4,14 @@
 
 LOCKFILE="/var/lock/fossil-update.lock"
 
-revision="$1"
+file="$1"
 
-file="$2"
+revision="$2"
 
-if [ -z "$revision" -o -z "$file" ]; then
-  echo "Usage: fossil-revert hex_revision_num file_name"
+if [ -z "$file" ]; then
+  echo "Usage: fossil-revert [/mnt/kd/]file_name [hex_revision_num]"
+  echo ""
+  echo "Note:  If no hex_revision_num is specified, the latest is used."
   exit 1
 fi
 
@@ -34,14 +36,10 @@
 
 fossil open $REPO --keep >/dev/null
 
-fossil revert -r "$revision" "$file"
+fossil revert${revision:+ -r $revision} "$file" | grep -v 'fossil undo'
 rtn=$?
 
-if [ $rtn -eq 0 ]; then
-  fossil changes
-  fossil commit --no-warnings -m "Revert file: $file"
-  rtn=$?
-fi
+fossil changes
 
 fossil close --force
 

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

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

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

Revision: 7208
          http://sourceforge.net/p/astlinux/code/7208
Author:   abelbeck
Date:     2015-08-20 19:13:16 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add another helper script fossil-revert

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.mk

Added Paths:
-----------
    branches/1.0/package/fossil/scripts/fossil-revert

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-20 17:55:03 UTC (rev 7207)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-20 19:13:16 UTC (rev 7208)
@@ -32,6 +32,7 @@
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-open $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-close $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-update $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-revert $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/fossil.init $(TARGET_DIR)/etc/init.d/fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/K15fossil
@@ -42,6 +43,7 @@
 	rm -f $(TARGET_DIR)/usr/bin/fossil-open
 	rm -f $(TARGET_DIR)/usr/bin/fossil-close
 	rm -f $(TARGET_DIR)/usr/bin/fossil-update
+	rm -f $(TARGET_DIR)/usr/bin/fossil-revert
 	rm -f $(TARGET_DIR)/etc/init.d/fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/K15fossil

Added: branches/1.0/package/fossil/scripts/fossil-revert
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-revert	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-revert	2015-08-20 19:13:16 UTC (rev 7208)
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+REPO="/mnt/kd/fossil/astlinux.fossil"
+
+LOCKFILE="/var/lock/fossil-update.lock"
+
+revision="$1"
+
+file="$2"
+
+if [ -z "$revision" -o -z "$file" ]; then
+  echo "Usage: fossil-revert hex_revision_num file_name"
+  exit 1
+fi
+
+if [ ! -f $REPO ]; then
+  echo "Fossil repository not found: $REPO" >&2
+  exit 1
+fi
+
+if ! cd /mnt/kd; then
+  exit 1
+fi
+
+if [ ! -f "$file" ]; then
+  echo "fossil-revert: file not found: /mnt/kd/${file#/mnt/kd/}" >&2
+  exit 1
+fi
+
+if [ -f "$LOCKFILE" ]; then
+  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
+fossil open $REPO --keep >/dev/null
+
+fossil revert -r "$revision" "$file"
+rtn=$?
+
+if [ $rtn -eq 0 ]; then
+  fossil changes
+  fossil commit --no-warnings -m "Revert file: $file"
+  rtn=$?
+fi
+
+fossil close --force
+
+exit $rtn


Property changes on: branches/1.0/package/fossil/scripts/fossil-revert
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7207] branches/1.0/package/lighttpd

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

Revision: 7207
          http://sourceforge.net/p/astlinux/code/7207
Author:   abelbeck
Date:     2015-08-20 17:55:03 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
lighttpd, add support for fossil

Modified Paths:
--------------
    branches/1.0/package/lighttpd/lighttpd.conf
    branches/1.0/package/lighttpd/lighttpd.init

Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf	2015-08-20 17:12:55 UTC (rev 7206)
+++ branches/1.0/package/lighttpd/lighttpd.conf	2015-08-20 17:55:03 UTC (rev 7207)
@@ -130,6 +130,12 @@
                                  "realm"   => "admin",
                                  "require" => "user=admin"
                                ),
+                               "/admin/fossil/" =>
+                               (
+                                 "method"  => "basic",
+                                 "realm"   => "admin",
+                                 "require" => "user=admin"
+                               ),
                                "/admin/monit/" =>
                                (
                                  "method"  => "basic",
@@ -161,6 +167,17 @@
 @CLI_PROXY_SERVER@                     )
 @CLI_PROXY_SERVER@}
 
+@FOSSIL_SERVER@$HTTP["scheme"] == "https" {
+@FOSSIL_SERVER@     proxy.server += ( "/admin/fossil/" =>
+@FOSSIL_SERVER@                       ( "localhost" =>
+@FOSSIL_SERVER@                         (
+@FOSSIL_SERVER@                           "host" => "127.0.0.1",
+@FOSSIL_SERVER@                           "port" => "8055"
+@FOSSIL_SERVER@                         )
+@FOSSIL_SERVER@                       )
+@FOSSIL_SERVER@                     )
+@FOSSIL_SERVER@}
+
 @MONIT_SERVER@$HTTP["scheme"] == "https" {
 @MONIT_SERVER@     proxy.server += ( "/admin/monit/" =>
 @MONIT_SERVER@                       ( "localhost" =>

Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init	2015-08-20 17:12:55 UTC (rev 7206)
+++ branches/1.0/package/lighttpd/lighttpd.init	2015-08-20 17:55:03 UTC (rev 7207)
@@ -96,6 +96,14 @@
     cli_proxy_server="#"
   fi
 
+  if [ -f /etc/init.d/fossil ]; then
+    # Always enable /admin/fossil/ proxy so fossil can be
+    # enabled/disabled without requiring a reboot via the web interface.
+    fossil_server=""
+  else
+    fossil_server="#"
+  fi
+
   if [ -f /etc/init.d/monit ]; then
     # Always enable /admin/monit/ proxy so monit can be
     # enabled/disabled without requiring a reboot via the web interface.
@@ -144,6 +152,7 @@
          -e "s|@HTTPSCGI@|${httpscgi}|g" \
          -e "s|@IPV6@|${ipv6}|g" \
          -e "s|@CLI_PROXY_SERVER@|${cli_proxy_server}|g" \
+         -e "s|@FOSSIL_SERVER@|${fossil_server}|g" \
          -e "s|@MONIT_SERVER@|${monit_server}|g" \
          -e "s|@NETSTAT_SERVER@|${netstat_server}|g" \
          -e "s|@PHONEPROV@|${phoneprov}|g" \

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

[Astlinux-commits] SF.net SVN: astlinux:[7206] branches/1.0

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

Revision: 7206
          http://sourceforge.net/p/astlinux/code/7206
Author:   abelbeck
Date:     2015-08-20 17:12:55 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add rc.conf variables FOSSIL_DEFAULT_FILES and FOSSIL_INCLUDE_FILES, add a lockfile for fossil-update, and automatically perform a 'fossil-update' after creating a new repo.

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.init
    branches/1.0/package/fossil/scripts/fossil-close
    branches/1.0/package/fossil/scripts/fossil-open
    branches/1.0/package/fossil/scripts/fossil-update
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/fossil/fossil.init
===================================================================
--- branches/1.0/package/fossil/fossil.init	2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/fossil.init	2015-08-20 17:12:55 UTC (rev 7206)
@@ -37,6 +37,8 @@
       fossil sqlite3 "REPLACE INTO config VALUES('project-name','${HOSTNAME}',now());" -R $REPO
       fossil sqlite3 "REPLACE INTO config VALUES('timeline-utc','0',now());" -R $REPO
       fossil sqlite3 "REPLACE INTO config VALUES('require-captcha','0',now());" -R $REPO
+
+      fossil-update "initial default check-in" >/dev/null
     fi
   fi
 }
@@ -54,6 +56,12 @@
 
 stop()
 {
+  # Close any open fossil checkouts
+  if [ -f /mnt/kd/.fslckout ]; then
+    echo "Closing fossil checkout..."
+    fossil-close
+  fi
+
   if [ -f $PIDFILE ]; then
     echo "Stopping fossil..."
 

Modified: branches/1.0/package/fossil/scripts/fossil-close
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-close	2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/scripts/fossil-close	2015-08-20 17:12:55 UTC (rev 7206)
@@ -1,7 +1,14 @@
 #!/bin/sh
 
+LOCKFILE="/var/lock/fossil-update.lock"
+
 if ! cd /mnt/kd; then
   exit 1
 fi
 
+if [ -f "$LOCKFILE" ]; then
+  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
 fossil close --force

Modified: branches/1.0/package/fossil/scripts/fossil-open
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-open	2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/scripts/fossil-open	2015-08-20 17:12:55 UTC (rev 7206)
@@ -2,6 +2,8 @@
 
 REPO="/mnt/kd/fossil/astlinux.fossil"
 
+LOCKFILE="/var/lock/fossil-update.lock"
+
 if [ ! -f $REPO ]; then
   echo "Fossil repository not found: $REPO" >&2
   exit 1
@@ -11,5 +13,10 @@
   exit 1
 fi
 
+if [ -f "$LOCKFILE" ]; then
+  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
 fossil open $REPO --keep >/dev/null
 fossil status

Modified: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update	2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/scripts/fossil-update	2015-08-20 17:12:55 UTC (rev 7206)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 . /etc/rc.conf
 
@@ -8,6 +8,8 @@
 
 REPO="/mnt/kd/fossil/astlinux.fossil"
 
+LOCKFILE="/var/lock/fossil-update.lock"
+
 if [ ! -f $REPO ]; then
   echo "Fossil repository not found: $REPO" >&2
   exit 1
@@ -17,6 +19,14 @@
   exit 1
 fi
 
+# Robust 'bash' method of creating/testing for a lockfile
+if ! ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
+  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
+trap 'rm -f "$LOCKFILE"; exit $?' INT TERM EXIT
+
 fossil open $REPO --keep >/dev/null
 fossil status
 
@@ -25,19 +35,29 @@
 if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
   dirs="$FOSSIL_DEFAULT_DIRS"
 else
-  dirs="rc.conf.d monit/monit.d"
+  dirs="rc.conf.d monit/monit.d openvpn/ccd"
   if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
     dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
   fi
 fi
 
+files="${FOSSIL_DEFAULT_FILES:-rc.elocal rc.local rc.local.stop dnsmasq.static}"
+
 unset IFS
 for dir in $dirs $FOSSIL_INCLUDE_DIRS; do
-  if [ -d $dir ]; then
-    fossil add --force $dir
+  if [ "$dir" != "/mnt/kd" -a "$dir" != "/mnt/kd/" -a -d "$dir" ]; then
+    fossil add --ignore '*.bak,*.db' --force "$dir"
   fi
 done
 
+for file in $files $FOSSIL_INCLUDE_FILES; do
+  if [ -f "$file" ]; then
+    if ! fossil ls "${file#/mnt/kd/}" | grep -q "${file#/mnt/kd/}"; then
+      fossil add --force "$file"
+    fi
+  fi
+done
+
 ## Check for locally deleted files, remove them from the repo
 if fossil changes | grep -q '^MISSING'; then
   fossil changes | awk '/^MISSING/ { print $2; }' | xargs fossil forget
@@ -48,4 +68,7 @@
 
 fossil close --force
 
+rm -f "$LOCKFILE"
+trap - INT TERM EXIT
+
 exit $rtn

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2015-08-20 17:12:55 UTC (rev 7206)
@@ -1099,6 +1099,16 @@
 #MONIT_NOTIFY="no...@my..."     # Notify via email, space separate multiple email addresses
 #MONIT_NOTIFY_FROM="mo...@my..." # Optional, From: email address
 
+## Fossil-Software Configuration Management
+## Enable Fossil server by setting FOSSIL_SERVER="yes"
+#FOSSIL_SERVER="yes"
+## Note: All directory and file names are relative to /mnt/kd/
+## Space separate multiple directory and/or file names.
+#FOSSIL_DEFAULT_DIRS=""           # Directory name(s), override the default set of directories: rc.conf.d asterisk dahdi etc.
+#FOSSIL_DEFAULT_FILES=""          # File name(s), override the default set of files: rc.local rc.elocal dnsmasq.static etc.
+#FOSSIL_INCLUDE_DIRS="snmp"       # Directory name(s), additional directories that are monitored for new added files and sub-dirs.
+#FOSSIL_INCLUDE_FILES="*.conf"    # File name(s), additional files that are added to the repository, the * wildcard is allowed.
+
 ## BOOTPFILE
 ## For diskless clients, the image to use for booting.
 #BOOTPFILE="/pxelinux.0"

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

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

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

Revision: 7205
          http://sourceforge.net/p/astlinux/code/7205
Author:   abelbeck
Date:     2015-08-20 04:12:09 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add rc.conf variables FOSSIL_DEFAULT_DIRS and FOSSIL_INCLUDE_DIRS to control what directories are monitored for new files to be added

Modified Paths:
--------------
    branches/1.0/package/fossil/scripts/fossil-update

Modified: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update	2015-08-19 22:07:06 UTC (rev 7204)
+++ branches/1.0/package/fossil/scripts/fossil-update	2015-08-20 04:12:09 UTC (rev 7205)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. /etc/rc.conf
+
 export FOSSIL_HOME="/mnt/kd/fossil"
 
 message="${1:-auto commit via cron}"
@@ -18,9 +20,24 @@
 fossil open $REPO --keep >/dev/null
 fossil status
 
-## Check for locally added files, add them to the repo
-fossil ls | sed 's:/[^/]*$::' | sort | uniq | xargs fossil add --force
+## Check for locally added files in selected directories, add them to the repo
 
+if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
+  dirs="$FOSSIL_DEFAULT_DIRS"
+else
+  dirs="rc.conf.d monit/monit.d"
+  if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
+    dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
+  fi
+fi
+
+unset IFS
+for dir in $dirs $FOSSIL_INCLUDE_DIRS; do
+  if [ -d $dir ]; then
+    fossil add --force $dir
+  fi
+done
+
 ## Check for locally deleted files, remove them from the repo
 if fossil changes | grep -q '^MISSING'; then
   fossil changes | awk '/^MISSING/ { print $2; }' | xargs fossil forget

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

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

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

Revision: 7204
          http://sourceforge.net/p/astlinux/code/7204
Author:   abelbeck
Date:     2015-08-19 22:07:06 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
fossil, fossil-update script, be more specific how new files are added

Modified Paths:
--------------
    branches/1.0/package/fossil/scripts/fossil-update

Modified: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update	2015-08-19 18:13:28 UTC (rev 7203)
+++ branches/1.0/package/fossil/scripts/fossil-update	2015-08-19 22:07:06 UTC (rev 7204)
@@ -19,7 +19,7 @@
 fossil status
 
 ## Check for locally added files, add them to the repo
-fossil ls | sed 's:/.*$::' | sort | uniq | xargs fossil add --force
+fossil ls | sed 's:/[^/]*$::' | sort | uniq | xargs fossil add --force
 
 ## Check for locally deleted files, remove them from the repo
 if fossil changes | grep -q '^MISSING'; then

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

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

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

Revision: 7203
          http://sourceforge.net/p/astlinux/code/7203
Author:   abelbeck
Date:     2015-08-19 18:13:28 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
fossil, helper script improvements

Modified Paths:
--------------
    branches/1.0/package/fossil/scripts/fossil-close
    branches/1.0/package/fossil/scripts/fossil-open
    branches/1.0/package/fossil/scripts/fossil-update

Modified: branches/1.0/package/fossil/scripts/fossil-close
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-close	2015-08-18 23:58:06 UTC (rev 7202)
+++ branches/1.0/package/fossil/scripts/fossil-close	2015-08-19 18:13:28 UTC (rev 7203)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
-cd /mnt/kd
+if ! cd /mnt/kd; then
+  exit 1
+fi
 
 fossil close --force

Modified: branches/1.0/package/fossil/scripts/fossil-open
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-open	2015-08-18 23:58:06 UTC (rev 7202)
+++ branches/1.0/package/fossil/scripts/fossil-open	2015-08-19 18:13:28 UTC (rev 7203)
@@ -1,6 +1,15 @@
 #!/bin/sh
 
-cd /mnt/kd
+REPO="/mnt/kd/fossil/astlinux.fossil"
 
-fossil open /mnt/kd/fossil/astlinux.fossil --keep >/dev/null
+if [ ! -f $REPO ]; then
+  echo "Fossil repository not found: $REPO" >&2
+  exit 1
+fi
+
+if ! cd /mnt/kd; then
+  exit 1
+fi
+
+fossil open $REPO --keep >/dev/null
 fossil status

Modified: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update	2015-08-18 23:58:06 UTC (rev 7202)
+++ branches/1.0/package/fossil/scripts/fossil-update	2015-08-19 18:13:28 UTC (rev 7203)
@@ -4,9 +4,31 @@
 
 message="${1:-auto commit via cron}"
 
-cd /mnt/kd
+REPO="/mnt/kd/fossil/astlinux.fossil"
 
-fossil open /mnt/kd/fossil/astlinux.fossil --keep >/dev/null
+if [ ! -f $REPO ]; then
+  echo "Fossil repository not found: $REPO" >&2
+  exit 1
+fi
+
+if ! cd /mnt/kd; then
+  exit 1
+fi
+
+fossil open $REPO --keep >/dev/null
 fossil status
+
+## Check for locally added files, add them to the repo
+fossil ls | sed 's:/.*$::' | sort | uniq | xargs fossil add --force
+
+## Check for locally deleted files, remove them from the repo
+if fossil changes | grep -q '^MISSING'; then
+  fossil changes | awk '/^MISSING/ { print $2; }' | xargs fossil forget
+fi
+
 fossil commit --no-warnings -m "$message"
+rtn=$?
+
 fossil close --force
+
+exit $rtn

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

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

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

Revision: 7202
          http://sourceforge.net/p/astlinux/code/7202
Author:   abelbeck
Date:     2015-08-18 23:58:06 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
fossil, init.d tweaks and some useful scripts

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.init
    branches/1.0/package/fossil/fossil.mk

Added Paths:
-----------
    branches/1.0/package/fossil/scripts/
    branches/1.0/package/fossil/scripts/fossil-close
    branches/1.0/package/fossil/scripts/fossil-open
    branches/1.0/package/fossil/scripts/fossil-update

Modified: branches/1.0/package/fossil/fossil.init
===================================================================
--- branches/1.0/package/fossil/fossil.init	2015-08-18 13:30:02 UTC (rev 7201)
+++ branches/1.0/package/fossil/fossil.init	2015-08-18 23:58:06 UTC (rev 7202)
@@ -30,8 +30,10 @@
     if [ ! -f $REPO ]; then
       fossil init --admin-user admin $REPO >/dev/null
 
-      fossil user password admin admin -R $REPO
-      fossil user default admin -R $REPO
+      fossil user password admin astlinux -R $REPO >/dev/null
+      fossil user default admin -R $REPO >/dev/null
+      fossil user capabilities nobody "a" -R $REPO >/dev/null
+      fossil user capabilities anonymous "" -R $REPO >/dev/null
       fossil sqlite3 "REPLACE INTO config VALUES('project-name','${HOSTNAME}',now());" -R $REPO
       fossil sqlite3 "REPLACE INTO config VALUES('timeline-utc','0',now());" -R $REPO
       fossil sqlite3 "REPLACE INTO config VALUES('require-captcha','0',now());" -R $REPO

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-18 13:30:02 UTC (rev 7201)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-18 23:58:06 UTC (rev 7202)
@@ -29,6 +29,9 @@
 
 define FOSSIL_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/fossil $(TARGET_DIR)/usr/bin/fossil
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-open $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-close $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-update $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/fossil.init $(TARGET_DIR)/etc/init.d/fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/K15fossil
@@ -36,6 +39,9 @@
 
 define FOSSIL_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/fossil
+	rm -f $(TARGET_DIR)/usr/bin/fossil-open
+	rm -f $(TARGET_DIR)/usr/bin/fossil-close
+	rm -f $(TARGET_DIR)/usr/bin/fossil-update
 	rm -f $(TARGET_DIR)/etc/init.d/fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/K15fossil

Added: branches/1.0/package/fossil/scripts/fossil-close
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-close	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-close	2015-08-18 23:58:06 UTC (rev 7202)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd /mnt/kd
+
+fossil close --force


Property changes on: branches/1.0/package/fossil/scripts/fossil-close
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/fossil/scripts/fossil-open
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-open	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-open	2015-08-18 23:58:06 UTC (rev 7202)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd /mnt/kd
+
+fossil open /mnt/kd/fossil/astlinux.fossil --keep >/dev/null
+fossil status


Property changes on: branches/1.0/package/fossil/scripts/fossil-open
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-update	2015-08-18 23:58:06 UTC (rev 7202)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+export FOSSIL_HOME="/mnt/kd/fossil"
+
+message="${1:-auto commit via cron}"
+
+cd /mnt/kd
+
+fossil open /mnt/kd/fossil/astlinux.fossil --keep >/dev/null
+fossil status
+fossil commit --no-warnings -m "$message"
+fossil close --force


Property changes on: branches/1.0/package/fossil/scripts/fossil-update
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 7201
          http://sourceforge.net/p/astlinux/code/7201
Author:   abelbeck
Date:     2015-08-18 13:30:02 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
fossil, add timeline-utc=0 and require-captcha=0 defaults

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.init

Modified: branches/1.0/package/fossil/fossil.init
===================================================================
--- branches/1.0/package/fossil/fossil.init	2015-08-18 05:08:07 UTC (rev 7200)
+++ branches/1.0/package/fossil/fossil.init	2015-08-18 13:30:02 UTC (rev 7201)
@@ -33,6 +33,8 @@
       fossil user password admin admin -R $REPO
       fossil user default admin -R $REPO
       fossil sqlite3 "REPLACE INTO config VALUES('project-name','${HOSTNAME}',now());" -R $REPO
+      fossil sqlite3 "REPLACE INTO config VALUES('timeline-utc','0',now());" -R $REPO
+      fossil sqlite3 "REPLACE INTO config VALUES('require-captcha','0',now());" -R $REPO
     fi
   fi
 }

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

[Astlinux-commits] SF.net SVN: astlinux:[7200] branches/1.0/package/fossil/ fossil-0001-proxy-base.patch

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

Revision: 7200
          http://sourceforge.net/p/astlinux/code/7200
Author:   abelbeck
Date:     2015-08-18 05:08:07 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
fossil, login redirects need the /admin/fossil path added

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil-0001-proxy-base.patch

Modified: branches/1.0/package/fossil/fossil-0001-proxy-base.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2015-08-18 00:04:41 UTC (rev 7199)
+++ branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2015-08-18 05:08:07 UTC (rev 7200)
@@ -26,3 +26,17 @@
        g.zTop = &g.zBaseURL[8+strlen(zHost)];
        g.zHttpsURL = g.zBaseURL;
      }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 @@
+     Blob redir;
+     blob_init(&redir, 0, 0);
+     if( login_wants_https_redirect() ){
+-      blob_appendf(&redir, "%s/login?g=%T", g.zHttpsURL, zUrl);
++      blob_appendf(&redir, "%s/login?g=/admin/fossil%T", g.zHttpsURL, zUrl);
+     }else{
+-      blob_appendf(&redir, "%R/login?g=%T", zUrl);
++      blob_appendf(&redir, "%R/login?g=/admin/fossil%T", zUrl);
+     }
+     if( anonOk ) blob_append(&redir, "&anon", 5);
+     if( zQS && zQS[0] ){

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

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

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

Revision: 7199
          http://sourceforge.net/p/astlinux/code/7199
Author:   abelbeck
Date:     2015-08-18 00:04:41 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
fossil, add init.d script

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.mk

Added Paths:
-----------
    branches/1.0/package/fossil/fossil.init

Added: branches/1.0/package/fossil/fossil.init
===================================================================
--- branches/1.0/package/fossil/fossil.init	                        (rev 0)
+++ branches/1.0/package/fossil/fossil.init	2015-08-18 00:04:41 UTC (rev 7199)
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+PIDFILE="/var/run/fossil.pid"
+
+TMPDIR="/mnt/kd/fossil/tmp"
+
+REPO="/mnt/kd/fossil/astlinux.fossil"
+
+init()
+{
+  if [ "$FOSSIL_SERVER" != "yes" ]; then
+    exit
+  fi
+
+  # Automatically create "/mnt/kd/fossil" directory if it doesn't exist
+  if [ ! -d /mnt/kd/fossil ]; then
+    mkdir /mnt/kd/fossil 2>/dev/null     # will fail on virgin RO filesystem, ignore stderr
+  fi
+  if [ -d /mnt/kd/fossil ]; then
+    ln -snf /mnt/kd/fossil /var/lib/fossil
+
+    if [ ! -f /root/.fossil ]; then
+      ln -sf /mnt/kd/fossil/.fossil /root/.fossil
+    fi
+    if [ ! -d $TMPDIR ]; then
+      mkdir $TMPDIR
+    fi
+    if [ ! -f $REPO ]; then
+      fossil init --admin-user admin $REPO >/dev/null
+
+      fossil user password admin admin -R $REPO
+      fossil user default admin -R $REPO
+      fossil sqlite3 "REPLACE INTO config VALUES('project-name','${HOSTNAME}',now());" -R $REPO
+    fi
+  fi
+}
+
+start()
+{
+  if [ "$FOSSIL_SERVER" = "yes" ]; then
+    echo "Starting fossil..."
+
+    ARGS="server --nojail --localhost --port 8055 $REPO"
+
+    start-stop-daemon -S -x /usr/bin/fossil -p $PIDFILE -m -b -- $ARGS
+  fi
+}
+
+stop()
+{
+  if [ -f $PIDFILE ]; then
+    echo "Stopping fossil..."
+
+    start-stop-daemon -K -q -n fossil -p $PIDFILE -s TERM
+    rm -f $PIDFILE
+  fi
+}
+
+case $1 in
+
+start)
+  start
+  ;;
+
+stop)
+  stop
+  ;;
+
+init)
+  init
+  start
+  ;;
+
+restart)
+  stop
+  sleep 2
+  start
+  ;;
+
+*)
+  echo "Usage: start|stop|restart"
+  ;;
+
+esac
+

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-17 17:59:54 UTC (rev 7198)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-18 00:04:41 UTC (rev 7199)
@@ -29,10 +29,16 @@
 
 define FOSSIL_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/fossil $(TARGET_DIR)/usr/bin/fossil
+	$(INSTALL) -m 0755 -D package/fossil/fossil.init $(TARGET_DIR)/etc/init.d/fossil
+	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/S75fossil
+	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/K15fossil
 endef
 
 define FOSSIL_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/fossil
+	rm -f $(TARGET_DIR)/etc/init.d/fossil
+	rm -f $(TARGET_DIR)/etc/runlevels/default/S75fossil
+	rm -f $(TARGET_DIR)/etc/runlevels/default/K15fossil
 endef
 
 $(eval $(call AUTOTARGETS,package,fossil))

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

[Astlinux-commits] SF.net SVN: astlinux:[7198] branches/1.0/package/fossil/ fossil-0002-tmp-file.patch

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

Revision: 7198
          http://sourceforge.net/p/astlinux/code/7198
Author:   abelbeck
Date:     2015-08-17 17:59:54 +0000 (Mon, 17 Aug 2015)
Log Message:
-----------
fossil, use /mnt/kd/fossil/tmp as the tmp dir if it exists

Added Paths:
-----------
    branches/1.0/package/fossil/fossil-0002-tmp-file.patch

Added: branches/1.0/package/fossil/fossil-0002-tmp-file.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0002-tmp-file.patch	                        (rev 0)
+++ branches/1.0/package/fossil/fossil-0002-tmp-file.patch	2015-08-17 17:59:54 UTC (rev 7198)
@@ -0,0 +1,12 @@
+--- 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 @@
+      0,
+      0,
+      0,
++     "/mnt/kd/fossil/tmp",
+      "/var/tmp",
+-     "/usr/tmp",
+      "/tmp",
+      0        /* List terminator */
+   };

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

[Astlinux-commits] SF.net SVN: astlinux:[7197] branches/1.0/package/fossil/ fossil-0001-proxy-base.patch

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

Revision: 7197
          http://sourceforge.net/p/astlinux/code/7197
Author:   abelbeck
Date:     2015-08-17 17:17:44 +0000 (Mon, 17 Aug 2015)
Log Message:
-----------
fossil, add patch to work with lighttpd's mod_proxy

Added Paths:
-----------
    branches/1.0/package/fossil/fossil-0001-proxy-base.patch

Added: branches/1.0/package/fossil/fossil-0001-proxy-base.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0001-proxy-base.patch	                        (rev 0)
+++ branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2015-08-17 17:17:44 UTC (rev 7197)
@@ -0,0 +1,28 @@
+--- fossil-1.33/src/cgi.c.orig	2015-08-16 14:43:49.000000000 -0500
++++ fossil-1.33/src/cgi.c	2015-08-16 15:14:28.000000000 -0500
+@@ -1346,6 +1346,12 @@
+   if( zToken==0 ){
+     malformed_request("malformed URL in HTTP header");
+   }
++  const char *proxy_base = "/admin/fossil/"; /* str must begin and end with '/' */
++  if( (i = strlen(proxy_base))>1 ){
++    if( strncmp(zToken, proxy_base, i)==0 ){
++      memmove(zToken, zToken+i-1, strlen(zToken)-i+2);
++    }
++  }
+   cgi_setenv("REQUEST_URI", zToken);
+   cgi_setenv("SCRIPT_NAME", "");
+   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 @@
+     zCur = PD("SCRIPT_NAME","/");
+     i = strlen(zCur);
+     while( i>0 && zCur[i-1]=='/' ) i--;
+-    if( fossil_stricmp(zMode,"on")==0 ){
+-      g.zBaseURL = mprintf("https://%s%.*s", zHost, i, zCur);
++    if( 1 ){  /* AstLinux */
++      g.zBaseURL = mprintf("https://%s/admin/fossil%.*s", zHost, i, zCur);
+       g.zTop = &g.zBaseURL[8+strlen(zHost)];
+       g.zHttpsURL = g.zBaseURL;
+     }else{

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

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

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

Revision: 7196
          http://sourceforge.net/p/astlinux/code/7196
Author:   abelbeck
Date:     2015-08-16 04:20:42 +0000 (Sun, 16 Aug 2015)
Log Message:
-----------
fossil, build does not need the extra TARGET_MAKE_ENV

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.mk

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-16 00:58:55 UTC (rev 7195)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-16 04:20:42 UTC (rev 7196)
@@ -23,7 +23,6 @@
 endef
 
 FOSSIL_MAKE_ENV = \
-	$(TARGET_MAKE_ENV) \
 	TCC="$(TARGET_CC)"
 
 FOSSIL_UNINSTALL_STAGING_OPT = --version

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