astlinux-commits — Commits to the AstLinux SVN repository

[Astlinux-commits] SF.net SVN: astlinux:[7420] branches/1.0/boot/runnix/runnix.mk

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

Revision: 7420
          http://sourceforge.net/p/astlinux/code/7420
Author:   abelbeck
Date:     2015-12-22 02:11:45 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
runnix, version bump to runnix-0.4-7419

Modified Paths:
--------------
    branches/1.0/boot/runnix/runnix.mk

Modified: branches/1.0/boot/runnix/runnix.mk
===================================================================
--- branches/1.0/boot/runnix/runnix.mk	2015-12-22 00:20:55 UTC (rev 7419)
+++ branches/1.0/boot/runnix/runnix.mk	2015-12-22 02:11:45 UTC (rev 7420)
@@ -3,7 +3,7 @@
 # runnix
 #
 #############################################################
-RUNNIX_VER:=0.4-6956
+RUNNIX_VER:=0.4-7419
 RUNNIX_SOURCE:=runnix-$(RUNNIX_VER).tar.gz
 RUNNIX_SITE:=http://mirror.astlinux.org/runnix4
 RUNNIX_DIR:=$(BUILD_DIR)/runnix-$(RUNNIX_VER)

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

[Astlinux-commits] SF.net SVN: astlinux:[7419] branches/1.0/project/runnix/target_skeleton/ runnix

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

Revision: 7419
          http://sourceforge.net/p/astlinux/code/7419
Author:   abelbeck
Date:     2015-12-22 00:20:55 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
runnix, update the /runnix script... cleanup, tweaks and incorporate what we learned with kernel-reboot

Modified Paths:
--------------
    branches/1.0/project/runnix/target_skeleton/runnix

Modified: branches/1.0/project/runnix/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix/target_skeleton/runnix	2015-12-20 17:39:48 UTC (rev 7418)
+++ branches/1.0/project/runnix/target_skeleton/runnix	2015-12-22 00:20:55 UTC (rev 7419)
@@ -2,12 +2,12 @@
 export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 
 # BASE is where the runnix partition is mounted
-BASE=/mnt/base
+BASE="/mnt/base"
 
 # ROOT is where the .run partition is mounted
-ROOT=/mnt/root
+ROOT="/mnt/root"
 
-RUNVER="`cat /etc/runnix-release`"
+RUNVER="$(cat /etc/runnix-release)"
 
 DRIVES="sda sdb sdc sdd sde sdf sdg sdh"
 
@@ -19,8 +19,8 @@
 
   #VLANS
   for i in $VLANS; do
-    IF=`echo $i | cut -d. -f1`
-    VID=`echo $i | cut -d. -f2`
+    IF="$(echo $i | cut -d. -f1)"
+    VID="$(echo $i | cut -d. -f2)"
     ifconfig $IF up
     vconfig add $IF $VID > /dev/null
   done
@@ -129,7 +129,7 @@
 mount -t tmpfs none /tmp
 mkdir /tmp/etc
 
-CMDLINE="`cat /proc/cmdline`"
+CMDLINE="$(cat /proc/cmdline)"
 
 for x in $DRIVES; do
   if mount -t iso9660 -o ro /dev/${x} $BASE 2>/dev/null; then
@@ -165,7 +165,7 @@
 for i in $CMDLINE; do
   case $i in
   runimg=*)
-    RUNIMG="`echo $i | cut -c8-`"
+    RUNIMG="$(echo $i | cut -c8-)"
     ;;
   esac
 done
@@ -188,15 +188,15 @@
   RUNIMG="auto"
 fi
 
+# Get the latest good one if "auto"
+cd $BASE/os
 if [ "$RUNIMG" = "auto" ]; then
-  # Get the latest good one
-  cd $BASE/os
-  RUNIMG="`ls *.run | tail -n1`"
+  RUNIMG="$(ls *.run | tail -n1)"
 fi
 
 #If we have a ver file, override auto/default.conf value
 if [ -f $BASE/os/ver ]; then
-  RUNIMG="`cat $BASE/os/ver`.run"
+  RUNIMG="$(cat $BASE/os/ver).run"
 fi
 
 if [ "$VERIFY_LOCAL" = "yes" ]; then
@@ -216,85 +216,81 @@
   . $BASE/os/$RUNIMG.conf
 fi
 
-if [ -n "$INITRAMFS" ]; then
-  if [ "$INITRAMFS" = "yes" ]; then
-    if [ -n "$KCMD" ]; then
-      echo "Image is initramfs, booting now..."
-      kexec --command-line="$KCMD" -f $BASE/os/$RUNIMG
-      do_failure
-    else
-      echo "You need to specify KCMD with initramfs"
-      do_failure
-    fi
+if [ "$INITRAMFS" = "yes" ]; then
+  if [ -n "$KCMD" ]; then
+    echo "Image is initramfs, booting now..."
+    /sbin/kexec --command-line="$KCMD" -f $BASE/os/$RUNIMG
+    do_failure
+  else
+    echo "You need to specify KCMD with initramfs"
+    do_failure
   fi
 fi
 
+# Find first unused loop device
+DEVLOOP="$(losetup -f)"
+
 if [ -z "$OFFSET" ]; then
-  losetup /dev/loop0 $BASE/os/$RUNIMG
+  losetup $DEVLOOP $BASE/os/$RUNIMG
 else
-  losetup -o "$OFFSET" /dev/loop0 $BASE/os/$RUNIMG
+  losetup -o "$OFFSET" $DEVLOOP $BASE/os/$RUNIMG
 fi
 
 if [ -z "$FSTYPE" ]; then
-  FSTYPE=ext2
+  FSTYPE="ext2"
 fi
 
-if mount -t $FSTYPE -o ro /dev/loop0 $ROOT; then
-  echo "Root mounted"
-else
+if ! mount -t $FSTYPE -o ro $DEVLOOP $ROOT; then
   echo "Error mounting $RUNIMG root fs"
   do_failure
 fi
 
 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 /mnt/tmp
-  cp "$INITRD" /mnt/tmp/initrd.img
-  cp "$KERN" /mnt/tmp/bzImage
-  echo "Unmounting image..."
+if [ -n "$KCMD" -a -f "$INITRD" -a -f "$KERN" ]; then
+  echo "Loading new kernel..."
+  if ! /sbin/kexec -l --command-line="$KCMD" --initrd="$INITRD" "$KERN"; then
+    umount $ROOT
+    do_failure
+  fi
   umount $ROOT
 else
-  echo "I couldn't find your kernel and/or initrd"
+  echo "Missing one or more of: kcmd, initrd, kernel"
+  umount $ROOT
   do_failure
 fi
 
-if [ -z "$KCMD" ]; then
-  echo "You need to specify a kernel command line.
-I can't guess that"
-  do_failure
-fi
+cd /
+losetup -d $DEVLOOP
 
-umount /tmp
+# Unmount all file systems or remount 'ro' if busy
+sync
+umount -a -r 2>/dev/null
 
 echo "Trying kexec..."
-kexec --command-line="$KCMD" --initrd=/mnt/tmp/initrd.img -f /mnt/tmp/bzImage
+/sbin/kexec -e
 
-do_failure
+do_shell
+# reboot

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

[Astlinux-commits] SF.net SVN: astlinux:[7418] branches/1.0/package/dmidecode

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

Revision: 7418
          http://sourceforge.net/p/astlinux/code/7418
Author:   abelbeck
Date:     2015-12-20 17:39:48 +0000 (Sun, 20 Dec 2015)
Log Message:
-----------
dmidecode, version bump to 3.0, not part of the standard builds

Modified Paths:
--------------
    branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch
    branches/1.0/package/dmidecode/dmidecode.mk

Modified: branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch
===================================================================
--- branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch	2015-12-20 17:12:48 UTC (rev 7417)
+++ branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch	2015-12-20 17:39:48 UTC (rev 7418)
@@ -1,30 +1,18 @@
-Minor build system fixes
-
-Usual build system fixes to allow CC/CFLAGS/LDFLAGS to be overriden
-from the command line, and completed by additional flags from the
-Makefile.
-
-Signed-off-by: Thomas Petazzoni <tho...@fr...>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -12,9 +12,10 @@
+--- dmidecode-3.0/Makefile.orig	2015-12-20 11:19:42.000000000 -0600
++++ dmidecode-3.0/Makefile	2015-12-20 11:23:29.000000000 -0600
+@@ -12,8 +12,9 @@
  #   (at your option) any later version.
  #
  
 -CC      = gcc
 -CFLAGS  = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
--          -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
 +CC      ?= gcc
 +override CFLAGS  += \
-+	-W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
-+        -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
- #CFLAGS += -DBIGENDIAN
- #CFLAGS += -DALIGNMENT_WORKAROUND
++          -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+           -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
  
-@@ -23,7 +24,7 @@
+ # Let lseek and mmap support 64-bit wide offsets
+@@ -27,7 +28,7 @@
  #CFLAGS += -g
  
  # Pass linker flags here

Modified: branches/1.0/package/dmidecode/dmidecode.mk
===================================================================
--- branches/1.0/package/dmidecode/dmidecode.mk	2015-12-20 17:12:48 UTC (rev 7417)
+++ branches/1.0/package/dmidecode/dmidecode.mk	2015-12-20 17:39:48 UTC (rev 7418)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DMIDECODE_VERSION = 2.12
+DMIDECODE_VERSION = 3.0
 DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
 
 define DMIDECODE_BUILD_CMDS

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

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

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

Revision: 7417
          http://sourceforge.net/p/astlinux/code/7417
Author:   abelbeck
Date:     2015-12-20 17:12:48 +0000 (Sun, 20 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-20 17:10:03 UTC (rev 7416)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-20 17:12:48 UTC (rev 7417)
@@ -95,6 +95,8 @@
 
 -- arnofw (AIF), added upstream patch for Issue #21, Leave the IPv6 sysctl accept_ra setting alone when forwarding=1
 
+-- (Custom Build Only) kamailio, version bump to 4.1.9
+
 ** Asterisk
 
 -- Asterisk 1.8.32.3 (no change), 11.19.0 (no change) and 13.5.0 (no change)

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

[Astlinux-commits] SF.net SVN: astlinux:[7416] branches/1.0/package/kamailio

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

Revision: 7416
          http://sourceforge.net/p/astlinux/code/7416
Author:   abelbeck
Date:     2015-12-20 17:10:03 +0000 (Sun, 20 Dec 2015)
Log Message:
-----------
kamailio, version bump to 4.1.9

Modified Paths:
--------------
    branches/1.0/package/kamailio/kamailio-sqlite-concat-fix.patch
    branches/1.0/package/kamailio/kamailio.mk

Modified: branches/1.0/package/kamailio/kamailio-sqlite-concat-fix.patch
===================================================================
--- branches/1.0/package/kamailio/kamailio-sqlite-concat-fix.patch	2015-12-17 15:50:19 UTC (rev 7415)
+++ branches/1.0/package/kamailio/kamailio-sqlite-concat-fix.patch	2015-12-20 17:10:03 UTC (rev 7416)
@@ -20,7 +20,7 @@
  AS 'SIP-ID' FROM $DA_TABLE $CLAUSE ; "
  			$DBROCMD "$QUERY"
  			#TMP_UUID=`sql_ro_query "$QUERY" | $AWK 'BEGIN {line=0;}
-@@ -1970,7 +1970,7 @@
+@@ -1973,7 +1973,7 @@
  $SD_DOMAIN_COLUMN='$OSERDOMAIN'"
  				mecho "Dumping speed-dials for user=<$2>"
  				echo
@@ -29,7 +29,7 @@
  $SD_SD_DOMAIN_COLUMN) AS 'Short number', $SD_NEW_URI_COLUMN AS 'New URI',\
  $SD_DESC_COLUMN FROM $SD_TABLE $CLAUSE;"
  				$DBROCMD "$QUERY"
-@@ -1996,8 +1996,8 @@
+@@ -1999,8 +1999,8 @@
  				else
  					exit 1
  				fi
@@ -40,7 +40,7 @@
  $SD_DOMAIN_COLUMN) AS 'Owner', $SD_NEW_URI_COLUMN AS 'New URI',\
  $SD_DESC_COLUMN FROM $SD_TABLE;"
  				$DBROCMD "$QUERY"
-@@ -2039,7 +2039,7 @@
+@@ -2042,7 +2042,7 @@
  			
  			CLAUSE="WHERE $SD_SD_USER_COLUMN='$OSERUSER' AND \
  $SD_SD_DOMAIN_COLUMN='$OSERDOMAIN'"

Modified: branches/1.0/package/kamailio/kamailio.mk
===================================================================
--- branches/1.0/package/kamailio/kamailio.mk	2015-12-17 15:50:19 UTC (rev 7415)
+++ branches/1.0/package/kamailio/kamailio.mk	2015-12-20 17:10:03 UTC (rev 7416)
@@ -4,7 +4,7 @@
 #
 ##############################################################
 
-KAMAILIO_VERSION = 4.1.8
+KAMAILIO_VERSION = 4.1.9
 KAMAILIO_SOURCE = kamailio-$(KAMAILIO_VERSION)_src.tar.gz
 KAMAILIO_SITE = http://kamailio.org/pub/kamailio/$(KAMAILIO_VERSION)/src
 KAMAILIO_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:[7415] branches/1.0/docs/ChangeLog.txt

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

Revision: 7415
          http://sourceforge.net/p/astlinux/code/7415
Author:   abelbeck
Date:     2015-12-17 15:50:19 +0000 (Thu, 17 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-17 15:40:42 UTC (rev 7414)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-17 15:50:19 UTC (rev 7415)
@@ -31,7 +31,7 @@
 
 -- Monit, version bump to 5.15
 
--- perl, version bump to 5.22.0 using perlcross 1.0.1
+-- perl, version bump to 5.22.1 using perlcross 1.0.2
 
 -- pcre, version bump to 8.38, security fixes: https://blog.fuzzing-project.org/29-Heap-Overflow-in-PCRE.html
 
@@ -73,13 +73,15 @@
 
 -- iperf3, new package, iperf3 is becomming more common, sits along side the old iperf since they are not compatible
 
+-- OpenVPN, version bump to 2.3.9
+
 -- lighttpd, version bump to 1.4.38
 
 -- libcurl (curl) version bump to 7.46.0
 
 -- openldap, version bump to 2.4.43
 
--- miniupnpd, version bump to 1.9.20151118
+-- miniupnpd, version bump to 1.9.20151212
 
 -- msmtp, version bump to 1.6.3
 
@@ -87,7 +89,7 @@
 
 -- sipgrep, version bump to 2.1.0
 
--- stunnel, version bump to 5.25
+-- stunnel, version bump to 5.28
 
 -- shellinabox, version bump to 2.19, new supported repository
 

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

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

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

Revision: 7414
          http://sourceforge.net/p/astlinux/code/7414
Author:   abelbeck
Date:     2015-12-17 15:40:42 +0000 (Thu, 17 Dec 2015)
Log Message:
-----------
perl, version bump to 5.22.1, perl-cross version bump to 1.0.2

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

Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk	2015-12-17 14:59:17 UTC (rev 7413)
+++ branches/1.0/package/perl/perl.mk	2015-12-17 15:40:42 UTC (rev 7414)
@@ -5,7 +5,7 @@
 #############################################################
 
 PERL_VERSION_MAJOR = 22
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
 PERL_INSTALL_STAGING = YES
@@ -17,9 +17,9 @@
 PERL_MODULES = constant version Carp Errno Fcntl PathTools POSIX Digest Socket IO XSLoader Exporter File-Find
 PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Long Time/Local File/Glob Sys/Hostname
 
-PERL_CROSS_VERSION = 1.0.1
-#PERL_CROSS_SITE = https://raw.github.com/arsv/perl-cross/releases
-PERL_CROSS_SITE = http://files.astlinux.org
+PERL_CROSS_VERSION = 1.0.2
+PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION)
+#PERL_CROSS_SITE = http://files.astlinux.org
 PERL_CROSS_SOURCE = perl-$(PERL_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
 
 # We use the perlcross hack to cross-compile perl. It should

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

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

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

Revision: 7413
          http://sourceforge.net/p/astlinux/code/7413
Author:   abelbeck
Date:     2015-12-17 14:59:17 +0000 (Thu, 17 Dec 2015)
Log Message:
-----------
miniupnpd, version bump to 1.9.20151212

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

Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk	2015-12-17 14:18:51 UTC (rev 7412)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk	2015-12-17 14:59:17 UTC (rev 7413)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MINIUPNPD_VERSION = 1.9.20151118
+MINIUPNPD_VERSION = 1.9.20151212
 MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz
 MINIUPNPD_SITE = http://miniupnp.free.fr/files
 MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables

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

[Astlinux-commits] SF.net SVN: astlinux:[7412] branches/1.0/package/stunnel

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

Revision: 7412
          http://sourceforge.net/p/astlinux/code/7412
Author:   abelbeck
Date:     2015-12-17 14:18:51 +0000 (Thu, 17 Dec 2015)
Log Message:
-----------
stunnel, version bump to 5.28

Modified Paths:
--------------
    branches/1.0/package/stunnel/stunnel-configure.patch
    branches/1.0/package/stunnel/stunnel.mk

Modified: branches/1.0/package/stunnel/stunnel-configure.patch
===================================================================
--- branches/1.0/package/stunnel/stunnel-configure.patch	2015-12-17 13:58:51 UTC (rev 7411)
+++ branches/1.0/package/stunnel/stunnel-configure.patch	2015-12-17 14:18:51 UTC (rev 7412)
@@ -1,6 +1,6 @@
 --- stunnel-5.01/configure.ac.orig	2014-04-11 10:43:39.000000000 -0500
 +++ stunnel-5.01/configure.ac	2014-04-11 10:49:05.000000000 -0500
-@@ -111,7 +111,8 @@
+@@ -118,7 +118,8 @@
      AC_CHECK_FILE("/dev/ptc", AC_DEFINE([HAVE_DEV_PTS_AND_PTC], [1],
          [Define to 1 if you have '/dev/ptc' device.]))
  else
@@ -10,7 +10,7 @@
  fi
  
  AC_MSG_NOTICE([**************************************** entropy sources])
-@@ -140,7 +141,9 @@
+@@ -147,7 +148,9 @@
          AC_DEFINE_UNQUOTED([RANDOM_FILE], ["$RANDOM_FILE"], [Random file path])
      fi
  else

Modified: branches/1.0/package/stunnel/stunnel.mk
===================================================================
--- branches/1.0/package/stunnel/stunnel.mk	2015-12-17 13:58:51 UTC (rev 7411)
+++ branches/1.0/package/stunnel/stunnel.mk	2015-12-17 14:18:51 UTC (rev 7412)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-STUNNEL_VERSION = 5.25
+STUNNEL_VERSION = 5.28
 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/5.x
 STUNNEL_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:[7411] branches/1.0/package/openvpn/openvpn.mk

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

Revision: 7411
          http://sourceforge.net/p/astlinux/code/7411
Author:   abelbeck
Date:     2015-12-17 13:58:51 +0000 (Thu, 17 Dec 2015)
Log Message:
-----------
openvpn, version bump to 2.3.9, configure option '--enable-password-save' removed, enabled by default

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

Modified: branches/1.0/package/openvpn/openvpn.mk
===================================================================
--- branches/1.0/package/openvpn/openvpn.mk	2015-12-16 13:06:04 UTC (rev 7410)
+++ branches/1.0/package/openvpn/openvpn.mk	2015-12-17 13:58:51 UTC (rev 7411)
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-OPENVPN_VERSION = 2.3.8
+OPENVPN_VERSION = 2.3.9
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_DEPENDENCIES = host-pkg-config
-OPENVPN_CONF_OPT = --disable-plugins --enable-iproute2 --enable-password-save
+OPENVPN_CONF_OPT = --disable-plugins --enable-iproute2
 OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
 	NETSTAT=/bin/netstat \
 	ROUTE=/sbin/route

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

[Astlinux-commits] SF.net SVN: astlinux:[7410] branches/1.0/scripts/astlinux-makeimage

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

Revision: 7410
          http://sourceforge.net/p/astlinux/code/7410
Author:   abelbeck
Date:     2015-12-16 13:06:04 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
astlinux-makeimage, fix for bash 4.3, fortunately backward compatible

Modified Paths:
--------------
    branches/1.0/scripts/astlinux-makeimage

Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage	2015-12-16 03:58:25 UTC (rev 7409)
+++ branches/1.0/scripts/astlinux-makeimage	2015-12-16 13:06:04 UTC (rev 7410)
@@ -169,7 +169,7 @@
 
 temp="${LOOPD}0"
 PREFIXLEN=${#temp}
-PREFIX="^${temp//\//\/}"
+PREFIX="^${temp//\//\\/}"
 
 # need to filter out bootable marker ('*') so it doesn't show up as $2
 eval $(sudo $HOST_BIN/fdisk -c=dos -u=sectors -l ${LOOPD}0 | tr '*' ' ' | awk "/${PREFIX}/ { printf \"%s=%s\\n\", substr(\$1, $PREFIXLEN+1), \$2; }")

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

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

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

Revision: 7409
          http://sourceforge.net/p/astlinux/code/7409
Author:   abelbeck
Date:     2015-12-16 03:58:25 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
astlinux-makeimage, build our own HOST fdisk that is compatible with our './scripts/bximage' binary blob

Modified Paths:
--------------
    branches/1.0/boot/runnix/runnix.mk
    branches/1.0/scripts/astlinux-makeimage

Added Paths:
-----------
    branches/1.0/package/fdisk/
    branches/1.0/package/fdisk/fdisk.mk

Modified: branches/1.0/boot/runnix/runnix.mk
===================================================================
--- branches/1.0/boot/runnix/runnix.mk	2015-12-15 00:29:22 UTC (rev 7408)
+++ branches/1.0/boot/runnix/runnix.mk	2015-12-16 03:58:25 UTC (rev 7409)
@@ -15,7 +15,7 @@
 $(DL_DIR)/$(RUNNIX_SOURCE):
 	$(WGET) -P $(DL_DIR) $(RUNNIX_SITE)/$(RUNNIX_SOURCE)
 
-$(RUNNIX_DIR)/.unpacked: $(DL_DIR)/$(RUNNIX_SOURCE)
+$(RUNNIX_DIR)/.unpacked: $(DL_DIR)/$(RUNNIX_SOURCE) | host-fdisk
 	$(RUNNIX_CAT) $(DL_DIR)/$(RUNNIX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $(RUNNIX_DIR)/.unpacked
 

Added: branches/1.0/package/fdisk/fdisk.mk
===================================================================
--- branches/1.0/package/fdisk/fdisk.mk	                        (rev 0)
+++ branches/1.0/package/fdisk/fdisk.mk	2015-12-16 03:58:25 UTC (rev 7409)
@@ -0,0 +1,48 @@
+#############################################################
+#
+# fdisk - HOST-Only
+#
+# Used by: ./scripts/astlinux-makeimage
+#
+#############################################################
+FDISK_VERSION = $(FDISK_VERSION_MAJOR).1
+FDISK_VERSION_MAJOR = 2.20
+FDISK_SOURCE = util-linux-$(FDISK_VERSION).tar.bz2
+FDISK_SITE = http://www.kernel.org/pub/linux/utils/util-linux/v$(FDISK_VERSION_MAJOR)
+
+HOST_FDISK_DEPENDENCIES = host-pkg-config
+HOST_FDISK_CONF_ENV = scanf_cv_type_modifier=no
+
+HOST_FDISK_CONF_OPT += --disable-rpath --disable-makeinstall-chown --without-ncurses
+
+HOST_FDISK_CONF_OPT += \
+	--disable-agetty \
+	--disable-arch \
+	--disable-cramfs \
+	--disable-ddate \
+	--disable-fallocate \
+	--disable-fsck \
+	--disable-kill \
+	--disable-libblkid \
+	--disable-libmount \
+	--disable-libuuid \
+	--disable-last \
+	--disable-mesg \
+	--disable-mount \
+	--disable-partx \
+	--disable-pivot_root \
+	--disable-raw \
+	--disable-rename \
+	--disable-reset \
+	--disable-schedutils \
+	--disable-switch_root \
+	--disable-unshare \
+	--disable-uuidd \
+	--disable-wall \
+	--disable-write
+
+define HOST_FDISK_INSTALL_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/fdisk/fdisk $(HOST_DIR)/usr/sbin/fdisk
+endef
+
+$(eval $(call AUTOTARGETS,package,fdisk,host))

Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage	2015-12-15 00:29:22 UTC (rev 7408)
+++ branches/1.0/scripts/astlinux-makeimage	2015-12-16 03:58:25 UTC (rev 7409)
@@ -7,8 +7,13 @@
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
 
-REQUIRED_CMDS="which sudo mkdosfs mkfs fdisk losetup gzip"
+HOST_BIN="./output/host/usr/sbin"
 
+# Package host-fdisk builds:
+REQUIRED_HOST_CMDS="fdisk"
+
+REQUIRED_CMDS="which sudo mkdosfs mkfs losetup gzip"
+
 RUNNIX_VER="$(awk -F'=' '/^RUNNIX_VER/ { print $2; exit }' boot/runnix/runnix.mk)"
 
 RUNNIX_DIR="output/build/runnix-${RUNNIX_VER// /}"
@@ -60,6 +65,12 @@
 fi
 
 error=0
+for i in $REQUIRED_HOST_CMDS; do
+  if [ ! -x "$HOST_BIN/$i" ]; then
+    error=1
+    echo "astlinux-makeimage: Required HOST command \"$i\" is missing." >&2
+  fi
+done
 for i in $REQUIRED_CMDS; do
   if ! which $i >/dev/null 2>&1; then
     error=1
@@ -154,14 +165,14 @@
     echo -e "n\np\n1\n\n\nt\n6\na\n1"
   fi
   echo "w"
-) | sudo fdisk -C $CYL -H $HEADS -S $SECTORS ${LOOPD}0
+) | sudo $HOST_BIN/fdisk -c=dos -u=cylinders -C $CYL -H $HEADS -S $SECTORS ${LOOPD}0
 
 temp="${LOOPD}0"
 PREFIXLEN=${#temp}
 PREFIX="^${temp//\//\/}"
 
 # need to filter out bootable marker ('*') so it doesn't show up as $2
-eval $(sudo fdisk -u -l ${LOOPD}0 | tr '*' ' ' | awk "/${PREFIX}/ { printf \"%s=%s\\n\", substr(\$1, $PREFIXLEN+1), \$2; }")
+eval $(sudo $HOST_BIN/fdisk -c=dos -u=sectors -l ${LOOPD}0 | tr '*' ' ' | awk "/${PREFIX}/ { printf \"%s=%s\\n\", substr(\$1, $PREFIXLEN+1), \$2; }")
 
 if [ -z "$p1" -o \( $AST_SIZE -gt 0 -a -z "$p2" \) ]; then
   echo "Couldn't extract partition offsets." >&2
@@ -223,7 +234,7 @@
 fi
 
 if [ -n "$DUMP_PARTITIONS" ]; then
-  sudo fdisk -l -u ${LOOPD}0
+  sudo $HOST_BIN/fdisk -c=dos -u=sectors -l ${LOOPD}0
 fi
 
 sudo losetup -d ${LOOPD}0

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

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

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

Revision: 7408
          http://sourceforge.net/p/astlinux/code/7408
Author:   abelbeck
Date:     2015-12-15 00:29:22 +0000 (Tue, 15 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-15 00:21:03 UTC (rev 7407)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-15 00:29:22 UTC (rev 7408)
@@ -114,10 +114,10 @@
 
 -- Network tab, new certificate creation, add Signature Algorithm: [ SHA-1, SHA-256 ] option, defaults to SHA-256.
    Applies only to new certificates:
-   == HTTPS web server certificate
    == SIP-TLS certificate (shared with other packages as well)
    == OpenVPN server certificate
    == IPsec server certificate
+   == HTTPS web server certificate (only SHA-256 for new certificates)
 
 -- CLI tab, set terminal background to 'white' and remove unnecessary title header.
 

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

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

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

Revision: 7407
          http://sourceforge.net/p/astlinux/code/7407
Author:   abelbeck
Date:     2015-12-15 00:21:03 +0000 (Tue, 15 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-15 00:16:59 UTC (rev 7406)
+++ branches/1.0/docs/ChangeLog.txt	2015-12-15 00:21:03 UTC (rev 7407)
@@ -44,7 +44,7 @@
 -- 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
+-- libsodium, version bump to 1.0.7
 
 -- ethtool, version bump to 4.2
 
@@ -112,7 +112,8 @@
 
 -- Network tab -> "External DHCPv6 Client Settings:" adds External Interface DHCPv6 configuration options.
 
--- Network tab, new certificate creation, deprecate SHA-1 and migrate to SHA-256. Applies only to new certificates:
+-- Network tab, new certificate creation, add Signature Algorithm: [ SHA-1, SHA-256 ] option, defaults to SHA-256.
+   Applies only to new certificates:
    == HTTPS web server certificate
    == SIP-TLS certificate (shared with other packages as well)
    == OpenVPN server certificate

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

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

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

Revision: 7406
          http://sourceforge.net/p/astlinux/code/7406
Author:   abelbeck
Date:     2015-12-15 00:16:59 +0000 (Tue, 15 Dec 2015)
Log Message:
-----------
web interface, New SSL certificate creation, add new 'Signature Algorithm:' option, defaults to SHA-256. We previously hard-coded this to sha256, but some IP Phones with OpenVPN do not (yet) support SHA-256, this allows SHA-1 to be chosen

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
    branches/1.0/package/webinterface/altweb/admin/openvpn.php
    branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
    branches/1.0/package/webinterface/altweb/admin/siptlscert.php
    branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php
    branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php
    branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php

Modified: branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php	2015-12-14 20:38:32 UTC (rev 7405)
+++ branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php	2015-12-15 00:16:59 UTC (rev 7406)
@@ -8,6 +8,7 @@
 
 // ipsecmobile.php for AstLinux
 // 11-23-2010
+// 12-14-2015, Added Signature Algorithm support
 //
 // System location of /mnt/kd/rc.conf.d directory
 $IPSECMCONFDIR = '/mnt/kd/rc.conf.d';
@@ -30,15 +31,20 @@
 
 // Function: ipsecmobile_openssl()
 //
-function ipsecmobile_openssl($keysize, $dnsname) {
+function ipsecmobile_openssl($keysize, $algorithm, $dnsname) {
   global $global_prefs;
   // System location of gui.network.conf file
   $NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
   
   if ($keysize === '') {
-    $keysize = '1024';
+    $keysize = '2048';
   }
   $opts['keysize'] = (int)$keysize;
+
+  if ($algorithm === '') {
+    $algorithm = 'sha256';
+  }
+  $opts['algorithm'] = $algorithm;
   $opts['dnsname'] = $dnsname;
 
   if (($countryName = getPREFdef($global_prefs, 'dn_country_name_cmdstr')) === '') {
@@ -75,8 +81,9 @@
   return($ssl);
 }
 $key_size = getVARdef($db, 'IPSECM_CERT_KEYSIZE');
+$signature_algorithm = getVARdef($db, 'IPSECM_CERT_ALGORITHM');
 $dns_name = getVARdef($db, 'IPSECM_CERT_DNSNAME');
-$openssl = ipsecmobile_openssl($key_size, $dns_name);
+$openssl = ipsecmobile_openssl($key_size, $signature_algorithm, $dns_name);
 
 $nat_t_menu = array (
   'off' => 'Disable',
@@ -136,6 +143,11 @@
   '2048' => '2048 Bits'
 );
 
+$signature_algorithm_menu = array (
+  'sha1' => 'SHA-1',
+  'sha256' => 'SHA-256'
+);
+
 // Function: saveIPSECMsettings
 //
 function saveIPSECMsettings($conf_dir, $conf_file) {
@@ -210,6 +222,9 @@
   $value = 'IPSECM_CERT_KEYSIZE="'.$_POST['key_size'].'"';
   fwrite($fp, "### Private Key Size\n".$value."\n");
 
+  $value = 'IPSECM_CERT_ALGORITHM="'.$_POST['signature_algorithm'].'"';
+  fwrite($fp, "### Signature Algorithm\n".$value."\n");
+
   $value = 'IPSECM_CERT_DNSNAME="'.str_replace(' ', '', tuq($_POST['dns_name'])).'"';
   fwrite($fp, "### Server Cert DNS Name\n".$value."\n");
 
@@ -269,8 +284,9 @@
       }
       // Rebuild openssl.cnf template for new CA
       $key_size = $_POST['key_size'];
+      $signature_algorithm = $_POST['signature_algorithm'];
       $dns_name = str_replace(' ', '', tuq($_POST['dns_name']));
-      if (($openssl = ipsecmobile_openssl($key_size, $dns_name)) !== FALSE) {
+      if (($openssl = ipsecmobile_openssl($key_size, $signature_algorithm, $dns_name)) !== FALSE) {
         if (opensslCREATEselfCert($openssl)) {
           if (opensslCREATEserverCert($openssl)) {
             $result = 30;
@@ -593,7 +609,7 @@
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Private Key Size:</td><td style="text-align: left;" colspan="4">');
   if (($key_size = getVARdef($db, 'IPSECM_CERT_KEYSIZE')) === '') {
-    $key_size = '1024';
+    $key_size = '2048';
   }
   putHtml('<select name="key_size">');
   foreach ($key_size_menu as $key => $value) {
@@ -602,7 +618,21 @@
   }
   putHtml('</select>');
   putHtml('</td></tr>');
+
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+  putHtml('Signature Algorithm:</td><td style="text-align: left;" colspan="4">');
+  if (($signature_algorithm = getVARdef($db, 'IPSECM_CERT_ALGORITHM')) === '') {
+    $signature_algorithm = 'sha256';
+  }
+  putHtml('<select name="signature_algorithm">');
+  foreach ($signature_algorithm_menu as $key => $value) {
+    $sel = ($signature_algorithm === $key) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+  }
+  putHtml('</select>');
+  putHtml('</td></tr>');
+
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Server Cert DNS Name:</td><td style="text-align: left;" colspan="4">');
   $value = getVARdef($db, 'IPSECM_CERT_DNSNAME');
   putHtml('<input type="text" size="24" maxlength="128" value="'.$value.'" name="dns_name" />');

Modified: branches/1.0/package/webinterface/altweb/admin/openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpn.php	2015-12-14 20:38:32 UTC (rev 7405)
+++ branches/1.0/package/webinterface/altweb/admin/openvpn.php	2015-12-15 00:16:59 UTC (rev 7406)
@@ -13,6 +13,7 @@
 // 08-13-2010, Added QoS Passthrough, setting passtos
 // 01-03-2013, Added private keysize support
 // 02-13-2013, Added OpenVPN 2.3 IPv6 support
+// 12-14-2015, Added Signature Algorithm support
 //
 // System location of /mnt/kd/rc.conf.d directory
 $OVPNCONFDIR = '/mnt/kd/rc.conf.d';
@@ -35,16 +36,21 @@
 
 // Function: openvpn_openssl()
 //
-function openvpn_openssl($keysize) {
+function openvpn_openssl($keysize, $algorithm) {
   global $global_prefs;
   // System location of gui.network.conf file
   $NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
   
   if ($keysize === '') {
-    $keysize = '1024';
+    $keysize = '2048';
   }
   $opts['keysize'] = (int)$keysize;
 
+  if ($algorithm === '') {
+    $algorithm = 'sha256';
+  }
+  $opts['algorithm'] = $algorithm;
+
   if (($countryName = getPREFdef($global_prefs, 'dn_country_name_cmdstr')) === '') {
     $countryName = 'US';
   }
@@ -79,7 +85,8 @@
   return($ssl);
 }
 $key_size = getVARdef($db, 'OVPN_CERT_KEYSIZE');
-$openssl = openvpn_openssl($key_size);
+$signature_algorithm = getVARdef($db, 'OVPN_CERT_ALGORITHM');
+$openssl = openvpn_openssl($key_size, $signature_algorithm);
 
 $cipher_menu = array (
   '' => 'Use Default',
@@ -91,8 +98,8 @@
 
 $auth_hmac_menu = array (
   '' => 'Use Default',
-  'SHA1' => 'SHA1',
-  'SHA256' => 'SHA256'
+  'SHA1' => 'SHA-1',
+  'SHA256' => 'SHA-256'
 );
 
 $verbosity_menu = array (
@@ -119,6 +126,11 @@
   '2048' => '2048 Bits'
 );
 
+$signature_algorithm_menu = array (
+  'sha1' => 'SHA-1',
+  'sha256' => 'SHA-256'
+);
+
 $topology_menu = array (
   '' => 'Use Default',
   'net30' => '[net30] older, OpenVPN 2.0 default',
@@ -204,6 +216,9 @@
   $value = 'OVPN_CERT_KEYSIZE="'.$_POST['key_size'].'"';
   fwrite($fp, "### Private Key Size\n".$value."\n");
 
+  $value = 'OVPN_CERT_ALGORITHM="'.$_POST['signature_algorithm'].'"';
+  fwrite($fp, "### Signature Algorithm\n".$value."\n");
+
 if (opensslOPENVPNis_valid($openssl)) {
   $value = 'OVPN_CA="'.$openssl['key_dir'].'/ca.crt"';
   fwrite($fp, "### CA File\n".$value."\n");
@@ -397,7 +412,8 @@
       }
       // Rebuild openssl.cnf template for new CA
       $key_size = $_POST['key_size'];
-      if (($openssl = openvpn_openssl($key_size)) !== FALSE) {
+      $signature_algorithm = $_POST['signature_algorithm'];
+      if (($openssl = openvpn_openssl($key_size, $signature_algorithm)) !== FALSE) {
         if (opensslCREATEselfCert($openssl)) {
           if (opensslCREATEserverCert($openssl)) {
             if (opensslCREATEdh_pem($openssl)) {
@@ -785,7 +801,7 @@
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Private Key Size:</td><td style="text-align: left;" colspan="4">');
   if (($key_size = getVARdef($db, 'OVPN_CERT_KEYSIZE')) === '') {
-    $key_size = '1024';
+    $key_size = '2048';
   }
   putHtml('<select name="key_size">');
   foreach ($key_size_menu as $key => $value) {
@@ -795,6 +811,19 @@
   putHtml('</select>');
   putHtml('</td></tr>');
 
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+  putHtml('Signature Algorithm:</td><td style="text-align: left;" colspan="4">');
+  if (($signature_algorithm = getVARdef($db, 'OVPN_CERT_ALGORITHM')) === '') {
+    $signature_algorithm = 'sha256';
+  }
+  putHtml('<select name="signature_algorithm">');
+  foreach ($signature_algorithm_menu as $key => $value) {
+    $sel = ($signature_algorithm === $key) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+  }
+  putHtml('</select>');
+  putHtml('</td></tr>');
+
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">');
   putHtml('Create New Certificate and Key:</td><td class="dialogText" style="text-align: left;" colspan="3">');
   $msg = '';

Modified: branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php	2015-12-14 20:38:32 UTC (rev 7405)
+++ branches/1.0/package/webinterface/altweb/admin/openvpnclient.php	2015-12-15 00:16:59 UTC (rev 7406)
@@ -47,8 +47,8 @@
 
 $auth_hmac_menu = array (
   '' => 'Use Default',
-  'SHA1' => 'SHA1',
-  'SHA256' => 'SHA256'
+  'SHA1' => 'SHA-1',
+  'SHA256' => 'SHA-256'
 );
 
 $nscerttype_menu = array (

Modified: branches/1.0/package/webinterface/altweb/admin/siptlscert.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/siptlscert.php	2015-12-14 20:38:32 UTC (rev 7405)
+++ branches/1.0/package/webinterface/altweb/admin/siptlscert.php	2015-12-15 00:16:59 UTC (rev 7406)
@@ -8,6 +8,7 @@
 
 // siptlscert.php for AstLinux
 // 11-12-2012
+// 12-14-2015, Added Signature Algorithm support
 //
 // System location of /mnt/kd/rc.conf.d directory
 $SIPTLSCERTCONFDIR = '/mnt/kd/rc.conf.d';
@@ -30,7 +31,7 @@
 
 // Function: siptlscert_openssl()
 //
-function siptlscert_openssl($keysize, $dnsname) {
+function siptlscert_openssl($keysize, $algorithm, $dnsname) {
   global $global_prefs;
   // System location of gui.network.conf file
   $NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
@@ -39,6 +40,11 @@
     $keysize = '2048';
   }
   $opts['keysize'] = (int)$keysize;
+
+  if ($algorithm === '') {
+    $algorithm = 'sha256';
+  }
+  $opts['algorithm'] = $algorithm;
   $opts['dnsname'] = $dnsname;
 
   if (($countryName = getPREFdef($global_prefs, 'dn_country_name_cmdstr')) === '') {
@@ -75,14 +81,20 @@
   return($ssl);
 }
 $key_size = getVARdef($db, 'SIPTLSCERT_CERT_KEYSIZE');
+$signature_algorithm = getVARdef($db, 'SIPTLSCERT_CERT_ALGORITHM');
 $dns_name = getVARdef($db, 'SIPTLSCERT_CERT_DNSNAME');
-$openssl = siptlscert_openssl($key_size, $dns_name);
+$openssl = siptlscert_openssl($key_size, $signature_algorithm, $dns_name);
 
 $key_size_menu = array (
   '1024' => '1024 Bits',
   '2048' => '2048 Bits'
 );
 
+$signature_algorithm_menu = array (
+  'sha1' => 'SHA-1',
+  'sha256' => 'SHA-256'
+);
+
 // Function: saveSIPTLSCERTsettings
 //
 function saveSIPTLSCERTsettings($conf_dir, $conf_file) {
@@ -101,6 +113,9 @@
   $value = 'SIPTLSCERT_CERT_KEYSIZE="'.$_POST['key_size'].'"';
   fwrite($fp, "### Private Key Size\n".$value."\n");
 
+  $value = 'SIPTLSCERT_CERT_ALGORITHM="'.$_POST['signature_algorithm'].'"';
+  fwrite($fp, "### Signature Algorithm\n".$value."\n");
+
   $value = 'SIPTLSCERT_CERT_DNSNAME="'.str_replace(' ', '', tuq($_POST['dns_name'])).'"';
   fwrite($fp, "### Server Cert DNS Name\n".$value."\n");
 
@@ -131,8 +146,9 @@
       }
       // Rebuild openssl.cnf template for new CA
       $key_size = $_POST['key_size'];
+      $signature_algorithm = $_POST['signature_algorithm'];
       $dns_name = str_replace(' ', '', tuq($_POST['dns_name']));
-      if (($openssl = siptlscert_openssl($key_size, $dns_name)) !== FALSE) {
+      if (($openssl = siptlscert_openssl($key_size, $signature_algorithm, $dns_name)) !== FALSE) {
         if (opensslCREATEselfCert($openssl)) {
           if (opensslCREATEserverCert($openssl)) {
             $result = 30;
@@ -281,7 +297,21 @@
   }
   putHtml('</select>');
   putHtml('</td></tr>');
+
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+  putHtml('Signature Algorithm:</td><td style="text-align: left;" colspan="4">');
+  if (($signature_algorithm = getVARdef($db, 'SIPTLSCERT_CERT_ALGORITHM')) === '') {
+    $signature_algorithm = 'sha256';
+  }
+  putHtml('<select name="signature_algorithm">');
+  foreach ($signature_algorithm_menu as $key => $value) {
+    $sel = ($signature_algorithm === $key) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+  }
+  putHtml('</select>');
+  putHtml('</td></tr>');
+
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Server Cert DNS Name:</td><td style="text-align: left;" colspan="4">');
   if (($value = getVARdef($db, 'SIPTLSCERT_CERT_DNSNAME')) === '') {
     $value = getPREFdef($global_prefs, 'dn_common_name_cmdstr');

Modified: branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php	2015-12-14 20:38:32 UTC (rev 7405)
+++ branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php	2015-12-15 00:16:59 UTC (rev 7406)
@@ -40,27 +40,27 @@
   );
   $ssl['configArgs'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'encrypt_key' => FALSE
   );
   $ssl['sign_ca'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'v3_ca',
     'encrypt_key' => FALSE
   );
   $ssl['sign_server'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'ipsecmobile_server',
     'encrypt_key' => FALSE
   );
   $ssl['sign_client'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'usr_cert',
     'encrypt_key' => FALSE

Modified: branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php	2015-12-14 20:38:32 UTC (rev 7405)
+++ branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php	2015-12-15 00:16:59 UTC (rev 7406)
@@ -42,27 +42,27 @@
   );
   $ssl['configArgs'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'encrypt_key' => FALSE
   );
   $ssl['sign_ca'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'v3_ca',
     'encrypt_key' => FALSE
   );
   $ssl['sign_server'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'openvpn_server',
     'encrypt_key' => FALSE
   );
   $ssl['sign_client'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'usr_cert',
     'encrypt_key' => FALSE

Modified: branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php	2015-12-14 20:38:32 UTC (rev 7405)
+++ branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php	2015-12-15 00:16:59 UTC (rev 7406)
@@ -40,27 +40,27 @@
   );
   $ssl['configArgs'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'encrypt_key' => FALSE
   );
   $ssl['sign_ca'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'v3_ca',
     'encrypt_key' => FALSE
   );
   $ssl['sign_server'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'sip_tls_server',
     'encrypt_key' => FALSE
   );
   $ssl['sign_client'] = array(
     'config' => $ssl['config'],
-    'digest_alg' => 'sha256',
+    'digest_alg' => $opts['algorithm'],
     'private_key_bits' => $opts['keysize'],
     'x509_extensions' => 'usr_cert',
     'encrypt_key' => FALSE

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

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

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

Revision: 7405
          http://sourceforge.net/p/astlinux/code/7405
Author:   abelbeck
Date:     2015-12-14 20:38:32 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
build system, change the default legacy SourceForge download mirror to 'iweb.dl.sourceforge.net'

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/initrd.config
    branches/1.0/runnix-uclibc.config
    branches/1.0/runnix.config
    branches/1.0/x86_64-configs/astlinux-ast11.config
    branches/1.0/x86_64-configs/astlinux-ast13.config
    branches/1.0/x86_64-configs/astlinux18.config
    branches/1.0/x86_64-configs/initrd.config

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/astlinux-ast11.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/astlinux-ast13.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/astlinux18.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/initrd.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/runnix-uclibc.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/runnix.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -70,7 +70,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/astlinux18.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config	2015-12-14 02:49:25 UTC (rev 7404)
+++ branches/1.0/x86_64-configs/initrd.config	2015-12-14 20:38:32 UTC (rev 7405)
@@ -51,7 +51,7 @@
 #
 BR2_PRIMARY_SITE=""
 BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_SOURCEFORGE_MIRROR="iweb"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
 BR2_DEBIAN_MIRROR="http://ftp.debian.org"

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

[Astlinux-commits] SF.net SVN: astlinux:[7404] branches/1.0/scripts/master-build

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

Revision: 7404
          http://sourceforge.net/p/astlinux/code/7404
Author:   abelbeck
Date:     2015-12-14 02:49:25 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
master-build, add an early 'sudo' test to make sure /etc/sudoers is correct

Modified Paths:
--------------
    branches/1.0/scripts/master-build

Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build	2015-12-13 23:03:15 UTC (rev 7403)
+++ branches/1.0/scripts/master-build	2015-12-14 02:49:25 UTC (rev 7404)
@@ -103,6 +103,17 @@
   fi
 fi
 
+echo "
+Trying sudo, if this prompts for a password, ^C and 'sudoedit /etc/sudoers' and add a line at the end
+something like:
+
+$(id -un) ALL = NOPASSWD: ALL
+"
+if ! sudo /bin/true; then
+  echo "master-build: You need to be a sudo group member to run this script" >&2
+  exit 1
+fi
+
 echo "Regenerate the initrd"
 rm -f initrd.img
 

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

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

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

Revision: 7403
          http://sourceforge.net/p/astlinux/code/7403
Author:   abelbeck
Date:     2015-12-13 23:03:15 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
build system, fix build reproducibility in Make 3.82 (upstream Buildroot)
Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.

This patch sort results of wildcards to ensure reproducibility.

Additionally, in fs/common.mk remove any pre-existing rootfs images for build reproducibility

Modified Paths:
--------------
    branches/1.0/Makefile
    branches/1.0/boot/common.mk
    branches/1.0/fs/common.mk
    branches/1.0/package/games/games.mk
    branches/1.0/package/java/java.mk
    branches/1.0/package/matchbox/matchbox.mk
    branches/1.0/package/multimedia/multimedia.mk

Modified: branches/1.0/Makefile
===================================================================
--- branches/1.0/Makefile	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/Makefile	2015-12-13 23:03:15 UTC (rev 7403)
@@ -309,7 +309,7 @@
 include toolchain/toolchain-crosstool-ng.mk
 endif
 
-include package/*/*.mk
+include $(sort $(wildcard package/*/*.mk))
 
 include boot/common.mk
 include target/Makefile.in

Modified: branches/1.0/boot/common.mk
===================================================================
--- branches/1.0/boot/common.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/boot/common.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include boot/*/*.mk
\ No newline at end of file
+include $(sort $(wildcard boot/*/*.mk))

Modified: branches/1.0/fs/common.mk
===================================================================
--- branches/1.0/fs/common.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/fs/common.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -44,6 +44,7 @@
 $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
+	rm -f $$@
 	rm -f $(FAKEROOT_SCRIPT)
 	touch $(BUILD_DIR)/.fakeroot.00000
 	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
@@ -81,4 +82,4 @@
 $(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
 endef
 
-include fs/*/*.mk
+include $(sort $(wildcard fs/*/*.mk))

Modified: branches/1.0/package/games/games.mk
===================================================================
--- branches/1.0/package/games/games.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/games/games.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/games/*/*.mk
+include $(sort $(wildcard package/games/*/*.mk))

Modified: branches/1.0/package/java/java.mk
===================================================================
--- branches/1.0/package/java/java.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/java/java.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/java/*/*.mk
+include $(sort $(wildcard package/java/*/*.mk))

Modified: branches/1.0/package/matchbox/matchbox.mk
===================================================================
--- branches/1.0/package/matchbox/matchbox.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/matchbox/matchbox.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1,4 +1,4 @@
 ifeq ($(BR2_PACKAGE_MATCHBOX),y)
-include package/matchbox/*/*.mk
+include $(sort $(wildcard package/matchbox/*/*.mk))
 TARGETS+=matchbox-lib matchbox-wm
 endif

Modified: branches/1.0/package/multimedia/multimedia.mk
===================================================================
--- branches/1.0/package/multimedia/multimedia.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/multimedia/multimedia.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/multimedia/*/*.mk
+include $(sort $(wildcard package/multimedia/*/*.mk))

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

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

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

Revision: 7402
          http://sourceforge.net/p/astlinux/code/7402
Author:   abelbeck
Date:     2015-12-13 17:09:41 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
build system, use find -perm /mode, instead of -perm +mode for stripping binaries, without it CentOS 7 will not strip anything resulting in a 50% larger image.
Note: he -perm +mode is deprecated, and sometimes yields suprising results.
It can be confused with permission in symbolic mode, for example '+u+g',
as POSIX spec suggests.

Modified Paths:
--------------
    branches/1.0/Makefile

Modified: branches/1.0/Makefile
===================================================================
--- branches/1.0/Makefile	2015-12-13 15:13:55 UTC (rev 7401)
+++ branches/1.0/Makefile	2015-12-13 17:09:41 UTC (rev 7402)
@@ -447,11 +447,21 @@
 ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
 	find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f
 endif
-	find $(TARGET_DIR) -type f -perm +111 '!' -name 'libthread_db*.so*' | \
-		xargs $(STRIPCMD) 2>/dev/null || true
-	find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
-		xargs -r $(KSTRIPCMD) || true
 
+# strip file exclusions:
+# - libpthread.so: a non-stripped libpthread shared library is needed for
+#   proper debugging of pthread programs using gdb.
+# - kernel modules (*.ko): do not function properly when stripped like normal
+#   applications and libraries. Normally kernel modules are already excluded
+#   by the executable permission check above, so the explicit exclusion is only
+#   done for kernel modules with incorrect permissions.
+
+	find $(TARGET_DIR) -type f \( -perm /111 -o -name '*.so*' \) -not \( -name 'libpthread*.so*' -o -name '*.ko' \) -print0 | \
+		xargs -0 $(STRIPCMD) 2>/dev/null || true
+	if test -d $(TARGET_DIR)/lib/modules; then \
+		find $(TARGET_DIR)/lib/modules -type f -name '*.ko' -print0 | \
+		xargs -0 -r $(KSTRIPCMD); fi
+
 	mkdir -p $(TARGET_DIR)/etc
 	# Mandatory configuration file and auxilliary cache directory
 	# for recent versions of ldconfig

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

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

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

Revision: 7401
          http://sourceforge.net/p/astlinux/code/7401
Author:   abelbeck
Date:     2015-12-13 15:13:55 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
build system, minor tweaks to cope with CentOS 7 as the build system

Modified Paths:
--------------
    branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch
    branches/1.0/package/rhino/rhino.mk

Modified: branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch
===================================================================
--- branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch	2015-12-13 14:50:37 UTC (rev 7400)
+++ branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch	2015-12-13 15:13:55 UTC (rev 7401)
@@ -21,7 +21,7 @@
 -
  $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME)
 -	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors
-+	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) -Llib -lsensors
++	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) -Llib -lsensors -lm
  
  all-prog-sensors: $(PROGSENSORSTARGETS)
  user :: all-prog-sensors

Modified: branches/1.0/package/rhino/rhino.mk
===================================================================
--- branches/1.0/package/rhino/rhino.mk	2015-12-13 14:50:37 UTC (rev 7400)
+++ branches/1.0/package/rhino/rhino.mk	2015-12-13 15:13:55 UTC (rev 7401)
@@ -14,7 +14,6 @@
 RHINO_LEGACY_MODULES := r4fxo
 
 RHINO_PREREQS := dahdi-linux
-RHINO_CONFIGURE := DAHDI_DIR=$(DAHDI_LINUX_DIR)
 
 $(DL_DIR)/$(RHINO_SOURCE):
 	$(WGET) -P $(DL_DIR) $(RHINO_SITE)/$(RHINO_SOURCE)
@@ -37,7 +36,7 @@
 		KINCLUDES=$(STAGING_DIR)/include \
 		KINSTDIR=/lib/modules/$(LINUX_VERSION_PROBED)/kernel \
 		INSTALL_PREFIX=$(TARGET_DIR) \
-		$(RHINO_CONFIGURE) \
+		DAHDI_DIR=$(DAHDI_LINUX_DIR) \
 		all
 	touch $@
 
@@ -50,7 +49,7 @@
 		KINCLUDES=$(STAGING_DIR)/include \
 		KINSTDIR=/lib/modules/$(LINUX_VERSION_PROBED)/kernel \
 		INSTALL_PREFIX=$(TARGET_DIR) \
-		$(RHINO_CONFIGURE) \
+		DAHDI_DIR=$(DAHDI_LINUX_DIR) \
 		install
 	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
 	echo -e "#!/bin/sh\necho \""$(RHINO_VERSION)"\"" > $(TARGET_DIR)/$(RHINO_TARGET_BINARY)

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

[Astlinux-commits] SF.net SVN: astlinux:[7400] branches/1.0/package/asterisk-app_notify/ Makefile.module

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

Revision: 7400
          http://sourceforge.net/p/astlinux/code/7400
Author:   abelbeck
Date:     2015-12-13 14:50:37 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
asterisk-app_notify, add -fPIC so it builds for x86_64

Modified Paths:
--------------
    branches/1.0/package/asterisk-app_notify/Makefile.module

Modified: branches/1.0/package/asterisk-app_notify/Makefile.module
===================================================================
--- branches/1.0/package/asterisk-app_notify/Makefile.module	2015-12-12 22:10:51 UTC (rev 7399)
+++ branches/1.0/package/asterisk-app_notify/Makefile.module	2015-12-13 14:50:37 UTC (rev 7400)
@@ -40,4 +40,4 @@
 	$(CC) -shared $(LIBS) -o $@ $<
 
 %.o: %.c
-	$(CC) $(INCLUDE) -DAST_MODULE=\"$*\" -o $@ -c $<
+	$(CC) -fPIC $(INCLUDE) -DAST_MODULE=\"$*\" -o $@ -c $<

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

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

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

Revision: 7399
          http://sourceforge.net/p/astlinux/code/7399
Author:   abelbeck
Date:     2015-12-12 22:10:51 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
libsodium, version bump to 1.0.7

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

Modified: branches/1.0/package/libsodium/libsodium.mk
===================================================================
--- branches/1.0/package/libsodium/libsodium.mk	2015-12-12 21:48:41 UTC (rev 7398)
+++ branches/1.0/package/libsodium/libsodium.mk	2015-12-12 22:10:51 UTC (rev 7399)
@@ -3,9 +3,9 @@
 # libsodium
 #
 #############################################################
-LIBSODIUM_VERSION = 1.0.6
+LIBSODIUM_VERSION = 1.0.7
 LIBSODIUM_SOURCE = libsodium-$(LIBSODIUM_VERSION).tar.gz
-LIBSODIUM_SITE = http://download.dnscrypt.org/libsodium/releases
+LIBSODIUM_SITE = https://download.dnscrypt.org/libsodium/releases
 
 LIBSODIUM_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:[7398] branches/1.0

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

Revision: 7398
          http://sourceforge.net/p/astlinux/code/7398
Author:   abelbeck
Date:     2015-12-12 21:48:41 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
build system, move '--no-check-certificate' to getter_script.sh when needed, and cleanup pevious hacks

Modified Paths:
--------------
    branches/1.0/package/iperf3/iperf3.mk
    branches/1.0/package/ntp/ntp.mk
    branches/1.0/package/perl/perl.mk
    branches/1.0/toolchain/getter_script.sh

Modified: branches/1.0/package/iperf3/iperf3.mk
===================================================================
--- branches/1.0/package/iperf3/iperf3.mk	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/iperf3/iperf3.mk	2015-12-12 21:48:41 UTC (rev 7398)
@@ -6,6 +6,6 @@
 
 IPERF3_VERSION = 3.0.11
 IPERF3_SOURCE = iperf-$(IPERF3_VERSION)-source.tar.gz
-IPERF3_SITE = --no-check-certificate https://iperf.fr/download/iperf_3.0
+IPERF3_SITE = https://iperf.fr/download/iperf_3.0
 
 $(eval $(call AUTOTARGETS,package,iperf3))

Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/ntp/ntp.mk	2015-12-12 21:48:41 UTC (rev 7398)
@@ -5,7 +5,7 @@
 #############################################################
 NTP_VERSION = 4.2.8p4
 NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
-NTP_SITE = --no-check-certificate https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 NTP_DEPENDENCIES = host-bison host-flex host-pkg-config
 
 NTP_CONF_OPT = \

Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/perl/perl.mk	2015-12-12 21:48:41 UTC (rev 7398)
@@ -18,7 +18,7 @@
 PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Long Time/Local File/Glob Sys/Hostname
 
 PERL_CROSS_VERSION = 1.0.1
-#PERL_CROSS_SITE = --no-check-certificate https://raw.github.com/arsv/perl-cross/releases
+#PERL_CROSS_SITE = https://raw.github.com/arsv/perl-cross/releases
 PERL_CROSS_SITE = http://files.astlinux.org
 PERL_CROSS_SOURCE = perl-$(PERL_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
 

Modified: branches/1.0/toolchain/getter_script.sh
===================================================================
--- branches/1.0/toolchain/getter_script.sh	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/toolchain/getter_script.sh	2015-12-12 21:48:41 UTC (rev 7398)
@@ -6,18 +6,29 @@
 
 WGET_ARGS="--passive-ftp --timeout=30 -c -t 2"
 
-wget $WGET_ARGS $@ || (
-	echo Retrying from astlinux alternate site...
-	index=$#-1
-	# Copy all params into an array
-	for (( i=0; $?==0; i++ ));do a[$i]=$1; shift; done
-	# Chop all but filename from last param and prepend out URL
-	a[$index]=${a[index]/*\//http:\/\/$SITE/}
-	# Now wget that from our server
-	wget $WGET_ARGS ${a[@]}
-)
+wget $WGET_ARGS $@
+wget_rtn=$?
 
+# SSL verification failure
+if [ $wget_rtn -eq 5 ]; then
+  wget --no-check-certificate $WGET_ARGS $@
+  wget_rtn=$?
+fi
 
+# Alternate site on error
+if [ $wget_rtn -ne 0 ]; then
+  echo "Retrying from AstLinux alternate site..."
+  (
+    index=$#-1
+    # Copy all params into an array
+    for (( i=0; $?==0; i++ ));do a[$i]=$1; shift; done
+    # Chop all but filename from last param and prepend out URL
+    a[$index]=${a[index]/*\//http:\/\/$SITE/}
+    # Now wget that from our server
+    wget $WGET_ARGS ${a[@]}
+  )
+fi
+
 for i in $@; do
   URL="$i"
 done

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

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

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

Revision: 7397
          http://sourceforge.net/p/astlinux/code/7397
Author:   abelbeck
Date:     2015-12-12 18:04:48 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
netsnmp, add 'pciutils' dependency since it can use libpci - pci_lookup_name

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

Modified: branches/1.0/package/netsnmp/netsnmp.mk
===================================================================
--- branches/1.0/package/netsnmp/netsnmp.mk	2015-12-12 16:36:18 UTC (rev 7396)
+++ branches/1.0/package/netsnmp/netsnmp.mk	2015-12-12 18:04:48 UTC (rev 7397)
@@ -51,6 +51,11 @@
 	NETSNMP_CONF_OPT += --without-openssl
 endif
 
+# libpci - pci_lookup_name
+ifeq ($(BR2_PACKAGE_PCIUTILS),y)
+	NETSNMP_DEPENDENCIES += pciutils
+endif
+
 # Remove IPv6 MIBs if there's no IPv6
 ifneq ($(BR2_INET_IPV6),y)
 define NETSNMP_REMOVE_MIBS_IPV6

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

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

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

Revision: 7396
          http://sourceforge.net/p/astlinux/code/7396
Author:   abelbeck
Date:     2015-12-12 16:36:18 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
netsmp, enable tsm + DTLSUDP/TLSTCP with openssl, from upstream Buildroot
Ref: https://git.busybox.net/buildroot/commit/package?id=984ec386096513c5b3fcfbc4f77f3dbe1ef9d35d

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

Modified: branches/1.0/package/netsnmp/netsnmp.mk
===================================================================
--- branches/1.0/package/netsnmp/netsnmp.mk	2015-12-11 16:38:09 UTC (rev 7395)
+++ branches/1.0/package/netsnmp/netsnmp.mk	2015-12-12 16:36:18 UTC (rev 7396)
@@ -44,7 +44,9 @@
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	NETSNMP_DEPENDENCIES += openssl
 	NETSNMP_CONF_OPT += \
-		--with-openssl=$(STAGING_DIR)/usr/include/openssl
+		--with-openssl=$(STAGING_DIR)/usr/include/openssl \
+		--with-security-modules="tsm,usm" \
+		--with-transports="DTLSUDP,TLSTCP"
 else
 	NETSNMP_CONF_OPT += --without-openssl
 endif

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