astlinux-commits Mailing List for AstLinux (Page 42)

Brought to you by: dhartman, krisk84

astlinux-commits — Commits to the AstLinux SVN repository

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun (6)	Jul (14)	Aug (156)	Sep (35)	Oct (48)	Nov (55)	Dec (16)
2007	Jan (24)	Feb (154)	Mar (139)	Apr (175)	May (87)	Jun (34)	Jul (42)	Aug (68)	Sep (41)	Oct (76)	Nov (77)	Dec (50)
2008	Jan (98)	Feb (43)	Mar (102)	Apr (27)	May (55)	Jun (13)	Jul (58)	Aug (62)	Sep (61)	Oct (43)	Nov (87)	Dec (134)
2009	Jan (175)	Feb (106)	Mar (58)	Apr (41)	May (74)	Jun (123)	Jul (252)	Aug (192)	Sep (69)	Oct (38)	Nov (117)	Dec (95)
2010	Jan (146)	Feb (76)	Mar (90)	Apr (60)	May (23)	Jun (19)	Jul (208)	Aug (140)	Sep (103)	Oct (114)	Nov (50)	Dec (47)
2011	Jan (59)	Feb (47)	Mar (61)	Apr (58)	May (41)	Jun (11)	Jul (17)	Aug (49)	Sep (34)	Oct (166)	Nov (38)	Dec (70)
2012	Jan (87)	Feb (37)	Mar (28)	Apr (25)	May (29)	Jun (30)	Jul (43)	Aug (27)	Sep (46)	Oct (27)	Nov (51)	Dec (70)
2013	Jan (92)	Feb (34)	Mar (58)	Apr (37)	May (46)	Jun (9)	Jul (38)	Aug (22)	Sep (28)	Oct (42)	Nov (44)	Dec (34)
2014	Jan (63)	Feb (39)	Mar (48)	Apr (31)	May (21)	Jun (43)	Jul (36)	Aug (69)	Sep (53)	Oct (56)	Nov (46)	Dec (49)
2015	Jan (63)	Feb (35)	Mar (30)	Apr (38)	May (27)	Jun (42)	Jul (42)	Aug (63)	Sep (18)	Oct (45)	Nov (65)	Dec (71)
2016	Jan (54)	Feb (79)	Mar (59)	Apr (38)	May (32)	Jun (46)	Jul (42)	Aug (30)	Sep (58)	Oct (33)	Nov (98)	Dec (59)
2017	Jan (79)	Feb (12)	Mar (43)	Apr (32)	May (76)	Jun (59)	Jul (44)	Aug (14)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 40 41 42 43 44 .. 329 > >> (Page 42 of 329)

[Astlinux-commits] SF.net SVN: astlinux:[7395] branches/1.0/crosstool-ng-src

From: <abe...@us...> - 2015-12-11 16:38:11

Revision: 7395
          http://sourceforge.net/p/astlinux/code/7395
Author:   abelbeck
Date:     2015-12-11 16:38:09 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
toolchain build system, add script for downloading crosstool-ng and any custom patches.  Thanks to David Kerr for the insights

Modified Paths:
--------------
    branches/1.0/crosstool-ng-src/README

Added Paths:
-----------
    branches/1.0/crosstool-ng-src/get-crosstool-ng.sh
    branches/1.0/crosstool-ng-src/patches/
    branches/1.0/crosstool-ng-src/patches/eglibc/
    branches/1.0/crosstool-ng-src/patches/eglibc/2_18/
    branches/1.0/crosstool-ng-src/patches/eglibc/2_18/900-Allow-new-versions-of-make.patch

Modified: branches/1.0/crosstool-ng-src/README
===================================================================
--- branches/1.0/crosstool-ng-src/README	2015-12-11 14:59:32 UTC (rev 7394)
+++ branches/1.0/crosstool-ng-src/README	2015-12-11 16:38:09 UTC (rev 7395)
@@ -11,7 +11,8 @@
 ## Install crosstool-ng ##
 # mkdir ~/source-control # used as example folder for these configs
 cd ~/source-control
-wget -O - http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.20.0.tar.bz2 | tar xj
+# run shell script "crosstool-ng-src/get-crosstool-ng.sh" located in the SVN
+sh ~/astlinux/1.0/crosstool-ng-src/get-crosstool-ng.sh
 cd crosstool-ng-1.20.0
 ./configure
 # Note: the 'gperf' package may need to be added to your system.

Added: branches/1.0/crosstool-ng-src/get-crosstool-ng.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-crosstool-ng.sh	                        (rev 0)
+++ branches/1.0/crosstool-ng-src/get-crosstool-ng.sh	2015-12-11 16:38:09 UTC (rev 7395)
@@ -0,0 +1,34 @@
+# shell script to download crosstool-ng and any patches
+
+CTNG_VERSION="1.20.0"
+
+CTNG_URL="http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-${CTNG_VERSION}.tar.bz2"
+
+CTNG_PATCHES_DIR="$(dirname $0)/patches"
+
+display_result()
+{
+  if [ $1 -eq 0 ]; then
+    echo "OK"
+  else
+    echo "FAILED"
+  fi
+}
+
+if [ -d "crosstool-ng-$CTNG_VERSION" ]; then
+  echo "directory \"crosstool-ng-$CTNG_VERSION\" already exists."
+  echo "crosstool-ng-$CTNG_VERSION probably is already downloaded, skipping."
+else
+  echo "Downloading $CTNG_URL ..."
+  wget -O - "$CTNG_URL" | tar xj
+  display_result $?
+
+  # Overlay our custom patches
+  if [ -d "crosstool-ng-$CTNG_VERSION" ]; then
+    echo "Adding custom patches ..."
+    rsync -a --exclude=".svn" "$CTNG_PATCHES_DIR/" "crosstool-ng-$CTNG_VERSION/patches/"
+    display_result $?
+  fi
+fi
+
+exit 0

Added: branches/1.0/crosstool-ng-src/patches/eglibc/2_18/900-Allow-new-versions-of-make.patch
===================================================================
--- branches/1.0/crosstool-ng-src/patches/eglibc/2_18/900-Allow-new-versions-of-make.patch	                        (rev 0)
+++ branches/1.0/crosstool-ng-src/patches/eglibc/2_18/900-Allow-new-versions-of-make.patch	2015-12-11 16:38:09 UTC (rev 7395)
@@ -0,0 +1,12 @@
+diff -Naur a/configure b/configure
+--- a/configure	2015-12-10 15:37:30.816272273 -0500
++++ b/configure	2015-12-10 15:36:46.373019524 -0500
+@@ -4772,7 +4772,7 @@
+   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+   case $ac_prog_version in
+     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    3.79* | 3.[89]*)
++    3.79* | 3.[89]* | [4-9].*)
+        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ 

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

[Astlinux-commits] SF.net SVN: astlinux:[7394] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-11 14:59:34

Revision: 7394
          http://sourceforge.net/p/astlinux/code/7394
Author:   abelbeck
Date:     2015-12-11 14:59:32 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-11 14:41:19 UTC (rev 7393)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-11 14:59:32 UTC (rev 7394)
@@ -127,7 +127,10 @@
 
 -- Status tab, allow empty lines within a Custom Asterisk Command output
 
+-- dialproxy, support GET/POST variables 'phone' and 'exten' synonymous for 'num' and 'ext' to be compatible
+   with the Asterisk Click2Call extension for Google Chrome and possibly others.
 
+
 Additions for AstLinux 1.2.4.1:
 ===============================
 

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

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

From: <abe...@us...> - 2015-12-11 14:41:22

Revision: 7393
          http://sourceforge.net/p/astlinux/code/7393
Author:   abelbeck
Date:     2015-12-11 14:41:19 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
web interface, dialproxy, support GET/POST variables 'phone' and 'exten' synonymous for 'num' and 'ext'

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

Modified: branches/1.0/package/webinterface/altweb/dialproxy.php
===================================================================
--- branches/1.0/package/webinterface/altweb/dialproxy.php	2015-12-10 18:03:45 UTC (rev 7392)
+++ branches/1.0/package/webinterface/altweb/dialproxy.php	2015-12-11 14:41:19 UTC (rev 7393)
@@ -9,6 +9,7 @@
 // dialproxy.php for AstLinux
 // 09-03-2009
 // 10-31-2013, Add POST method
+// 12-11-2015, Add GET/POST variables 'phone' and 'exten' synonymous for 'num' and 'ext'
 //
 // GET Method:
 // Usage: http://pbx/dialproxy.php?num=2223334444&ext=default
@@ -216,16 +217,33 @@
   return($num);
 }
 
-if (isset($_POST['num'], $_POST['ext'])) {
-  $num = normalize_phone_number($_POST['num'], $opts);
+if (isset($_POST['num'])) {
+  $num = $_POST['num'];
+} elseif (isset($_POST['phone'])) {
+  $num = $_POST['phone'];
+} elseif (isset($_GET['num'])) {
+  $num = $_GET['num'];
+} elseif (isset($_GET['phone'])) {
+  $num = $_GET['phone'];
+} else {
+  $num = '';
+}
+if ($num !== '') {
+  $num = normalize_phone_number($num, $opts);
+}
+
+if (isset($_POST['ext'])) {
   $ext = $_POST['ext'];
-} elseif (isset($_GET['num'], $_GET['ext'])) {
-  $num = normalize_phone_number($_GET['num'], $opts);
+} elseif (isset($_POST['exten'])) {
+  $ext = $_POST['exten'];
+} elseif (isset($_GET['ext'])) {
   $ext = $_GET['ext'];
+} elseif (isset($_GET['exten'])) {
+  $ext = $_GET['exten'];
 } else {
-  $num = '';
   $ext = '';
 }
+
 if (isset($_POST['debug']) || isset($_GET['debug'])) {
   myexit(0, "Debug: num=$num ext=$ext dialprefix=".$opts['dialprefix']);
 }

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

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

From: <abe...@us...> - 2015-12-10 18:03:48

Revision: 7392
          http://sourceforge.net/p/astlinux/code/7392
Author:   abelbeck
Date:     2015-12-10 18:03:45 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
web interface, Shutdown alert text tweaked, German by Michael

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

Modified: branches/1.0/package/webinterface/altweb/admin/shutdown.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/shutdown.php	2015-12-10 16:34:21 UTC (rev 7391)
+++ branches/1.0/package/webinterface/altweb/admin/shutdown.php	2015-12-10 18:03:45 UTC (rev 7392)
@@ -73,13 +73,15 @@
   putHtml('<table class="stdtable">');
   putHtml('<tr><td class="dialogText" style="color: red; text-align: center;">');
   putHtml('WARNING: "Shutdown" will stop this computer.<br />');
-  putHtml('Disconnecting and reconnecting the power is required to restart.<br />');
+  putHtml('Disconnecting and reconnecting the power may be required to restart.<br />');
   putHtml('Make sure you have physical access to this computer before continuing.<br />');
   putHtml('</td></tr>');
   putHtml('<tr><td class="dialogText" style="color: red; text-align: center;">');
   putHtml('WARNUNG: "Shutdown" wird diesen Computer herunterfahren.<br />');
-  putHtml('Um neu zu starten, ist es erforderlich, die Stromversorgung zu Trennen und Wiederherzustellen.<br />');
-  putHtml('Stellen Sie sicher, da&szlig; Sie physikalischen Zugang zu diesem Computer haben, bevor Sie fortfahren.<br />');
+  putHtml('Um neu zu starten, ist es m&ouml;glicherweise erforderlich,<br />');
+  putHtml('die Stromversorgung zu Trennen und Wiederherzustellen.<br />');
+  putHtml('Stellen Sie sicher, da&szlig; Sie physikalischen Zugang zu diesem Computer haben,<br />');
+  putHtml('bevor Sie fortfahren.<br />');
   putHtml('</td></tr>');
   putHtml('<tr><td class="dialogText" style="text-align: center;">');
   putHtml('<input type="submit" value="Shutdown" name="submit_shutdown" />');

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

[Astlinux-commits] SF.net SVN: astlinux:[7391] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-10 16:34:24

Revision: 7391
          http://sourceforge.net/p/astlinux/code/7391
Author:   abelbeck
Date:     2015-12-10 16:34:21 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-10 16:31:48 UTC (rev 7390)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-10 16:34:21 UTC (rev 7391)
@@ -21,6 +21,8 @@
 
 -- linux, add kernel patch allowing Geode LX (alix and net5501) to use tsc clocksource instead of pit clocksource
 
+-- igb, version bump to 5.3.3.5, Intel Gigabit Ethernet Network Driver
+
 -- e1000e version bump to 3.3.1 Intel PCI-Express PRO/1000 Ethernet Linux driver
 
 -- tg3, version bump to 3.137k, Broadcom NetLink 10/100/1000 Mbps PCI/PCI-X/PCI Express Ethernet Linux driver

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

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

From: <abe...@us...> - 2015-12-10 16:31:51

Revision: 7390
          http://sourceforge.net/p/astlinux/code/7390
Author:   abelbeck
Date:     2015-12-10 16:31:48 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
igb, version bump to 5.3.3.5

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

Modified: branches/1.0/package/igb/igb.mk
===================================================================
--- branches/1.0/package/igb/igb.mk	2015-12-10 16:16:01 UTC (rev 7389)
+++ branches/1.0/package/igb/igb.mk	2015-12-10 16:31:48 UTC (rev 7390)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IGB_VERSION = 5.3.3.2
+IGB_VERSION = 5.3.3.5
 IGB_SOURCE:=igb-$(IGB_VERSION).tar.gz
 IGB_SITE = http://downloads.sourceforge.net/project/e1000/igb%20stable/$(IGB_VERSION)
 IGB_DEPENDENCIES = linux

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

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

From: <abe...@us...> - 2015-12-10 16:16:04

Revision: 7389
          http://sourceforge.net/p/astlinux/code/7389
Author:   abelbeck
Date:     2015-12-10 16:16:01 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
web interface, Prefs tab, add two more entries to the 'System Reboot Timer:'

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

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-12-09 04:36:04 UTC (rev 7388)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-12-10 16:16:01 UTC (rev 7389)
@@ -1032,7 +1032,8 @@
     $value = '0';
   }
   putHtml('<select name="reboot_timer">');
-  $reboot_timer_label = array( '80', '60', '40', '30', '20', '10', '0', '-10', '-20', '-30', '-40', '-50', '-60', '-80');
+  $reboot_timer_label = array( '80', '60', '40', '30', '20', '10', '0',
+                              '-10', '-20', '-30', '-40', '-50', '-60', '-70', '-80', '-90');
   foreach ($reboot_timer_label as $adjust) {
     $sel = ($value === $adjust) ? ' selected="selected"' : '';
     if ((int)$adjust == 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:[7388] branches/1.0/project/astlinux/target_skeleton/ sbin/kernel-reboot

From: <abe...@us...> - 2015-12-09 04:36:06

Revision: 7388
          http://sourceforge.net/p/astlinux/code/7388
Author:   abelbeck
Date:     2015-12-09 04:36:04 +0000 (Wed, 09 Dec 2015)
Log Message:
-----------
kernel-reboot, tweak to allow the vfat partition to be un-mounted before the kexec

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-09 00:08:58 UTC (rev 7387)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-09 04:36:04 UTC (rev 7388)
@@ -139,6 +139,9 @@
     do_failure
   fi
 
+  cd /root
+  losetup -d $DEVLOOP
+
   # Stop services and unmount all file systems or remount 'ro' if busy
   /etc/rc shutdown
 

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

[Astlinux-commits] SF.net SVN: astlinux:[7387] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-09 00:09:00

Revision: 7387
          http://sourceforge.net/p/astlinux/code/7387
Author:   abelbeck
Date:     2015-12-09 00:08:58 +0000 (Wed, 09 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-09 00:04:27 UTC (rev 7386)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-09 00:08:58 UTC (rev 7387)
@@ -53,6 +53,8 @@
 
 -- nano, version bump to 2.5.0
 
+-- acpid, version bump to 2.0.25
+
 -- strace, version bump to 4.10
 
 ** Networking

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

[Astlinux-commits] SF.net SVN: astlinux:[7386] branches/1.0/project/astlinux/target_skeleton/ sbin/kernel-reboot

From: <abe...@us...> - 2015-12-09 00:04:29

Revision: 7386
          http://sourceforge.net/p/astlinux/code/7386
Author:   abelbeck
Date:     2015-12-09 00:04:27 +0000 (Wed, 09 Dec 2015)
Log Message:
-----------
kernel-reboot, fix un-setup image issues by moving '/etc/rc shutdown' to then end and simplifying.  Now works with un-setup images (no unionfs) and with and without 'noram' in the KCMD.  Hopefully we have a production version.

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-08 15:07:11 UTC (rev 7385)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-09 00:04:27 UTC (rev 7386)
@@ -23,36 +23,16 @@
 do_failure()
 {
   echo '## Falling back to /sbin/reboot ##'
-  /sbin/reboot -f
+  sleep 1
+  /sbin/reboot
   exit 1
 }
 
 do_reboot()
 {
-  # Stop services and unmount all file systems or remount 'ro' if busy
-  /etc/rc shutdown
-
+  echo ''
   echo '## Using /sbin/kernel-reboot ##'
 
-  # Stop udevd since /dev is now 'ro'
-  echo "Stopping udevd..."
-  udevadm control --timeout=121 --exit
-  killall udevd 2>/dev/null
-
-  ROOT="/tmp/mnt/root"
-
-  KEXEC_BASE="/tmp/mnt/kexec"
-
-  # We may have lost /proc on the shutdown, mount if missing
-  if [ ! -e /proc/mounts ]; then
-    mount -t proc none /proc
-  fi
-
-  mount -t tmpfs none /tmp
-
-  mkdir -p "$ROOT"
-  mkdir -p "$KEXEC_BASE"
-
   BASE="/oldroot/cdrom"
 
   if ! mount | grep -q "$BASE"; then
@@ -66,6 +46,10 @@
     fi
   fi
 
+  ROOT="/tmp/mnt/root"
+
+  mkdir -p "$ROOT"
+
   if [ -f $BASE/os/default.conf ]; then
     . $BASE/os/default.conf
   fi
@@ -100,19 +84,20 @@
   INITRD="${BASE}${INITRD#/mnt/base}"
   KERN="${ROOT}${KERN#/mnt/root}"
 
+  # Find first unused loop device
+  DEVLOOP="$(losetup -f)"
+
   if [ -z "$OFFSET" ]; then
-    losetup /dev/loop0 $BASE/os/$RUNIMG
+    losetup $DEVLOOP $BASE/os/$RUNIMG
   else
-    losetup -o "$OFFSET" /dev/loop0 $BASE/os/$RUNIMG
+    losetup -o "$OFFSET" $DEVLOOP $BASE/os/$RUNIMG
   fi
 
   if [ -z "$FSTYPE" ]; then
     FSTYPE="ext2"
   fi
 
-  if mount -t $FSTYPE -o ro /dev/loop0 $ROOT; then
-    echo "Root mounted"
-  else
+  if ! mount -t $FSTYPE -o ro $DEVLOOP $ROOT; then
     echo "Error mounting $RUNIMG root fs"
     do_failure
   fi
@@ -141,28 +126,33 @@
     KERN="$ROOT/boot/bzImage"
   fi
 
-  if [ -f "$INITRD" -a -f "$KERN" ]; then
-    echo "Copying kernel and initrd to ramdisk..."
-    mount -t tmpfs none "$KEXEC_BASE"
-    cp "$INITRD" "$KEXEC_BASE/initrd.img"
-    cp "$KERN" "$KEXEC_BASE/bzImage"
-    echo "Unmounting image..."
+  if [ -n "$KCMD" -a -f "$INITRD" -a -f "$KERN" ]; then
+    echo "Loading new kernel..."
+    if ! /sbin/kexec -l --command-line="$KCMD" --initrd="$INITRD" "$KERN"; then
+      umount $ROOT
+      do_failure
+    fi
     umount $ROOT
   else
-    echo "I couldn't find your kernel and/or initrd"
+    echo "Missing one or more of: kcmd, initrd, kernel"
+    umount $ROOT
     do_failure
   fi
 
-  if [ -z "$KCMD" ]; then
-    echo "You need to specify a kernel command line.
-  I can't guess that"
-    do_failure
-  fi
+  # Stop services and unmount all file systems or remount 'ro' if busy
+  /etc/rc shutdown
 
+  echo "Stopping udevd..."
+  udevadm control --timeout=121 --exit
+  killall udevd 2>/dev/null
+
   echo "Trying kexec..."
-  /sbin/kexec --command-line="$KCMD" --initrd="$KEXEC_BASE/initrd.img" -f "$KEXEC_BASE/bzImage"
+  /sbin/kexec -e
 
-  do_failure
+  echo '## Falling back to /sbin/reboot ##'
+  sleep 1
+  /sbin/reboot -f
+  exit 1
 }
 
 # Set a working dir for when called via PHP

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

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

From: <abe...@us...> - 2015-12-08 15:07:14

Revision: 7385
          http://sourceforge.net/p/astlinux/code/7385
Author:   abelbeck
Date:     2015-12-08 15:07:11 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
acpid, version bump to 2.0.25, add K01acpid runlevel

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

Removed Paths:
-------------
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid

Modified: branches/1.0/package/acpid/acpid.init
===================================================================
--- branches/1.0/package/acpid/acpid.init	2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/package/acpid/acpid.init	2015-12-08 15:07:11 UTC (rev 7385)
@@ -10,7 +10,7 @@
 
 start () {
 
-  if [ -x /usr/sbin/acpid -a -f /proc/acpi/event ]; then
+  if [ -x /usr/sbin/acpid -a -e /proc/acpi/event ]; then
     echo "Starting acpid..."
 
     /usr/sbin/acpid -p $PIDFILE

Modified: branches/1.0/package/acpid/acpid.mk
===================================================================
--- branches/1.0/package/acpid/acpid.mk	2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/package/acpid/acpid.mk	2015-12-08 15:07:11 UTC (rev 7385)
@@ -4,16 +4,26 @@
 #
 #############################################################
 
-ACPID_VERSION = 2.0.23
+ACPID_VERSION = 2.0.25
 ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
 ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
 
-define ACPID_SET_EVENTS
+define ACPID_SET_EVENTS_FILES
 	mkdir -p $(TARGET_DIR)/etc/acpi/events
 	/bin/echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
 	$(INSTALL) -D -m 755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid
+	ln -sf ../../init.d/acpid $(TARGET_DIR)/etc/runlevels/default/S24acpid
+	ln -sf ../../init.d/acpid $(TARGET_DIR)/etc/runlevels/default/K01acpid
 endef
 
-ACPID_POST_INSTALL_TARGET_HOOKS += ACPID_SET_EVENTS
+ACPID_POST_INSTALL_TARGET_HOOKS += ACPID_SET_EVENTS_FILES
 
+define ACPID_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/acpid
+	rm -f $(TARGET_DIR)/usr/bin/acpi_listen
+	rm -f $(TARGET_DIR)/etc/init.d/acpid
+	rm -f $(TARGET_DIR)/etc/runlevels/default/S24acpid
+	rm -f $(TARGET_DIR)/etc/runlevels/default/K01acpid
+endef
+
 $(eval $(call AUTOTARGETS,package,acpid))

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid	2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid	2015-12-08 15:07:11 UTC (rev 7385)
@@ -1 +0,0 @@
-link ../../init.d/acpid
\ No newline at end of file

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

[Astlinux-commits] SF.net SVN: astlinux:[7384] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-07 21:55:01

Revision: 7384
          http://sourceforge.net/p/astlinux/code/7384
Author:   abelbeck
Date:     2015-12-07 21:54:59 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-07 21:53:57 UTC (rev 7383)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-07 21:54:59 UTC (rev 7384)
@@ -51,7 +51,7 @@
 -- kernel-reboot, new command performs a reboot via kexec just as RUNNIX does, all changes to the run images and versions are honored.
    Reboots are 30-40 seconds faster using kernel-reboot. The kernel-reboot command replaces the sreboot script that has been removed.
 
--- nano, version bump to 2.4.3
+-- nano, version bump to 2.5.0
 
 -- strace, version bump to 4.10
 

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

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

From: <abe...@us...> - 2015-12-07 21:53:59

Revision: 7383
          http://sourceforge.net/p/astlinux/code/7383
Author:   abelbeck
Date:     2015-12-07 21:53:57 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
nano, version bump to 2.5.0

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

Modified: branches/1.0/package/nano/nano.mk
===================================================================
--- branches/1.0/package/nano/nano.mk	2015-12-07 18:39:52 UTC (rev 7382)
+++ branches/1.0/package/nano/nano.mk	2015-12-07 21:53:57 UTC (rev 7383)
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-NANO_VERSION = 2.4.3
-NANO_SITE = http://www.nano-editor.org/dist/v2.4
+NANO_VERSION = 2.5.0
+NANO_SITE = http://www.nano-editor.org/dist/v2.5
 NANO_MAKE_ENV = CURSES_LIB="-lncurses"
 NANO_CONF_ENV = ac_cv_prog_NCURSESW_CONFIG=false
 NANO_CONF_OPT = \

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

[Astlinux-commits] SF.net SVN: astlinux:[7382] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-07 18:39:54

Revision: 7382
          http://sourceforge.net/p/astlinux/code/7382
Author:   abelbeck
Date:     2015-12-07 18:39:52 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-07 18:36:57 UTC (rev 7381)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-07 18:39:52 UTC (rev 7382)
@@ -121,7 +121,9 @@
 -- Network and System tabs, now use "/sbin/kernel-reboot" if available for a faster reboot.
    Use classic reboot method by checking Prefs tab option 'Disable faster "kernel-reboot" System Reboot'.
 
+-- Status tab, allow empty lines within a Custom Asterisk Command output
 
+
 Additions for AstLinux 1.2.4.1:
 ===============================
 

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

[Astlinux-commits] SF.net SVN: astlinux:[7381] branches/1.0/package/webinterface/altweb/common /status.inc

From: <abe...@us...> - 2015-12-07 18:36:59

Revision: 7381
          http://sourceforge.net/p/astlinux/code/7381
Author:   abelbeck
Date:     2015-12-07 18:36:57 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
web interface, Status tab, allow empty lines within a Custom Asterisk Command output

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/common/status.inc

Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc	2015-12-07 17:29:04 UTC (rev 7380)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2015-12-07 18:36:57 UTC (rev 7381)
@@ -1066,10 +1066,22 @@
       $tmpfile = tempnam("/tmp", "PHP_");
       asteriskCMD($cmd, $tmpfile);
       $ph = @fopen($tmpfile, "r");
+      $valid_line = FALSE;
+      $empty_lines = 0;
       while (! feof($ph)) {
-        if (($line = trim(fgets($ph, 1024))) !== '') {
-          if (strncasecmp($line, 'verbosity ', 10)) {
+        $line = trim(fgets($ph, 1024));
+        if (strncasecmp($line, 'verbosity ', 10)) {
+          if ($line !== '') {
+            if ($valid_line) {
+              while ($empty_lines > 0) {
+                putText('');
+                $empty_lines--;
+              }
+            }
             putText($line);
+            $valid_line = TRUE;
+          } else {
+            $empty_lines++;
           }
         }
       }

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

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

From: <abe...@us...> - 2015-12-07 17:29:07

Revision: 7380
          http://sourceforge.net/p/astlinux/code/7380
Author:   abelbeck
Date:     2015-12-07 17:29:04 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
web interface, fix a sloppy conditional from 8 years ago that got replicated over the years, previously a line containing only '0' (among others) would be treated as an empty line.  Most likely did not effect any users.

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/cdrlog.php
    branches/1.0/package/webinterface/altweb/admin/confbridge.php
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
    branches/1.0/package/webinterface/altweb/admin/meetme.php
    branches/1.0/package/webinterface/altweb/admin/monitor.php
    branches/1.0/package/webinterface/altweb/admin/phoneprov.php
    branches/1.0/package/webinterface/altweb/admin/users.php
    branches/1.0/package/webinterface/altweb/admin/view.php
    branches/1.0/package/webinterface/altweb/admin/voicemail.php
    branches/1.0/package/webinterface/altweb/common/functions.php
    branches/1.0/package/webinterface/altweb/common/license.inc
    branches/1.0/package/webinterface/altweb/common/status.inc
    branches/1.0/package/webinterface/altweb/common/users-password.php

Modified: branches/1.0/package/webinterface/altweb/admin/cdrlog.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/cdrlog.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/cdrlog.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -313,7 +313,7 @@
   }
   $ph = @fopen($tmpfile, "r");
   while (! feof($ph)) {
-    if ($line = trim(fgets($ph, 1024))) {
+    if (($line = trim(fgets($ph, 1024))) !== '') {
       $i = $map['commasafe'];
       $linetokens = explode('",', $line, ($i + 1));
       if (isset($linetokens[$i])) {
@@ -585,7 +585,7 @@
       $last = (getPREFdef($global_prefs, 'cdrlog_last_show') === 'yes') ? getPREFdef($global_prefs, 'cdrlog_last_cmd') : '';
       $map = mapCDRvalues($default, $extra, $last);
       while (! feof($fp)) {
-        if ($line = trim(fgets($fp, 1024))) {
+        if (($line = trim(fgets($fp, 1024))) !== '') {
           if (($line = parseCDRline($line, $format, $match, $map)) !== FALSE) {
             echo $line, "\n";
           }

Modified: branches/1.0/package/webinterface/altweb/admin/confbridge.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/confbridge.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/confbridge.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -144,7 +144,7 @@
   if ($status == 0) {
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (preg_match('/^([0-9]+) +([0-9]+) +([0-9]+) +([a-z]+).*$/', $line, $ips)) {
           $rooms[$id]['room'] = $ips[1];
           $rooms[$id]['locked'] = ($ips[4] === 'locked') ? '1' : '0';
@@ -174,14 +174,14 @@
     if ($status == 0) {
       $ph = @fopen($tmpfile, "r");
       while (! feof($ph)) {  // Skip through a line beginning with a =
-        if ($line = fgets($ph, 1024)) {
+        if (($line = fgets($ph, 1024)) != '') {
           if ($line[0] === '=') {
             break;
           }
         }
       }
       while (! feof($ph)) {
-        if ($line = trim(fgets($ph, 1024))) {
+        if (($line = trim(fgets($ph, 1024))) !== '') {
           if ($ast13) {
             if (preg_match('/^([^ ]+) .* ([^ ]+) *$/', $line, $ips)) {
               $db['data'][$id]['room'] = $room_list[$i]['room'];

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -729,7 +729,7 @@
   if ($openfile !== '') {
     if (($ph = @fopen($openfile, "rb")) !== FALSE) {
       while (! feof($ph)) {
-        if ($line = fgets($ph, 1024)) {
+        if (($line = fgets($ph, 1024)) != '') {
           $line = str_replace(chr(10), chr(13), $line);
           echo htmlspecialchars($line);
         }

Modified: branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/fossilcmd.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/fossilcmd.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -132,7 +132,7 @@
         echo "<strong>----- Result too large to display, showing the end of the output -----</strong>\n";
       }
       while (! feof($fp)) {                   
-        if ($line = fgets($fp, 1024)) {      
+        if (($line = fgets($fp, 1024)) != '') {      
           echo htmlspecialchars($line);
         }                
       }                                    

Modified: branches/1.0/package/webinterface/altweb/admin/meetme.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/meetme.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/meetme.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -173,7 +173,7 @@
   if ($status == 0) {
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if ($isASTERISKv1_4) {
           if (preg_match('/^([0-9][0-9]*) .*$/', $line, $ips)) {
             $rooms[$id]['room'] = $ips[1];
@@ -209,7 +209,7 @@
     if ($status == 0) {
       $ph = @fopen($tmpfile, "r");
       while (! feof($ph)) {
-        if ($line = trim(fgets($ph, 1024))) {
+        if (($line = trim(fgets($ph, 1024))) !== '') {
           if (strpos($line, '!') !== FALSE) {
             $ips = explode('!', $line);
             $db['data'][$id]['room'] = $room_list[$i]['room'];

Modified: branches/1.0/package/webinterface/altweb/admin/monitor.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/monitor.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/monitor.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -30,7 +30,7 @@
   if (($db['status'] = $status) == 0) {
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (substr($line, 0, $ldir) === $dir) {
           if (($value = substr($line, $ldir)) !== '') {
             if (($stat = @stat($dir.$value)) !== FALSE) {

Modified: branches/1.0/package/webinterface/altweb/admin/phoneprov.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/phoneprov.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/phoneprov.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -400,7 +400,7 @@
     return(3);
   }
   while (! feof($fp)) {
-    if ($line = trim(fgets($fp, 1024))) {
+    if (($line = trim(fgets($fp, 1024))) !== '') {
       if ($line[0] !== '#') {
         if (preg_match('/^([^ \t]+)[ \t]+([^ \t]+)[ \t]+([^ \t]+)[ \t]+([^ \t]+)(.*)$/', $line, $tokens)) {
           $mac = strtolower($tokens[2]);

Modified: branches/1.0/package/webinterface/altweb/admin/users.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/users.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/users.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -33,7 +33,7 @@
   @exec('sed -n "/^\['.$context.'\]/,/^\[/ s/^[0-9][0-9]*[ ]*[=][> ]*[-*0-9]*,/&/p" '.$fname.' >'.$tmpfile);
   $ph = @fopen($tmpfile, "r");
   while (! feof($ph)) {
-    if ($line = trim(fgets($ph, 1024))) {
+    if (($line = trim(fgets($ph, 1024))) !== '') {
       $linetokens = explode(',', $line);
       $boxtokens = explode('=', $linetokens[0]);
       $db['data'][$id]['mbox'] = trim($boxtokens[0], ' ');

Modified: branches/1.0/package/webinterface/altweb/admin/view.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/view.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/view.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -77,7 +77,7 @@
         echo "<strong>----- File too large to display, showing the end of the file -----</strong>\n";
       }
       while (! feof($fp)) {                   
-        if ($line = fgets($fp, 1024)) {      
+        if (($line = fgets($fp, 1024)) != '') {      
           echo htmlspecialchars($line);
         }                
       }                                    

Modified: branches/1.0/package/webinterface/altweb/admin/voicemail.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/voicemail.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/admin/voicemail.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -80,7 +80,7 @@
   $vm['cidnum'] = '';
   $vm['duration'] = 0;
   while (! feof($ph)) {
-    if ($line = trim(fgets($ph, 1024))) {
+    if (($line = trim(fgets($ph, 1024))) !== '') {
       if ($line[0] !== ';' && $line[0] !== '[') {
         if (($pos = strpos($line, '=')) !== FALSE) {
           $var = trim(substr($line, 0, $pos), ' ');
@@ -117,7 +117,7 @@
   if (($db['status'] = $status) == 0) {
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (substr($line, 0, $ldir) === $dir) {
           if (($value = substr($line, $ldir, -4)) !== '') {
             $path = $dir.$value.'.txt';
@@ -193,7 +193,7 @@
   if (getPREFdef($global_prefs, 'voicemail_extern_notify') === 'yes') {
     if (($ph = popen("grep -m 1 '^externnotify' /etc/asterisk/voicemail.conf", "r")) !== FALSE) {
       if (! feof($ph)) {
-        if ($line = trim(fgets($ph, 1024))) {
+        if (($line = trim(fgets($ph, 1024))) !== '') {
           if (($pos = strpos($line, '=')) !== FALSE) {
             $value = trim(substr($line, ($pos + 1)), '" ');
             if (($pos = strpos($value, ' ')) !== FALSE) {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -321,7 +321,7 @@
   @exec($cmd);
   $ph = @fopen($tmpfile, "r");
   while (! feof($ph)) {
-    if ($line = trim(fgets($ph, 1024))) {
+    if (($line = trim(fgets($ph, 1024))) !== '') {
       if (($pos = strpos($line, ':')) !== FALSE) {
         $linetokens = explode(':', $line);
         if ($linetokens[1] === '0') {
@@ -502,7 +502,7 @@
   @exec("sed -e 's/^#.*//' -e '/^$/ d' ".$conffile.' >'.$tmpfile);
   $ph = @fopen($tmpfile, "r");
   while (! feof($ph)) {
-    if ($line = trim(fgets($ph, 1024))) {
+    if (($line = trim(fgets($ph, 1024))) !== '') {
       if (($pos = strpos($line, '=')) !== FALSE) {
         $var = trim(substr($line, 0, $pos), ' ');
         $line = substr($line, ($pos + 1));
@@ -510,7 +510,7 @@
           if (($end = strrpos($line, '"')) !== FALSE) {
             if ($begin == $end) {  // multi-line definition, single quote
               while (! feof($ph)) {
-                if ($qstr = rtrim(fgets($ph, 1024))) {
+                if (($qstr = rtrim(fgets($ph, 1024))) !== '') {
                   if (($end = strrpos($qstr, '"')) !== FALSE && ! ($end > 0 && substr($qstr, $end - 1, 1) === '\\')) {
                     if (($pos = strpos($qstr, '#', $end)) !== FALSE) {
                       $qstr = substr($qstr, 0, $pos);
@@ -729,7 +729,7 @@
   if (($db['status'] = $status) == 0) {
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (($pos = strpos($line, ': ')) !== FALSE) {
           $keystr = substr($line, 0, $pos);
           $valuestr = substr($line, ($pos + 2));
@@ -949,7 +949,7 @@
     if (is_file($pfile)) {
       if (($ph = @fopen($pfile, "r")) !== FALSE) {
         while (! feof($ph)) {
-          if ($line = trim(fgets($ph, 1024))) {
+          if (($line = trim(fgets($ph, 1024))) !== '') {
             if ($line[0] !== '#') {
               if (($pos = strpos($line, '=')) !== FALSE) {
                 $var = trim(substr($line, 0, $pos), ' ');

Modified: branches/1.0/package/webinterface/altweb/common/license.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license.inc	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/common/license.inc	2015-12-07 17:29:04 UTC (rev 7380)
@@ -28,7 +28,7 @@
   $id = 0;
   if (($fh = @fopen($file, "r")) !== FALSE) {
     while (! feof($fh)) {
-      if ($line = trim(fgets($fh, 1024))) {
+      if (($line = trim(fgets($fh, 1024))) !== '') {
         $linetokens = explode('~', $line);
         if (isset($linetokens[0]) && ($linetokens[0][0] !== '#')) {
           $status['data'][$id]['package'] = $linetokens[0];
@@ -66,7 +66,7 @@
   putHtml('<tr><td class="dialogText" style="text-align: left;">');
   if (($fp = @fopen($LICENSEFILE, "rb")) !== FALSE) {
     while (! feof($fp)) {
-      if ($line = fgets($fp, 1024)) {
+      if (($line = fgets($fp, 1024)) != '') {
         $line = str_replace('(c)', '<big>&copy;</big>', htmlspecialchars($line));
         echo $line;
         putHtml("<br />");

Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2015-12-07 17:29:04 UTC (rev 7380)
@@ -106,7 +106,7 @@
   $cid = 0;
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
-      if ($line = rtrim(fgets($ph, 1024))) {
+      if (($line = rtrim(fgets($ph, 1024))) !== '') {
         if (preg_match('/^([a-z][a-z.]*)[ :]*(.*)$/', $line, $ips)) {
           switch ($ips[1]) {
           case 'ups.model':
@@ -133,7 +133,7 @@
   $cid = -1;
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
-      if ($line = rtrim(fgets($ph, 1024))) {
+      if (($line = rtrim(fgets($ph, 1024))) !== '') {
         if (preg_match('/^([0-9a-fA-F][0-9a-fA-F.:]*).* ([0-9a-fA-F][0-9a-fA-F.:]*)/', $line, $ips)) {
           $cid++;
           $status['states'][$cid]['src'] = $ips[1];
@@ -186,7 +186,7 @@
   $cid = 0;
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         $linetokens = preg_split('/ +/', $line);
         if (isset($linetokens[3]) && isset($proto[$linetokens[3]])) {
           $bytes = 0;
@@ -334,7 +334,7 @@
   $cid = 0;
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         $linetokens = explode(':', $line);
         if (isset($linetokens[4])) {
           $status['clients'][$cid]['proto'] = $linetokens[0];
@@ -366,7 +366,7 @@
   $cur_time = time();
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         $linetokens = explode(' ', $line);
         if (isset($linetokens[0]) && ($linetokens[0] > $cur_time)) {
           $status['clients'][$cid]['expire'] = $linetokens[0];
@@ -399,7 +399,7 @@
 
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         $linetokens = explode(',', $line);
         if (strncasecmp($linetokens[0], 'UPDATED', 7) == 0) {
           $status['updated'] = $linetokens[1];
@@ -431,7 +431,7 @@
   $cid = 0;
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         $linetokens = explode(',', $line);
         if ($linetokens[0] === "TITLE") {
           $status['title'] = $linetokens[1];
@@ -528,7 +528,7 @@
   $rconf = is_file('/etc/resolv-extern.conf') ? '/etc/resolv-extern.conf' : '/etc/resolv.conf';
   if (($fp = @fopen($rconf, 'r')) !== FALSE) {
     while (! feof($fp)) {
-      if ($line = trim(fgets($fp, 1024))) {
+      if (($line = trim(fgets($fp, 1024))) !== '') {
         echo '<tr ', ($i++ % 2 == 0) ? 'class="dtrow0"' : 'class="dtrow1"', '>';
         echo '<td class="dialogText" style="text-align: right; font-weight: bold;">', 'DNS:', '</td>';
         echo '<td style="text-align: left;" colspan="3">', $line, '</td>';
@@ -627,7 +627,7 @@
     if ($status == 0) {
       $ph = @fopen($tmpfile, "r");
       while (! feof($ph)) {
-        if ($line = trim(fgets($ph, 1024))) {
+        if (($line = trim(fgets($ph, 1024))) !== '') {
           putText($line);
         }
       }
@@ -646,7 +646,7 @@
 
       $ph = @fopen($tmpfile, "r");
       while (! feof($ph)) {
-        if ($line = trim(fgets($ph, 1024))) {
+        if (($line = trim(fgets($ph, 1024))) !== '') {
           putText($line);
         }
       }
@@ -675,7 +675,7 @@
   @exec('df -h | grep "^/dev/[sh]d[a-h][0-9]" | sort -k 1,1 >>'.$tmpfile);
   $ph = @fopen($tmpfile, "r");
   while (! feof($ph)) {
-    if ($line = trim(fgets($ph, 1024))) {
+    if (($line = trim(fgets($ph, 1024))) !== '') {
       putText($line);
     }
   }
@@ -708,7 +708,7 @@
     if ($status == 0) {
       $ph = @fopen($tmpfile, "r");
       while (! feof($ph)) {
-        if ($line = rtrim(fgets($ph, 1024))) {
+        if (($line = rtrim(fgets($ph, 1024))) !== '') {
           putText($line);
         }
       }
@@ -899,7 +899,7 @@
     putHtml('<pre>');
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10) && stripos($line, 'command is deprecated') === FALSE) {
           putText($line);
         }
@@ -922,7 +922,7 @@
     asteriskCMD('sip show registry', $tmpfile);
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10)) {
           putText($line);
         }
@@ -940,7 +940,7 @@
     asteriskCMD('sip show peers', $tmpfile);
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10) &&
             ((getPREFdef($global_prefs, 'status_exclude_extensions') !== 'yes') || !preg_match('/^[1-9]...\/[1-9].../', $line))) {
           putText($line);
@@ -959,7 +959,7 @@
     asteriskCMD('iax2 show registry', $tmpfile);
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10)) {
           putText($line);
         }
@@ -977,7 +977,7 @@
     asteriskCMD('iax2 show peers', $tmpfile);
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10) &&
             ((getPREFdef($global_prefs, 'status_exclude_extensions') !== 'yes') || !preg_match('/^[1-9]...\/[1-9].../', $line))) {
           putText($line);
@@ -999,7 +999,7 @@
     asteriskCMD($cmd, $tmpfile);
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10) && stripos($line, 'command is deprecated') === FALSE) {
           putText($line);
         }
@@ -1024,7 +1024,7 @@
     }
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10)) {
           putText($line);
         }
@@ -1045,7 +1045,7 @@
     asteriskCMD($cmd, $tmpfile);
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         if (strncasecmp($line, 'verbosity ', 10)) {
           putText($line);
         }
@@ -1067,7 +1067,7 @@
       asteriskCMD($cmd, $tmpfile);
       $ph = @fopen($tmpfile, "r");
       while (! feof($ph)) {
-        if ($line = trim(fgets($ph, 1024))) {
+        if (($line = trim(fgets($ph, 1024))) !== '') {
           if (strncasecmp($line, 'verbosity ', 10)) {
             putText($line);
           }
@@ -1114,12 +1114,12 @@
   
     $ph = @fopen($tmpfile, "r");
     if (! feof($ph)) {
-      if ($line = rtrim(fgets($ph, 1024))) {
+      if (($line = rtrim(fgets($ph, 1024))) !== '') {
         putText('Prosody Version: '.$line);
       }
     }
     while (! feof($ph)) {
-      if ($line = rtrim(fgets($ph, 1024))) {
+      if (($line = rtrim(fgets($ph, 1024))) !== '') {
         putText($line);
       }
     }
@@ -1140,7 +1140,7 @@
   
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         putText($line);
       }
     }
@@ -1232,7 +1232,7 @@
   
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         putText($line);
       }
     }
@@ -1295,7 +1295,7 @@
     }
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if (($line = trim(fgets($ph, 1024))) !== '') {
         putText($line);
       }
     }

Modified: branches/1.0/package/webinterface/altweb/common/users-password.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/users-password.php	2015-12-07 01:40:00 UTC (rev 7379)
+++ branches/1.0/package/webinterface/altweb/common/users-password.php	2015-12-07 17:29:04 UTC (rev 7380)
@@ -27,7 +27,7 @@
 
         if (($fp = @fopen($HTPASSWD,"rb")) !== FALSE) {
           while (! feof($fp)) {
-            if ($line = trim(fgets($fp, 1024))) {
+            if (($line = trim(fgets($fp, 1024))) !== '') {
               if (strncmp($line, 'admin:', 6) == 0) {
                 $oldpass['admin'] = $line;
               } elseif (strncmp($line, 'staff:', 6) == 0) {
@@ -117,7 +117,7 @@
     if (($fp = @fopen($HTPASSWD,"rb")) !== FALSE) {
       $len = strlen($user) + 1;
       while (! feof($fp)) {
-        if ($line = trim(fgets($fp, 1024))) {
+        if (($line = trim(fgets($fp, 1024))) !== '') {
           if (strncmp($line, $user.':', $len) != 0) {
             $oldpass['users'][$id] = $line;
             $id++;

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

[Astlinux-commits] SF.net SVN: astlinux:[7379] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-07 01:40:02

Revision: 7379
          http://sourceforge.net/p/astlinux/code/7379
Author:   abelbeck
Date:     2015-12-07 01:40:00 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-07 01:36:17 UTC (rev 7378)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-07 01:40:00 UTC (rev 7379)
@@ -14,6 +14,9 @@
 
 -- Added 64-bit support for x86_64 CPU's with new board types genx86_64 and genx86_64-serial
 
+-- Update build system tools:
+   == fakeroot, version bump to 1.20.2
+
 ** System
 
 -- linux, add kernel patch allowing Geode LX (alix and net5501) to use tsc clocksource instead of pit clocksource

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

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

From: <abe...@us...> - 2015-12-07 01:36:20

Revision: 7378
          http://sourceforge.net/p/astlinux/code/7378
Author:   abelbeck
Date:     2015-12-07 01:36:17 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
host-fakeroot, version bump to 1.20.2

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

Modified: branches/1.0/package/fakeroot/fakeroot.mk
===================================================================
--- branches/1.0/package/fakeroot/fakeroot.mk	2015-12-06 17:20:59 UTC (rev 7377)
+++ branches/1.0/package/fakeroot/fakeroot.mk	2015-12-07 01:36:17 UTC (rev 7378)
@@ -3,12 +3,13 @@
 # fakeroot
 #
 #############################################################
-FAKEROOT_VERSION = 1.18.2
+FAKEROOT_VERSION = 1.20.2
 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
-FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20111201T093630Z/pool/main/f/fakeroot
+FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot
 
-# The package for the target cannot be selected (build problems when
-# largefile is enabled), but is needed for the host package to work
-# due to deficiencies in the package infrastructure.
-$(eval $(call AUTOTARGETS,package,fakeroot))
+# Force capabilities detection off
+# For now these are process capabilities (faked) rather than file
+# so they're of no real use
+HOST_FAKEROOT_CONF_ENV = ac_cv_func_capset=no
+
 $(eval $(call AUTOTARGETS,package,fakeroot,host))

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

[Astlinux-commits] SF.net SVN: astlinux:[7377] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-06 17:21:01

Revision: 7377
          http://sourceforge.net/p/astlinux/code/7377
Author:   abelbeck
Date:     2015-12-06 17:20:59 +0000 (Sun, 06 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-06 17:13:18 UTC (rev 7376)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-06 17:20:59 UTC (rev 7377)
@@ -66,6 +66,8 @@
 
 -- iperf3, new package, iperf3 is becomming more common, sits along side the old iperf since they are not compatible
 
+-- lighttpd, version bump to 1.4.38
+
 -- libcurl (curl) version bump to 7.46.0
 
 -- openldap, version bump to 2.4.43
@@ -80,7 +82,7 @@
 
 -- stunnel, version bump to 5.25
 
--- shellinabox, version bump to 2.18, new supported repository
+-- shellinabox, version bump to 2.19, new supported repository
 
 -- arnofw (AIF), added upstream patch for Issue #21, Leave the IPv6 sysctl accept_ra setting alone when forwarding=1
 

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

[Astlinux-commits] SF.net SVN: astlinux:[7376] branches/1.0/package/shellinabox

From: <abe...@us...> - 2015-12-06 17:13:21

Revision: 7376
          http://sourceforge.net/p/astlinux/code/7376
Author:   abelbeck
Date:     2015-12-06 17:13:18 +0000 (Sun, 06 Dec 2015)
Log Message:
-----------
shellinabox, version bump to 2.19

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

Removed Paths:
-------------
    branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch
    branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch

Deleted: branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch	2015-12-06 16:36:59 UTC (rev 7375)
+++ branches/1.0/package/shellinabox/shellinabox-0000-fixed-reverse-video-rendering.patch	2015-12-06 17:13:18 UTC (rev 7376)
@@ -1,208 +0,0 @@
-From cde2e923786486d30c41246f7adc554855fb7e62 Mon Sep 17 00:00:00 2001
-From: KLuka <luk...@gm...>
-Date: Thu, 3 Sep 2015 19:01:17 +0200
-Subject: [PATCH] Issue #341: Fixed reverse video rendering
-
-* Added new CSS class for handling reverse video with default terminal
-  colors. For colors given with value 0-255 background and foreground
-  values are just switched.
-* New CSS classes were also added to Black On White and White On Black
-  color themes.
----
- shellinabox/black-on-white.css | 16 +++++++++++
- shellinabox/color.css          |  2 ++
- shellinabox/styles.css         |  7 +++++
- shellinabox/vt100.jspp         | 62 +++++++++++++++++++++++-------------------
- shellinabox/white-on-black.css | 16 +++++++++++
- 5 files changed, 75 insertions(+), 28 deletions(-)
-
-diff --git a/shellinabox/black-on-white.css b/shellinabox/black-on-white.css
-index e69de29..8f08acf 100644
---- a/shellinabox/black-on-white.css
-+++ b/shellinabox/black-on-white.css
-@@ -0,0 +1,16 @@
-+#vt100 .ansiDefR {
-+  color:            #ffffff;
-+}
-+
-+#vt100 .bgAnsiDefR {
-+  background-color: #000000;
-+}
-+
-+#vt100 #scrollable.inverted .ansiDefR {
-+  color:            #000000;
-+}
-+
-+#vt100 #scrollable.inverted .bgAnsiDefR {
-+  background-color: #ffffff;
-+}
-+
-diff --git a/shellinabox/color.css b/shellinabox/color.css
-index 06e565b..3c042ee 100644
---- a/shellinabox/color.css
-+++ b/shellinabox/color.css
-@@ -2,6 +2,7 @@
- 
- /* SYSTEM colors */
- #vt100 .ansiDef   {                            }
-+#vt100 .ansiDefR  {                            }
- 
- #vt100 .ansi0     { color:            #000000; }
- #vt100 .ansi1     { color:            #cd0000; }
-@@ -264,6 +265,7 @@
- 
- /* SYSTEM colors */
- #vt100 .bgAnsiDef {                            }
-+#vt100 .bgAnsiDefR {                            }
- 
- #vt100 .bgAnsi0   { background-color: #000000; }
- #vt100 .bgAnsi1   { background-color: #cd0000; }
-diff --git a/shellinabox/styles.css b/shellinabox/styles.css
-index d025c94..8978eaa 100755
---- a/shellinabox/styles.css
-+++ b/shellinabox/styles.css
-@@ -243,9 +243,12 @@
- [else DEFINES_COLORS]
- /* SYSTEM colors */
- #vt100 .ansiDef   { color:            #000000; }
-+#vt100 .ansiDefR  { color:            #ffffff; }
- 
- #vt100 #scrollable.inverted .ansiDef
-                   { color:            #ffffff; }
-+#vt100 #scrollable.inverted .ansiDefR
-+                  { color:            #000000; }
- 
- #vt100 .ansi0     { color:            #000000; }
- #vt100 .ansi1     { color:            #cd0000; }
-@@ -508,9 +511,13 @@
- 
- /* SYSTEM colors */
- #vt100 .bgAnsiDef { background-color: #ffffff; }
-+#vt100 .bgAnsiDefR
-+                  { background-color: #000000; }
- 
- #vt100 #scrollable.inverted .bgAnsiDef
-                   { background-color: #000000; }
-+#vt100 #scrollable.inverted .bgAnsiDefR
-+                  { background-color: #ffffff; }
- 
- #vt100 .bgAnsi0   { background-color: #000000; }
- #vt100 .bgAnsi1   { background-color: #cd0000; }
-diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp
-index e06efca..d44c631 100755
---- a/shellinabox/vt100.jspp
-+++ b/shellinabox/vt100.jspp
-@@ -3351,44 +3351,50 @@ VT100.prototype.respondSecondaryDA = function() {
- 
- 
- VT100.prototype.updateStyle = function() {
--  this.style   = '';
-+  var fg          = '';
-+  var bg          = '';
-+  this.style      = '';
-+
-   if (this.attr & ATTR_UNDERLINE) {
--    this.style = 'text-decoration: underline;';
--  }
--  var bg       = (this.attr >> 4) & 0xF;
--  var fg       =  this.attr       & 0xF;
--  if (this.attr & ATTR_REVERSE) {
--    var tmp    = bg;
--    bg         = fg;
--    fg         = tmp;
--  }
--  if ((this.attr & (ATTR_REVERSE | ATTR_DIM)) == ATTR_DIM) {
--    fg         = 8; // Dark grey
--  } else if (this.attr & ATTR_BRIGHT) {
--    fg        |= 8;
--    this.style = 'font-weight: bold;';
-+    this.style   += 'text-decoration: underline;';
-   }
-   if (this.attr & ATTR_BLINK) {
--    this.style = 'text-decoration: blink;';
--  }
--
--  // Default colors
--  if (this.attr & ATTR_DEF_FG) {
--    fg         = 'Def';
--  }
--  if (this.attr & ATTR_DEF_BG) {
--    bg         = 'Def';
-+    this.style   += 'text-decoration: blink;';
-   }
- 
--  // Extended color mode support (256 colors).
-+  // Forground color
-   if (this.attrFg) {
--    fg         = this.attrFg;
-+    // 256 color mode
-+    fg            = this.attrFg
-+  } else if (this.attr & ATTR_DEF_FG) {
-+    fg            = 'Def';
-+  } else {
-+    fg            = this.attr & 0xF;
-+    if (this.attr & ATTR_BRIGHT) {
-+      fg         |= 8;
-+      this.style += 'font-weight: bold;';
-+    }
-   }
-+
-+  // Background color
-   if (this.attrBg) {
--    bg         = this.attrBg;
-+    // 256 color mode
-+    bg            = this.attrBg
-+  } else if (this.attr & ATTR_DEF_BG) {
-+    bg            = 'Def';
-+  } else {
-+    bg            = (this.attr >> 4) & 0xF;
-+  }
-+
-+  // Reverse colors
-+  if (this.attr & ATTR_REVERSE) {
-+    var tmpFg     = fg;
-+    var tmpBg     = bg;
-+    fg            = (tmpBg == 'Def') ? 'DefR' : tmpBg;
-+    bg            = (tmpFg == 'Def') ? 'DefR' : tmpFg;
-   }
- 
--  this.color   = 'ansi' + fg + ' bgAnsi' + bg;
-+  this.color      = 'ansi' + fg + ' bgAnsi' + bg;
- };
- 
- VT100.prototype.setAttrColors = function(attr) {
-diff --git a/shellinabox/white-on-black.css b/shellinabox/white-on-black.css
-index 2482f1d..92cdef8 100755
---- a/shellinabox/white-on-black.css
-+++ b/shellinabox/white-on-black.css
-@@ -24,14 +24,30 @@
-   color:            #ffffff;
- }
- 
-+#vt100 .ansiDefR {
-+  color:            #000000;
-+}
-+
- #vt100 .bgAnsiDef {
-   background-color: #000000;
- }
- 
-+#vt100 .bgAnsiDefR {
-+  background-color: #ffffff;
-+}
-+
- #vt100 #scrollable.inverted .ansiDef {
-   color:            #000000;
- }
- 
-+#vt100 #scrollable.inverted .ansiDefR {
-+  color:            #ffffff;
-+}
-+
- #vt100 #scrollable.inverted .bgAnsiDef {
-   background-color: #ffffff;
- }
-+
-+#vt100 #scrollable.inverted .bgAnsiDefR {
-+  background-color: #000000;
-+}

Deleted: branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch	2015-12-06 16:36:59 UTC (rev 7375)
+++ branches/1.0/package/shellinabox/shellinabox-0011-ios-vt100.patch	2015-12-06 17:13:18 UTC (rev 7376)
@@ -1,21 +0,0 @@
---- shellinabox-2.18/shellinabox/vt100.jspp.orig	2015-11-14 19:14:16.000000000 -0600
-+++ shellinabox-2.18/shellinabox/vt100.jspp	2015-11-14 19:20:34.000000000 -0600
-@@ -301,6 +301,9 @@
-     this.signature          = Math.floor(16807*this.signature + 1) %
-                                          ((1 << 31) - 1);
-   }
-+  if (navigator.userAgent.match(/iPad|iPhone|iPod/i) != null) {
-+    this.softKeyboard = true;
-+  }
-   if (typeof userCSSList != 'undefined') {
-     for (var i = 0; i < userCSSList.length; ++i) {
-       var label             = userCSSList[i][0];
-@@ -1199,7 +1199,7 @@
-                                      document.body.clientHeight))-1;
- 
-   // Prevent ever growing consoles on iPad.
--  if (navigator.userAgent.match(/iPad/i) != null) {
-+  if (navigator.userAgent.match(/iPad|iPhone|iPod/i) != null) {
-     height                    -= 1;
-   }
- 

Modified: branches/1.0/package/shellinabox/shellinabox.mk
===================================================================
--- branches/1.0/package/shellinabox/shellinabox.mk	2015-12-06 16:36:59 UTC (rev 7375)
+++ branches/1.0/package/shellinabox/shellinabox.mk	2015-12-06 17:13:18 UTC (rev 7376)
@@ -3,7 +3,7 @@
 # shellinabox
 #
 #############################################################
-SHELLINABOX_VERSION = 2.18
+SHELLINABOX_VERSION = 2.19
 SHELLINABOX_SOURCE = shellinabox-$(SHELLINABOX_VERSION).tar.gz
 #SHELLINABOX_SITE = https://github.com/shellinabox/shellinabox
 SHELLINABOX_SITE = http://files.astlinux.org

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

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

From: <abe...@us...> - 2015-12-06 16:37:02

Revision: 7375
          http://sourceforge.net/p/astlinux/code/7375
Author:   abelbeck
Date:     2015-12-06 16:36:59 +0000 (Sun, 06 Dec 2015)
Log Message:
-----------
lighttpd, version bump to 1.4.38

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

Modified: branches/1.0/package/lighttpd/lighttpd.mk
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.mk	2015-12-06 16:18:49 UTC (rev 7374)
+++ branches/1.0/package/lighttpd/lighttpd.mk	2015-12-06 16:36:59 UTC (rev 7375)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIGHTTPD_VERSION = 1.4.37
+LIGHTTPD_VERSION = 1.4.38
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_DEPENDENCIES = host-pkg-config
 LIGHTTPD_CONF_OPT = \

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

[Astlinux-commits] SF.net SVN: astlinux:[7374] branches/1.0/project/astlinux/target_skeleton/ sbin/kernel-reboot

From: <abe...@us...> - 2015-12-06 16:18:52

Revision: 7374
          http://sourceforge.net/p/astlinux/code/7374
Author:   abelbeck
Date:     2015-12-06 16:18:49 +0000 (Sun, 06 Dec 2015)
Log Message:
-----------
kernel-reboot, add some output text per Michael's suggestions

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-05 14:21:21 UTC (rev 7373)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-06 16:18:49 UTC (rev 7374)
@@ -22,7 +22,8 @@
 
 do_failure()
 {
-  reboot -f
+  echo '## Falling back to /sbin/reboot ##'
+  /sbin/reboot -f
   exit 1
 }
 
@@ -31,6 +32,8 @@
   # Stop services and unmount all file systems or remount 'ro' if busy
   /etc/rc shutdown
 
+  echo '## Using /sbin/kernel-reboot ##'
+
   # Stop udevd since /dev is now 'ro'
   echo "Stopping udevd..."
   udevadm control --timeout=121 --exit
@@ -58,7 +61,7 @@
       mount -t vfat -o ro "$LABEL" $BASE
     fi
     if ! mount | grep -q "$BASE"; then
-      echo "Unable to find Runnix partition."
+      echo "Unable to find RUNNIX partition."
       do_failure
     fi
   fi
@@ -166,14 +169,14 @@
 cd /root
 
 if [ ! -x /sbin/kexec ]; then
-  echo "kernel-reboot: You don't have kexec-tools installed - rebooting" >&2
-  reboot
+  echo "kernel-reboot: You don't have kexec-tools installed, falling back to /sbin/reboot" >&2
+  /sbin/reboot
   exit 1
 fi
 
 if [ ! -x /sbin/findfs ]; then
-  echo "kernel-reboot: You don't have findfs installed - rebooting" >&2
-  reboot
+  echo "kernel-reboot: You don't have findfs installed, falling back to /sbin/reboot" >&2
+  /sbin/reboot
   exit 1
 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:[7373] branches/1.0/project/astlinux/target_skeleton/ sbin/kernel-reboot

From: <abe...@us...> - 2015-12-05 14:21:23

Revision: 7373
          http://sourceforge.net/p/astlinux/code/7373
Author:   abelbeck
Date:     2015-12-05 14:21:21 +0000 (Sat, 05 Dec 2015)
Log Message:
-----------
kernel-reboot, add a 'sync' and allow only root users

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-05 02:54:14 UTC (rev 7372)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-05 14:21:21 UTC (rev 7373)
@@ -166,13 +166,13 @@
 cd /root
 
 if [ ! -x /sbin/kexec ]; then
-  echo "You don't have kexec-tools installed - rebooting"
+  echo "kernel-reboot: You don't have kexec-tools installed - rebooting" >&2
   reboot
   exit 1
 fi
 
 if [ ! -x /sbin/findfs ]; then
-  echo "You don't have findfs installed - rebooting"
+  echo "kernel-reboot: You don't have findfs installed - rebooting" >&2
   reboot
   exit 1
 fi
@@ -187,10 +187,17 @@
   esac
 fi
 
+if [ $(id -u) -ne 0 ]; then
+  echo "kernel-reboot: Operation not permitted, must be root" >&2
+  exit 1
+fi
+
 if [ -n "$DELAY" ] && [ $DELAY -gt 0 ]; then
   sleep $DELAY
 fi
 
+sync
+
 # Ignore terminating signals from here on
 trap '' HUP INT TERM
 

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

[Astlinux-commits] SF.net SVN: astlinux:[7372] branches/1.0/project/astlinux/target_skeleton/ sbin/kernel-reboot

From: <abe...@us...> - 2015-12-05 02:54:16

Revision: 7372
          http://sourceforge.net/p/astlinux/code/7372
Author:   abelbeck
Date:     2015-12-05 02:54:14 +0000 (Sat, 05 Dec 2015)
Log Message:
-----------
kernel-reboot, set a working dir for when called via PHP, otherwise shell-init errors are displayed on video consoles, only cosmetic

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-05 01:17:16 UTC (rev 7371)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-05 02:54:14 UTC (rev 7372)
@@ -162,6 +162,9 @@
   do_failure
 }
 
+# Set a working dir for when called via PHP
+cd /root
+
 if [ ! -x /sbin/kexec ]; then
   echo "You don't have kexec-tools installed - rebooting"
   reboot

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

[Astlinux-commits] SF.net SVN: astlinux:[7371] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-05 01:17:18

Revision: 7371
          http://sourceforge.net/p/astlinux/code/7371
Author:   abelbeck
Date:     2015-12-05 01:17:16 +0000 (Sat, 05 Dec 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-12-05 01:05:26 UTC (rev 7370)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-05 01:17:16 UTC (rev 7371)
@@ -45,12 +45,17 @@
 
 -- kexec-tools, version bump to 2.0.11
 
+-- kernel-reboot, new command performs a reboot via kexec just as RUNNIX does, all changes to the run images and versions are honored.
+   Reboots are 30-40 seconds faster using kernel-reboot. The kernel-reboot command replaces the sreboot script that has been removed.
+
 -- nano, version bump to 2.4.3
 
 -- strace, version bump to 4.10
 
 ** Networking
 
+-- OpenSSL, version bump to 1.0.1q, security fixes: CVE-2015-3194, CVE-2015-3195
+
 -- ntpd/sntp, version bump to 4.2.8p4, security fixes: CVE-2015-7871 plus 12 other low/medium-severity vulnerabilities
 
 -- wide-dhcpv6, new package, added support for DHCPv6 using dhcp6c for External and WAN Failover interfaces.
@@ -108,7 +113,10 @@
 
 -- Status tab, add system architecture string to 'AstLinux Release:'
 
+-- Network and System tabs, now use "/sbin/kernel-reboot" if available for a faster reboot.
+   Use classic reboot method by checking Prefs tab option 'Disable faster "kernel-reboot" System Reboot'.
 
+
 Additions for AstLinux 1.2.4.1:
 ===============================
 

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

1 message has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 40 41 42 43 44 .. 329 > >> (Page 42 of 329)