astlinux-commits Mailing List for AstLinux (Page 43)

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 .. 41 42 43 44 45 .. 329 > >> (Page 43 of 329)

[Astlinux-commits] SF.net SVN: astlinux:[7370] branches/1.0/package/openssl

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

Revision: 7370
          http://sourceforge.net/p/astlinux/code/7370
Author:   abelbeck
Date:     2015-12-05 01:05:26 +0000 (Sat, 05 Dec 2015)
Log Message:
-----------
openssl, version bump to 1.0.1q, security fixes: CVE-2015-3194, CVE-2015-3195
Enable IDEA since otherwise the build breaks - it's no longer patent encumbered.

Modified Paths:
--------------
    branches/1.0/package/openssl/openssl-do-not-build-docs.patch
    branches/1.0/package/openssl/openssl.mk

Modified: branches/1.0/package/openssl/openssl-do-not-build-docs.patch
===================================================================
--- branches/1.0/package/openssl/openssl-do-not-build-docs.patch	2015-12-04 22:56:04 UTC (rev 7369)
+++ branches/1.0/package/openssl/openssl-do-not-build-docs.patch	2015-12-05 01:05:26 UTC (rev 7370)
@@ -1,6 +1,6 @@
 --- openssl-1.0.1h/Makefile.org.orig	2014-06-05 11:36:09.000000000 -0500
 +++ openssl-1.0.1h/Makefile.org	2014-06-05 11:36:17.000000000 -0500
-@@ -529,7 +529,7 @@
+@@ -532,7 +532,7 @@
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  

Modified: branches/1.0/package/openssl/openssl.mk
===================================================================
--- branches/1.0/package/openssl/openssl.mk	2015-12-04 22:56:04 UTC (rev 7369)
+++ branches/1.0/package/openssl/openssl.mk	2015-12-05 01:05:26 UTC (rev 7370)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.1p
+OPENSSL_VERSION = 1.0.1q
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib
@@ -61,7 +61,6 @@
 			--libdir=/lib \
 			$(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \
 			$(if $(BR2_PREFER_STATIC_LIB),no-shared,shared) \
-			no-idea \
 			no-rc5 \
 			enable-camellia \
 			enable-mdc2 \

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

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

From: <abe...@us...> - 2015-12-04 22:56:06

Revision: 7369
          http://sourceforge.net/p/astlinux/code/7369
Author:   abelbeck
Date:     2015-12-04 22:56:04 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
web interface, Add Prefs tab option 'Disable faster "kernel-reboot" System Reboot'

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

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-12-04 21:56:02 UTC (rev 7368)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-12-04 22:56:04 UTC (rev 7369)
@@ -344,6 +344,10 @@
       $value = 'system_backup_temp_disk = yes';
       fwrite($fp, $value."\n");
     }
+    if (isset($_POST['reboot_classic_full'])) {
+      $value = 'system_reboot_classic_full = yes';
+      fwrite($fp, $value."\n");
+    }
     $value = 'system_reboot_timer_adjust = "'.$_POST['reboot_timer'].'"';
     fwrite($fp, $value."\n");
     $value = 'system_asterisk_reload_cmdstr = "'.tuqp($_POST['asterisk_reload']).'"';
@@ -1019,6 +1023,9 @@
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'system_backup_temp_disk') === 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="backup_temp" name="backup_temp"'.$sel.' /></td><td colspan="5">Backup temporary file uses /mnt/kd/ instead of /tmp/</td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;">');
+  $sel = (getPREFdef($global_prefs, 'system_reboot_classic_full') === 'yes') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="reboot_classic_full" name="reboot_classic_full"'.$sel.' /></td><td colspan="5">Disable faster "kernel-reboot" System Reboot</td></tr>');
 
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">System Reboot Timer:</td><td colspan="3">');
   if (($value = getPREFdef($global_prefs, 'system_reboot_timer_adjust')) === '') {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-04 21:56:02 UTC (rev 7368)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-04 22:56:04 UTC (rev 7369)
@@ -180,7 +180,7 @@
   }
 
   $cmd = '/sbin/kernel-reboot';
-  if (! is_executable($cmd)) {
+  if (! is_executable($cmd) || (getPREFdef($global_prefs, 'system_reboot_classic_full') === 'yes')) {
     $cmd = '/sbin/reboot';
     $count_down_secs += 30;                                     
   }

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

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

From: <abe...@us...> - 2015-12-04 21:56:05

Revision: 7368
          http://sourceforge.net/p/astlinux/code/7368
Author:   abelbeck
Date:     2015-12-04 21:56:02 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
kernel-reboot, ignore terminating signals and add automatic support to the web interface

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/common/functions.php
    branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-04 17:25:25 UTC (rev 7367)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-04 21:56:02 UTC (rev 7368)
@@ -168,7 +168,7 @@
 function systemREBOOT($myself, $result, $setup = FALSE) {
   global $global_prefs;
   
-  $count_down_secs = 150;                                     
+  $count_down_secs = 120;                                     
   
   if (($adjust = getPREFdef($global_prefs, 'system_reboot_timer_adjust')) !== '') {
     $count_down_secs += (int)$adjust;                                     
@@ -178,8 +178,14 @@
   if ($arch === 'net4801' || $arch === 'wrap') {
     $count_down_secs += 20;                                     
   }
+
+  $cmd = '/sbin/kernel-reboot';
+  if (! is_executable($cmd)) {
+    $cmd = '/sbin/reboot';
+    $count_down_secs += 30;                                     
+  }
   
-  shell('/sbin/reboot -d4 >/dev/null 2>/dev/null &', $status);
+  shell($cmd.' -d4 >/dev/null 2>/dev/null &', $status);
   if ($status == 0) {                                           
     if ($setup) {
       $count_down_secs += 50;                                     

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-04 17:25:25 UTC (rev 7367)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-04 21:56:02 UTC (rev 7368)
@@ -188,4 +188,7 @@
   sleep $DELAY
 fi
 
+# Ignore terminating signals from here on
+trap '' HUP INT TERM
+
 do_reboot >/dev/console 2>&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:[7367] branches/1.0/project/astlinux/target_skeleton/ sbin

From: <abe...@us...> - 2015-12-04 17:25:27

Revision: 7367
          http://sourceforge.net/p/astlinux/code/7367
Author:   abelbeck
Date:     2015-12-04 17:25:25 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
kernel-reboot, new script renamed from sreboot, add '-d sec' delay option and remount /proc if unmounted during the shutdown

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

Removed Paths:
-------------
    branches/1.0/project/astlinux/target_skeleton/sbin/sreboot

Copied: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot (from rev 7366, branches/1.0/project/astlinux/target_skeleton/sbin/sreboot)
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-04 17:25:25 UTC (rev 7367)
@@ -0,0 +1,191 @@
+#!/bin/sh
+
+## kexec based quick reboot for AstLinux
+## Replicate the basic functionality of the RUNNIX script
+##
+## If anything fails, do a normal reboot
+
+ARGS="$1$2"
+
+usage()
+{
+  echo '
+Usage: kernel-reboot [-d DELAY]
+
+Reboot the system using kexec as RUNNIX does
+
+Options:
+    -d SEC    Delay interval
+'
+  exit 1
+}
+
+do_failure()
+{
+  reboot -f
+  exit 1
+}
+
+do_reboot()
+{
+  # Stop services and unmount all file systems or remount 'ro' if busy
+  /etc/rc shutdown
+
+  # 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
+    LABEL="$(/sbin/findfs LABEL=RUNNIX)"
+    if [ -n "$LABEL" ]; then
+      mount -t vfat -o ro "$LABEL" $BASE
+    fi
+    if ! mount | grep -q "$BASE"; then
+      echo "Unable to find Runnix partition."
+      do_failure
+    fi
+  fi
+
+  if [ -f $BASE/os/default.conf ]; then
+    . $BASE/os/default.conf
+  fi
+
+  # Get the latest good one
+  cd $BASE/os
+  RUNIMG="$(ls *.run | tail -n1)"
+
+  # If we have a ver file, override auto/default.conf value
+  if [ -f $BASE/os/ver ]; then
+    RUNIMG="$(cat $BASE/os/ver).run"
+  fi
+
+  if [ "$VERIFY_LOCAL" = "yes" ]; then
+    echo "Verifying $RUNIMG..."
+
+    if sha1sum -cs $RUNIMG.sha1; then
+      echo "$RUNIMG verified"
+      IMGVER=1
+    else
+      echo "$RUNIMG not verified"
+    fi
+  else
+    echo "Skip Verifying $RUNIMG"
+  fi
+
+  if [ -f $BASE/os/$RUNIMG.conf ]; then
+    . $BASE/os/$RUNIMG.conf
+  fi
+
+  # Fixup RUNNIX -> Astlinux paths
+  INITRD="${BASE}${INITRD#/mnt/base}"
+  KERN="${ROOT}${KERN#/mnt/root}"
+
+  if [ -z "$OFFSET" ]; then
+    losetup /dev/loop0 $BASE/os/$RUNIMG
+  else
+    losetup -o "$OFFSET" /dev/loop0 $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
+    echo "Error mounting $RUNIMG root fs"
+    do_failure
+  fi
+
+  if [ -n "$INITRD" ]; then
+    if [ -f "$INITRD" ]; then
+      echo "Custom initrd $INITRD found"
+    else
+      INITRD="$BASE/os/initrd.img"
+      echo "Custom initrd not found - using $INITRD"
+    fi
+  else
+    echo "Using default initrd"
+    INITRD="$BASE/os/initrd.img"
+  fi
+
+  if [ -n "$KERN" ]; then
+    if [ -f "$KERN" ]; then
+      echo "Custom kernel $KERN found"
+    else
+      KERN="$ROOT/boot/bzImage"
+      echo "Custom kernel not found - using $KERN"
+    fi
+  else
+    echo "Using default kernel"
+    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..."
+    umount $ROOT
+  else
+    echo "I couldn't find your kernel and/or initrd"
+    do_failure
+  fi
+
+  if [ -z "$KCMD" ]; then
+    echo "You need to specify a kernel command line.
+  I can't guess that"
+    do_failure
+  fi
+
+  echo "Trying kexec..."
+  /sbin/kexec --command-line="$KCMD" --initrd="$KEXEC_BASE/initrd.img" -f "$KEXEC_BASE/bzImage"
+
+  do_failure
+}
+
+if [ ! -x /sbin/kexec ]; then
+  echo "You don't have kexec-tools installed - rebooting"
+  reboot
+  exit 1
+fi
+
+if [ ! -x /sbin/findfs ]; then
+  echo "You don't have findfs installed - rebooting"
+  reboot
+  exit 1
+fi
+
+DELAY=0
+
+if [ -n "$ARGS" ]; then
+  case "$ARGS" in
+    -d*) DELAY="${ARGS#-d}"
+         DELAY="$(echo "$DELAY" | tr -c -d '0-9')" ;;
+      *) usage ;;
+  esac
+fi
+
+if [ -n "$DELAY" ] && [ $DELAY -gt 0 ]; then
+  sleep $DELAY
+fi
+
+do_reboot >/dev/console 2>&1 &

Deleted: branches/1.0/project/astlinux/target_skeleton/sbin/sreboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/sreboot	2015-12-04 04:25:35 UTC (rev 7366)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/sreboot	2015-12-04 17:25:25 UTC (rev 7367)
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-## kexec based quick reboot for AstLinux
-## Replicate the basic functionality of the RUNNIX script
-##
-## If anything fails, do a normal reboot
-
-do_failure()
-{
-  reboot -f
-  exit 1
-}
-
-do_reboot()
-{
-  # Stop services and unmount all file systems or remount 'ro' if busy
-  /etc/rc shutdown
-  
-  # 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"
-  
-  mount -t tmpfs none /tmp
-  
-  mkdir -p "$ROOT"
-  mkdir -p "$KEXEC_BASE"
-  
-  BASE="/oldroot/cdrom"
-  
-  if ! mount | grep -q "$BASE"; then
-    LABEL="$(/sbin/findfs LABEL=RUNNIX)"
-    if [ -n "$LABEL" ]; then
-      mount -t vfat -o ro "$LABEL" $BASE
-    fi
-    if ! mount | grep -q "$BASE"; then
-      echo "Unable to find Runnix partition."
-      do_failure
-    fi
-  fi
-  
-  if [ -f $BASE/os/default.conf ]; then
-    . $BASE/os/default.conf
-  fi
-  
-  # Get the latest good one
-  cd $BASE/os
-  RUNIMG="$(ls *.run | tail -n1)"
-  
-  # If we have a ver file, override auto/default.conf value
-  if [ -f $BASE/os/ver ]; then
-    RUNIMG="$(cat $BASE/os/ver).run"
-  fi
-  
-  if [ "$VERIFY_LOCAL" = "yes" ]; then
-    echo "Verifying $RUNIMG..."
-  
-    if sha1sum -cs $RUNIMG.sha1; then
-      echo "$RUNIMG verified"
-      IMGVER=1
-    else
-      echo "$RUNIMG not verified"
-    fi
-  else
-    echo "Skip Verifying $RUNIMG"
-  fi
-  
-  if [ -f $BASE/os/$RUNIMG.conf ]; then
-    . $BASE/os/$RUNIMG.conf
-  fi
-  
-  # Fixup RUNNIX -> Astlinux paths
-  INITRD="${BASE}${INITRD#/mnt/base}"
-  KERN="${ROOT}${KERN#/mnt/root}"
-  
-  if [ -z "$OFFSET" ]; then
-    losetup /dev/loop0 $BASE/os/$RUNIMG
-  else
-    losetup -o "$OFFSET" /dev/loop0 $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
-    echo "Error mounting $RUNIMG root fs"
-    do_failure
-  fi
-  
-  if [ -n "$INITRD" ]; then
-    if [ -f "$INITRD" ]; then
-      echo "Custom initrd $INITRD found"
-    else
-      INITRD="$BASE/os/initrd.img"
-      echo "Custom initrd not found - using $INITRD"
-    fi
-  else
-    echo "Using default initrd"
-    INITRD="$BASE/os/initrd.img"
-  fi
-  
-  if [ -n "$KERN" ]; then
-    if [ -f "$KERN" ]; then
-      echo "Custom kernel $KERN found"
-    else
-      KERN="$ROOT/boot/bzImage"
-      echo "Custom kernel not found - using $KERN"
-    fi
-  else
-    echo "Using default kernel"
-    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..."
-    umount $ROOT
-  else
-    echo "I couldn't find your kernel and/or initrd"
-    do_failure
-  fi
-  
-  if [ -z "$KCMD" ]; then
-    echo "You need to specify a kernel command line.
-  I can't guess that"
-    do_failure
-  fi
-  
-  echo "Trying kexec..."
-  /sbin/kexec --command-line="$KCMD" --initrd="$KEXEC_BASE/initrd.img" -f "$KEXEC_BASE/bzImage"
-  
-  do_failure
-}
-
-if [ ! -x /sbin/kexec ]; then
-  echo "You don't have kexec-tools installed - rebooting"
-  reboot
-  exit 1
-fi
-
-if [ ! -x /sbin/findfs ]; then
-  echo "You don't have findfs installed - rebooting"
-  reboot
-  exit 1
-fi
-
-do_reboot >/dev/console 2>&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:[7366] branches/1.0/project/astlinux/target_skeleton

From: <abe...@us...> - 2015-12-04 04:25:37

Revision: 7366
          http://sourceforge.net/p/astlinux/code/7366
Author:   abelbeck
Date:     2015-12-04 04:25:35 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
Rewrite the 'sreboot' script to perform a reboot via kexec just as RUNNIX does, changes to images are honored.  The goal would be to allow the web interface use 'sreboot' instead of 'reboot' and save about 40 seconds on each reboot.

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/rc
    branches/1.0/project/astlinux/target_skeleton/sbin/sreboot

Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/rc	2015-12-03 13:44:45 UTC (rev 7365)
+++ branches/1.0/project/astlinux/target_skeleton/etc/rc	2015-12-04 04:25:35 UTC (rev 7366)
@@ -394,7 +394,6 @@
 }
 
 shutdown() {
-  # args: sreboot_flag
 
   CMDLINE="`cat /proc/cmdline`"
 
@@ -420,11 +419,7 @@
     hwclock -wu 2>/dev/null
   fi
 
-  if [ "$1" = "sreboot" ]; then
-    echo "shutdown sreboot..."
-  else
-    umount -a -r 2>/dev/null
-  fi
+  umount -a -r 2>/dev/null
 
 }
 
@@ -436,7 +431,7 @@
   ;;
 
 shutdown)
-  shutdown "$2"
+  shutdown
   ;;
 
 esac

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/sreboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/sreboot	2015-12-03 13:44:45 UTC (rev 7365)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/sreboot	2015-12-04 04:25:35 UTC (rev 7366)
@@ -1,27 +1,157 @@
 #!/bin/sh
-# kexec based quick reboot for AstLinux
 
-KERN="/boot/bzImage"
-INITRD="/oldroot/cdrom/os/initrd.img"
+## kexec based quick reboot for AstLinux
+## Replicate the basic functionality of the RUNNIX script
+##
+## If anything fails, do a normal reboot
 
-if [ ! -f "$INITRD" -o ! -f "$KERN" ]; then
-  echo "You don't have your drives mounted - exiting"
+do_failure()
+{
+  reboot -f
   exit 1
-fi
+}
 
+do_reboot()
+{
+  # Stop services and unmount all file systems or remount 'ro' if busy
+  /etc/rc shutdown
+  
+  # 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"
+  
+  mount -t tmpfs none /tmp
+  
+  mkdir -p "$ROOT"
+  mkdir -p "$KEXEC_BASE"
+  
+  BASE="/oldroot/cdrom"
+  
+  if ! mount | grep -q "$BASE"; then
+    LABEL="$(/sbin/findfs LABEL=RUNNIX)"
+    if [ -n "$LABEL" ]; then
+      mount -t vfat -o ro "$LABEL" $BASE
+    fi
+    if ! mount | grep -q "$BASE"; then
+      echo "Unable to find Runnix partition."
+      do_failure
+    fi
+  fi
+  
+  if [ -f $BASE/os/default.conf ]; then
+    . $BASE/os/default.conf
+  fi
+  
+  # Get the latest good one
+  cd $BASE/os
+  RUNIMG="$(ls *.run | tail -n1)"
+  
+  # If we have a ver file, override auto/default.conf value
+  if [ -f $BASE/os/ver ]; then
+    RUNIMG="$(cat $BASE/os/ver).run"
+  fi
+  
+  if [ "$VERIFY_LOCAL" = "yes" ]; then
+    echo "Verifying $RUNIMG..."
+  
+    if sha1sum -cs $RUNIMG.sha1; then
+      echo "$RUNIMG verified"
+      IMGVER=1
+    else
+      echo "$RUNIMG not verified"
+    fi
+  else
+    echo "Skip Verifying $RUNIMG"
+  fi
+  
+  if [ -f $BASE/os/$RUNIMG.conf ]; then
+    . $BASE/os/$RUNIMG.conf
+  fi
+  
+  # Fixup RUNNIX -> Astlinux paths
+  INITRD="${BASE}${INITRD#/mnt/base}"
+  KERN="${ROOT}${KERN#/mnt/root}"
+  
+  if [ -z "$OFFSET" ]; then
+    losetup /dev/loop0 $BASE/os/$RUNIMG
+  else
+    losetup -o "$OFFSET" /dev/loop0 $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
+    echo "Error mounting $RUNIMG root fs"
+    do_failure
+  fi
+  
+  if [ -n "$INITRD" ]; then
+    if [ -f "$INITRD" ]; then
+      echo "Custom initrd $INITRD found"
+    else
+      INITRD="$BASE/os/initrd.img"
+      echo "Custom initrd not found - using $INITRD"
+    fi
+  else
+    echo "Using default initrd"
+    INITRD="$BASE/os/initrd.img"
+  fi
+  
+  if [ -n "$KERN" ]; then
+    if [ -f "$KERN" ]; then
+      echo "Custom kernel $KERN found"
+    else
+      KERN="$ROOT/boot/bzImage"
+      echo "Custom kernel not found - using $KERN"
+    fi
+  else
+    echo "Using default kernel"
+    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..."
+    umount $ROOT
+  else
+    echo "I couldn't find your kernel and/or initrd"
+    do_failure
+  fi
+  
+  if [ -z "$KCMD" ]; then
+    echo "You need to specify a kernel command line.
+  I can't guess that"
+    do_failure
+  fi
+  
+  echo "Trying kexec..."
+  /sbin/kexec --command-line="$KCMD" --initrd="$KEXEC_BASE/initrd.img" -f "$KEXEC_BASE/bzImage"
+  
+  do_failure
+}
+
 if [ ! -x /sbin/kexec ]; then
-  echo "You don't have kexec-tools installed - exiting"
+  echo "You don't have kexec-tools installed - rebooting"
+  reboot
   exit 1
 fi
 
-echo "Calling AstLinux Shutdown..."
-/etc/rc shutdown sreboot
+if [ ! -x /sbin/findfs ]; then
+  echo "You don't have findfs installed - rebooting"
+  reboot
+  exit 1
+fi
 
-echo "Loading kernel..."
-/sbin/kexec -l --command-line="`cat /proc/cmdline`" --initrd="$INITRD" "$KERN"
-
-sync
-umount -a -r 2>/dev/null
-
-echo "Rebooting system..."
-/sbin/kexec -e
+do_reboot >/dev/console 2>&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:[7365] branches/1.0/docs/ChangeLog.txt

From: <abe...@us...> - 2015-12-03 13:44:47

Revision: 7365
          http://sourceforge.net/p/astlinux/code/7365
Author:   abelbeck
Date:     2015-12-03 13:44:45 +0000 (Thu, 03 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-03 13:42:15 UTC (rev 7364)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-03 13:44:45 UTC (rev 7365)
@@ -61,6 +61,10 @@
 
 -- iperf3, new package, iperf3 is becomming more common, sits along side the old iperf since they are not compatible
 
+-- libcurl (curl) version bump to 7.46.0
+
+-- openldap, version bump to 2.4.43
+
 -- miniupnpd, version bump to 1.9.20151118
 
 -- msmtp, version bump to 1.6.3

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

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

From: <abe...@us...> - 2015-12-03 13:42:18

Revision: 7364
          http://sourceforge.net/p/astlinux/code/7364
Author:   abelbeck
Date:     2015-12-03 13:42:15 +0000 (Thu, 03 Dec 2015)
Log Message:
-----------
openldap, version bump to 2.4.43

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

Modified: branches/1.0/package/openldap/openldap.mk
===================================================================
--- branches/1.0/package/openldap/openldap.mk	2015-12-03 13:22:37 UTC (rev 7363)
+++ branches/1.0/package/openldap/openldap.mk	2015-12-03 13:42:15 UTC (rev 7364)
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-OPENLDAP_VERSION = 2.4.42
+OPENLDAP_VERSION = 2.4.43
 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz
-OPENLDAP_SITE = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release
+OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release
 OPENLDAP_INSTALL_STAGING = YES
 OPENLDAP_DEPENDENCIES += 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:[7363] branches/1.0/package/libcurl/libcurl.mk

From: <abe...@us...> - 2015-12-03 13:22:39

Revision: 7363
          http://sourceforge.net/p/astlinux/code/7363
Author:   abelbeck
Date:     2015-12-03 13:22:37 +0000 (Thu, 03 Dec 2015)
Log Message:
-----------
libcurl, version bump to 7.46.0

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

Modified: branches/1.0/package/libcurl/libcurl.mk
===================================================================
--- branches/1.0/package/libcurl/libcurl.mk	2015-11-30 18:57:48 UTC (rev 7362)
+++ branches/1.0/package/libcurl/libcurl.mk	2015-12-03 13:22:37 UTC (rev 7363)
@@ -3,7 +3,7 @@
 # libcurl
 #
 #############################################################
-LIBCURL_VERSION = 7.45.0
+LIBCURL_VERSION = 7.46.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.gz
 LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_INSTALL_STAGING = 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:[7362] branches/1.0/package

From: <abe...@us...> - 2015-11-30 18:57:50

Revision: 7362
          http://sourceforge.net/p/astlinux/code/7362
Author:   abelbeck
Date:     2015-11-30 18:57:48 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
uw-imap, version bump to 2007f (July 2011), and compile with -fPIC

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk
    branches/1.0/package/uw-imap/uw-imap.mk

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2015-11-30 17:54:56 UTC (rev 7361)
+++ branches/1.0/package/asterisk/asterisk.mk	2015-11-30 18:57:48 UTC (rev 7362)
@@ -88,7 +88,7 @@
 ifeq ($(strip $(BR2_PACKAGE_UW_IMAP)),y)
 ASTERISK_EXTRAS+=uw-imap
 ASTERISK_CONFIGURE_ARGS+= \
-			--with-imap="$(BUILD_DIR)/uw-imap-2007e" 
+			--with-imap="$(BUILD_DIR)/uw-imap-2007f" 
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_NETSNMP)),y)

Modified: branches/1.0/package/uw-imap/uw-imap.mk
===================================================================
--- branches/1.0/package/uw-imap/uw-imap.mk	2015-11-30 17:54:56 UTC (rev 7361)
+++ branches/1.0/package/uw-imap/uw-imap.mk	2015-11-30 18:57:48 UTC (rev 7362)
@@ -3,7 +3,7 @@
 # uw-imap
 #
 #############################################################
-UW_IMAP_VERSION = 2007e
+UW_IMAP_VERSION = 2007f
 UW_IMAP_SITE = ftp://ftp.cac.washington.edu/imap
 UW_IMAP_SOURCE = imap-$(UW_IMAP_VERSION).tar.gz
 UW_IMAP_INSTALL_STAGING = NO
@@ -16,7 +16,7 @@
 endef
 
 UW_IMAP_MAKE_OPT = slx CC='$(TARGET_CC)' \
-		   EXTRACFLAGS="-I$(STAGING_DIR)/usr/include/openssl" \
+		   EXTRACFLAGS="-I$(STAGING_DIR)/usr/include/openssl -fPIC" \
 		   SSLLIB=$(STAGING_DIR)/lib \
 		   SSLTYPE=nopwd \
 		   SHLIBBASE=c-client \

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

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

From: <abe...@us...> - 2015-11-30 17:54:58

Revision: 7361
          http://sourceforge.net/p/astlinux/code/7361
Author:   abelbeck
Date:     2015-11-30 17:54:56 +0000 (Mon, 30 Nov 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-11-30 17:50:06 UTC (rev 7360)
+++ branches/1.0/docs/ChangeLog.txt	2015-11-30 17:54:56 UTC (rev 7361)
@@ -43,6 +43,8 @@
 
 -- ethtool, version bump to 4.2
 
+-- kexec-tools, version bump to 2.0.11
+
 -- nano, version bump to 2.4.3
 
 -- 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:[7360] branches/1.0/package/kexec/kexec.mk

From: <abe...@us...> - 2015-11-30 17:50:08

Revision: 7360
          http://sourceforge.net/p/astlinux/code/7360
Author:   abelbeck
Date:     2015-11-30 17:50:06 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
kexec, version bump to 2.0.11, allows 'sreboot' on x86_64 systems

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

Modified: branches/1.0/package/kexec/kexec.mk
===================================================================
--- branches/1.0/package/kexec/kexec.mk	2015-11-29 15:29:55 UTC (rev 7359)
+++ branches/1.0/package/kexec/kexec.mk	2015-11-30 17:50:06 UTC (rev 7360)
@@ -3,7 +3,7 @@
 # kexec
 #
 #############################################################
-KEXEC_VERSION = 2.0.8
+KEXEC_VERSION = 2.0.11
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.gz
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
 

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

[Astlinux-commits] SF.net SVN: astlinux:[7359] branches/1.0/package/ipsec-tools/ipsec-tools.mk

From: <abe...@us...> - 2015-11-29 15:29:58

Revision: 7359
          http://sourceforge.net/p/astlinux/code/7359
Author:   abelbeck
Date:     2015-11-29 15:29:55 +0000 (Sun, 29 Nov 2015)
Log Message:
-----------
ipsec-tools, move 'ac_cv_va_copy=yes' to the shell environment instead of a ./configure argument, no functional change but consistant with other packages

Modified Paths:
--------------
    branches/1.0/package/ipsec-tools/ipsec-tools.mk

Modified: branches/1.0/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-tools.mk	2015-11-29 06:40:54 UTC (rev 7358)
+++ branches/1.0/package/ipsec-tools/ipsec-tools.mk	2015-11-29 15:29:55 UTC (rev 7359)
@@ -14,8 +14,9 @@
 # configure hardcodes -Werror, so override CFLAGS on make invocation
 IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
 
+IPSEC_TOOLS_CONF_ENV = ac_cv_va_copy=yes
+
 IPSEC_TOOLS_CONF_OPT = \
-	ac_cv_va_copy=yes \
 	--enable-hybrid \
 	--without-libpam \
 	--disable-gssapi \

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

[Astlinux-commits] SF.net SVN: astlinux:[7358] branches/1.0/package/ipsec-tools/ipsec-tools.mk

From: <abe...@us...> - 2015-11-29 06:40:56

Revision: 7358
          http://sourceforge.net/p/astlinux/code/7358
Author:   abelbeck
Date:     2015-11-29 06:40:54 +0000 (Sun, 29 Nov 2015)
Log Message:
-----------
ipsec-tools, build with 'ac_cv_va_copy=yes' so generic workaround (fails on x86_64) is not used

Modified Paths:
--------------
    branches/1.0/package/ipsec-tools/ipsec-tools.mk

Modified: branches/1.0/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-tools.mk	2015-11-28 17:15:18 UTC (rev 7357)
+++ branches/1.0/package/ipsec-tools/ipsec-tools.mk	2015-11-29 06:40:54 UTC (rev 7358)
@@ -6,7 +6,7 @@
 
 IPSEC_TOOLS_VERSION = 0.8.2
 IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
-IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.8/
+IPSEC_TOOLS_SITE = http://downloads.sourceforge.net/project/ipsec-tools/ipsec-tools/$(IPSEC_TOOLS_VERSION)
 IPSEC_TOOLS_INSTALL_STAGING = YES
 IPSEC_TOOLS_MAKE = $(MAKE1)
 IPSEC_TOOLS_DEPENDENCIES = openssl host-bison flex host-flex
@@ -15,11 +15,12 @@
 IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
 
 IPSEC_TOOLS_CONF_OPT = \
-	  --enable-hybrid \
-	  --without-libpam \
-	  --disable-gssapi \
-	  --localstatedir=/var \
-	  --with-kernel-headers=$(STAGING_DIR)/usr/include
+	ac_cv_va_copy=yes \
+	--enable-hybrid \
+	--without-libpam \
+	--disable-gssapi \
+	--localstatedir=/var \
+	--with-kernel-headers=$(STAGING_DIR)/usr/include
 
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
 IPSEC_TOOLS_CONF_OPT+= --enable-adminport

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

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

From: <abe...@us...> - 2015-11-28 17:15:20

Revision: 7357
          http://sourceforge.net/p/astlinux/code/7357
Author:   abelbeck
Date:     2015-11-28 17:15:18 +0000 (Sat, 28 Nov 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-11-28 17:10:08 UTC (rev 7356)
+++ branches/1.0/docs/ChangeLog.txt	2015-11-28 17:15:18 UTC (rev 7357)
@@ -34,6 +34,8 @@
 
 -- sqlite, version bump to 3.9.2
 
+-- libsrtp, version bump to 1.5.3, security fix: CVE-2015-6360
+
 -- libxml2, version bump to 2.9.3, security fixes: CVE-2015-1819, CVE-2015-7941, CVE-2015-7942, CVE-2015-8035
                                                    CVE-2015-5312, CVE-2015-7497, CVE-2015-7500, CVE-2015-8242
 
@@ -59,6 +61,8 @@
 
 -- miniupnpd, version bump to 1.9.20151118
 
+-- msmtp, version bump to 1.6.3
+
 -- fping, version bump to 3.13
 
 -- sipgrep, version bump to 2.1.0
@@ -96,7 +100,9 @@
 
 -- CLI tab, set terminal background to 'white' and remove unnecessary title header.
 
+-- Status tab, add system architecture string to 'AstLinux Release:'
 
+
 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:[7356] branches/1.0/package/msmtp

From: <abe...@us...> - 2015-11-28 17:10:10

Revision: 7356
          http://sourceforge.net/p/astlinux/code/7356
Author:   abelbeck
Date:     2015-11-28 17:10:08 +0000 (Sat, 28 Nov 2015)
Log Message:
-----------
msmtp, version bump to 1.6.3, and add system architecture string to 'testmail' script

Modified Paths:
--------------
    branches/1.0/package/msmtp/msmtp.mk
    branches/1.0/package/msmtp/testmail.sh

Modified: branches/1.0/package/msmtp/msmtp.mk
===================================================================
--- branches/1.0/package/msmtp/msmtp.mk	2015-11-28 16:43:13 UTC (rev 7355)
+++ branches/1.0/package/msmtp/msmtp.mk	2015-11-28 17:10:08 UTC (rev 7356)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MSMTP_VERSION = 1.6.2
+MSMTP_VERSION = 1.6.3
 MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz
 MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
 MSMTP_DEPENDENCIES = openssl

Modified: branches/1.0/package/msmtp/testmail.sh
===================================================================
--- branches/1.0/package/msmtp/testmail.sh	2015-11-28 16:43:13 UTC (rev 7355)
+++ branches/1.0/package/msmtp/testmail.sh	2015-11-28 17:10:08 UTC (rev 7356)
@@ -65,9 +65,9 @@
   fi
   if [ -f /etc/astlinux-release ]; then
     if [ -x /usr/sbin/asterisk ]; then
-      echo "AstLinux Release:   $(cat /etc/astlinux-release) - $(/usr/sbin/asterisk -V)"
+      echo "AstLinux Release:   $(cat /etc/astlinux-release) $(uname -m) - $(/usr/sbin/asterisk -V)"
     else
-      echo "AstLinux Release:   $(cat /etc/astlinux-release)"
+      echo "AstLinux Release:   $(cat /etc/astlinux-release) $(uname -m)"
     fi
   fi
   if [ -f /oldroot/cdrom/ver ]; then

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

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

From: <abe...@us...> - 2015-11-28 16:43:15

Revision: 7355
          http://sourceforge.net/p/astlinux/code/7355
Author:   abelbeck
Date:     2015-11-28 16:43:13 +0000 (Sat, 28 Nov 2015)
Log Message:
-----------
libsrtp, version bump to 1.5.3, security fix: CVE-2015-6360

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

Modified: branches/1.0/package/libsrtp/libsrtp.mk
===================================================================
--- branches/1.0/package/libsrtp/libsrtp.mk	2015-11-28 15:56:43 UTC (rev 7354)
+++ branches/1.0/package/libsrtp/libsrtp.mk	2015-11-28 16:43:13 UTC (rev 7355)
@@ -3,7 +3,7 @@
 # libsrtp
 #
 #############################################################
-LIBSRTP_VERSION = 1.5.2
+LIBSRTP_VERSION = 1.5.3
 LIBSRTP_SITE = http://files.astlinux.org
 #LIBSRTP_SITE = https://github.com/cisco/libsrtp/releases
 LIBSRTP_SOURCE = libsrtp-$(LIBSRTP_VERSION).tar.gz

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

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

From: <abe...@us...> - 2015-11-28 15:56:46

Revision: 7354
          http://sourceforge.net/p/astlinux/code/7354
Author:   abelbeck
Date:     2015-11-28 15:56:43 +0000 (Sat, 28 Nov 2015)
Log Message:
-----------
web interface, Status tab, add system architecture string to 'AstLinux Release:'

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-11-25 16:03:05 UTC (rev 7353)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2015-11-28 15:56:43 UTC (rev 7354)
@@ -572,7 +572,7 @@
 echo '<td style="text-align: left;">';
 if (($fp = @fopen('/etc/astlinux-release', 'r')) !== FALSE) {
   if (! feof($fp)) {
-    $line = trim(fgets($fp, 1024));
+    $line = trim(fgets($fp, 1024)).' '.trim(shell_exec('uname -m'));
     if ($daemon['asterisk'] > 0) {
       $line .= ' - '.trim(shell_exec('/usr/sbin/asterisk -V'));
     }

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

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

From: <abe...@us...> - 2015-11-25 16:03:07

Revision: 7353
          http://sourceforge.net/p/astlinux/code/7353
Author:   abelbeck
Date:     2015-11-25 16:03:05 +0000 (Wed, 25 Nov 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-11-25 15:44:19 UTC (rev 7352)
+++ branches/1.0/docs/ChangeLog.txt	2015-11-25 16:03:05 UTC (rev 7353)
@@ -10,6 +10,10 @@
 
 Released **TBD**
 
+** Build System
+
+-- Added 64-bit support for x86_64 CPU's with new board types genx86_64 and genx86_64-serial
+
 ** System
 
 -- linux, add kernel patch allowing Geode LX (alix and net5501) to use tsc clocksource instead of pit clocksource
@@ -24,11 +28,14 @@
 
 -- perl, version bump to 5.22.0 using perlcross 1.0.1
 
+-- pcre, version bump to 8.38, security fixes: https://blog.fuzzing-project.org/29-Heap-Overflow-in-PCRE.html
+
 -- sudo, version bump to 1.8.15
 
 -- sqlite, version bump to 3.9.2
 
--- libxml2, security fixes: CVE-2015-1819, CVE-2015-7941, CVE-2015-7942, CVE-2015-8035
+-- libxml2, version bump to 2.9.3, security fixes: CVE-2015-1819, CVE-2015-7941, CVE-2015-7942, CVE-2015-8035
+                                                   CVE-2015-5312, CVE-2015-7497, CVE-2015-7500, CVE-2015-8242
 
 -- libsodium, version bump to 1.0.6
 
@@ -36,6 +43,8 @@
 
 -- nano, version bump to 2.4.3
 
+-- strace, version bump to 4.10
+
 ** Networking
 
 -- ntpd/sntp, version bump to 4.2.8p4, security fixes: CVE-2015-7871 plus 12 other low/medium-severity vulnerabilities
@@ -68,6 +77,8 @@
 
 -- pjsip 2.4 (no change)
 
+-- wanpipe, version bump to 7.0.15
+
 ** Web Interface
 
 -- Network tab and and WAN Failover sub-tab, add DHCPv6 support with Connection Type: [DHCP/DHCPv6]

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

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

From: <abe...@us...> - 2015-11-25 15:44:21

Revision: 7352
          http://sourceforge.net/p/astlinux/code/7352
Author:   abelbeck
Date:     2015-11-25 15:44:19 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
wanpipe, version bump to 7.0.15

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

Modified: branches/1.0/package/wanpipe/wanpipe.mk
===================================================================
--- branches/1.0/package/wanpipe/wanpipe.mk	2015-11-25 14:49:42 UTC (rev 7351)
+++ branches/1.0/package/wanpipe/wanpipe.mk	2015-11-25 15:44:19 UTC (rev 7352)
@@ -3,7 +3,7 @@
 # wanpipe
 #
 #############################################################
-WANPIPE_VER:= 7.0.14
+WANPIPE_VER:= 7.0.15
 WANPIPE_SITE:= ftp://ftp.sangoma.com/linux/current_wanpipe
 WANPIPE_SOURCE:=wanpipe-$(WANPIPE_VER).tgz
 WANPIPE_DIR:=$(BUILD_DIR)/wanpipe-$(WANPIPE_VER)
@@ -14,7 +14,8 @@
 
 WANPIPE_PREREQS:=flex dahdi-linux
 WANPIPE_CONFIGURE:=\
-		ZAPDIR="$(DAHDI_LINUX_DIR)"
+	ARCH=$(KERNEL_ARCH) \
+	ZAPDIR="$(DAHDI_LINUX_DIR)"
 
 $(DL_DIR)/$(WANPIPE_SOURCE):
 	$(WGET) -P $(DL_DIR) $(WANPIPE_SITE)/$(WANPIPE_SOURCE)

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

[Astlinux-commits] SF.net SVN: astlinux:[7351] branches/1.0/package/libxml2

From: <abe...@us...> - 2015-11-25 14:49:45

Revision: 7351
          http://sourceforge.net/p/astlinux/code/7351
Author:   abelbeck
Date:     2015-11-25 14:49:42 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
libxml2, version bump to 2.9.3
Fixes:
CVE-2015-5312 - Another entity expansion issue
CVE-2015-7497 - Avoid an heap buffer overflow in xmlDictComputeFastQKey
CVE-2015-7500 - Fix memory access error due to incorrect entities boundaries
CVE-2015-8242 - Buffer overead with HTML parser in push mode
>From previous upstream patches:
CVE-2015-1819 - The xmlreader in libxml allows remote attackers to cause
  a denial of service (memory consumption) via crafted XML data, related
  to an XML Entity Expansion (XEE) attack.
CVE-2015-7941 - out-of-bounds memory access.
CVE-2015-7942 - heap-buffer-overflow in xmlParseConditionalSections.
CVE-2015-8035 - DoS via crafted xz file.

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

Removed Paths:
-------------
    branches/1.0/package/libxml2/libxml2-0003-fix-CVE-2015-1819.patch
    branches/1.0/package/libxml2/libxml2-0004-fix-CVE-2015-7941-1.patch
    branches/1.0/package/libxml2/libxml2-0005-fix-CVE-2015-7941-2.patch
    branches/1.0/package/libxml2/libxml2-0006-fix-CVE-2015-7942-1.patch
    branches/1.0/package/libxml2/libxml2-0007-fix-CVE-2015-7942-2.patch
    branches/1.0/package/libxml2/libxml2-0008-fix-CVE-2015-8035.patch
    branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch

Deleted: branches/1.0/package/libxml2/libxml2-0003-fix-CVE-2015-1819.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-0003-fix-CVE-2015-1819.patch	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2-0003-fix-CVE-2015-1819.patch	2015-11-25 14:49:42 UTC (rev 7351)
@@ -1,177 +0,0 @@
-From 213f1fe0d76d30eaed6e5853057defc43e6df2c9 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <vei...@re...>
-Date: Tue, 14 Apr 2015 17:41:48 +0800
-Subject: CVE-2015-1819 Enforce the reader to run in constant memory
-
-One of the operation on the reader could resolve entities
-leading to the classic expansion issue. Make sure the
-buffer used for xmlreader operation is bounded.
-Introduce a new allocation type for the buffers for this effect.
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
----
- buf.c                 | 43 ++++++++++++++++++++++++++++++++++++++++++-
- include/libxml/tree.h |  3 ++-
- xmlreader.c           | 20 +++++++++++++++++++-
- 3 files changed, 63 insertions(+), 3 deletions(-)
-
-diff --git a/buf.c b/buf.c
-index 6efc7b6..07922ff 100644
---- a/buf.c
-+++ b/buf.c
-@@ -27,6 +27,7 @@
- #include <libxml/tree.h>
- #include <libxml/globals.h>
- #include <libxml/tree.h>
-+#include <libxml/parserInternals.h> /* for XML_MAX_TEXT_LENGTH */
- #include "buf.h"
- 
- #define WITH_BUFFER_COMPAT
-@@ -299,7 +300,8 @@ xmlBufSetAllocationScheme(xmlBufPtr buf,
-     if ((scheme == XML_BUFFER_ALLOC_DOUBLEIT) ||
-         (scheme == XML_BUFFER_ALLOC_EXACT) ||
-         (scheme == XML_BUFFER_ALLOC_HYBRID) ||
--        (scheme == XML_BUFFER_ALLOC_IMMUTABLE)) {
-+        (scheme == XML_BUFFER_ALLOC_IMMUTABLE) ||
-+	(scheme == XML_BUFFER_ALLOC_BOUNDED)) {
- 	buf->alloc = scheme;
-         if (buf->buffer)
-             buf->buffer->alloc = scheme;
-@@ -458,6 +460,18 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) {
-     size = buf->use + len + 100;
- #endif
- 
-+    if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+        /*
-+	 * Used to provide parsing limits
-+	 */
-+        if ((buf->use + len >= XML_MAX_TEXT_LENGTH) ||
-+	    (buf->size >= XML_MAX_TEXT_LENGTH)) {
-+	    xmlBufMemoryError(buf, "buffer error: text too long\n");
-+	    return(0);
-+	}
-+	if (size >= XML_MAX_TEXT_LENGTH)
-+	    size = XML_MAX_TEXT_LENGTH;
-+    }
-     if ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL)) {
-         size_t start_buf = buf->content - buf->contentIO;
- 
-@@ -739,6 +753,15 @@ xmlBufResize(xmlBufPtr buf, size_t size)
-     CHECK_COMPAT(buf)
- 
-     if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return(0);
-+    if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+        /*
-+	 * Used to provide parsing limits
-+	 */
-+        if (size >= XML_MAX_TEXT_LENGTH) {
-+	    xmlBufMemoryError(buf, "buffer error: text too long\n");
-+	    return(0);
-+	}
-+    }
- 
-     /* Don't resize if we don't have to */
-     if (size < buf->size)
-@@ -867,6 +890,15 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) {
- 
-     needSize = buf->use + len + 2;
-     if (needSize > buf->size){
-+	if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+	    /*
-+	     * Used to provide parsing limits
-+	     */
-+	    if (needSize >= XML_MAX_TEXT_LENGTH) {
-+		xmlBufMemoryError(buf, "buffer error: text too long\n");
-+		return(-1);
-+	    }
-+	}
-         if (!xmlBufResize(buf, needSize)){
- 	    xmlBufMemoryError(buf, "growing buffer");
-             return XML_ERR_NO_MEMORY;
-@@ -938,6 +970,15 @@ xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) {
-     }
-     needSize = buf->use + len + 2;
-     if (needSize > buf->size){
-+	if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) {
-+	    /*
-+	     * Used to provide parsing limits
-+	     */
-+	    if (needSize >= XML_MAX_TEXT_LENGTH) {
-+		xmlBufMemoryError(buf, "buffer error: text too long\n");
-+		return(-1);
-+	    }
-+	}
-         if (!xmlBufResize(buf, needSize)){
- 	    xmlBufMemoryError(buf, "growing buffer");
-             return XML_ERR_NO_MEMORY;
-diff --git a/include/libxml/tree.h b/include/libxml/tree.h
-index 2f90717..4a9b3bc 100644
---- a/include/libxml/tree.h
-+++ b/include/libxml/tree.h
-@@ -76,7 +76,8 @@ typedef enum {
-     XML_BUFFER_ALLOC_EXACT,	/* grow only to the minimal size */
-     XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */
-     XML_BUFFER_ALLOC_IO,	/* special allocation scheme used for I/O */
--    XML_BUFFER_ALLOC_HYBRID	/* exact up to a threshold, and doubleit thereafter */
-+    XML_BUFFER_ALLOC_HYBRID,	/* exact up to a threshold, and doubleit thereafter */
-+    XML_BUFFER_ALLOC_BOUNDED	/* limit the upper size of the buffer */
- } xmlBufferAllocationScheme;
- 
- /**
-diff --git a/xmlreader.c b/xmlreader.c
-index f19e123..471e7e2 100644
---- a/xmlreader.c
-+++ b/xmlreader.c
-@@ -2091,6 +2091,9 @@ xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) {
- 		"xmlNewTextReader : malloc failed\n");
- 	return(NULL);
-     }
-+    /* no operation on a reader should require a huge buffer */
-+    xmlBufSetAllocationScheme(ret->buffer,
-+			      XML_BUFFER_ALLOC_BOUNDED);
-     ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler));
-     if (ret->sax == NULL) {
- 	xmlBufFree(ret->buffer);
-@@ -3616,6 +3619,7 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) {
- 	    return(((xmlNsPtr) node)->href);
-         case XML_ATTRIBUTE_NODE:{
- 	    xmlAttrPtr attr = (xmlAttrPtr) node;
-+	    const xmlChar *ret;
- 
- 	    if ((attr->children != NULL) &&
- 	        (attr->children->type == XML_TEXT_NODE) &&
-@@ -3629,10 +3633,21 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) {
-                                         "xmlTextReaderSetup : malloc failed\n");
-                         return (NULL);
-                     }
-+		    xmlBufSetAllocationScheme(reader->buffer,
-+		                              XML_BUFFER_ALLOC_BOUNDED);
-                 } else
-                     xmlBufEmpty(reader->buffer);
- 	        xmlBufGetNodeContent(reader->buffer, node);
--		return(xmlBufContent(reader->buffer));
-+		ret = xmlBufContent(reader->buffer);
-+		if (ret == NULL) {
-+		    /* error on the buffer best to reallocate */
-+		    xmlBufFree(reader->buffer);
-+		    reader->buffer = xmlBufCreateSize(100);
-+		    xmlBufSetAllocationScheme(reader->buffer,
-+		                              XML_BUFFER_ALLOC_BOUNDED);
-+		    ret = BAD_CAST "";
-+		}
-+		return(ret);
- 	    }
- 	    break;
- 	}
-@@ -5131,6 +5146,9 @@ xmlTextReaderSetup(xmlTextReaderPtr reader,
-                         "xmlTextReaderSetup : malloc failed\n");
-         return (-1);
-     }
-+    /* no operation on a reader should require a huge buffer */
-+    xmlBufSetAllocationScheme(reader->buffer,
-+			      XML_BUFFER_ALLOC_BOUNDED);
-     if (reader->sax == NULL)
- 	reader->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler));
-     if (reader->sax == NULL) {
--- 
-cgit v0.11.2

Deleted: branches/1.0/package/libxml2/libxml2-0004-fix-CVE-2015-7941-1.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-0004-fix-CVE-2015-7941-1.patch	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2-0004-fix-CVE-2015-7941-1.patch	2015-11-25 14:49:42 UTC (rev 7351)
@@ -1,33 +0,0 @@
-From a7dfab7411cbf545f359dd3157e5df1eb0e7ce31 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <vei...@re...>
-Date: Mon, 23 Feb 2015 11:17:35 +0800
-Subject: Stop parsing on entities boundaries errors
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=744980
-
-There are times, like on unterminated entities that it's preferable to
-stop parsing, even if that means less error reporting. Entities are
-feeding the parser on further processing, and if they are ill defined
-then it's possible to get the parser to bug. Also do the same on
-Conditional Sections if the input is broken, as the structure of
-the document can't be guessed.
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
----
- parser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/parser.c b/parser.c
-index a8d1b67..bbe97eb 100644
---- a/parser.c
-+++ b/parser.c
-@@ -5658,6 +5658,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
- 	if (RAW != '>') {
- 	    xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_NOT_FINISHED,
- 	            "xmlParseEntityDecl: entity %s not terminated\n", name);
-+	    xmlStopParser(ctxt);
- 	} else {
- 	    if (input != ctxt->input) {
- 		xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY,
--- 
-cgit v0.11.2

Deleted: branches/1.0/package/libxml2/libxml2-0005-fix-CVE-2015-7941-2.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-0005-fix-CVE-2015-7941-2.patch	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2-0005-fix-CVE-2015-7941-2.patch	2015-11-25 14:49:42 UTC (rev 7351)
@@ -1,50 +0,0 @@
-From 9b8512337d14c8ddf662fcb98b0135f225a1c489 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <vei...@re...>
-Date: Mon, 23 Feb 2015 11:29:20 +0800
-Subject: Cleanup conditional section error handling
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=744980
-
-The error handling of Conditional Section also need to be
-straightened as the structure of the document can't be
-guessed on a failure there and it's better to stop parsing
-as further errors are likely to be irrelevant.
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
----
- parser.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index bbe97eb..fe603ac 100644
---- a/parser.c
-+++ b/parser.c
-@@ -6770,6 +6770,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 	SKIP_BLANKS;
- 	if (RAW != '[') {
- 	    xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
-+	    xmlStopParser(ctxt);
-+	    return;
- 	} else {
- 	    if (ctxt->input->id != id) {
- 		xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
-@@ -6830,6 +6832,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 	SKIP_BLANKS;
- 	if (RAW != '[') {
- 	    xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
-+	    xmlStopParser(ctxt);
-+	    return;
- 	} else {
- 	    if (ctxt->input->id != id) {
- 		xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
-@@ -6885,6 +6889,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 
-     } else {
- 	xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL);
-+	xmlStopParser(ctxt);
-+	return;
-     }
- 
-     if (RAW == 0)
--- 
-cgit v0.11.2

Deleted: branches/1.0/package/libxml2/libxml2-0006-fix-CVE-2015-7942-1.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-0006-fix-CVE-2015-7942-1.patch	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2-0006-fix-CVE-2015-7942-1.patch	2015-11-25 14:49:42 UTC (rev 7351)
@@ -1,33 +0,0 @@
-From bd0526e66a56e75a18da8c15c4750db8f801c52d Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <vei...@re...>
-Date: Fri, 23 Oct 2015 19:02:28 +0800
-Subject: Another variation of overflow in Conditional sections
-
-Which happen after the previous fix to
-https://bugzilla.gnome.org/show_bug.cgi?id=756456
-
-But stopping the parser and exiting we didn't pop the intermediary entities
-and doing the SKIP there applies on an input which may be too small
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
----
- parser.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/parser.c b/parser.c
-index a65e4cc..b9217ff 100644
---- a/parser.c
-+++ b/parser.c
-@@ -6904,7 +6904,9 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 	"All markup of the conditional section is not in the same entity\n",
- 				 NULL, NULL);
- 	}
--        SKIP(3);
-+	if ((ctxt-> instate != XML_PARSER_EOF) &&
-+	    ((ctxt->input->cur + 3) < ctxt->input->end))
-+	    SKIP(3);
-     }
- }
- 
--- 
-cgit v0.11.2

Deleted: branches/1.0/package/libxml2/libxml2-0007-fix-CVE-2015-7942-2.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-0007-fix-CVE-2015-7942-2.patch	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2-0007-fix-CVE-2015-7942-2.patch	2015-11-25 14:49:42 UTC (rev 7351)
@@ -1,29 +0,0 @@
-From 41ac9049a27f52e7a1f3b341f8714149fc88d450 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <vei...@re...>
-Date: Tue, 27 Oct 2015 10:53:44 +0800
-Subject: Fix an error in previous Conditional section patch
-
-an off by one mistake in the change, led to error on correct
-document where the end of the included entity was exactly
-the end of the conditional section, leading to regtest failure
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
----
- parser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/parser.c b/parser.c
-index b9217ff..d67b300 100644
---- a/parser.c
-+++ b/parser.c
-@@ -6905,7 +6905,7 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
- 				 NULL, NULL);
- 	}
- 	if ((ctxt-> instate != XML_PARSER_EOF) &&
--	    ((ctxt->input->cur + 3) < ctxt->input->end))
-+	    ((ctxt->input->cur + 3) <= ctxt->input->end))
- 	    SKIP(3);
-     }
- }
--- 
-cgit v0.11.2

Deleted: branches/1.0/package/libxml2/libxml2-0008-fix-CVE-2015-8035.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-0008-fix-CVE-2015-8035.patch	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2-0008-fix-CVE-2015-8035.patch	2015-11-25 14:49:42 UTC (rev 7351)
@@ -1,32 +0,0 @@
-From f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <vei...@re...>
-Date: Tue, 3 Nov 2015 15:31:25 +0800
-Subject: CVE-2015-8035 Fix XZ compression support loop
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=757466
-DoS when parsing specially crafted XML document if XZ support
-is compiled in (which wasn't the case for 2.9.2 and master since
-Nov 2013, fixed in next commit !)
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
----
- xzlib.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/xzlib.c b/xzlib.c
-index 0dcb9f4..1fab546 100644
---- a/xzlib.c
-+++ b/xzlib.c
-@@ -581,6 +581,10 @@ xz_decomp(xz_statep state)
-             xz_error(state, LZMA_DATA_ERROR, "compressed data error");
-             return -1;
-         }
-+        if (ret == LZMA_PROG_ERROR) {
-+            xz_error(state, LZMA_PROG_ERROR, "compression error");
-+            return -1;
-+        }
-     } while (strm->avail_out && ret != LZMA_STREAM_END);
- 
-     /* update available output and crc check value */
--- 
-cgit v0.11.2

Deleted: branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch
===================================================================
--- branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2-config.cmake.in-update-include-directories.patch	2015-11-25 14:49:42 UTC (rev 7351)
@@ -1,28 +0,0 @@
-From dd6125f4b58fe7bc270e51bc3fcf41cd228d22fc Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.m...@gm...>
-Date: Mon, 29 Dec 2014 20:40:18 +0100
-Subject: [PATCH] libxml2-config.cmake.in: update include directories
-
-Align the include directories on those from the pkg-config module.
-
-Signed-off-by: Samuel Martin <s.m...@gm...>
----
- libxml2-config.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in
-index ac29329..6b16fc2 100644
---- a/libxml2-config.cmake.in
-+++ b/libxml2-config.cmake.in
-@@ -21,7 +21,7 @@ set(LIBXML2_VERSION_MINOR  @LIBXML_MINOR_VERSION@)
- set(LIBXML2_VERSION_MICRO  @LIBXML_MICRO_VERSION@)
- set(LIBXML2_VERSION_STRING "@VERSION@")
- set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
--set(LIBXML2_INCLUDE_DIRS   ${_libxml2_rootdir}/include)
-+set(LIBXML2_INCLUDE_DIRS   ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2)
- set(LIBXML2_LIBRARY_DIR    ${_libxml2_rootdir}/lib)
- set(LIBXML2_LIBRARIES      -L${LIBXML2_LIBRARY_DIR} -lxml2)
- 
--- 
-2.2.1
-

Modified: branches/1.0/package/libxml2/libxml2.mk
===================================================================
--- branches/1.0/package/libxml2/libxml2.mk	2015-11-25 14:35:50 UTC (rev 7350)
+++ branches/1.0/package/libxml2/libxml2.mk	2015-11-25 14:49:42 UTC (rev 7351)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBXML2_VERSION = 2.9.2
+LIBXML2_VERSION = 2.9.3
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = 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:[7350] branches/1.0/package/pcre

From: <abe...@us...> - 2015-11-25 14:35:53

Revision: 7350
          http://sourceforge.net/p/astlinux/code/7350
Author:   abelbeck
Date:     2015-11-25 14:35:50 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
pcre, version bump to 8.38
Fixes:
Ref: https://blog.fuzzing-project.org/29-Heap-Overflow-in-PCRE.html

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

Removed Paths:
-------------
    branches/1.0/package/pcre/pcre-pre-8.38-security-fixes.patch

Deleted: branches/1.0/package/pcre/pcre-pre-8.38-security-fixes.patch
===================================================================
--- branches/1.0/package/pcre/pcre-pre-8.38-security-fixes.patch	2015-11-24 18:36:52 UTC (rev 7349)
+++ branches/1.0/package/pcre/pcre-pre-8.38-security-fixes.patch	2015-11-25 14:35:50 UTC (rev 7350)
@@ -1,359 +0,0 @@
---- pcre-8.37/pcre_compile.c	2015/04/14 17:02:30	1548
-+++ pcre-8.37/pcre_compile.c	2015/06/03 16:51:59	1562
-@@ -1799,7 +1799,7 @@
-     case OP_ASSERTBACK:
-     case OP_ASSERTBACK_NOT:
-     do cc += GET(cc, 1); while (*cc == OP_ALT);
--    cc += PRIV(OP_lengths)[*cc];
-+    cc += 1 + LINK_SIZE;
-     break;
- 
-     /* Skip over things that don't match chars */
-@@ -3985,11 +3985,12 @@
- is called, the partially compiled regex must be temporarily terminated with
- OP_END.
- 
--This function has been extended with the possibility of forward references for
--recursions and subroutine calls. It must also check the list of such references
--for the group we are dealing with. If it finds that one of the recursions in
--the current group is on this list, it adjusts the offset in the list, not the
--value in the reference (which is a group number).
-+This function has been extended to cope with forward references for recursions
-+and subroutine calls. It must check the list of such references for the
-+group we are dealing with. If it finds that one of the recursions in the
-+current group is on this list, it does not adjust the value in the reference
-+(which is a group number). After the group has been scanned, all the offsets in
-+the forward reference list for the group are adjusted.
- 
- Arguments:
-   group      points to the start of the group
-@@ -4005,29 +4006,21 @@
- adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
-   size_t save_hwm_offset)
- {
-+int offset;
-+pcre_uchar *hc;
- pcre_uchar *ptr = group;
- 
- while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
-   {
--  int offset;
--  pcre_uchar *hc;
--
--  /* See if this recursion is on the forward reference list. If so, adjust the
--  reference. */
--
-   for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-        hc += LINK_SIZE)
-     {
-     offset = (int)GET(hc, 0);
--    if (cd->start_code + offset == ptr + 1)
--      {
--      PUT(hc, 0, offset + adjust);
--      break;
--      }
-+    if (cd->start_code + offset == ptr + 1) break;
-     }
- 
--  /* Otherwise, adjust the recursion offset if it's after the start of this
--  group. */
-+  /* If we have not found this recursion on the forward reference list, adjust
-+  the recursion's offset if it's after the start of this group. */
- 
-   if (hc >= cd->hwm)
-     {
-@@ -4037,6 +4030,15 @@
- 
-   ptr += 1 + LINK_SIZE;
-   }
-+
-+/* Now adjust all forward reference offsets for the group. */
-+
-+for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-+     hc += LINK_SIZE)
-+  {
-+  offset = (int)GET(hc, 0);
-+  PUT(hc, 0, offset + adjust);
-+  }
- }
- 
- 
-@@ -4465,7 +4467,7 @@
- const pcre_uchar *nestptr = NULL;
- pcre_uchar *previous = NULL;
- pcre_uchar *previous_callout = NULL;
--size_t save_hwm_offset = 0;
-+size_t item_hwm_offset = 0;
- pcre_uint8 classbits[32];
- 
- /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
-@@ -4767,6 +4769,7 @@
-     zeroreqchar = reqchar;
-     zeroreqcharflags = reqcharflags;
-     previous = code;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
-     *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
-     break;
- 
-@@ -4818,6 +4821,7 @@
-     /* Handle a real character class. */
- 
-     previous = code;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
- 
-     /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
-     they are encountered at the top level, so we'll do that too. */
-@@ -5930,7 +5934,7 @@
-       {
-       register int i;
-       int len = (int)(code - previous);
--      size_t base_hwm_offset = save_hwm_offset;
-+      size_t base_hwm_offset = item_hwm_offset;
-       pcre_uchar *bralink = NULL;
-       pcre_uchar *brazeroptr = NULL;
- 
-@@ -5985,7 +5989,7 @@
-         if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
-           {
-           *code = OP_END;
--          adjust_recurse(previous, 1, utf, cd, save_hwm_offset);
-+          adjust_recurse(previous, 1, utf, cd, item_hwm_offset);
-           memmove(previous + 1, previous, IN_UCHARS(len));
-           code++;
-           if (repeat_max == 0)
-@@ -6009,7 +6013,7 @@
-           {
-           int offset;
-           *code = OP_END;
--          adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm_offset);
-+          adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset);
-           memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
-           code += 2 + LINK_SIZE;
-           *previous++ = OP_BRAZERO + repeat_type;
-@@ -6267,7 +6271,7 @@
-               {
-               int nlen = (int)(code - bracode);
-               *code = OP_END;
--              adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm_offset);
-+              adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-               memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
-               code += 1 + LINK_SIZE;
-               nlen += 1 + LINK_SIZE;
-@@ -6401,7 +6405,7 @@
-         else
-           {
-           *code = OP_END;
--          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset);
-+          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-           memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-           code += 1 + LINK_SIZE;
-           len += 1 + LINK_SIZE;
-@@ -6450,7 +6454,7 @@
- 
-         default:
-         *code = OP_END;
--        adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset);
-+        adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-         memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-         code += 1 + LINK_SIZE;
-         len += 1 + LINK_SIZE;
-@@ -6623,7 +6627,7 @@
-     newoptions = options;
-     skipbytes = 0;
-     bravalue = OP_CBRA;
--    save_hwm_offset = cd->hwm - cd->start_workspace;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
-     reset_bracount = FALSE;
- 
-     /* Deal with the extended parentheses; all are introduced by '?', and the
-@@ -6769,7 +6773,7 @@
-             ptr++;
-             }
-           namelen = (int)(ptr - name);
--          if (lengthptr != NULL) *lengthptr += IMM2_SIZE;
-+          if (lengthptr != NULL) skipbytes += IMM2_SIZE;
-           }
- 
-         /* Check the terminator */
-@@ -7173,14 +7177,26 @@
-           number. If the name is not found, set the value to 0 for a forward
-           reference. */
- 
-+          recno = 0;
-           ng = cd->named_groups;
-           for (i = 0; i < cd->names_found; i++, ng++)
-             {
-             if (namelen == ng->length &&
-                 STRNCMP_UC_UC(name, ng->name, namelen) == 0)
--              break;
-+              {
-+              open_capitem *oc;
-+              recno = ng->number;
-+              if (is_recurse) break;
-+              for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-+                {
-+                if (oc->number == recno)
-+                  {
-+                  oc->flag = TRUE;
-+                  break;
-+                  }
-+                }
-+              }
-             }
--          recno = (i < cd->names_found)? ng->number : 0;
- 
-           /* Count named back references. */
- 
-@@ -7191,6 +7207,19 @@
-           16-bit data item. */
- 
-           *lengthptr += IMM2_SIZE;
-+
-+          /* If this is a forward reference and we are within a (?|...) group,
-+          the reference may end up as the number of a group which we are
-+          currently inside, that is, it could be a recursive reference. In the
-+          real compile this will be picked up and the reference wrapped with
-+          OP_ONCE to make it atomic, so we must space in case this occurs. */
-+
-+          /* In fact, this can happen for a non-forward reference because
-+          another group with the same number might be created later. This
-+          issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
-+          only mode, we finesse the bug by allowing more memory always. */
-+
-+          /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE;
-           }
- 
-         /* In the real compile, search the name table. We check the name
-@@ -7247,6 +7276,7 @@
-             {
-             if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-             previous = code;
-+            item_hwm_offset = cd->hwm - cd->start_workspace;
-             *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF;
-             PUT2INC(code, 0, index);
-             PUT2INC(code, 0, count);
-@@ -7360,6 +7390,7 @@
-           HANDLE_RECURSION:
- 
-           previous = code;
-+          item_hwm_offset = cd->hwm - cd->start_workspace;
-           called = cd->start_code;
- 
-           /* When we are actually compiling, find the bracket that is being
-@@ -7561,7 +7592,11 @@
-       previous = NULL;
-       cd->iscondassert = FALSE;
-       }
--    else previous = code;
-+    else
-+      {
-+      previous = code;
-+      item_hwm_offset = cd->hwm - cd->start_workspace;
-+      }
- 
-     *code = bravalue;
-     tempcode = code;
-@@ -7809,7 +7844,7 @@
-         const pcre_uchar *p;
-         pcre_uint32 cf;
- 
--        save_hwm_offset = cd->hwm - cd->start_workspace;   /* Normally this is set when '(' is read */
-+        item_hwm_offset = cd->hwm - cd->start_workspace;   /* Normally this is set when '(' is read */
-         terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
-           CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
- 
-@@ -7877,6 +7912,7 @@
-         HANDLE_REFERENCE:
-         if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-         previous = code;
-+        item_hwm_offset = cd->hwm - cd->start_workspace;
-         *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
-         PUT2INC(code, 0, recno);
-         cd->backref_map |= (recno < 32)? (1 << recno) : 1;
-@@ -7906,6 +7942,7 @@
-         if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
-           goto FAILED;
-         previous = code;
-+        item_hwm_offset = cd->hwm - cd->start_workspace;
-         *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP;
-         *code++ = ptype;
-         *code++ = pdata;
-@@ -7946,6 +7983,7 @@
- 
-           {
-           previous = (escape > ESC_b && escape < ESC_Z)? code : NULL;
-+          item_hwm_offset = cd->hwm - cd->start_workspace;
-           *code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape;
-           }
-         }
-@@ -7989,6 +8027,7 @@
- 
-     ONE_CHAR:
-     previous = code;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
- 
-     /* For caseless UTF-8 mode when UCP support is available, check whether
-     this character has more than one other case. If so, generate a special
-
---- pcre-8.37/pcre_compile.c	2015/06/03 16:51:59	1562
-+++ pcre-8.37/pcre_compile.c	2015/06/09 17:45:25	1566
-@@ -204,7 +204,7 @@
- /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
- /*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
- /*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
--/*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
-+/*  90 */     0,     0, -ESC_k,       0,      0, ESC_n,      0, -ESC_p,
- /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
- /*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
- /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
-@@ -2487,7 +2487,7 @@
-   if (c == OP_BRA  || c == OP_BRAPOS ||
-       c == OP_CBRA || c == OP_CBRAPOS ||
-       c == OP_ONCE || c == OP_ONCE_NC ||
--      c == OP_COND)
-+      c == OP_COND || c == OP_SCOND)
-     {
-     BOOL empty_branch;
-     if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
-@@ -7353,7 +7353,15 @@
- 
-           recno = 0;
-           while(IS_DIGIT(*ptr))
-+            {
-+            if (recno > INT_MAX / 10 - 1) /* Integer overflow */            
-+              {                                                             
-+              while (IS_DIGIT(*ptr)) ptr++;                                 
-+              *errorcodeptr = ERR61;                                        
-+              goto FAILED;                                                  
-+              }
-             recno = recno * 10 + *ptr++ - CHAR_0;
-+            } 
- 
-           if (*ptr != (pcre_uchar)terminator)
-             {
-
---- pcre-8.37/pcre_compile.c	2015/06/22 09:38:41	1570
-+++ pcre-8.37/pcre_compile.c	2015/06/23 16:34:53	1571
-@@ -9427,7 +9427,7 @@
- exceptional ones forgo this. We scan the pattern to check that they are fixed
- length, and set their lengths. */
- 
--if (cd->check_lookbehind)
-+if (errorcode == 0 && cd->check_lookbehind)
-   {
-   pcre_uchar *cc = (pcre_uchar *)codestart;
- 
-
---- pcre-8.37/pcre_exec.c	2015/06/09 16:33:27	1564
-+++ pcre-8.37/pcre_exec.c	2015/06/09 16:46:52	1565
-@@ -6685,7 +6685,8 @@
-   register int *iend = iptr - re->top_bracket;
-   if (iend < md->offset_vector + 2) iend = md->offset_vector + 2;
-   while (--iptr >= iend) *iptr = -1;
--  md->offset_vector[0] = md->offset_vector[1] = -1;
-+  if (offsetcount > 0) md->offset_vector[0] = -1;
-+  if (offsetcount > 1) md->offset_vector[1] = -1;
-   }
- 
- /* Set up the first character to match, if available. The first_char value is
-

Modified: branches/1.0/package/pcre/pcre.mk
===================================================================
--- branches/1.0/package/pcre/pcre.mk	2015-11-24 18:36:52 UTC (rev 7349)
+++ branches/1.0/package/pcre/pcre.mk	2015-11-25 14:35:50 UTC (rev 7350)
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-PCRE_VERSION = 8.37
-PCRE_SITE = http://downloads.sourceforge.net/project/pcre/pcre/$(PCRE_VERSION)
+PCRE_VERSION = 8.38
+PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
 PCRE_INSTALL_STAGING = 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:[7349] branches/1.0

From: <abe...@us...> - 2015-11-24 18:36:55

Revision: 7349
          http://sourceforge.net/p/astlinux/code/7349
Author:   abelbeck
Date:     2015-11-24 18:36:52 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Asterisk FOP2, add support for x86_64 binary blob

Modified Paths:
--------------
    branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package

Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk	2015-11-24 17:38:50 UTC (rev 7348)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk	2015-11-24 18:36:52 UTC (rev 7349)
@@ -8,6 +8,13 @@
 ASTERISK_FOP2_SITE = http://download.fop2.com
 # Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
 
+ASTERISK_FOP2_X86_64_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-x86_64.tgz
+
+define ASTERISK_FOP2_X86_64_DOWNLOAD
+	$(call DOWNLOAD,$(ASTERISK_FOP2_SITE),$(ASTERISK_FOP2_X86_64_SOURCE))
+endef
+ASTERISK_FOP2_POST_DOWNLOAD_HOOKS += ASTERISK_FOP2_X86_64_DOWNLOAD
+
 define ASTERISK_FOP2_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 package/asterisk-fop2/fop2.init $(TARGET_DIR)/etc/init.d/fop2
 	$(INSTALL) -D -m 0644 package/asterisk-fop2/config/fop2.cfg $(TARGET_DIR)/stat/etc/fop2/fop2.cfg

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2015-11-24 17:38:50 UTC (rev 7348)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2015-11-24 18:36:52 UTC (rev 7349)
@@ -248,7 +248,7 @@
   if ! RAM_needed_MB 475; then
     finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
   fi
-  SRC_URL="http://files.astlinux.org/fop2-2.28-debian-i386.tgz"
+  SRC_URL="http://files.astlinux.org/fop2-2.28-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
   ;;
 
 show)

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

[Astlinux-commits] SF.net SVN: astlinux:[7348] branches/1.0/package/asterisk-codec-silk/ asterisk-codec-silk.mk

From: <abe...@us...> - 2015-11-24 17:38:52

Revision: 7348
          http://sourceforge.net/p/astlinux/code/7348
Author:   abelbeck
Date:     2015-11-24 17:38:50 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Asterisk SILK CODEC, add support for x86_64 binary blob

Modified Paths:
--------------
    branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk

Modified: branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk
===================================================================
--- branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk	2015-11-24 00:24:16 UTC (rev 7347)
+++ branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk	2015-11-24 17:38:50 UTC (rev 7348)
@@ -4,12 +4,22 @@
 #
 ##############################################################
 ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
+  ifeq ($(ARCH),x86_64)
+ASTERISK_CODEC_SILK_VERSION := 11.0_1.0.0-generic_64
+ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-11.0/x86-64
+  else
 ASTERISK_CODEC_SILK_VERSION := 11.0_1.0.0-i686_32
 ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-11.0/x86-32
+  endif
 endif
 ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
+  ifeq ($(ARCH),x86_64)
+ASTERISK_CODEC_SILK_VERSION := 13.0_1.0.0-generic_64
+ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-13.0/x86-64
+  else
 ASTERISK_CODEC_SILK_VERSION := 13.0_1.0.0-i686_32
 ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-13.0/x86-32
+  endif
 endif
 ASTERISK_CODEC_SILK_SOURCE := codec_silk-$(ASTERISK_CODEC_SILK_VERSION).tar.gz
 ASTERISK_CODEC_SILK_DIR := $(BUILD_DIR)/codec_silk-$(ASTERISK_CODEC_SILK_VERSION)

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

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

From: <abe...@us...> - 2015-11-24 00:24:19

Revision: 7347
          http://sourceforge.net/p/astlinux/code/7347
Author:   abelbeck
Date:     2015-11-24 00:24:16 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Add genx86_64 and genx86_64-serial board types

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
    branches/1.0/scripts/master-build

Added Paths:
-----------
    branches/1.0/project/astlinux/board/genx86_64/
    branches/1.0/project/astlinux/board/genx86_64/runnix.conf
    branches/1.0/project/astlinux/board/genx86_64/target_skeleton/
    branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/
    branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab
    branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
    branches/1.0/project/astlinux/board/genx86_64-serial/
    branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf
    branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/
    branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/
    branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab
    branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules

Added: branches/1.0/project/astlinux/board/genx86_64/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/runnix.conf	                        (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/runnix.conf	2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=genx86_64 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"

Added: branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab	                        (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab	2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,15 @@
+# 
+# /etc/inittab
+#
+# $Id: inittab 1681 2004-09-01 18:12:49Z  $
+#
+
+console::sysinit:/etc/rc sysinit
+console::respawn:/sbin/getty -L 19200 /dev/tty1 linux
+
+# ttyS0::respawn:/sbin/getty -L 19200 /dev/ttyS0 vt100
+# ttyS1::respawn:/sbin/getty -L 19200 /dev/ttyS1 vt100
+
+# Stuff to do before rebooting
+::ctrlaltdel:/sbin/reboot
+::shutdown:/etc/rc shutdown

Added: branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules	                        (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules	2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,26 @@
+## These modules get modprobe'd when the system starts up.
+rtc
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
+3c59x
+typhoon
+tulip
+e100
+natsemi
+forcedeth
+8139too
+via-rhine
+via-velocity
+vmxnet3
+pcnet32
+acenic
+e1000
+e1000e
+igb
+ns83820
+r8168
+r8169
+tg3
+skge

Added: branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf	                        (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf	2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=genx86_64 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"

Added: branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab	                        (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab	2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,12 @@
+# 
+# /etc/inittab
+#
+# $Id: inittab 1681 2004-09-01 18:12:49Z  $
+#
+
+console::sysinit:/etc/rc sysinit
+console::respawn:/sbin/getty -L 19200 /dev/ttyS0 vt100
+
+# Stuff to do before rebooting
+::ctrlaltdel:/sbin/reboot
+::shutdown:/etc/rc shutdown

Added: branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules	                        (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules	2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,26 @@
+## These modules get modprobe'd when the system starts up.
+rtc
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
+3c59x
+typhoon
+tulip
+e100
+natsemi
+forcedeth
+8139too
+via-rhine
+via-velocity
+#vmxnet3
+pcnet32
+acenic
+e1000
+e1000e
+igb
+ns83820
+r8168
+r8169
+tg3
+skge

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2015-11-24 00:24:16 UTC (rev 7347)
@@ -127,7 +127,7 @@
     exit $RED
   fi
 
-  if [ "$ARCH" = "geni586" ]; then
+  if [ "$ARCH" = "geni586" -o "$ARCH" = "genx86_64" ]; then
     if [ -n "$SERIAL" ]; then
       IS_SERIAL="-serial"
       ARCH="${ARCH}${IS_SERIAL}"

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image	2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image	2015-11-24 00:24:16 UTC (rev 7347)
@@ -135,6 +135,10 @@
       ARCH=`echo $i | sed -e 's/astlinux=//'`
       if [ "$ARCH" = "via" -o "$ARCH" = "viac7" ]; then  # Redirect deprecated boards
         ARCH="geni586"
+      elif [ "$ARCH" = "geni586" -a "$ARCH_BITS" = "64" ]; then
+        ARCH="genx86_64"
+      elif [ "$ARCH" = "genx86_64" -a "$ARCH_BITS" = "32" ]; then
+        ARCH="geni586"
       fi
     elif echo $i | grep -q "console="; then
       SERIAL=`echo $i | sed -e 's/console=//'`
@@ -146,7 +150,7 @@
     exit $RED
   fi
 
-  if [ "$ARCH" = "geni586" ]; then
+  if [ "$ARCH" = "geni586" -o "$ARCH" = "genx86_64" ]; then
     if [ -n "$SERIAL" ]; then
       ARCH="${ARCH}-serial"
     fi
@@ -345,9 +349,10 @@
   if [ -n "$2" ]; then
     SRC_URL=$2
   else
-    echo "Usage: upgrade-run-image check firmware_repository_url"
+    echo "Usage: upgrade-run-image check firmware_repository_url [32|64]"
     exit 1
   fi
+  ARCH_BITS="$3"
   check
   echo "Current version is: ${OVER}${AFTER_REBOOT},  Newest available version is: ${VER}"
   exit $GREEN
@@ -357,9 +362,10 @@
   if [ -n "$2" ]; then
     SRC_URL=$2
   else
-    echo "Usage: upgrade-run-image upgrade firmware_repository_url"
+    echo "Usage: upgrade-run-image upgrade firmware_repository_url [32|64]"
     exit 1
   fi
+  ARCH_BITS="$3"
   check
   upgrade
   echo "Successful upgrade to: ${VER}${AFTER_REBOOT}"
@@ -379,7 +385,7 @@
   ;;
   
 *)
-  echo "Usage: upgrade-run-image check|upgrade|show|revert firmware_repository_url"
+  echo "Usage: upgrade-run-image check|upgrade|show|revert firmware_repository_url [32|64]"
   exit 1
   ;;
   

Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build	2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/scripts/master-build	2015-11-24 00:24:16 UTC (rev 7347)
@@ -9,6 +9,8 @@
 
 FAT_SIZE=256
 
+BOARDS_SMP64="genx86_64 genx86_64-serial"
+
 BOARDS_SMP="geni586 geni586-serial"
 
 BOARDS_NO_SMP="net5501 alix"
@@ -139,6 +141,16 @@
   for board in $BOARDS_SMP; do
     build_board "$FIRMWARE" "$IMG"
   done
+
+  # SMP64 Builds
+  echo "Cleaning out any existing builds..."
+  rm -rf output
+
+  cp "x86_64-configs/$CONFIG" .config
+
+  for board in $BOARDS_SMP64; do
+    build_board "$FIRMWARE" "$IMG"
+  done
 done
 
 echo "

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

[Astlinux-commits] SF.net SVN: astlinux:[7346] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/alert

From: <abe...@us...> - 2015-11-23 16:30:25

Revision: 7346
          http://sourceforge.net/p/astlinux/code/7346
Author:   abelbeck
Date:     2015-11-23 16:30:24 +0000 (Mon, 23 Nov 2015)
Log Message:
-----------
startup alert script, add -m to uname and prepare for genx86_64 board type

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert	2015-11-23 16:03:15 UTC (rev 7345)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert	2015-11-23 16:30:24 UTC (rev 7346)
@@ -35,7 +35,7 @@
 
        Hostname: $HOSTNAME
          Domain: $DOMAIN
-          Linux: $(uname -r)
+          Linux: $(uname -r -m)
      RAM Memory: $memtotal MB, Free $memfree MB
 
       Interface: $EXTIF (External)   IPv4 Address: $(dev_to_ipv4_addresses $EXTIF)${INTIF:+
@@ -157,7 +157,7 @@
   fi
 
   # Generate Alert Sounds (after finished booting)
-  if grep -q "astlinux=geni586" /proc/cmdline; then
+  if grep -q "astlinux=gen[ix][0-9]" /proc/cmdline; then
 
     if is_alert_sound_type startup; then
       play_alert_sound_type startup
@@ -199,7 +199,7 @@
   fi
 
   # Generate Alert Sounds (on reboot/shutdown)
-  if grep -q "astlinux=geni586" /proc/cmdline; then
+  if grep -q "astlinux=gen[ix][0-9]" /proc/cmdline; then
 
     if is_alert_sound_type shutdown; then
       play_alert_sound_type shutdown

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 .. 41 42 43 44 45 .. 329 > >> (Page 43 of 329)