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

Brought to you by: dhartman, krisk84

astlinux-commits

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

From: <abe...@us...> - 2015-08-18 00:04:43

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:[7202] branches/1.0/package/fossil

From: <abe...@us...> - 2015-08-18 23:58:08

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:[7208] branches/1.0/package/fossil

From: <abe...@us...> - 2015-08-20 19:13:19

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:[7209] branches/1.0/package/fossil

From: <abe...@us...> - 2015-08-20 22:21:17

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:[7211] branches/1.0/package/fossil

From: <abe...@us...> - 2015-08-20 23:45:54

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:[7215] branches/1.0/package/fossil

From: <abe...@us...> - 2015-08-21 21:14:25

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:[7222] branches/1.0/package/fossil

From: <abe...@us...> - 2015-08-24 20:49:59

Revision: 7222
          http://sourceforge.net/p/astlinux/code/7222
Author:   abelbeck
Date:     2015-08-24 20:49:56 +0000 (Mon, 24 Aug 2015)
Log Message:
-----------
fossil, forgot fossil-update to fossil-commit name change in fossil.init, also in fossil-commit ignore more database suffixes

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

Modified: branches/1.0/package/fossil/fossil.init
===================================================================
--- branches/1.0/package/fossil/fossil.init	2015-08-23 21:45:48 UTC (rev 7221)
+++ branches/1.0/package/fossil/fossil.init	2015-08-24 20:49:56 UTC (rev 7222)
@@ -40,7 +40,7 @@
       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
+      fossil-commit "initial default check-in" >/dev/null
     fi
   fi
 }

Modified: branches/1.0/package/fossil/scripts/fossil-commit
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-commit	2015-08-23 21:45:48 UTC (rev 7221)
+++ branches/1.0/package/fossil/scripts/fossil-commit	2015-08-24 20:49:56 UTC (rev 7222)
@@ -46,7 +46,7 @@
 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"
+    fossil add --ignore '*.bak,*.db,*.sqlite3,*.fossil' --force "$dir"
   fi
 done
 

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

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

From: <abe...@us...> - 2015-11-02 23:34:32

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.

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

From: <abe...@us...> - 2015-11-04 14:21:42

Revision: 7314
          http://sourceforge.net/p/astlinux/code/7314
Author:   abelbeck
Date:     2015-11-04 14:21:39 +0000 (Wed, 04 Nov 2015)
Log Message:
-----------
fossil, add upstream patch to display Release Version in footer

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

Added Paths:
-----------
    branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch

Added: branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch	                        (rev 0)
+++ branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch	2015-11-04 14:21:39 UTC (rev 7314)
@@ -0,0 +1,107 @@
+Index: skins/black_and_white/footer.txt
+==================================================================
+--- fossil-1.34/skins/black_and_white/footer.txt
++++ fossil-1.34/skins/black_and_white/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/blitz/footer.txt
+==================================================================
+--- fossil-1.34/skins/blitz/footer.txt
++++ fossil-1.34/skins/blitz/footer.txt
+@@ -1,12 +1,12 @@
+       </div> <!-- end div container -->
+     </div> <!-- end div middle max-full-width -->
+     <div class="footer">
+       <div class="container">
+         <div class="pull-right">
+-          <a href="http://fossil-scm.org">Fossil version $manifest_version $manifest_date</a>
++          <a href="http://fossil-scm.org">Fossil $release_version $manifest_version $manifest_date</a>
+         </div>
+         This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s
+       </div>
+     </div>
+   </body>
+ </html>
+
+Index: skins/blitz_no_logo/footer.txt
+==================================================================
+--- fossil-1.34/skins/blitz_no_logo/footer.txt
++++ fossil-1.34/skins/blitz_no_logo/footer.txt
+@@ -1,12 +1,12 @@
+       </div> <!-- end div container -->
+     </div> <!-- end div middle max-full-width -->
+     <div class="footer">
+       <div class="container">
+         <div class="pull-right">
+-          <a href="http://fossil-scm.org">Fossil version $manifest_version $manifest_date</a>
++          <a href="http://fossil-scm.org">Fossil $release_version $manifest_version $manifest_date</a>
+         </div>
+         This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s
+       </div>
+     </div>
+   </body>
+ </html>
+
+Index: skins/default/footer.txt
+==================================================================
+--- fossil-1.34/skins/default/footer.txt
++++ fossil-1.34/skins/default/footer.txt
+@@ -1,6 +1,6 @@
+ <div class="footer">
+ This page was generated in about
+ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/khaki/footer.txt
+==================================================================
+--- fossil-1.34/skins/khaki/footer.txt
++++ fossil-1.34/skins/khaki/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/original/footer.txt
+==================================================================
+--- fossil-1.34/skins/original/footer.txt
++++ fossil-1.34/skins/original/footer.txt
+@@ -1,6 +1,6 @@
+ <div class="footer">
+ This page was generated in about
+ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/plain_gray/footer.txt
+==================================================================
+--- fossil-1.34/skins/plain_gray/footer.txt
++++ fossil-1.34/skins/plain_gray/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/rounded1/footer.txt
+==================================================================
+--- fossil-1.34/skins/rounded1/footer.txt
++++ fossil-1.34/skins/rounded1/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-11-03 16:49:26 UTC (rev 7313)
+++ branches/1.0/package/fossil/fossil.mk	2015-11-04 14:21:39 UTC (rev 7314)
@@ -17,6 +17,7 @@
 		--prefix=/usr \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
+		--disable-fusefs \
 		--with-openssl="$(STAGING_DIR)/usr" \
 		--with-zlib="$(STAGING_DIR)/usr" \
         )

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

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

From: <abe...@us...> - 2016-06-15 17:33:50

Revision: 7721
          http://sourceforge.net/p/astlinux/code/7721
Author:   abelbeck
Date:     2016-06-15 17:33:47 +0000 (Wed, 15 Jun 2016)
Log Message:
-----------
fossil, version bump to 1.35

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-0101-skin-footer-release-version.patch

Modified: branches/1.0/package/fossil/fossil-0001-proxy-base.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2016-06-15 13:04:02 UTC (rev 7720)
+++ branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2016-06-15 17:33:47 UTC (rev 7721)
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -1347,6 +1347,12 @@
    if( zToken==0 ){
      malformed_request("malformed URL in HTTP header");
    }
@@ -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
-@@ -1387,8 +1387,8 @@
+@@ -1479,8 +1479,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
-@@ -1251,9 +1251,9 @@
+@@ -1265,9 +1265,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	2016-06-15 13:04:02 UTC (rev 7720)
+++ branches/1.0/package/fossil/fossil-0002-tmp-file.patch	2016-06-15 17:33:47 UTC (rev 7721)
@@ -1,12 +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
-@@ -32061,8 +32061,8 @@
+@@ -34504,8 +34504,8 @@
+   static const char *azDirs[] = {
       0,
       0,
-      0,
 +     "/mnt/kd/fossil/tmp",
       "/var/tmp",
 -     "/usr/tmp",
       "/tmp",
-      0        /* List terminator */
+      "."
    };

Deleted: branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch	2016-06-15 13:04:02 UTC (rev 7720)
+++ branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch	2016-06-15 17:33:47 UTC (rev 7721)
@@ -1,107 +0,0 @@
-Index: skins/black_and_white/footer.txt
-==================================================================
---- fossil-1.34/skins/black_and_white/footer.txt
-+++ fossil-1.34/skins/black_and_white/footer.txt
-@@ -1,4 +1,4 @@
- <div class="footer">
--Fossil version $manifest_version $manifest_date
-+Fossil $release_version $manifest_version $manifest_date
- </div>
- </body></html>
-
-Index: skins/blitz/footer.txt
-==================================================================
---- fossil-1.34/skins/blitz/footer.txt
-+++ fossil-1.34/skins/blitz/footer.txt
-@@ -1,12 +1,12 @@
-       </div> <!-- end div container -->
-     </div> <!-- end div middle max-full-width -->
-     <div class="footer">
-       <div class="container">
-         <div class="pull-right">
--          <a href="http://fossil-scm.org">Fossil version $manifest_version $manifest_date</a>
-+          <a href="http://fossil-scm.org">Fossil $release_version $manifest_version $manifest_date</a>
-         </div>
-         This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s
-       </div>
-     </div>
-   </body>
- </html>
-
-Index: skins/blitz_no_logo/footer.txt
-==================================================================
---- fossil-1.34/skins/blitz_no_logo/footer.txt
-+++ fossil-1.34/skins/blitz_no_logo/footer.txt
-@@ -1,12 +1,12 @@
-       </div> <!-- end div container -->
-     </div> <!-- end div middle max-full-width -->
-     <div class="footer">
-       <div class="container">
-         <div class="pull-right">
--          <a href="http://fossil-scm.org">Fossil version $manifest_version $manifest_date</a>
-+          <a href="http://fossil-scm.org">Fossil $release_version $manifest_version $manifest_date</a>
-         </div>
-         This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s
-       </div>
-     </div>
-   </body>
- </html>
-
-Index: skins/default/footer.txt
-==================================================================
---- fossil-1.34/skins/default/footer.txt
-+++ fossil-1.34/skins/default/footer.txt
-@@ -1,6 +1,6 @@
- <div class="footer">
- This page was generated in about
- <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
--Fossil version $manifest_version $manifest_date
-+Fossil $release_version $manifest_version $manifest_date
- </div>
- </body></html>
-
-Index: skins/khaki/footer.txt
-==================================================================
---- fossil-1.34/skins/khaki/footer.txt
-+++ fossil-1.34/skins/khaki/footer.txt
-@@ -1,4 +1,4 @@
- <div class="footer">
--Fossil version $manifest_version $manifest_date
-+Fossil $release_version $manifest_version $manifest_date
- </div>
- </body></html>
-
-Index: skins/original/footer.txt
-==================================================================
---- fossil-1.34/skins/original/footer.txt
-+++ fossil-1.34/skins/original/footer.txt
-@@ -1,6 +1,6 @@
- <div class="footer">
- This page was generated in about
- <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
--Fossil version $manifest_version $manifest_date
-+Fossil $release_version $manifest_version $manifest_date
- </div>
- </body></html>
-
-Index: skins/plain_gray/footer.txt
-==================================================================
---- fossil-1.34/skins/plain_gray/footer.txt
-+++ fossil-1.34/skins/plain_gray/footer.txt
-@@ -1,4 +1,4 @@
- <div class="footer">
--Fossil version $manifest_version $manifest_date
-+Fossil $release_version $manifest_version $manifest_date
- </div>
- </body></html>
-
-Index: skins/rounded1/footer.txt
-==================================================================
---- fossil-1.34/skins/rounded1/footer.txt
-+++ fossil-1.34/skins/rounded1/footer.txt
-@@ -1,4 +1,4 @@
- <div class="footer">
--Fossil version $manifest_version $manifest_date
-+Fossil $release_version $manifest_version $manifest_date
- </div>
- </body></html>

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2016-06-15 13:04:02 UTC (rev 7720)
+++ branches/1.0/package/fossil/fossil.mk	2016-06-15 17:33:47 UTC (rev 7721)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FOSSIL_VERSION = 1.34
+FOSSIL_VERSION = 1.35
 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.

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

From: <abe...@us...> - 2017-01-28 17:49:18

Revision: 8129
          http://sourceforge.net/p/astlinux/code/8129
Author:   abelbeck
Date:     2017-01-28 17:49:16 +0000 (Sat, 28 Jan 2017)
Log Message:
-----------
fossil, version bump to 1.37

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

Modified: branches/1.0/package/fossil/fossil-0001-proxy-base.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2017-01-28 15:31:49 UTC (rev 8128)
+++ branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2017-01-28 17:49:16 UTC (rev 8129)
@@ -1,6 +1,6 @@
 --- 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
-@@ -1347,6 +1347,12 @@
+@@ -1392,6 +1392,12 @@
    if( zToken==0 ){
      malformed_request("malformed URL in HTTP header");
    }
@@ -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
-@@ -1479,8 +1479,8 @@
+@@ -1098,8 +1098,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
-@@ -1265,9 +1265,9 @@
+@@ -1277,9 +1277,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	2017-01-28 15:31:49 UTC (rev 8128)
+++ branches/1.0/package/fossil/fossil-0002-tmp-file.patch	2017-01-28 17:49:16 UTC (rev 8129)
@@ -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
-@@ -34504,8 +34504,8 @@
+@@ -35091,8 +35091,8 @@
    static const char *azDirs[] = {
       0,
       0,

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2017-01-28 15:31:49 UTC (rev 8128)
+++ branches/1.0/package/fossil/fossil.mk	2017-01-28 17:49:16 UTC (rev 8129)
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-FOSSIL_VERSION = 1.35
+FOSSIL_VERSION = 1.37
 FOSSIL_SOURCE = fossil-src-$(FOSSIL_VERSION).tar.gz
-FOSSIL_SITE = http://www.fossil-scm.org/download
+FOSSIL_SITE = https://www.fossil-scm.org/fossil/uv/download
 FOSSIL_DEPENDENCIES = zlib openssl
 
 define FOSSIL_CONFIGURE_CMDS

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

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

From: <abe...@us...> - 2017-03-05 14:33:24

Revision: 8208
          http://sourceforge.net/p/astlinux/code/8208
Author:   abelbeck
Date:     2017-03-05 14:33:22 +0000 (Sun, 05 Mar 2017)
Log Message:
-----------
fossil, version bump to 2.0, adds a hardened SHA1 implementation and understands SHA3-256 hashes

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-0100-upstream-fix-change-password-segfault.patch

Modified: branches/1.0/package/fossil/fossil-0001-proxy-base.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2017-03-02 18:36:14 UTC (rev 8207)
+++ branches/1.0/package/fossil/fossil-0001-proxy-base.patch	2017-03-05 14:33:22 UTC (rev 8208)
@@ -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
-@@ -1098,8 +1098,8 @@
+@@ -1123,8 +1123,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
-@@ -1277,9 +1277,9 @@
+@@ -1287,9 +1287,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	2017-03-02 18:36:14 UTC (rev 8207)
+++ branches/1.0/package/fossil/fossil-0002-tmp-file.patch	2017-03-05 14:33:22 UTC (rev 8208)
@@ -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
-@@ -35091,8 +35091,8 @@
+@@ -35195,8 +35195,8 @@
    static const char *azDirs[] = {
       0,
       0,

Deleted: branches/1.0/package/fossil/fossil-0100-upstream-fix-change-password-segfault.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0100-upstream-fix-change-password-segfault.patch	2017-03-02 18:36:14 UTC (rev 8207)
+++ branches/1.0/package/fossil/fossil-0100-upstream-fix-change-password-segfault.patch	2017-03-05 14:33:22 UTC (rev 8208)
@@ -1,118 +0,0 @@
---- a/src/login.c
-+++ b/src/login.c
-@@ -526,53 +526,63 @@
- 
-   /* Deal with password-change requests */
-   if( g.perm.Password && zPasswd
-    && (zNew1 = P("n1"))!=0 && (zNew2 = P("n2"))!=0
-   ){
--    /* The user requests a password change */
--    zSha1Pw = sha1_shared_secret(zPasswd, g.zLogin, 0);
--    if( db_int(1, "SELECT 0 FROM user"
--                  " WHERE uid=%d"
--                  " AND (constant_time_cmp(pw,%Q)=0"
--                  "      OR constant_time_cmp(pw,%Q)=0)",
--                  g.userUid, zSha1Pw, zPasswd) ){
--      sleep(1);
-+    /* If there is not a "real" login, we cannot change any password. */
-+    if( g.zLogin ){
-+      /* The user requests a password change */
-+      zSha1Pw = sha1_shared_secret(zPasswd, g.zLogin, 0);
-+      if( db_int(1, "SELECT 0 FROM user"
-+                    " WHERE uid=%d"
-+                    " AND (constant_time_cmp(pw,%Q)=0"
-+                    "      OR constant_time_cmp(pw,%Q)=0)",
-+                    g.userUid, zSha1Pw, zPasswd) ){
-+        sleep(1);
-+        zErrMsg =
-+           @ <p><span class="loginError">
-+           @ You entered an incorrect old password while attempting to change
-+           @ your password.  Your password is unchanged.
-+           @ </span></p>
-+        ;
-+      }else if( fossil_strcmp(zNew1,zNew2)!=0 ){
-+        zErrMsg =
-+           @ <p><span class="loginError">
-+           @ The two copies of your new passwords do not match.
-+           @ Your password is unchanged.
-+           @ </span></p>
-+        ;
-+      }else{
-+        char *zNewPw = sha1_shared_secret(zNew1, g.zLogin, 0);
-+        char *zChngPw;
-+        char *zErr;
-+        db_multi_exec(
-+           "UPDATE user SET pw=%Q WHERE uid=%d", zNewPw, g.userUid
-+        );
-+        fossil_free(zNewPw);
-+        zChngPw = mprintf(
-+           "UPDATE user"
-+           "   SET pw=shared_secret(%Q,%Q,"
-+           "        (SELECT value FROM config WHERE name='project-code'))"
-+           " WHERE login=%Q",
-+           zNew1, g.zLogin, g.zLogin
-+        );
-+        if( login_group_sql(zChngPw, "<p>", "</p>\n", &zErr) ){
-+          zErrMsg = mprintf("<span class=\"loginError\">%s</span>", zErr);
-+          fossil_free(zErr);
-+        }else{
-+          redirect_to_g();
-+          return;
-+        }
-+      }
-+    }else{
-       zErrMsg =
-          @ <p><span class="loginError">
--         @ You entered an incorrect old password while attempting to change
--         @ your password.  Your password is unchanged.
--         @ </span></p>
--      ;
--    }else if( fossil_strcmp(zNew1,zNew2)!=0 ){
--      zErrMsg =
--         @ <p><span class="loginError">
--         @ The two copies of your new passwords do not match.
--         @ Your password is unchanged.
-+         @ The password cannot be changed for this type of login.
-+         @ The password is unchanged.
-          @ </span></p>
-       ;
--    }else{
--      char *zNewPw = sha1_shared_secret(zNew1, g.zLogin, 0);
--      char *zChngPw;
--      char *zErr;
--      db_multi_exec(
--         "UPDATE user SET pw=%Q WHERE uid=%d", zNewPw, g.userUid
--      );
--      fossil_free(zNewPw);
--      zChngPw = mprintf(
--         "UPDATE user"
--         "   SET pw=shared_secret(%Q,%Q,"
--         "        (SELECT value FROM config WHERE name='project-code'))"
--         " WHERE login=%Q",
--         zNew1, g.zLogin, g.zLogin
--      );
--      if( login_group_sql(zChngPw, "<p>", "</p>\n", &zErr) ){
--        zErrMsg = mprintf("<span class=\"loginError\">%s</span>", zErr);
--        fossil_free(zErr);
--      }else{
--        redirect_to_g();
--        return;
--      }
-     }
-   }
-   zIpAddr = PD("REMOTE_ADDR","nil");   /* Complete IP address for logging */
-   zReferer = P("HTTP_REFERER");
-   uid = login_is_valid_anonymous(zUsername, zPasswd, P("cs"));
-@@ -699,11 +709,11 @@
-     }
-     @ </div>
-     free(zCaptcha);
-   }
-   @ </form>
--  if( g.perm.Password ){
-+  if( g.zLogin && g.perm.Password ){
-     @ <hr />
-     @ <p>Change Password for user <b>%h(g.zLogin)</b>:</p>
-     form_begin(0, "%R/login");
-     @ <table>
-     @ <tr><td class="login_out_label">Old Password:</td>

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2017-03-02 18:36:14 UTC (rev 8207)
+++ branches/1.0/package/fossil/fossil.mk	2017-03-05 14:33:22 UTC (rev 8208)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FOSSIL_VERSION = 1.37
+FOSSIL_VERSION = 2.0
 FOSSIL_SOURCE = fossil-src-$(FOSSIL_VERSION).tar.gz
 FOSSIL_SITE = https://www.fossil-scm.org/fossil/uv/download
 FOSSIL_DEPENDENCIES = zlib openssl

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