Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2016-03-09 00:52:26
|
Revision: 7576
http://sourceforge.net/p/astlinux/code/7576
Author: abelbeck
Date: 2016-03-09 00:52:24 +0000 (Wed, 09 Mar 2016)
Log Message:
-----------
Linux version bump from linux-3.2.66 to linux-3.2.78
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
branches/1.0/crosstool-ng-src/get-files.sh
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/geni586/linux.config
branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
branches/1.0/project/astlinux/genx86_64/linux-smp.config
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/project/runnix-iso/geni586/linux.config
branches/1.0/runnix-iso.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
Removed Paths:
-------------
branches/1.0/project/astlinux/kernel-patches/linux-900-crypto-aesni-fix-memory-usage-in-GCM-decryption.patch
branches/1.0/project/astlinux/kernel-patches/linux-920-fix-Geode-LX-timekeeping.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/astlinux-ast11.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -914,7 +914,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/astlinux-ast13.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -914,7 +914,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/astlinux18.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -914,7 +914,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -219,7 +219,7 @@
# CT_KERNEL_V_2_6_31 is not set
# CT_KERNEL_V_2_6_27 is not set
CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.66.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.78.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -219,7 +219,7 @@
# CT_KERNEL_V_2_6_31 is not set
# CT_KERNEL_V_2_6_27 is not set
CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.66.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.78.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/get-files.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-files.sh 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/crosstool-ng-src/get-files.sh 2016-03-09 00:52:24 UTC (rev 7576)
@@ -4,7 +4,7 @@
TARBALLS=".build/tarballs"
-LINUX_KERNEL="linux-3.2.66.tar.gz"
+LINUX_KERNEL="linux-3.2.78.tar.gz"
EGLIBC="eglibc-2_18.tar.bz2"
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.66 Kernel Configuration
+# Linux/i386 3.2.78 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -18,7 +18,6 @@
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
-# CONFIG_NEED_DMA_MAP_STATE is not set
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
Modified: branches/1.0/project/astlinux/geni586/linux.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/astlinux/geni586/linux.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.66 Kernel Configuration
+# Linux/i386 3.2.78 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -18,7 +18,6 @@
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
-# CONFIG_NEED_DMA_MAP_STATE is not set
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.66 Kernel Configuration
+# Linux/x86_64 3.2.78 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -102,7 +102,7 @@
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT=64
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.66 Kernel Configuration
+# Linux/x86_64 3.2.78 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -102,7 +102,7 @@
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT=64
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
Deleted: branches/1.0/project/astlinux/kernel-patches/linux-900-crypto-aesni-fix-memory-usage-in-GCM-decryption.patch
===================================================================
--- branches/1.0/project/astlinux/kernel-patches/linux-900-crypto-aesni-fix-memory-usage-in-GCM-decryption.patch 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/astlinux/kernel-patches/linux-900-crypto-aesni-fix-memory-usage-in-GCM-decryption.patch 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,61 +0,0 @@
-From ccfe8c3f7e52ae83155cb038753f4c75b774ca8a Mon Sep 17 00:00:00 2001
-From: Stephan Mueller <smu...@ch...>
-Date: Thu, 12 Mar 2015 09:17:51 +0100
-Subject: crypto: aesni - fix memory usage in GCM decryption
-
-The kernel crypto API logic requires the caller to provide the
-length of (ciphertext || authentication tag) as cryptlen for the
-AEAD decryption operation. Thus, the cipher implementation must
-calculate the size of the plaintext output itself and cannot simply use
-cryptlen.
-
-The RFC4106 GCM decryption operation tries to overwrite cryptlen memory
-in req->dst. As the destination buffer for decryption only needs to hold
-the plaintext memory but cryptlen references the input buffer holding
-(ciphertext || authentication tag), the assumption of the destination
-buffer length in RFC4106 GCM operation leads to a too large size. This
-patch simply uses the already calculated plaintext size.
-
-In addition, this patch fixes the offset calculation of the AAD buffer
-pointer: as mentioned before, cryptlen already includes the size of the
-tag. Thus, the tag does not need to be added. With the addition, the AAD
-will be written beyond the already allocated buffer.
-
-Note, this fixes a kernel crash that can be triggered from user space
-via AF_ALG(aead) -- simply use the libkcapi test application
-from [1] and update it to use rfc4106-gcm-aes.
-
-Using [1], the changes were tested using CAVS vectors to demonstrate
-that the crypto operation still delivers the right results.
-
-[1] http://www.chronox.de/libkcapi.html
-
-CC: Tadeusz Struk <tad...@in...>
-Cc: st...@vg...
-Signed-off-by: Stephan Mueller <smu...@ch...>
-Signed-off-by: Herbert Xu <he...@go...>
-
-diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
-index 947c6bf..54f60ab 100644
---- a/arch/x86/crypto/aesni-intel_glue.c
-+++ b/arch/x86/crypto/aesni-intel_glue.c
-@@ -1202,7 +1202,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req)
- src = kmalloc(req->cryptlen + req->assoclen, GFP_ATOMIC);
- if (!src)
- return -ENOMEM;
-- assoc = (src + req->cryptlen + auth_tag_len);
-+ assoc = (src + req->cryptlen);
- scatterwalk_map_and_copy(src, req->src, 0, req->cryptlen, 0);
- scatterwalk_map_and_copy(assoc, req->assoc, 0,
- req->assoclen, 0);
-@@ -1227,7 +1227,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req)
- scatterwalk_done(&src_sg_walk, 0, 0);
- scatterwalk_done(&assoc_sg_walk, 0, 0);
- } else {
-- scatterwalk_map_and_copy(dst, req->dst, 0, req->cryptlen, 1);
-+ scatterwalk_map_and_copy(dst, req->dst, 0, tempCipherLen, 1);
- kfree(src);
- }
- return retval;
---
-cgit v0.10.2
Deleted: branches/1.0/project/astlinux/kernel-patches/linux-920-fix-Geode-LX-timekeeping.patch
===================================================================
--- branches/1.0/project/astlinux/kernel-patches/linux-920-fix-Geode-LX-timekeeping.patch 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/astlinux/kernel-patches/linux-920-fix-Geode-LX-timekeeping.patch 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,73 +0,0 @@
-From 03da3ff1cfcd7774c8780d2547ba0d995f7dc03d Mon Sep 17 00:00:00 2001
-From: David Woodhouse <dw...@in...>
-Date: Wed, 16 Sep 2015 14:10:03 +0100
-Subject: x86/platform: Fix Geode LX timekeeping in the generic x86 build
-
-In 2007, commit 07190a08eef36 ("Mark TSC on GeodeLX reliable")
-bypassed verification of the TSC on Geode LX. However, this code
-(now in the check_system_tsc_reliable() function in
-arch/x86/kernel/tsc.c) was only present if CONFIG_MGEODE_LX was
-set.
-
-OpenWRT has recently started building its generic Geode target
-for Geode GX, not LX, to include support for additional
-platforms. This broke the timekeeping on LX-based devices,
-because the TSC wasn't marked as reliable:
-https://dev.openwrt.org/ticket/20531
-
-By adding a runtime check on is_geode_lx(), we can also include
-the fix if CONFIG_MGEODEGX1 or CONFIG_X86_GENERIC are set, thus
-fixing the problem.
-
-Signed-off-by: David Woodhouse <Dav...@in...>
-Cc: Andres Salomon <dil...@qu...>
-Cc: Linus Torvalds <tor...@li...>
-Cc: Marcelo Tosatti <ma...@kv...>
-Cc: Peter Zijlstra <pe...@in...>
-Cc: Thomas Gleixner <tg...@li...>
-Cc: st...@vg...
-Link: http://lkml.kernel.org/r/144...@in...
-Signed-off-by: Ingo Molnar <mi...@ke...>
----
- arch/x86/kernel/tsc.c | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
-index 79055cf..51e62d6 100644
---- a/arch/x86/kernel/tsc.c
-+++ b/arch/x86/kernel/tsc.c
-@@ -18,6 +18,7 @@
- #include <asm/hypervisor.h>
- #include <asm/nmi.h>
- #include <asm/x86_init.h>
-+#include <asm/geode.h>
-
- unsigned int __read_mostly cpu_khz; /* TSC clocks / usec, not used here */
- EXPORT_SYMBOL(cpu_khz);
-@@ -802,15 +803,17 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable);
-
- static void __init check_system_tsc_reliable(void)
- {
--#ifdef CONFIG_MGEODE_LX
-- /* RTSC counts during suspend */
-+#if defined(CONFIG_MGEODEGX1) || defined(CONFIG_MGEODE_LX) || defined(CONFIG_X86_GENERIC)
-+ if (is_geode_lx()) {
-+ /* RTSC counts during suspend */
- #define RTSC_SUSP 0x100
-- unsigned long res_low, res_high;
-+ unsigned long res_low, res_high;
-
-- rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
-- /* Geode_LX - the OLPC CPU has a very reliable TSC */
-- if (res_low & RTSC_SUSP)
-- tsc_clocksource_reliable = 1;
-+ rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
-+ /* Geode_LX - the OLPC CPU has a very reliable TSC */
-+ if (res_low & RTSC_SUSP)
-+ tsc_clocksource_reliable = 1;
-+ }
- #endif
- if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE))
- tsc_clocksource_reliable = 1;
---
-cgit v0.11.2
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/runnix/geni586/linux.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.66 Kernel Configuration
+# Linux/i386 3.2.78 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -18,7 +18,6 @@
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
-# CONFIG_NEED_DMA_MAP_STATE is not set
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
Modified: branches/1.0/project/runnix-iso/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix-iso/geni586/linux.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/project/runnix-iso/geni586/linux.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.66 Kernel Configuration
+# Linux/i386 3.2.78 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -18,7 +18,6 @@
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
-# CONFIG_NEED_DMA_MAP_STATE is not set
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/runnix-iso.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -809,7 +809,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/runnix.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -810,7 +810,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -895,7 +895,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -895,7 +895,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-03-08 21:01:57 UTC (rev 7575)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-03-09 00:52:24 UTC (rev 7576)
@@ -895,7 +895,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-03-16 17:17:20
|
Revision: 7597
http://sourceforge.net/p/astlinux/code/7597
Author: abelbeck
Date: 2016-03-16 17:17:18 +0000 (Wed, 16 Mar 2016)
Log Message:
-----------
notifications, add a 'name' in the From: header
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-sip-monitor
branches/1.0/package/asterisk/safe_asterisk
branches/1.0/package/monit/monit.init
branches/1.0/package/msmtp/testmail.sh
branches/1.0/package/nut/upsnotify.sh
branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
Modified: branches/1.0/package/asterisk/asterisk-sip-monitor
===================================================================
--- branches/1.0/package/asterisk/asterisk-sip-monitor 2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/asterisk/asterisk-sip-monitor 2016-03-16 17:17:18 UTC (rev 7597)
@@ -96,7 +96,7 @@
unset IFS
for TO in $NOTIFY; do
echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"SIP-$HOSTNAME\" <$NOTIFY_FROM>}
Subject: $subject
Warning! Your PBX '$HOSTNAME' has detected that a SIP FAILURE has occurred.
@@ -114,7 +114,7 @@
unset IFS
for TO in $NOTIFY; do
echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"SIP-$HOSTNAME\" <$NOTIFY_FROM>}
Subject: $subject
SIP Status Change! Your PBX '$HOSTNAME' has an updated list of SIP FAILURE's.
@@ -132,7 +132,7 @@
unset IFS
for TO in $NOTIFY; do
echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"SIP-$HOSTNAME\" <$NOTIFY_FROM>}
Subject: $subject
Your PBX '$HOSTNAME' has resolved previous SIP issues.
Modified: branches/1.0/package/asterisk/safe_asterisk
===================================================================
--- branches/1.0/package/asterisk/safe_asterisk 2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/asterisk/safe_asterisk 2016-03-16 17:17:18 UTC (rev 7597)
@@ -119,7 +119,7 @@
logger -s -t safe_asterisk -p kern.info "$MESG"
for TO in $NOTIFY; do
echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"Asterisk-$MACHINE\" <$NOTIFY_FROM>}
Subject: Asterisk **Stopped** on '$MACHINE'
Asterisk on '$MACHINE' stopped, restarting too often.
@@ -145,7 +145,7 @@
logger -s -t safe_asterisk -p kern.info "$MESG"
for TO in $NOTIFY; do
echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"Asterisk-$MACHINE\" <$NOTIFY_FROM>}
Subject: Asterisk Crashed on '$MACHINE'
Asterisk on '$MACHINE' exited on signal $EXITSIGNAL. Restarting Asterisk...
Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init 2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/monit/monit.init 2016-03-16 17:17:18 UTC (rev 7597)
@@ -28,6 +28,8 @@
if [ -n "$MONIT_NOTIFY_FROM" ]; then
echo "set mail-format { from: \"Monit-$HOSTNAME\" <$MONIT_NOTIFY_FROM> }"
+ elif [ -n "$SMTP_DOMAIN" ]; then
+ echo "set mail-format { from: \"Monit-$HOSTNAME\" <monit@$SMTP_DOMAIN> }"
fi
echo "
Modified: branches/1.0/package/msmtp/testmail.sh
===================================================================
--- branches/1.0/package/msmtp/testmail.sh 2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/msmtp/testmail.sh 2016-03-16 17:17:18 UTC (rev 7597)
@@ -41,7 +41,7 @@
(
echo "To: ${TO}${FROM:+
-From: $FROM}
+From: \"Test-$HOSTNAME\" <$FROM>}
Subject: Test Email from '$HOSTNAME'
Test Email from '$HOSTNAME'
Modified: branches/1.0/package/nut/upsnotify.sh
===================================================================
--- branches/1.0/package/nut/upsnotify.sh 2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/nut/upsnotify.sh 2016-03-16 17:17:18 UTC (rev 7597)
@@ -23,7 +23,7 @@
for TO in $NOTIFY; do
(
echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"UPS-$HOSTNAME\" <$NOTIFY_FROM>}
Subject: UPS on '$HOSTNAME': $message
UPS on '$HOSTNAME': $message
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover 2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover 2016-03-16 17:17:18 UTC (rev 7597)
@@ -75,7 +75,7 @@
unset IFS
for TO in $NOTIFY; do
echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"WAN-$HOSTNAME\" <$NOTIFY_FROM>}
Subject: $subject
$body
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-03-18 21:58:16
|
Revision: 7598
http://sourceforge.net/p/astlinux/code/7598
Author: abelbeck
Date: 2016-03-18 21:58:15 +0000 (Fri, 18 Mar 2016)
Log Message:
-----------
ca-certificates, new package installing trusted root certificates, single file bundle, mainly for use by 'curl'
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
branches/1.0/package/libcurl/libcurl.mk
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
Added Paths:
-----------
branches/1.0/package/ca-certificates/
branches/1.0/package/ca-certificates/Config.in
branches/1.0/package/ca-certificates/ca-certificates.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/astlinux-ast11.config 2016-03-18 21:58:15 UTC (rev 7598)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7597-dirty Configuration
+# Fri Mar 18 13:54:34 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -520,6 +520,7 @@
# Crypto
#
# BR2_PACKAGE_BEECRYPT is not set
+BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/astlinux-ast13.config 2016-03-18 21:58:15 UTC (rev 7598)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7597-dirty Configuration
+# Fri Mar 18 13:54:38 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -520,6 +520,7 @@
# Crypto
#
# BR2_PACKAGE_BEECRYPT is not set
+BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/astlinux18.config 2016-03-18 21:58:15 UTC (rev 7598)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7597-dirty Configuration
+# Fri Mar 18 13:54:31 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -520,6 +520,7 @@
# Crypto
#
# BR2_PACKAGE_BEECRYPT is not set
+BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/package/Config.in 2016-03-18 21:58:15 UTC (rev 7598)
@@ -289,6 +289,7 @@
menu "Crypto"
source "package/beecrypt/Config.in"
+source "package/ca-certificates/Config.in"
source "package/gnutls/Config.in"
source "package/libgcrypt/Config.in"
source "package/libgpg-error/Config.in"
Added: branches/1.0/package/ca-certificates/Config.in
===================================================================
--- branches/1.0/package/ca-certificates/Config.in (rev 0)
+++ branches/1.0/package/ca-certificates/Config.in 2016-03-18 21:58:15 UTC (rev 7598)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_CA_CERTIFICATES
+ bool "CA Certificates"
+ depends on BR2_PACKAGE_OPENSSL
+ help
+ This package includes PEM files of CA certificates to allow
+ SSL-based applications to check for the authenticity of SSL
+ connections.
+
+ https://curl.haxx.se/docs/caextract.html
Added: branches/1.0/package/ca-certificates/ca-certificates.mk
===================================================================
--- branches/1.0/package/ca-certificates/ca-certificates.mk (rev 0)
+++ branches/1.0/package/ca-certificates/ca-certificates.mk 2016-03-18 21:58:15 UTC (rev 7598)
@@ -0,0 +1,31 @@
+################################################################################
+#
+# ca-certificates
+#
+################################################################################
+
+CA_CERTIFICATES_VERSION = 20160120
+CA_CERTIFICATES_SOURCE = cacert-$(CA_CERTIFICATES_VERSION).pem
+CA_CERTIFICATES_SITE = http://files.astlinux.org
+
+##
+## curl -o dl/cacert-20160120.pem https://curl.haxx.se/ca/cacert.pem
+## ./scripts/upload-dl-pair dl/cacert-20160120.pem
+##
+
+define CA_CERTIFICATES_EXTRACT_CMDS
+ cp $(DL_DIR)/$(CA_CERTIFICATES_SOURCE) $(@D)/cacert.pem
+endef
+
+define CA_CERTIFICATES_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/lib/ssl/certs
+ $(INSTALL) -m 0444 -D $(@D)/cacert.pem $(TARGET_DIR)/usr/share/ca-certificates/ca-bundle.crt
+ ln -sf /usr/share/ca-certificates/ca-bundle.crt $(TARGET_DIR)/usr/lib/ssl/certs/ca-bundle.crt
+endef
+
+define CA_CERTIFICATES_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/ssl/certs/ca-bundle.crt
+ rm -rf $(TARGET_DIR)/usr/share/ca-certificates
+endef
+
+$(eval $(call GENTARGETS,package,ca-certificates))
Modified: branches/1.0/package/libcurl/libcurl.mk
===================================================================
--- branches/1.0/package/libcurl/libcurl.mk 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/package/libcurl/libcurl.mk 2016-03-18 21:58:15 UTC (rev 7598)
@@ -30,8 +30,9 @@
# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
# are found first.
LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
- --with-ca-path=/usr/lib/ssl/certs
+LIBCURL_CONF_OPT += \
+ --with-ssl=$(STAGING_DIR)/usr \
+ --with-ca-bundle=/usr/lib/ssl/certs/ca-bundle.crt
else
LIBCURL_CONF_OPT += --without-ssl
endif
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-03-18 21:58:15 UTC (rev 7598)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7597-dirty Configuration
+# Fri Mar 18 13:54:56 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -501,6 +501,7 @@
# Crypto
#
# BR2_PACKAGE_BEECRYPT is not set
+BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-03-18 21:58:15 UTC (rev 7598)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:07:00 2016
+# Buildroot 2011.08-svn7597-dirty Configuration
+# Fri Mar 18 13:54:58 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -501,6 +501,7 @@
# Crypto
#
# BR2_PACKAGE_BEECRYPT is not set
+BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-03-16 17:17:18 UTC (rev 7597)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-03-18 21:58:15 UTC (rev 7598)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7597-dirty Configuration
+# Fri Mar 18 13:54:54 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -501,6 +501,7 @@
# Crypto
#
# BR2_PACKAGE_BEECRYPT is not set
+BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-03-18 23:28:39
|
Revision: 7599
http://sourceforge.net/p/astlinux/code/7599
Author: abelbeck
Date: 2016-03-18 23:28:36 +0000 (Fri, 18 Mar 2016)
Log Message:
-----------
mac2vendor, build system, re-code to use GENTARGETS
Modified Paths:
--------------
branches/1.0/package/mac2vendor/mac2vendor.mk
branches/1.0/toolchain/file_exclude
Modified: branches/1.0/package/mac2vendor/mac2vendor.mk
===================================================================
--- branches/1.0/package/mac2vendor/mac2vendor.mk 2016-03-18 21:58:15 UTC (rev 7598)
+++ branches/1.0/package/mac2vendor/mac2vendor.mk 2016-03-18 23:28:36 UTC (rev 7599)
@@ -1,48 +1,37 @@
-#############################################################
+################################################################################
#
# mac2vendor
#
-##############################################################
-MAC2VENDOR_VERSION := 2016-01-17
-MAC2VENDOR_DATA := oui-$(MAC2VENDOR_VERSION).txt
-MAC2VENDOR_DATA_ORIG := oui.txt
-MAC2VENDOR_SITE := http://standards-oui.ieee.org
-MAC2VENDOR_DIR := $(BUILD_DIR)/mac2vendor
-MAC2VENDOR_BINARY := usr/sbin/mac2vendor
+################################################################################
-$(DL_DIR)/$(MAC2VENDOR_DATA):
- rm -f $(DL_DIR)/$(MAC2VENDOR_DATA_ORIG)
- $(WGET) -P $(DL_DIR) $(MAC2VENDOR_SITE)/$(MAC2VENDOR_DATA_ORIG)
- cp -a $(DL_DIR)/$(MAC2VENDOR_DATA_ORIG) $(DL_DIR)/$(MAC2VENDOR_DATA)
+MAC2VENDOR_VERSION = 2016-01-17
+MAC2VENDOR_SOURCE = oui-$(MAC2VENDOR_VERSION).txt
+MAC2VENDOR_SITE = http://files.astlinux.org
-$(MAC2VENDOR_DIR)/.data: $(DL_DIR)/$(MAC2VENDOR_DATA)
- mkdir -p $(MAC2VENDOR_DIR)/oui-db
+##
+## curl -o dl/oui-2016-01-17.txt http://standards-oui.ieee.org/oui.txt
+## ./scripts/upload-dl-pair dl/oui-2016-01-17.txt
+##
+
+define MAC2VENDOR_EXTRACT_CMDS
+ mkdir -p $(@D)/oui-db
for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
- sed 's/^ *//' $(DL_DIR)/$(MAC2VENDOR_DATA) | \
+ sed 's/^ *//' $(DL_DIR)/$(MAC2VENDOR_SOURCE) | \
grep "^[0-9A-F]\{5\}$$i " | \
- sed 's/ [^(]*.base 16.[^0-9a-zA-Z]*/~/' > $(MAC2VENDOR_DIR)/oui-db/xxxxx$$i ; \
- chmod a-w $(MAC2VENDOR_DIR)/oui-db/xxxxx$$i ; \
+ sed 's/ [^(]*.base 16.[^0-9a-zA-Z]*/~/' > $(@D)/oui-db/xxxxx$$i ; \
done
- touch $@
+endef
-$(TARGET_DIR)/$(MAC2VENDOR_BINARY): $(MAC2VENDOR_DIR)/.data
- $(INSTALL) -D -m 0755 package/mac2vendor/mac2vendor $(TARGET_DIR)/$(MAC2VENDOR_BINARY)
- cp -a $(MAC2VENDOR_DIR)/oui-db $(TARGET_DIR)/usr/share/oui-db
+define MAC2VENDOR_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 package/mac2vendor/mac2vendor $(TARGET_DIR)/usr/sbin/mac2vendor
+ $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/oui-db
+ cp $(@D)/oui-db/* $(TARGET_DIR)/usr/share/oui-db/
+ chmod a-w $(TARGET_DIR)/usr/share/oui-db/*
+endef
-mac2vendor: $(TARGET_DIR)/$(MAC2VENDOR_BINARY)
-
-mac2vendor-clean:
- rm -f $(TARGET_DIR)/$(MAC2VENDOR_BINARY)
+define MAC2VENDOR_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/mac2vendor
rm -rf $(TARGET_DIR)/usr/share/oui-db
+endef
-mac2vendor-dirclean:
- rm -rf $(MAC2VENDOR_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MAC2VENDOR)),y)
-TARGETS+=mac2vendor
-endif
+$(eval $(call GENTARGETS,package,mac2vendor))
Modified: branches/1.0/toolchain/file_exclude
===================================================================
--- branches/1.0/toolchain/file_exclude 2016-03-18 21:58:15 UTC (rev 7598)
+++ branches/1.0/toolchain/file_exclude 2016-03-18 23:28:36 UTC (rev 7599)
@@ -1,7 +1,6 @@
pci.ids.bz2
nProbe-4.9.4.tar.gz
dialog.tar.gz
-oui.txt
bfdetect_src.tar.gz
fop2-2.27-debian-i386.tgz
memtest86+-4.20.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-03-19 18:40:10
|
Revision: 7600
http://sourceforge.net/p/astlinux/code/7600
Author: abelbeck
Date: 2016-03-19 18:40:08 +0000 (Sat, 19 Mar 2016)
Log Message:
-----------
Use 'curl' instead of Busybox 'wget' for downloads with new download-file script. Automatically redirect to our HTTPS cloudfront.net mirror, for now
Modified Paths:
--------------
branches/1.0/package/arnofw/reload-spamhaus-drop
branches/1.0/package/asterisk/upgrade-asterisk-sounds
branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
Modified: branches/1.0/package/arnofw/reload-spamhaus-drop
===================================================================
--- branches/1.0/package/arnofw/reload-spamhaus-drop 2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/package/arnofw/reload-spamhaus-drop 2016-03-19 18:40:08 UTC (rev 7600)
@@ -39,7 +39,7 @@
unset IFS
for URL in $URLS; do
rm -f $TMP_FILE
- if ! wget -q -O $TMP_FILE $URL >/dev/null; then
+ if ! /usr/sbin/download-file "$TMP_FILE" "$URL"; then
rm -f $TMP_DROP $TMP_FILE
MESG="Retrieving Spamhaus DROP list failed for '$URL', no action."
logger -s -t reload-spamhaus-drop -p kern.info "$MESG"
Modified: branches/1.0/package/asterisk/upgrade-asterisk-sounds
===================================================================
--- branches/1.0/package/asterisk/upgrade-asterisk-sounds 2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/package/asterisk/upgrade-asterisk-sounds 2016-03-19 18:40:08 UTC (rev 7600)
@@ -124,7 +124,7 @@
FILE="$(get_url_filename $type $lang $codec)"
- if ! wget -q -c -O /tmp/snd/$FILE.sha1 $SRC_URL/$FILE.sha1 >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/snd/$FILE.sha1" "$SRC_URL/$FILE.sha1"; then
unmount_tmpfs_snd
echo "SHA1 download failed for sound package \"$(get_sha1_filename "$type" "$lang" "$codec")\"."
exit $RED
@@ -139,7 +139,7 @@
exit $ORANGE
fi
- if ! wget -q -c -O /tmp/snd/$FILE $SRC_URL/$FILE >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/snd/$FILE" "$SRC_URL/$FILE"; then
unmount_tmpfs_snd
echo "Sounds download failed for sound package \"$(get_sha1_filename "$type" "$lang" "$codec")\"."
exit $RED
Added: branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file 2016-03-19 18:40:08 UTC (rev 7600)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+file="$1"
+
+url="$2"
+
+redirect_url()
+{
+ local in_url="$1" out_url="$2" base_url
+
+ base_url="${url#$in_url}"
+ if [ "$url" != "$base_url" ]; then
+ url="$out_url$base_url"
+ fi
+}
+
+if [ -z "$file" -o -z "$url" ]; then
+ echo "Usage: download-file file url" >&2
+ exit 1
+fi
+
+## Redirect to AstLinux HTTPS mirror URL
+##
+redirect_url "http://mirror.astlinux.org/" "https://d7rzm9p7jly0z.cloudfront.net/"
+redirect_url "https://mirror.astlinux.org/" "https://d7rzm9p7jly0z.cloudfront.net/"
+
+curl -sSfL --globoff --retry 1 --connect-timeout 15 --max-time 1800 -o "$file" "$url" >/dev/null
+
Property changes on: branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale 2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale 2016-03-19 18:40:08 UTC (rev 7600)
@@ -33,13 +33,13 @@
mkdir /tmp/get-locale
- if ! wget -q -c -O /tmp/get-locale/locale-archive.gz.sha1 $SRC_URL/$locale/locale-archive.gz.sha1 >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/get-locale/locale-archive.gz.sha1" "$SRC_URL/$locale/locale-archive.gz.sha1"; then
rm -rf /tmp/get-locale/
echo "SHA1 download failed for locale \"$locale\"."
exit $RED
fi
- if ! wget -q -c -O /tmp/get-locale/locale-archive.gz $SRC_URL/$locale/locale-archive.gz >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/get-locale/locale-archive.gz" "$SRC_URL/$locale/locale-archive.gz"; then
rm -rf /tmp/get-locale/
echo "Download failed for locale \"$locale\"."
exit $RED
@@ -77,7 +77,7 @@
{
mkdir /tmp/get-locale
- if ! wget -q -c -O /tmp/get-locale/locales.txt $SRC_URL/locales.txt >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/get-locale/locales.txt" "$SRC_URL/locales.txt"; then
rm -rf /tmp/get-locale/
echo "Locale Listing download failed."
exit $RED
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 2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2016-03-19 18:40:08 UTC (rev 7600)
@@ -141,7 +141,7 @@
exit $RED
fi
- if wget -q -c -O /tmp/runup_ver $SRC_URL/ver >/dev/null; then
+ if /usr/sbin/download-file "/tmp/runup_ver" "$SRC_URL/ver"; then
VER=$(cat /tmp/runup_ver)
rm -f /tmp/runup_ver
else
@@ -185,14 +185,14 @@
exit $RED
fi
- if ! wget -q -c -O /tmp/runup/$VER.tar.gz $SRC_URL/$VER.tar.gz >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/runup/$VER.tar.gz" "$SRC_URL/$VER.tar.gz"; then
unmount_tmpfs_runup
unmount_oldroot_cdrom
echo "Firmware download failed."
exit $RED
fi
- if ! wget -q -c -O /tmp/runup/$VER.tar.gz.sha1 $SRC_URL/$VER.tar.gz.sha1 >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/runup/$VER.tar.gz.sha1" "$SRC_URL/$VER.tar.gz.sha1"; then
unmount_tmpfs_runup
unmount_oldroot_cdrom
echo "Firmware sha1sum download failed."
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-03-19 18:40:08 UTC (rev 7600)
@@ -67,7 +67,7 @@
mkdir -p $BASE/TMP/dl
mkdir -p $BASE/TMP/tar
- if ! wget -q -c -O $BASE/TMP/dl/$PKG.$suffix.sha1 "$SRC_URL.sha1" >/dev/null; then
+ if ! /usr/sbin/download-file "$BASE/TMP/dl/$PKG.$suffix.sha1" "$SRC_URL.sha1"; then
finish $RED "Package '$PKG' SHA1 download failed."
fi
@@ -75,7 +75,7 @@
finish $ORANGE "Package '$PKG' is already installed."
fi
- if ! wget -q -c -O $BASE/TMP/dl/$PKG.$suffix "$SRC_URL" >/dev/null; then
+ if ! /usr/sbin/download-file "$BASE/TMP/dl/$PKG.$suffix" "$SRC_URL"; then
finish $RED "Package '$PKG' download failed."
fi
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 2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image 2016-03-19 18:40:08 UTC (rev 7600)
@@ -165,7 +165,7 @@
exit $RED
fi
- if wget -q -c -O /tmp/up_ver $URL/ver >/dev/null; then
+ if /usr/sbin/download-file "/tmp/up_ver" "$URL/ver"; then
VER=`cat /tmp/up_ver`
rm -f /tmp/up_ver
else
@@ -211,14 +211,14 @@
exit $RED
fi
- if ! wget -q -c -O /tmp/up/$VER.tar.gz $URL/$VER.tar.gz >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/up/$VER.tar.gz" "$URL/$VER.tar.gz"; then
unmount_tmpfs_up
unmount_oldroot_cdrom
echo "Firmware download failed."
exit $RED
fi
- if ! wget -q -c -O /tmp/up/$VER.tar.gz.sha1 $URL/$VER.tar.gz.sha1 >/dev/null; then
+ if ! /usr/sbin/download-file "/tmp/up/$VER.tar.gz.sha1" "$URL/$VER.tar.gz.sha1"; then
unmount_tmpfs_up
unmount_oldroot_cdrom
echo "Firmware sha1sum download failed."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-03-20 04:13:43
|
Revision: 7601
http://sourceforge.net/p/astlinux/code/7601
Author: abelbeck
Date: 2016-03-20 04:13:41 +0000 (Sun, 20 Mar 2016)
Log Message:
-----------
miniupnpd, use '/mnt/kd/upnp.leases' as a persistant lease_file so UPnP leases survive a reboot, also add UPNP_MIN_LIFETIME and UPNP_MAX_LIFETIME rc.conf variables. Thanks to David Kerr
Modified Paths:
--------------
branches/1.0/package/miniupnpd/miniupnpd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init 2016-03-19 18:40:08 UTC (rev 7600)
+++ branches/1.0/package/miniupnpd/miniupnpd.init 2016-03-20 04:13:41 UTC (rev 7601)
@@ -14,10 +14,15 @@
UPNP_BITRATE_UP="${UPNP_BITRATE_UP:-1000000}"
UPNP_BITRATE_DOWN="${UPNP_BITRATE_DOWN:-10000000}"
-MINIUPNPD=/usr/sbin/miniupnpd
-MINIUPNPD_CONF=/tmp/etc/miniupnpd.conf
-MINIUPNPD_LEASEFILE=/var/db/upnp.leases
+UPNP_MIN_LIFETIME="${UPNP_MIN_LIFETIME:-120}"
+UPNP_MAX_LIFETIME="${UPNP_MAX_LIFETIME:-86400}"
+MINIUPNPD="/usr/sbin/miniupnpd"
+MINIUPNPD_CONF="/tmp/etc/miniupnpd.conf"
+
+# Define persistant lease_file
+MINIUPNPD_LEASEFILE="/mnt/kd/upnp.leases"
+
aif_miniupnpd_plugin()
{
local action="$1"
@@ -158,6 +163,10 @@
return
fi
+ # Symlink to persistant lease_file
+ # Note: The lease_file= can get deleted, so don't use symlink for it.
+ ln -sf "$MINIUPNPD_LEASEFILE" /var/db/upnp.leases
+
astlinux_release="$(cat /etc/astlinux-release)"
echo "http_port=5000
@@ -167,6 +176,8 @@
bitrate_up=$UPNP_BITRATE_UP
bitrate_down=$UPNP_BITRATE_DOWN
secure_mode=$UPNP_SECURE_MODE
+min_lifetime=$UPNP_MIN_LIFETIME
+max_lifetime=$UPNP_MAX_LIFETIME
system_uptime=yes
notify_interval=60
clean_ruleset_interval=600
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-03-19 18:40:08 UTC (rev 7600)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-03-20 04:13:41 UTC (rev 7601)
@@ -512,6 +512,8 @@
#UPNP_BITRATE_UP=1000000
#UPNP_BITRATE_DOWN=10000000
#UPNP_SECURE_MODE="no"
+#UPNP_MIN_LIFETIME=120
+#UPNP_MAX_LIFETIME=86400
## XMPP (Jabber) Server - Prosody
## Data stored in /mnt/kd/prosody/ symlinked from /etc/prosody/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-03-22 18:06:55
|
Revision: 7605
http://sourceforge.net/p/astlinux/code/7605
Author: abelbeck
Date: 2016-03-22 18:06:53 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
unbound, new package, enabled by default, only install the lib and the 'unbound-host' command. Adds 780 KB un-compressed, 350 KB compressed to the image. May be used by Asterisk per Matthew Jordan.
Ref: https://wiki.asterisk.org/wiki/display/~jcolp/DNS+Support+in+Asterisk#DNSSupportinAsterisk-libunbound
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/package/Config.in
branches/1.0/runnix-iso.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
Added Paths:
-----------
branches/1.0/package/unbound/
branches/1.0/package/unbound/Config.in
branches/1.0/package/unbound/unbound-enable-r-option-by-default.patch
branches/1.0/package/unbound/unbound.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/astlinux-ast11.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7597-dirty Configuration
-# Fri Mar 18 13:54:34 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -798,6 +798,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+BR2_PACKAGE_UNBOUND=y
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/astlinux-ast13.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7597-dirty Configuration
-# Fri Mar 18 13:54:38 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -798,6 +798,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+BR2_PACKAGE_UNBOUND=y
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/astlinux18.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7597-dirty Configuration
-# Fri Mar 18 13:54:31 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -798,6 +798,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+BR2_PACKAGE_UNBOUND=y
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/initrd.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:58 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -644,6 +644,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_UNBOUND is not set
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/package/Config.in 2016-03-22 18:06:53 UTC (rev 7605)
@@ -548,6 +548,7 @@
source "package/tn5250/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
+source "package/unbound/Config.in"
source "package/uw-imap/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
Added: branches/1.0/package/unbound/Config.in
===================================================================
--- branches/1.0/package/unbound/Config.in (rev 0)
+++ branches/1.0/package/unbound/Config.in 2016-03-22 18:06:53 UTC (rev 7605)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_UNBOUND
+ bool "unbound lib and unbound-host tool"
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_EXPAT
+ help
+ Unbound is a validating, recursive, and caching DNS resolver.
+
+ https://www.unbound.net
+
Added: branches/1.0/package/unbound/unbound-enable-r-option-by-default.patch
===================================================================
--- branches/1.0/package/unbound/unbound-enable-r-option-by-default.patch (rev 0)
+++ branches/1.0/package/unbound/unbound-enable-r-option-by-default.patch 2016-03-22 18:06:53 UTC (rev 7605)
@@ -0,0 +1,12 @@
+--- unbound-1.5.8/smallapp/unbound-host.c.orig 2016-03-22 09:29:02.000000000 -0500
++++ unbound-1.5.8/smallapp/unbound-host.c 2016-03-22 09:31:10.000000000 -0500
+@@ -426,6 +426,9 @@
+ /* no need to fetch additional targets, we only do few lookups */
+ check_ub_res(ub_ctx_set_option(ctx, "target-fetch-policy:", "0 0 0 0 0"));
+
++ /* By default, read forwarder information from /etc/resolv.conf */
++ check_ub_res(ub_ctx_resolvconf(ctx, "/etc/resolv.conf"));
++
+ /* parse the options */
+ while( (c=getopt(argc, argv, "46DF:c:df:hrt:vy:C:")) != -1) {
+ switch(c) {
Added: branches/1.0/package/unbound/unbound.mk
===================================================================
--- branches/1.0/package/unbound/unbound.mk (rev 0)
+++ branches/1.0/package/unbound/unbound.mk 2016-03-22 18:06:53 UTC (rev 7605)
@@ -0,0 +1,37 @@
+#############################################################
+#
+# unbound
+#
+#############################################################
+
+UNBOUND_VERSION = 1.5.8
+UNBOUND_SITE = https://www.unbound.net/downloads
+UNBOUND_SOURCE = unbound-$(UNBOUND_VERSION).tar.gz
+UNBOUND_INSTALL_STAGING = YES
+
+UNBOUND_DEPENDENCIES = openssl expat
+
+UNBOUND_CONF_OPT = \
+ --with-libexpat="$(STAGING_DIR)/usr" \
+ --with-ssl="$(STAGING_DIR)/usr"
+
+# GOST cipher support requires openssl extra engines
+ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
+UNBOUND_CONF_OPT += --enable-gost
+else
+UNBOUND_CONF_OPT += --disable-gost
+endif
+
+define UNBOUND_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(STAGING_DIR)/usr/sbin/unbound-host $(TARGET_DIR)/usr/sbin/unbound-host
+ ln -sf ../sbin/unbound-host $(TARGET_DIR)/usr/bin/host
+ cp -a $(STAGING_DIR)/usr/lib/libunbound.so* $(TARGET_DIR)/usr/lib/
+endef
+
+define UNBOUND_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/unbound-host
+ rm -f $(TARGET_DIR)/usr/bin/host
+ rm -f $(TARGET_DIR)/usr/lib/libunbound.so*
+endef
+
+$(eval $(call AUTOTARGETS,package,unbound))
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/runnix-iso.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:58 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -683,6 +683,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_UNBOUND is not set
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/runnix.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:06:59 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:58 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -684,6 +684,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_UNBOUND is not set
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7597-dirty Configuration
-# Fri Mar 18 13:54:56 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:58 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -779,6 +779,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+BR2_PACKAGE_UNBOUND=y
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7597-dirty Configuration
-# Fri Mar 18 13:54:58 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:58 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -779,6 +779,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+BR2_PACKAGE_UNBOUND=y
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7597-dirty Configuration
-# Fri Mar 18 13:54:54 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:58 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -779,6 +779,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+BR2_PACKAGE_UNBOUND=y
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-03-21 15:13:36 UTC (rev 7604)
+++ branches/1.0/x86_64-configs/initrd.config 2016-03-22 18:06:53 UTC (rev 7605)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7563-dirty Configuration
-# Sat Feb 27 17:07:00 2016
+# Buildroot 2011.08-svn7604-dirty Configuration
+# Tue Mar 22 12:22:58 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -625,6 +625,7 @@
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_UNBOUND is not set
# BR2_PACKAGE_UW_IMAP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-04-16 13:51:25
|
Revision: 7639
http://sourceforge.net/p/astlinux/code/7639
Author: abelbeck
Date: 2016-04-16 13:51:22 +0000 (Sat, 16 Apr 2016)
Log Message:
-----------
notifications, followup to r7597, sanity check for From: header format <a@b.tld>
Revision Links:
--------------
http://sourceforge.net/p/astlinux/code/7597
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-sip-monitor
branches/1.0/package/asterisk/safe_asterisk
branches/1.0/package/monit/monit.init
branches/1.0/package/msmtp/testmail.sh
branches/1.0/package/nut/upsnotify.sh
branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
Modified: branches/1.0/package/asterisk/asterisk-sip-monitor
===================================================================
--- branches/1.0/package/asterisk/asterisk-sip-monitor 2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/asterisk/asterisk-sip-monitor 2016-04-16 13:51:22 UTC (rev 7639)
@@ -23,6 +23,10 @@
NOTIFY="$SAFE_ASTERISK_NOTIFY" # Who to notify with alerts, space separate
NOTIFY_FROM="$SAFE_ASTERISK_NOTIFY_FROM" # From email header (optional)
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
NOTIFY_FROM="asterisk@$SMTP_DOMAIN"
fi
Modified: branches/1.0/package/asterisk/safe_asterisk
===================================================================
--- branches/1.0/package/asterisk/safe_asterisk 2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/asterisk/safe_asterisk 2016-04-16 13:51:22 UTC (rev 7639)
@@ -20,6 +20,10 @@
TTY=""
fi
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
NOTIFY_FROM="asterisk@$SMTP_DOMAIN"
fi
Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init 2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/monit/monit.init 2016-04-16 13:51:22 UTC (rev 7639)
@@ -26,12 +26,20 @@
echo "set alert $i not on { action, instance }"
done
- if [ -n "$MONIT_NOTIFY_FROM" ]; then
- echo "set mail-format { from: \"Monit-$HOSTNAME\" <$MONIT_NOTIFY_FROM> }"
- elif [ -n "$SMTP_DOMAIN" ]; then
- echo "set mail-format { from: \"Monit-$HOSTNAME\" <monit@$SMTP_DOMAIN> }"
+ NOTIFY_FROM="$MONIT_NOTIFY_FROM"
+
+ # Extract from possible <a@b.tld> format
+ NOTIFY_FROM="${NOTIFY_FROM##*<}"
+ NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
+ if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
+ NOTIFY_FROM="monit@$SMTP_DOMAIN"
fi
+ if [ -n "$NOTIFY_FROM" ]; then
+ echo "set mail-format { from: \"Monit-$HOSTNAME\" <$NOTIFY_FROM> }"
+ fi
+
echo "
include /etc/monit/monit.d/*.conf"
}
Modified: branches/1.0/package/msmtp/testmail.sh
===================================================================
--- branches/1.0/package/msmtp/testmail.sh 2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/msmtp/testmail.sh 2016-04-16 13:51:22 UTC (rev 7639)
@@ -35,6 +35,10 @@
exit 1
fi
+# Extract from possible <a@b.tld> format
+FROM="${FROM##*<}"
+FROM="${FROM%%>*}"
+
if [ -z "$FROM" -a -n "$SMTP_DOMAIN" ]; then
FROM="noreply@$SMTP_DOMAIN"
fi
Modified: branches/1.0/package/nut/upsnotify.sh
===================================================================
--- branches/1.0/package/nut/upsnotify.sh 2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/package/nut/upsnotify.sh 2016-04-16 13:51:22 UTC (rev 7639)
@@ -16,6 +16,10 @@
NOTIFY="$UPS_NOTIFY"
NOTIFY_FROM="$UPS_NOTIFY_FROM"
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
NOTIFY_FROM="noreply@$SMTP_DOMAIN"
fi
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover 2016-04-14 17:04:48 UTC (rev 7638)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover 2016-04-16 13:51:22 UTC (rev 7639)
@@ -27,6 +27,14 @@
NOTIFY="$WAN_FAILOVER_NOTIFY" # Who to notify with email alerts, space separate
NOTIFY_FROM="$WAN_FAILOVER_NOTIFY_FROM" # From email header (optional)
+# Extract from possible <a@b.tld> format
+NOTIFY_FROM="${NOTIFY_FROM##*<}"
+NOTIFY_FROM="${NOTIFY_FROM%%>*}"
+
+if [ -z "$NOTIFY_FROM" -a -n "$SMTP_DOMAIN" ]; then
+ NOTIFY_FROM="noreply@$SMTP_DOMAIN"
+fi
+
TARGETS_FAILED=0
TEST_INTERVAL=$INTERVAL
NO_OF_TARGETS=0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-05-09 16:24:18
|
Revision: 7671
http://sourceforge.net/p/astlinux/code/7671
Author: abelbeck
Date: 2016-05-09 16:24:15 +0000 (Mon, 09 May 2016)
Log Message:
-----------
Linux version bump from linux-3.2.78 to linux-3.2.80
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
branches/1.0/crosstool-ng-src/get-files.sh
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/geni586/linux.config
branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
branches/1.0/project/astlinux/genx86_64/linux-smp.config
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/project/runnix-iso/geni586/linux.config
branches/1.0/runnix-iso.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
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/astlinux-ast11.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -916,7 +916,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/astlinux-ast13.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -916,7 +916,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/astlinux18.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -916,7 +916,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -219,7 +219,7 @@
# CT_KERNEL_V_2_6_31 is not set
# CT_KERNEL_V_2_6_27 is not set
CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.78.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.80.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -219,7 +219,7 @@
# CT_KERNEL_V_2_6_31 is not set
# CT_KERNEL_V_2_6_27 is not set
CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.78.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.80.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/get-files.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-files.sh 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/crosstool-ng-src/get-files.sh 2016-05-09 16:24:15 UTC (rev 7671)
@@ -4,7 +4,7 @@
TARBALLS=".build/tarballs"
-LINUX_KERNEL="linux-3.2.78.tar.gz"
+LINUX_KERNEL="linux-3.2.80.tar.gz"
EGLIBC="eglibc-2_18.tar.bz2"
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.78 Kernel Configuration
+# Linux/i386 3.2.80 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/astlinux/geni586/linux.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/project/astlinux/geni586/linux.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.78 Kernel Configuration
+# Linux/i386 3.2.80 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.78 Kernel Configuration
+# Linux/x86_64 3.2.80 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.78 Kernel Configuration
+# Linux/x86_64 3.2.80 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/project/runnix/geni586/linux.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.78 Kernel Configuration
+# Linux/i386 3.2.80 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/runnix-iso/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix-iso/geni586/linux.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/project/runnix-iso/geni586/linux.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.78 Kernel Configuration
+# Linux/i386 3.2.80 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/runnix-iso.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -810,7 +810,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/runnix.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -811,7 +811,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -897,7 +897,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -897,7 +897,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-05-07 23:46:17 UTC (rev 7670)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-05-09 16:24:15 UTC (rev 7671)
@@ -897,7 +897,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.78.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-05-29 15:15:52
|
Revision: 7688
http://sourceforge.net/p/astlinux/code/7688
Author: abelbeck
Date: 2016-05-29 15:15:50 +0000 (Sun, 29 May 2016)
Log Message:
-----------
arnofw, add AstLinux NAT_FOREIGN_NETWORK rc.conf variable to support a downstream router with NAT disabled
Modified Paths:
--------------
branches/1.0/package/arnofw/arnofw.wrapper
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/arnofw/arnofw.wrapper
===================================================================
--- branches/1.0/package/arnofw/arnofw.wrapper 2016-05-26 21:29:03 UTC (rev 7687)
+++ branches/1.0/package/arnofw/arnofw.wrapper 2016-05-29 15:15:50 UTC (rev 7688)
@@ -81,6 +81,17 @@
fi
}
+setFOREIGNnet()
+{
+ local x IFS
+
+ unset IFS
+ for x in $NAT_FOREIGN_NETWORK; do
+ NAT_INTERNAL_NET="$NAT_INTERNAL_NET${NAT_INTERNAL_NET:+ }$x"
+ NAT=1
+ done
+}
+
setIPSECnet()
{
# args: IP, NM
@@ -184,6 +195,10 @@
MODEM_IF=""
+if [ -n "$NAT_FOREIGN_NETWORK" ]; then
+ setFOREIGNnet
+fi
+
EXT_IF_DHCP_IP=0
if [ -n "$EXTIF" -a -z "$EXTIP" ] && [ "$EXTIF" != "ppp0" -o -z "$PPPOEIF" ]; then
EXT_IF_DHCP_IP=1
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-05-26 21:29:03 UTC (rev 7687)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-05-29 15:15:50 UTC (rev 7688)
@@ -48,7 +48,7 @@
#NTPSERVS="oceania.pool.ntp.org"
#NTPSERVS="africa.pool.ntp.org"
## If you would like to specify several servers to be used at the same time,
-## you can specify them in NTPSERVS seperated by spaces.
+## you can specify them in NTPSERVS separated by spaces.
#NTPSERVS="ntp1.cs.wisc.edu us.pool.ntp.org"
## Persistent Logs
@@ -142,7 +142,7 @@
## If configured with bridge-utils AstLinux can setup layer 2 bridges for you
## Very useful for access points, small "switches" etc. You can define up to
## three total (BRIDGE0, BRIDGE1, BRIDGE2). This example creates device "br0"
-## and adds the interfaces (seperated by spaces) to the bridge. Bridges can
+## and adds the interfaces (separated by spaces) to the bridge. Bridges can
## include vlans as defined above.
#BRIDGE0="eth1 ap0"
#BRIDGE1="ap1 eth0"
@@ -281,9 +281,15 @@
## Disable IPv4 NAT (NONAT)
## By default for IPv4, NAT/PAT is enabled on all of the internal interfaces. If you don't
-## want to, define that here. As usual, multiple interfaces can be seperated by spaces.
+## want to, define that here. As usual, multiple interfaces can be separated by spaces.
#NONAT="tun0"
+## NAT Foreign (downstream) IPv4 Network(s)
+## Support a downstream router with NAT disabled, allow AstLinux to NAT the router's subnets
+## Defined using a space separated list of network(s) using CIDR notation.
+## Note: Use the /mnt/kd/rc.elocal script to define the necessary static routes.
+#NAT_FOREIGN_NETWORK="192.168.6.0/24 192.168.7.0/24"
+
## Allow LAN to LAN traffic for internal interfaces, defaults to disallow
## Space separate "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
## Separate groups using a ~ (tilde)
@@ -832,7 +838,7 @@
#KERNEL_SYSCTL="kernel.panic=3 vm.min_free_kbytes=8192"
## LMSensors Modules
-## List your hardware modules, seperated by spaces
+## List your hardware modules, separated by spaces
## You will also need to create a sensors.conf
#SENSEMODS="vt1211"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-06-03 13:25:49
|
Revision: 7698
http://sourceforge.net/p/astlinux/code/7698
Author: abelbeck
Date: 2016-06-03 13:25:46 +0000 (Fri, 03 Jun 2016)
Log Message:
-----------
p910nd, move runlevel symlinks to the package makefile
Modified Paths:
--------------
branches/1.0/package/p910nd/p910nd.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K08p910nd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S63p910nd
Modified: branches/1.0/package/p910nd/p910nd.mk
===================================================================
--- branches/1.0/package/p910nd/p910nd.mk 2016-06-03 13:11:52 UTC (rev 7697)
+++ branches/1.0/package/p910nd/p910nd.mk 2016-06-03 13:25:46 UTC (rev 7698)
@@ -23,11 +23,15 @@
define P910ND_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/p910nd $(TARGET_DIR)/usr/sbin/p910nd
$(INSTALL) -m 0755 -D package/p910nd/p910nd.init $(TARGET_DIR)/etc/init.d/p910nd
+ ln -sf ../../init.d/p910nd $(TARGET_DIR)/etc/runlevels/default/S63p910nd
+ ln -sf ../../init.d/p910nd $(TARGET_DIR)/etc/runlevels/default/K08p910nd
endef
define P910ND_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/sbin/p910nd
rm -f $(TARGET_DIR)/etc/init.d/p910nd
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S63p910nd
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K08p910nd
endef
$(eval $(call AUTOTARGETS,package,p910nd))
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K08p910nd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K08p910nd 2016-06-03 13:11:52 UTC (rev 7697)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K08p910nd 2016-06-03 13:25:46 UTC (rev 7698)
@@ -1 +0,0 @@
-link ../../init.d/p910nd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S63p910nd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S63p910nd 2016-06-03 13:11:52 UTC (rev 7697)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S63p910nd 2016-06-03 13:25:46 UTC (rev 7698)
@@ -1 +0,0 @@
-link ../../init.d/p910nd
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-06-03 13:37:11
|
Revision: 7699
http://sourceforge.net/p/astlinux/code/7699
Author: abelbeck
Date: 2016-06-03 13:37:09 +0000 (Fri, 03 Jun 2016)
Log Message:
-----------
mdnsresponder, move runlevel symlinks to the package makefile
Modified Paths:
--------------
branches/1.0/package/mdnsresponder/mdnsresponder.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05mdns
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92mdns
Modified: branches/1.0/package/mdnsresponder/mdnsresponder.mk
===================================================================
--- branches/1.0/package/mdnsresponder/mdnsresponder.mk 2016-06-03 13:25:46 UTC (rev 7698)
+++ branches/1.0/package/mdnsresponder/mdnsresponder.mk 2016-06-03 13:37:09 UTC (rev 7699)
@@ -28,14 +28,18 @@
$(TARGET_DIR)/$(MDNSRESPONDER_TARGET_BINARY): $(MDNSRESPONDER_DIR)/$(MDNSRESPONDER_BINARY)
$(INSTALL) -s -D -m 0755 $(MDNSRESPONDER_DIR)/$(MDNSRESPONDER_BINARY) $(TARGET_DIR)/$(MDNSRESPONDER_TARGET_BINARY)
$(INSTALL) -D -m 0755 package/mdnsresponder/mdns.init $(TARGET_DIR)/etc/init.d/mdns
+ ln -sf ../../init.d/mdns $(TARGET_DIR)/etc/runlevels/default/S92mdns
+ ln -sf ../../init.d/mdns $(TARGET_DIR)/etc/runlevels/default/K05mdns
mdnsresponder: $(TARGET_DIR)/$(MDNSRESPONDER_TARGET_BINARY)
mdnsresponder-source: $(MDNSRESPONDER_DIR)/.source
mdnsresponder-clean:
- rm -rf $(TARGET_DIR)/$(MDNSRESPONDER_TARGET_BINARY)
- rm -rf $(TARGET_DIR)/etc/init.d/mdns
+ rm -f $(TARGET_DIR)/$(MDNSRESPONDER_TARGET_BINARY)
+ rm -f $(TARGET_DIR)/etc/init.d/mdns
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S92mdns
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K05mdns
-$(MAKE) -C $(MDNSRESPONDER_DIR)/mDNSPosix os=linux clean
mdnsresponder-dirclean:
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05mdns
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05mdns 2016-06-03 13:25:46 UTC (rev 7698)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05mdns 2016-06-03 13:37:09 UTC (rev 7699)
@@ -1 +0,0 @@
-link ../../init.d/mdns
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92mdns
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92mdns 2016-06-03 13:25:46 UTC (rev 7698)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92mdns 2016-06-03 13:37:09 UTC (rev 7699)
@@ -1 +0,0 @@
-link ../../init.d/mdns
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-06-04 22:55:32
|
Revision: 7703
http://sourceforge.net/p/astlinux/code/7703
Author: abelbeck
Date: 2016-06-04 22:55:30 +0000 (Sat, 04 Jun 2016)
Log Message:
-----------
Migrate from mdnsresponder to avahi for mDNS support
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/avahi/avahi.init
branches/1.0/package/mdnsresponder/Config.in
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
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
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/astlinux-ast11.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:57 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:10 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -625,7 +625,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -682,7 +682,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -733,7 +736,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/astlinux-ast13.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:57 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:15 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -625,7 +625,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -682,7 +682,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -733,7 +736,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/astlinux18.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:57 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:04 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -625,7 +625,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -682,7 +682,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -733,7 +736,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/package/avahi/avahi.init
===================================================================
--- branches/1.0/package/avahi/avahi.init 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/package/avahi/avahi.init 2016-06-04 22:55:30 UTC (rev 7703)
@@ -8,9 +8,48 @@
exit
fi
+gen_initial_setup_mdns()
+{
+ echo "## Autogenerated. Do not edit.
+[server]
+use-ipv4=yes
+use-ipv6=no
+ratelimit-interval-usec=1000000
+ratelimit-burst=1000
+
+[wide-area]
+enable-wide-area=no
+
+[publish]
+publish-hinfo=no
+publish-workstation=no
+publish-aaaa-on-ipv4=no
+publish-a-on-ipv6=no
+
+[reflector]
+enable-reflector=no
+
+[rlimits]
+rlimit-core=0
+rlimit-data=4194304
+rlimit-fsize=0
+rlimit-nofile=768
+rlimit-stack=4194304
+rlimit-nproc=3
+"
+}
+
init ()
{
if [ "$AVAHI_ENABLE" != "yes" ]; then
+ if [ -n "$ADNAME" ]; then
+ if [ -d /tmp/etc/avahi ]; then
+ rm -rf /tmp/etc/avahi
+ fi
+ mkdir -p /tmp/etc/avahi/services
+ gen_initial_setup_mdns > /tmp/etc/avahi/avahi-daemon.conf
+ return
+ fi
exit
fi
@@ -21,13 +60,19 @@
fi
fi
+ if [ -d /tmp/etc/avahi ]; then
+ rm -rf /tmp/etc/avahi
+ fi
ln -snf /mnt/kd/avahi /tmp/etc/avahi
}
start ()
{
- if [ "$AVAHI_ENABLE" = "yes" ] && ! $DAEMON --check; then
+ if [ "$AVAHI_ENABLE" = "yes" -o -n "$ADNAME" ] && ! $DAEMON --check; then
echo "Starting Avahi mDNS/DNS-SD..."
+ if [ "$AVAHI_ENABLE" != "yes" -a -n "$ADNAME" ]; then
+ echo " Warning: ADNAME is active."
+ fi
$DAEMON --daemonize
fi
}
Modified: branches/1.0/package/mdnsresponder/Config.in
===================================================================
--- branches/1.0/package/mdnsresponder/Config.in 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/package/mdnsresponder/Config.in 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,4 +1,5 @@
config BR2_PACKAGE_MDNSRESPONDER
+ depends on !BR2_PACKAGE_AVAHI
bool "mdnsresponder"
default n
help
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-06-04 22:55:30 UTC (rev 7703)
@@ -492,11 +492,14 @@
#STUNNEL_DEBUGLEVEL="5" # "0" is no debug, "2" is critical, "3" is errors, "5" is notice, "7" is full debugging
#STUNNELUSER="root" # defaults to "nobody", do not change unless binding fails
-## Service Advertisement (mDNS)
-## If you define ADNAME, I will advertise all of the available services on
-## your AstLinux machine in a way that is compatible with bonjour/rendezvous.
-## THIS IS VERY INSECURE, THIS SHOULD BE THE FIRST THING YOU DISABLE
-## ADNAME is automatically (always) disabled whenever the web interface Network Tab is saved.
+## Bonjour/mDNS Service Discovery (Avahi)
+## Configuration stored in /mnt/kd/avahi/ symlinked from /etc/avahi/
+## Enable mDNS/DNS-SD by setting AVAHI_ENABLE="yes"
+#AVAHI_ENABLE="yes"
+##
+## Defining ADNAME when AVAHI_ENABLE="no" (or undefined) will advertise pbx.local on all interfaces.
+## Use only for initial setup. THIS IS VERY INSECURE, THIS SHOULD BE THE FIRST THING YOU DISABLE
+## Note: ADNAME is automatically (always) disabled whenever the web interface Network Tab is saved.
ADNAME="AstLinux PBX"
## Universal Plug and Play (UPnP)
@@ -907,10 +910,9 @@
#UPS_NOTIFY_FROM="up...@my..." # Optional, From: email address
## Additionally, custom files in /mnt/kd/ups/ will override auto-generated 'ups*' files if any exist.
-## NetJet Emulation (P910ND)
+## NetJet Emulation (P910ND) - Non-spooling printer daemon using 9100/tcp to USB printer
+## Note: Enable Bonjour/mDNS discovery with AVAHI_ENABLE="yes" and configuring /mnt/kd/avahi/
#P910ND_DEVICE0="/dev/usblp0"
-## Enable Bonjour/mDNS Broadcasts
-#P910ND_ADNAME0="HP Officejet 6200"
## Redfone foneBRIDGE (PRI-to-Ethernet bridge)
## If the package "fonulator" is built, Redfone foneBRIDGE configuration support is added.
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:35 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -606,7 +606,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -663,7 +663,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -714,7 +717,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:37 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -606,7 +606,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -663,7 +663,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -714,7 +717,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:30 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -606,7 +606,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -663,7 +663,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -714,7 +717,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-06-04 23:05:49
|
Revision: 7704
http://sourceforge.net/p/astlinux/code/7704
Author: abelbeck
Date: 2016-06-04 23:05:46 +0000 (Sat, 04 Jun 2016)
Log Message:
-----------
Add /mnt/kd/avahi to fossil's default directories and the web interface's Restore Basic Configuration
Modified Paths:
--------------
branches/1.0/package/fossil/scripts/fossil-commit
branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf
Modified: branches/1.0/package/fossil/scripts/fossil-commit
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-commit 2016-06-04 22:55:30 UTC (rev 7703)
+++ branches/1.0/package/fossil/scripts/fossil-commit 2016-06-04 23:05:46 UTC (rev 7704)
@@ -35,7 +35,7 @@
if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
dirs="$FOSSIL_DEFAULT_DIRS"
else
- dirs="rc.conf.d crontabs arno-iptables-firewall/plugins monit/monit.d openvpn/ccd"
+ dirs="rc.conf.d crontabs avahi arno-iptables-firewall/plugins monit/monit.d openvpn/ccd"
if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
fi
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf 2016-06-04 22:55:30 UTC (rev 7703)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf 2016-06-04 23:05:46 UTC (rev 7704)
@@ -70,7 +70,7 @@
# Restore basic configuration directories, clearing target directory
#
-if ! restore_dirs rc.conf.d ssh_keys asterisk dahdi openvpn ipsec crontabs ups snmp fop2 kamailio monit; then
+if ! restore_dirs rc.conf.d ssh_keys asterisk dahdi openvpn ipsec crontabs avahi ups snmp fop2 kamailio monit; then
exit 2
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-06-10 13:54:39
|
Revision: 7715
http://sourceforge.net/p/astlinux/code/7715
Author: abelbeck
Date: 2016-06-10 13:54:37 +0000 (Fri, 10 Jun 2016)
Log Message:
-----------
build system, workaround 'files.astlinux.org' DNS issues
Modified Paths:
--------------
branches/1.0/crosstool-ng-src/get-files.sh
branches/1.0/toolchain/getter_script.sh
Modified: branches/1.0/crosstool-ng-src/get-files.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-files.sh 2016-06-10 03:20:38 UTC (rev 7714)
+++ branches/1.0/crosstool-ng-src/get-files.sh 2016-06-10 13:54:37 UTC (rev 7715)
@@ -1,6 +1,7 @@
# shell script to add additional files
-FILES_URL="http://files.astlinux.org"
+#FILES_URL="http://files.astlinux.org"
+FILES_URL="http://d18y2f4fr43xzs.cloudfront.net"
TARBALLS=".build/tarballs"
Modified: branches/1.0/toolchain/getter_script.sh
===================================================================
--- branches/1.0/toolchain/getter_script.sh 2016-06-10 03:20:38 UTC (rev 7714)
+++ branches/1.0/toolchain/getter_script.sh 2016-06-10 13:54:37 UTC (rev 7715)
@@ -2,7 +2,8 @@
# getter_better script from gumstix
# what a great idea...
#SITE="http://astlinuxfiles.s3.amazonaws.com"
-SITE="files.astlinux.org"
+#SITE="files.astlinux.org"
+SITE="d18y2f4fr43xzs.cloudfront.net"
WGET_ARGS="--passive-ftp --timeout=30 -c -t 2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-06-19 22:35:09
|
Revision: 7727
http://sourceforge.net/p/astlinux/code/7727
Author: abelbeck
Date: 2016-06-19 22:35:06 +0000 (Sun, 19 Jun 2016)
Log Message:
-----------
Rename S3 related URL's from astlinux.org to astlinux-project.org, and S3 buckets from astlinuxfiles,astlinuxmirror to files.astlinux-project,mirror.astlinux-project
Modified Paths:
--------------
branches/1.0/crosstool-ng-src/get-files.sh
branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
branches/1.0/scripts/gen-locale
branches/1.0/scripts/master-locales
branches/1.0/scripts/master-runnix-upload
branches/1.0/scripts/master-sounds
branches/1.0/scripts/master-upload
branches/1.0/scripts/upload-dl-pair
branches/1.0/scripts/upload_script.sh
branches/1.0/toolchain/getter_script.sh
Modified: branches/1.0/crosstool-ng-src/get-files.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-files.sh 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/crosstool-ng-src/get-files.sh 2016-06-19 22:35:06 UTC (rev 7727)
@@ -1,7 +1,6 @@
# shell script to add additional files
-#FILES_URL="http://files.astlinux.org"
-FILES_URL="http://d18y2f4fr43xzs.cloudfront.net"
+FILES_URL="http://files.astlinux-project.org"
TARBALLS=".build/tarballs"
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file 2016-06-19 22:35:06 UTC (rev 7727)
@@ -41,7 +41,7 @@
## Redirect AstLinux mirror URL to HTTPS
##
-redirect_url_to_https "mirror.astlinux.org"
+redirect_url_to_https "mirror.astlinux-project.org"
curl -sSfL --globoff --retry 1 --connect-timeout 15 --max-time 1800 -o "$file" "$url" >/dev/null
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale 2016-06-19 22:35:06 UTC (rev 7727)
@@ -7,7 +7,7 @@
GREEN=0
#
# locale repository
-SRC_URL="https://mirror.astlinux.org/locale"
+SRC_URL="https://mirror.astlinux-project.org/locale"
#
# base locale directory
BASE="/usr/lib/locale"
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 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2016-06-19 22:35:06 UTC (rev 7727)
@@ -7,7 +7,7 @@
GREEN=0
#
# Default RUNNIX Repository
-SRC_URL="https://mirror.astlinux.org/runnix4"
+SRC_URL="https://mirror.astlinux-project.org/runnix4"
#
# Default RUNNIX Version (use if no local 'ver' file)
RUN_VER="runnix-0.2.1"
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-06-19 22:35:06 UTC (rev 7727)
@@ -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-$(uname -m | sed -e 's/i.86/i386/').tgz"
+ SRC_URL="https://files.astlinux-project.org/fop2-2.28-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
;;
show)
Modified: branches/1.0/scripts/gen-locale
===================================================================
--- branches/1.0/scripts/gen-locale 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/gen-locale 2016-06-19 22:35:06 UTC (rev 7727)
@@ -33,7 +33,7 @@
echo "gen-locale: Skipping '$i', only UTF-8 is supported." >&2
continue
fi
- localedef --prefix "$TMP_DIR" --little-endian -c -i ${lang} -f UTF-8 ${lang}.UTF-8
+ localedef --prefix "$TMP_DIR" -c -i ${lang} -f UTF-8 ${lang}.UTF-8
if [ $? -eq 0 ]; then
VALID="$VALID${VALID:+, }${lang}.UTF-8"
fi
Modified: branches/1.0/scripts/master-locales
===================================================================
--- branches/1.0/scripts/master-locales 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-locales 2016-06-19 22:35:06 UTC (rev 7727)
@@ -80,6 +80,8 @@
vi_VN
"
+S3_BUCKET="mirror.astlinux-project"
+
TMP_LIST_FILE="/tmp/master-locale-list"
LOCALE_FILE="$(pwd)/locale-archive"
@@ -98,13 +100,13 @@
sha1sum locale-archive.gz > locale-archive.gz.sha1
for file in locale-archive.gz locale-archive.gz.sha1; do
if [ "$ACTION" = "upload" ]; then
- s3cmd put --acl-public "$file" "s3://astlinuxmirror/locale/${locale}/${file}"
+ s3cmd put --acl-public "$file" "s3://${S3_BUCKET}/locale/${locale}/${file}"
if [ $? -ne 0 ]; then
rm -f "$TMP_LIST_FILE" "$LOCALE_FILE.gz" "$LOCALE_FILE.gz.sha1"
exit 1
fi
else
- echo "s3cmd put --acl-public $file s3://astlinuxmirror/locale/${locale}/${file}"
+ echo "s3cmd put --acl-public $file s3://${S3_BUCKET}/locale/${locale}/${file}"
fi
done
else
@@ -114,13 +116,13 @@
file="$TMP_LIST_FILE"
if [ "$ACTION" = "upload" ]; then
- s3cmd put --acl-public "$file" "s3://astlinuxmirror/locale/locales.txt"
+ s3cmd put --acl-public "$file" "s3://${S3_BUCKET}/locale/locales.txt"
if [ $? -ne 0 ]; then
rm -f "$TMP_LIST_FILE" "$LOCALE_FILE" "$LOCALE_FILE.gz" "$LOCALE_FILE.gz.sha1"
exit 1
fi
else
- echo "s3cmd put --acl-public $file s3://astlinuxmirror/locale/locales.txt"
+ echo "s3cmd put --acl-public $file s3://${S3_BUCKET}/locale/locales.txt"
fi
if [ $err_cnt -gt 0 ]; then
Modified: branches/1.0/scripts/master-runnix-upload
===================================================================
--- branches/1.0/scripts/master-runnix-upload 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-runnix-upload 2016-06-19 22:35:06 UTC (rev 7727)
@@ -20,7 +20,7 @@
echo "$runnix" > /tmp/ver
for file in $runnix.tar.gz $runnix.tar.gz.sha1 /tmp/ver; do
- s3cmd put --acl-public "$file" "s3://astlinuxmirror/runnix4/${file##*/}"
+ s3cmd put --acl-public "$file" "s3://mirror.astlinux-project/runnix4/${file##*/}"
done
rm /tmp/ver
Modified: branches/1.0/scripts/master-sounds
===================================================================
--- branches/1.0/scripts/master-sounds 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-sounds 2016-06-19 22:35:06 UTC (rev 7727)
@@ -86,6 +86,8 @@
asterisk-moh-opsound-wav
"
+S3_BUCKET="mirror.astlinux-project"
+
SOUNDS_URL="http://downloads.asterisk.org/pub/telephony/sounds"
SUFFIX="current.tar.gz"
@@ -120,19 +122,19 @@
download_sound $i
if [ $? -eq 0 ]; then
if [ "$ACTION" = "upload" ]; then
- s3cmd put --acl-public "$TMP_SND_FILE" "s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}"
+ s3cmd put --acl-public "$TMP_SND_FILE" "s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}"
if [ $? -ne 0 ]; then
cleanup
exit 1
fi
- s3cmd put --acl-public "$TMP_SND_FILE.sha1" "s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}.sha1"
+ s3cmd put --acl-public "$TMP_SND_FILE.sha1" "s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}.sha1"
if [ $? -ne 0 ]; then
cleanup
exit 1
fi
else
- echo "s3cmd put --acl-public $TMP_SND_FILE s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}"
- echo "s3cmd put --acl-public $TMP_SND_FILE.sha1 s3://astlinuxmirror/asterisk-sounds/${i}-${SUFFIX}.sha1"
+ echo "s3cmd put --acl-public $TMP_SND_FILE s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}"
+ echo "s3cmd put --acl-public $TMP_SND_FILE.sha1 s3://${S3_BUCKET}/asterisk-sounds/${i}-${SUFFIX}.sha1"
fi
else
err_cnt=$((err_cnt+1))
Modified: branches/1.0/scripts/master-upload
===================================================================
--- branches/1.0/scripts/master-upload 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/master-upload 2016-06-19 22:35:06 UTC (rev 7727)
@@ -14,7 +14,7 @@
local remote_dir="$1" files="$2" count="$3" IFS=' ' file
for file in $files; do
- s3cmd put --acl-public "$file" "s3://astlinuxmirror/$remote_dir/${file##*/}"
+ s3cmd put --acl-public "$file" "s3://mirror.astlinux-project/$remote_dir/${file##*/}"
done
if [ $? -eq 0 ]; then
Modified: branches/1.0/scripts/upload-dl-pair
===================================================================
--- branches/1.0/scripts/upload-dl-pair 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/upload-dl-pair 2016-06-19 22:35:06 UTC (rev 7727)
@@ -14,6 +14,6 @@
sha1sum ${1} > ${1}.sha1
for file in ${1} ${1}.sha1; do
- s3cmd put --acl-public "$file" "s3://astlinuxfiles/${file##*/}"
+ s3cmd put --acl-public "$file" "s3://files.astlinux-project/${file##*/}"
done
Modified: branches/1.0/scripts/upload_script.sh
===================================================================
--- branches/1.0/scripts/upload_script.sh 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/scripts/upload_script.sh 2016-06-19 22:35:06 UTC (rev 7727)
@@ -15,7 +15,7 @@
done
if [ "$action" = "all" ]; then
- s3cmd sync --acl-public --exclude '*/*' -v dl/ s3://astlinuxfiles/
+ s3cmd sync --acl-public --exclude '*/*' -v dl/ s3://files.astlinux-project/
elif [ "$action" = "dry-run" ]; then
- s3cmd sync --dry-run --exclude '*/*' -v dl/ s3://astlinuxfiles/
+ s3cmd sync --dry-run --exclude '*/*' -v dl/ s3://files.astlinux-project/
fi
Modified: branches/1.0/toolchain/getter_script.sh
===================================================================
--- branches/1.0/toolchain/getter_script.sh 2016-06-17 15:56:00 UTC (rev 7726)
+++ branches/1.0/toolchain/getter_script.sh 2016-06-19 22:35:06 UTC (rev 7727)
@@ -1,9 +1,8 @@
#!/bin/bash
# getter_better script from gumstix
# what a great idea...
-#SITE="http://astlinuxfiles.s3.amazonaws.com"
-#SITE="files.astlinux.org"
-SITE="d18y2f4fr43xzs.cloudfront.net"
+#SITE="http://s3.amazonaws.com/files.astlinux-project"
+SITE="files.astlinux-project.org"
WGET_ARGS="--passive-ftp --timeout=30 -c -t 2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-06 12:49:35
|
Revision: 7742
http://sourceforge.net/p/astlinux/code/7742
Author: abelbeck
Date: 2016-07-06 12:49:32 +0000 (Wed, 06 Jul 2016)
Log Message:
-----------
mark release 'astlinux-1.2.7'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-06-30 14:54:15 UTC (rev 7741)
+++ branches/1.0/docs/ChangeLog.txt 2016-07-06 12:49:32 UTC (rev 7742)
@@ -8,7 +8,7 @@
Additions for AstLinux 1.2.7:
=============================
-Released @TBD@
+Released 2016-07-06
** IMPORTANT NOTICE
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-06-30 14:54:15 UTC (rev 7741)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-07-06 12:49:32 UTC (rev 7742)
@@ -1 +1 @@
-svn
+astlinux-1.2.7
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-06 12:49:47
|
Revision: 7744
http://sourceforge.net/p/astlinux/code/7744
Author: abelbeck
Date: 2016-07-06 12:49:45 +0000 (Wed, 06 Jul 2016)
Log Message:
-----------
return to release 'svn'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-07-06 12:49:38 UTC (rev 7743)
+++ branches/1.0/docs/ChangeLog.txt 2016-07-06 12:49:45 UTC (rev 7744)
@@ -5,6 +5,12 @@
=== docs/ChangeLog.txt
=========================================================
+Additions for AstLinux 1.2.8:
+=============================
+
+Released @TBD@
+
+
Additions for AstLinux 1.2.7:
=============================
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-07-06 12:49:38 UTC (rev 7743)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-07-06 12:49:45 UTC (rev 7744)
@@ -1 +1 @@
-astlinux-1.2.7
+svn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-10 15:10:20
|
Revision: 7747
http://sourceforge.net/p/astlinux/code/7747
Author: abelbeck
Date: 2016-07-10 15:10:17 +0000 (Sun, 10 Jul 2016)
Log Message:
-----------
arnofw, add Deny LAN to DMZ traffic for internal interfaces, rc.conf variable DMZ_DENYLAN, defaults to allow as before. Simple rework of the astlinux.shim script making all the intermediate variables 'local' so as not to appear in the AIF script.
Modified Paths:
--------------
branches/1.0/package/arnofw/arnofw.wrapper
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/arnofw/arnofw.wrapper
===================================================================
--- branches/1.0/package/arnofw/arnofw.wrapper 2016-07-09 16:14:30 UTC (rev 7746)
+++ branches/1.0/package/arnofw/arnofw.wrapper 2016-07-10 15:10:17 UTC (rev 7747)
@@ -1,9 +1,11 @@
-#
-# In this shim, we're invoked after /etc/arno-iptables-firewall/firewall.conf
-# has been read. We then read /etc/rc.conf, and paste in variables from
-# the latter file that will override whatever values were configured in
-# firewall.conf.
-#
+##
+## Custom AstLinux Variables -> AIF Configuration
+##
+## This script is called by AIF as a LOCAL_CONFIG_FILE which occurs after
+## the /etc/arno-iptables-firewall/firewall.conf defaults are read.
+## The AstLinux variables are then sourced from /etc/rc.conf, which together
+## with this script allows AIF variables to be configured as needed.
+##
. /etc/rc.conf
@@ -25,7 +27,7 @@
isNATinterface()
{
# args: IF
- local IFS
+ local intf IFS
unset IFS
for intf in $NONAT; do
@@ -40,9 +42,10 @@
addINTERNALnet()
{
# args: IF, IP, NM
+ local NETWORK PREFIX
+
if [ -n "$1" -a "$1" != "none" -a -n "$2" -a -n "$3" ]; then
- local NETWORK PREFIX
- eval `ipcalc -np $2 $3`
+ eval $(ipcalc -np $2 $3)
INT_IF="$INT_IF${INT_IF:+ }$1"
INTERNAL_NET="$INTERNAL_NET${INTERNAL_NET:+ }$NETWORK/$PREFIX"
@@ -56,9 +59,10 @@
addNOnatINTERNALnet()
{
# args: IF, IP, NM
+ local NETWORK PREFIX
+
if [ -n "$1" -a "$1" != "none" -a -n "$2" -a -n "$3" ]; then
- local NETWORK PREFIX
- eval `ipcalc -np $2 $3`
+ eval $(ipcalc -np $2 $3)
INT_IF="$INT_IF${INT_IF:+ }$1"
INTERNAL_NET="$INTERNAL_NET${INTERNAL_NET:+ }$NETWORK/$PREFIX"
@@ -68,9 +72,10 @@
setDMZnet()
{
# args: IF, IP, NM
+ local NETWORK PREFIX
+
if [ -n "$1" -a "$1" != "none" -a -n "$2" -a -n "$3" ]; then
- local NETWORK PREFIX
- eval `ipcalc -np $2 $3`
+ eval $(ipcalc -np $2 $3)
DMZ_IF="$1"
DMZ_NET="$NETWORK/$PREFIX"
@@ -95,9 +100,10 @@
setIPSECnet()
{
# args: IP, NM
+ local NETWORK PREFIX
+
if [ -n "$1" -a -n "$2" ]; then
- local NETWORK PREFIX
- eval `ipcalc -np $1 $2`
+ eval $(ipcalc -np $1 $2)
NAT_INTERNAL_NET="$NAT_INTERNAL_NET${NAT_INTERNAL_NET:+ }$NETWORK/$PREFIX"
NAT=1
@@ -106,8 +112,9 @@
getLANinterface()
{
+ # args: LAN
local lanif=""
-
+
case $1 in
INTIF)
lanif="$INTIF"
@@ -123,7 +130,7 @@
if [ -z "$lanif" ]; then
return 1
fi
-
+
echo "$lanif"
return 0
}
@@ -141,172 +148,194 @@
esac
}
-## Disable TOS mangling
-MANGLE_TOS=0
+astlinux_wrapper()
+{
+ local intf lan lans extCIDR ovpnIF ovpnIP ovpnNM allowif allowifs denyif count IFS
-if [ "$IPV6" = "yes" ]; then
- IPV6_SUPPORT=1
-fi
+ MANGLE_TOS=0
-if [ -z "$PPPOEIF" ]; then
- EXT_IF=""
- unset IFS
- for intf in $EXTIF $EXT2IF; do
- EXT_IF="$EXT_IF${EXT_IF:+ }$intf"
- done
-else
- EXT_IF="${PPPOE_EXTIF:-ppp+}"
- unset IFS
- for intf in $EXTIF $EXT2IF; do
- case "$intf" in
- ppp[0-9]*) ;;
- *) EXT_IF="$EXT_IF $intf" ;;
- esac
- done
-fi
+ if [ "$IPV6" = "yes" ]; then
+ IPV6_SUPPORT=1
+ fi
-# Add external interface 'ip6tun' if an IPv6 tunnel is defined
-if [ "$IPV6" = "yes" -a -n "$IPV6_TUNNEL" ]; then
- EXT_IF="$EXT_IF ip6tun"
-fi
+ if [ -z "$PPPOEIF" ]; then
+ EXT_IF=""
+ unset IFS
+ for intf in $EXTIF $EXT2IF; do
+ EXT_IF="$EXT_IF${EXT_IF:+ }$intf"
+ done
+ else
+ EXT_IF="${PPPOE_EXTIF:-ppp+}"
+ unset IFS
+ for intf in $EXTIF $EXT2IF; do
+ case "$intf" in
+ ppp[0-9]*) ;;
+ *) EXT_IF="$EXT_IF $intf" ;;
+ esac
+ done
+ fi
-if [ -z "$EXTERNAL_NET" ]; then
- unset IFS
- for intf in $EXTIF $EXT2IF; do
- extCIDR="$(get_network_cidr "$intf")"
- if [ -n "$extCIDR" ]; then
- EXTERNAL_NET="$EXTERNAL_NET${EXTERNAL_NET:+ }$extCIDR"
- fi
- done
-fi
+ # Add external interface 'ip6tun' if an IPv6 tunnel is defined
+ if [ "$IPV6" = "yes" -a -n "$IPV6_TUNNEL" ]; then
+ EXT_IF="$EXT_IF ip6tun"
+ fi
-INT_IF=""
-INTERNAL_NET=""
-NAT_INTERNAL_NET=""
-NAT=0
+ if [ -z "$EXTERNAL_NET" ]; then
+ unset IFS
+ for intf in $EXTIF $EXT2IF; do
+ extCIDR="$(get_network_cidr "$intf")"
+ if [ -n "$extCIDR" ]; then
+ EXTERNAL_NET="$EXTERNAL_NET${EXTERNAL_NET:+ }$extCIDR"
+ fi
+ done
+ fi
-addINTERNALnet "$INTIF" "$INTIP" "$INTNM"
+ INT_IF=""
+ INTERNAL_NET=""
+ NAT_INTERNAL_NET=""
+ NAT=0
-addINTERNALnet "$INT2IF" "$INT2IP" "$INT2NM"
+ addINTERNALnet "$INTIF" "$INTIP" "$INTNM"
-addINTERNALnet "$INT3IF" "$INT3IP" "$INT3NM"
+ addINTERNALnet "$INT2IF" "$INT2IP" "$INT2NM"
-setDMZnet "$DMZIF" "$DMZIP" "$DMZNM"
+ addINTERNALnet "$INT3IF" "$INT3IP" "$INT3NM"
-MODEM_IF=""
+ setDMZnet "$DMZIF" "$DMZIP" "$DMZNM"
-if [ -n "$NAT_FOREIGN_NETWORK" ]; then
- setFOREIGNnet
-fi
+ MODEM_IF=""
-EXT_IF_DHCP_IP=0
-if [ -n "$EXTIF" -a -z "$EXTIP" ] && [ "$EXTIF" != "ppp0" -o -z "$PPPOEIF" ]; then
- EXT_IF_DHCP_IP=1
-fi
-if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && [ "$EXT2IF" != "ppp0" -o -z "$PPPOEIF" ]; then
- EXT_IF_DHCP_IP=1
-fi
+ if [ -n "$NAT_FOREIGN_NETWORK" ]; then
+ setFOREIGNnet
+ fi
-if [ "$EXTDHCP" = "yes" -a -n "$EXTIP" -a -n "$EXTGW" -a -z "$EXT2IF" -a -z "$PPPOEIF" ]; then
- EXTERNAL_DHCP_SERVER=1
-fi
+ EXT_IF_DHCP_IP=0
+ if [ -n "$EXTIF" -a -z "$EXTIP" ] && [ "$EXTIF" != "ppp0" -o -z "$PPPOEIF" ]; then
+ EXT_IF_DHCP_IP=1
+ fi
+ if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && [ "$EXT2IF" != "ppp0" -o -z "$PPPOEIF" ]; then
+ EXT_IF_DHCP_IP=1
+ fi
-if isVPNtype racoon || isVPNtype ipsecmobile; then
- RP_FILTER=0
-fi
+ if [ "$EXTDHCP" = "yes" -a -n "$EXTIP" -a -n "$EXTGW" -a -z "$EXT2IF" -a -z "$PPPOEIF" ]; then
+ EXTERNAL_DHCP_SERVER=1
+ fi
-if isVPNtype ipsecmobile && [ "$IPSECM_AUTH_METHOD" = "xauth_rsa_server" ]; then
- setIPSECnet "$IPSECM_XAUTH_POOLBASE" "$IPSECM_XAUTH_POOLMASK"
-fi
+ if isVPNtype racoon || isVPNtype ipsecmobile; then
+ RP_FILTER=0
+ fi
-if isVPNtype openvpn; then
- if [ -n "$OVPN_SERVER" ]; then
- ovpnIP="`echo $OVPN_SERVER | awk '{ print $1; }'`"
- ovpnNM="`echo $OVPN_SERVER | awk '{ print $2; }'`"
- if [ -z "$OVPN_DEV" -o "$OVPN_DEV" = "tun" ]; then
- ovpnIF="tun+"
+ if isVPNtype ipsecmobile && [ "$IPSECM_AUTH_METHOD" = "xauth_rsa_server" ]; then
+ setIPSECnet "$IPSECM_XAUTH_POOLBASE" "$IPSECM_XAUTH_POOLMASK"
+ fi
+
+ if isVPNtype openvpn; then
+ if [ -n "$OVPN_SERVER" ]; then
+ ovpnIP="$(echo $OVPN_SERVER | awk '{ print $1; }')"
+ ovpnNM="$(echo $OVPN_SERVER | awk '{ print $2; }')"
+ if [ -z "$OVPN_DEV" -o "$OVPN_DEV" = "tun" ]; then
+ ovpnIF="tun+"
+ else
+ ovpnIF="$OVPN_DEV"
+ fi
+ addINTERNALnet "$ovpnIF" "$ovpnIP" "$ovpnNM"
+ if [ -n "$OVPN_ALLOWLAN" ]; then
+ unset IFS
+ for lan in $OVPN_ALLOWLAN; do
+ allowif="$(getLANinterface "$lan")"
+ if [ $? -eq 0 ]; then
+ IFS=' ,'
+ for intf in $INT_IF; do
+ if [ "$intf" = "$allowif" ]; then
+ IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
+ break
+ fi
+ done
+ fi
+ done
+ fi
else
- ovpnIF="$OVPN_DEV"
+ # Failsafe if /mnt/kd/openvpn/openvpn.conf is used
+ # and OVPN_SERVER is not defined.
+ TRUSTED_IF="tun+"
fi
- addINTERNALnet "$ovpnIF" "$ovpnIP" "$ovpnNM"
- if [ -n "$OVPN_ALLOWLAN" ]; then
- unset IFS
- for lan in $OVPN_ALLOWLAN; do
- allowif="$(getLANinterface "$lan")"
- if [ $? -eq 0 ]; then
- IFS=' ,'
- for intf in $INT_IF; do
- if [ "$intf" = "$allowif" ]; then
- IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
- break;
- fi
- done
- fi
- done
- fi
- else
- # Failsafe if /mnt/kd/openvpn/openvpn.conf is used
- # and OVPN_SERVER is not defined.
- TRUSTED_IF="tun+"
fi
-fi
-if isVPNtype openvpnclient; then
- if [ -n "$OVPNC_SERVER" ]; then
- ovpnIP="`echo $OVPNC_SERVER | awk '{ print $1; }'`"
- ovpnNM="`echo $OVPNC_SERVER | awk '{ print $2; }'`"
- if [ -z "$OVPNC_DEV" -o "$OVPNC_DEV" = "tun" ]; then
- ovpnIF="tun+"
+ if isVPNtype openvpnclient; then
+ if [ -n "$OVPNC_SERVER" ]; then
+ ovpnIP="$(echo $OVPNC_SERVER | awk '{ print $1; }')"
+ ovpnNM="$(echo $OVPNC_SERVER | awk '{ print $2; }')"
+ if [ -z "$OVPNC_DEV" -o "$OVPNC_DEV" = "tun" ]; then
+ ovpnIF="tun+"
+ else
+ ovpnIF="$OVPNC_DEV"
+ fi
+ addNOnatINTERNALnet "$ovpnIF" "$ovpnIP" "$ovpnNM"
+ if [ -n "$OVPNC_ALLOWLAN" ]; then
+ unset IFS
+ for lan in $OVPNC_ALLOWLAN; do
+ allowif="$(getLANinterface "$lan")"
+ if [ $? -eq 0 ]; then
+ IFS=' ,'
+ for intf in $INT_IF; do
+ if [ "$intf" = "$allowif" ]; then
+ IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
+ break
+ fi
+ done
+ fi
+ done
+ fi
else
- ovpnIF="$OVPNC_DEV"
+ # Failsafe if /mnt/kd/openvpn/openvpnconf.conf is used
+ # and OVPNC_SERVER is not defined.
+ TRUSTED_IF="tun+"
fi
- addNOnatINTERNALnet "$ovpnIF" "$ovpnIP" "$ovpnNM"
- if [ -n "$OVPNC_ALLOWLAN" ]; then
- unset IFS
- for lan in $OVPNC_ALLOWLAN; do
+ fi
+
+ if [ -n "$ALLOWLANS" ]; then
+ IFS='~'
+ for lans in $ALLOWLANS; do
+ allowifs=""
+ count=0
+ IFS=' '
+ for lan in $lans; do
allowif="$(getLANinterface "$lan")"
if [ $? -eq 0 ]; then
IFS=' ,'
for intf in $INT_IF; do
if [ "$intf" = "$allowif" ]; then
- IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
- break;
+ allowifs="$allowifs${allowifs:+ }$allowif"
+ count=$((count + 1))
+ break
fi
done
fi
done
- fi
- else
- # Failsafe if /mnt/kd/openvpn/openvpnconf.conf is used
- # and OVPNC_SERVER is not defined.
- TRUSTED_IF="tun+"
+ if [ -n "$allowifs" ] && [ $count -gt 1 ]; then
+ IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowifs"
+ fi
+ done
fi
-fi
-if [ -n "$ALLOWLANS" ]; then
- IFS='~'
- for lans in $ALLOWLANS; do
- allowifs=""
- count=0
- IFS=' '
- for lan in $lans; do
- allowif="$(getLANinterface "$lan")"
- if [ $? -eq 0 ]; then
- IFS=' ,'
- for intf in $INT_IF; do
- if [ "$intf" = "$allowif" ]; then
- allowifs="$allowifs${allowifs:+ }$allowif"
- count=$((count + 1))
- break;
+ if [ -n "$DMZ_DENYLAN" ]; then
+ IFS=' ,'
+ for intf in $INT_IF; do
+ allowif="$intf"
+ unset IFS
+ for lan in $DMZ_DENYLAN; do
+ denyif="$(getLANinterface "$lan")"
+ if [ $? -eq 0 ]; then
+ if [ "$intf" = "$denyif" ]; then
+ allowif=""
+ break
fi
- done
+ fi
+ done
+ if [ -n "$allowif" ]; then
+ LAN_DMZ_ALLOW_IF="$LAN_DMZ_ALLOW_IF${LAN_DMZ_ALLOW_IF:+ }$allowif"
fi
done
- if [ -n "$allowifs" ] && [ "$count" -gt 1 ]; then
- IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowifs"
- fi
- done
-fi
-
-unset IFS
-
+ fi
+}
+astlinux_wrapper
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-07-09 16:14:30 UTC (rev 7746)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-07-10 15:10:17 UTC (rev 7747)
@@ -290,13 +290,17 @@
## Note: Use the /mnt/kd/rc.elocal script to define the necessary static routes.
#NAT_FOREIGN_NETWORK="192.168.6.0/24 192.168.7.0/24"
-## Allow LAN to LAN traffic for internal interfaces, defaults to disallow
+## Allow LAN to LAN traffic for internal interfaces, defaults to disallow.
## Space separate "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
## Separate groups using a ~ (tilde)
#ALLOWLANS="INTIF INT2IF"
#ALLOWLANS="INTIF INT2IF~INTIF INT3IF"
#ALLOWLANS="INTIF INT2IF INT3IF"
+## Deny LAN to DMZ traffic for internal interfaces, defaults to allow.
+## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
+#DMZ_DENYLAN="INT2IF INT3IF"
+
## Traffic Shaping
## Shapetype. This defines the qdisc type. Traffic shaping currently supports htb
## (default and well tested) or the newer hfsc version (less tested). You can
@@ -653,8 +657,9 @@
#username1 password1
#username2 password2
#"
-## Allow OpenVPN Server tunnel to LAN Interface(s), defaults to disallow
+## Allow OpenVPN Server tunnel to LAN Interface(s), defaults to disallow.
## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
+## Note: OpenVPN Server tunnel to DMZ Interface is allowed.
#OVPN_ALLOWLAN="INTIF"
##
## Firewall Options, automatically supported via AIF openvpn-server plugin.
@@ -692,8 +697,9 @@
#OVPNC_USER_PASS="user pass"
## Define ns-cert-type if set
#OVPNC_NSCERTTYPE="server"
-## Allow OpenVPN Client tunnel to LAN Interface(s), defaults to disallow
+## Allow OpenVPN Client tunnel to LAN Interface(s), defaults to disallow.
## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
+## Note: OpenVPN Client tunnel to DMZ Interface is allowed.
#OVPNC_ALLOWLAN="INTIF"
## Racoon support - VPN above must include "racoon"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-16 13:23:03
|
Revision: 7755
http://sourceforge.net/p/astlinux/code/7755
Author: abelbeck
Date: 2016-07-16 13:22:59 +0000 (Sat, 16 Jul 2016)
Log Message:
-----------
Add 4th LAN Interface
Modified Paths:
--------------
branches/1.0/package/arnofw/arnofw.wrapper
branches/1.0/package/darkstat/darkstat.init
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/package/miniupnpd/miniupnpd.init
branches/1.0/package/msmtp/testmail.sh
branches/1.0/package/phoneprov-tools/phoneprov-build
branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
branches/1.0/package/webinterface/altweb/admin/firewall.php
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/admin/phoneprov.php
branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert
branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/arnofw/arnofw.wrapper
===================================================================
--- branches/1.0/package/arnofw/arnofw.wrapper 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/arnofw/arnofw.wrapper 2016-07-16 13:22:59 UTC (rev 7755)
@@ -125,6 +125,9 @@
INT3IF)
lanif="$INT3IF"
;;
+ INT4IF)
+ lanif="$INT4IF"
+ ;;
esac
if [ -z "$lanif" ]; then
@@ -206,6 +209,8 @@
addINTERNALnet "$INT3IF" "$INT3IP" "$INT3NM"
+ addINTERNALnet "$INT4IF" "$INT4IP" "$INT4NM"
+
setDMZnet "$DMZIF" "$DMZIP" "$DMZNM"
MODEM_IF=""
Modified: branches/1.0/package/darkstat/darkstat.init
===================================================================
--- branches/1.0/package/darkstat/darkstat.init 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/darkstat/darkstat.init 2016-07-16 13:22:59 UTC (rev 7755)
@@ -36,7 +36,7 @@
}
start () {
- local promisc="" interfaces="" f_ext="" f_lan="" f_lan2="" f_lan3="" f_dmz=""
+ local promisc="" interfaces="" f_ext="" f_int="" f_int2="" f_int3="" f_int4="" f_dmz=""
if [ "$NETSTAT_SERVER" = "darkstat" ]; then
echo "Starting darkstat..."
@@ -70,6 +70,10 @@
interfaces="$interfaces${interfaces:+ }-i $INT3IF"
f_int3="$NETSTAT_FILTER"
fi
+ if is_darkstat_enabled INT4IF && is_interface_enabled "$INT4IF" "$INT4IP" "$INT4NM"; then
+ interfaces="$interfaces${interfaces:+ }-i $INT4IF"
+ f_int4="$NETSTAT_FILTER"
+ fi
if is_darkstat_enabled DMZIF && is_interface_enabled "$DMZIF" "$DMZIP" "$DMZNM"; then
interfaces="$interfaces${interfaces:+ }-i $DMZIF"
f_dmz="$NETSTAT_FILTER"
@@ -80,7 +84,7 @@
fi
darkstat ${interfaces} --chroot $CHROOT_DIR --pidfile $PIDFILE --syslog ${promisc}${f_ext:+ -f "$f_ext"} \
- ${f_int:+ -f "$f_int"}${f_int2:+ -f "$f_int2"}${f_int3:+ -f "$f_int3"}${f_dmz:+ -f "$f_dmz"} \
+ ${f_int:+ -f "$f_int"}${f_int2:+ -f "$f_int2"}${f_int3:+ -f "$f_int3"}${f_int4:+ -f "$f_int4"}${f_dmz:+ -f "$f_dmz"} \
-b 127.0.0.1 -p 667 --base /admin/netstat/ $NETSTAT_OPTIONS
fi
}
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2016-07-16 13:22:59 UTC (rev 7755)
@@ -149,6 +149,13 @@
break
fi
;;
+ INT4IF)
+ if [ "$tag" = "lan4" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
+ prefix="$(addr_to_prefix64 "$INT4IPV6")"
+ break
+ fi
+ ;;
DMZIF)
if [ "$tag" = "dmz" ]; then
dhcpv6="$DHCPV6_CLIENT_ENABLE"
@@ -323,7 +330,7 @@
is_DHCP_active()
{
- for intf in $INTIF $INT2IF $INT3IF $DMZIF; do
+ for intf in $INTIF $INT2IF $INT3IF $INT4IF $DMZIF; do
if [ "$intf" != "none" ] && isDHCPinterface $intf; then
return 0
fi
@@ -400,6 +407,8 @@
addDNSMASQnet "$INT3IF" "$INT3IP" "$INT3NM" lan3 >> /tmp/etc/dnsmasq.conf
+ addDNSMASQnet "$INT4IF" "$INT4IP" "$INT4NM" lan4 >> /tmp/etc/dnsmasq.conf
+
addDNSMASQnet "$DMZIF" "$DMZIP" "$DMZNM" dmz >> /tmp/etc/dnsmasq.conf
if is_EXTDHCP_active; then
Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/miniupnpd/miniupnpd.init 2016-07-16 13:22:59 UTC (rev 7755)
@@ -155,6 +155,10 @@
echo "listening_ip=$INT3IP/$INT3NM" >> $MINIUPNPD_CONF
RULES="$RULES${RULES:+\n}allow 1024-65535 $(get_cidr $INT3IP $INT3NM) 1024-65535"
fi
+ if is_upnp_enabled INT4IF && is_interface_enabled "$INT4IF" "$INT4IP" "$INT4NM"; then
+ echo "listening_ip=$INT4IP/$INT4NM" >> $MINIUPNPD_CONF
+ RULES="$RULES${RULES:+\n}allow 1024-65535 $(get_cidr $INT4IP $INT4NM) 1024-65535"
+ fi
if is_upnp_enabled DMZIF && is_interface_enabled "$DMZIF" "$DMZIP" "$DMZNM"; then
echo "listening_ip=$DMZIP/$DMZNM" >> $MINIUPNPD_CONF
RULES="$RULES${RULES:+\n}allow 1024-65535 $(get_cidr $DMZIP $DMZNM) 1024-65535"
Modified: branches/1.0/package/msmtp/testmail.sh
===================================================================
--- branches/1.0/package/msmtp/testmail.sh 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/msmtp/testmail.sh 2016-07-16 13:22:59 UTC (rev 7755)
@@ -64,6 +64,9 @@
if [ -n "$INT3IF" ]; then
echo "3rd LAN IPv4 Network: $(dev_to_ipv4_network $INT3IF)"
fi
+ if [ -n "$INT4IF" ]; then
+ echo "4th LAN IPv4 Network: $(dev_to_ipv4_network $INT4IF)"
+ fi
if [ -n "$DMZIF" ]; then
echo "The DMZ IPv4 Network: $(dev_to_ipv4_network $DMZIF)"
fi
Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build 2016-07-16 13:22:59 UTC (rev 7755)
@@ -21,7 +21,7 @@
Options:
-f, --force-overwrite Overwrite existing files
-h, --help Show this help text
- -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN
+ -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, INT4IF, EXTIF, ethN, brN
Defaults to config variable PHONEPROV_GW_IF
'
exit 1
@@ -266,6 +266,10 @@
sip_server_if="$INT3IF"
sip_server_ipv4="$INT3IP"
;;
+ INT4IF)
+ sip_server_if="$INT4IF"
+ sip_server_ipv4="$INT4IP"
+ ;;
EXTIF)
sip_server_if="$EXTIF"
sip_server_ipv4="$(find_ipv4_from_if $EXTIF)"
Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment 2016-07-16 13:22:59 UTC (rev 7755)
@@ -21,7 +21,7 @@
-A, --only-pass Same as "-a, --auto-pass" without further processing
-f, --force-overwrite Overwrite existing files
-h, --help Show this help text
- -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN
+ -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, INT4IF, EXTIF, ethN, brN
Defaults to config variable PHONEPROV_GW_IF
-p, --partial Partial input, append "dialplan" and "sip" entries to existing
-r, --auto-reload Automatically reload Asterisk "dialplan" and "sip" on success
Modified: branches/1.0/package/webinterface/altweb/admin/firewall.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/firewall.php 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/webinterface/altweb/admin/firewall.php 2016-07-16 13:22:59 UTC (rev 7755)
@@ -90,20 +90,47 @@
'INTIF' => '1st',
'INT2IF' => '2nd',
'INT3IF' => '3rd',
- 'INTIF INT2IF' => '1st and 2nd',
- 'INTIF INT3IF' => '1st and 3rd',
- 'INT2IF INT3IF' => '2nd and 3rd',
- 'INTIF INT2IF INT3IF' => '1st and 2nd and 3rd'
+ 'INT4IF' => '4th',
+ 'INTIF INT2IF' => '1st, 2nd',
+ 'INTIF INT3IF' => '1st, 3rd',
+ 'INTIF INT4IF' => '1st, 4th',
+ 'INT2IF INT3IF' => '2nd, 3rd',
+ 'INT2IF INT4IF' => '2nd, 4th',
+ 'INT3IF INT4IF' => '3rd, 4th',
+ 'INTIF INT2IF INT3IF' => '1st, 2nd, 3rd',
+ 'INTIF INT2IF INT4IF' => '1st, 2nd, 4th',
+ 'INTIF INT3IF INT4IF' => '1st, 3rd, 4th',
+ 'INT2IF INT3IF INT4IF' => '2nd, 3rd, 4th',
+ 'INTIF INT2IF INT3IF INT4IF' => '1st, 2nd, 3rd, 4th'
);
$allowlans_label = array (
- 'INTIF INT2IF' => '1st and 2nd',
- 'INTIF INT3IF' => '1st and 3rd',
- 'INT2IF INT3IF' => '2nd and 3rd',
- 'INTIF INT2IF~INTIF INT3IF' => '1st and 2nd, 1st and 3rd',
- 'INTIF INT2IF~INT2IF INT3IF' => '1st and 2nd, 2nd and 3rd',
- 'INTIF INT3IF~INT2IF INT3IF' => '1st and 3rd, 2nd and 3rd',
- 'INTIF INT2IF INT3IF' => '1st and 2nd and 3rd'
+ 'INTIF INT2IF' => '1st + 2nd',
+ 'INTIF INT3IF' => '1st + 3rd',
+ 'INTIF INT4IF' => '1st + 4th',
+ 'INT2IF INT3IF' => '2nd + 3rd',
+ 'INT2IF INT4IF' => '2nd + 4th',
+ 'INT3IF INT4IF' => '3rd + 4th',
+ 'INTIF INT2IF INT3IF' => '1st + 2nd + 3rd',
+ 'INTIF INT2IF INT4IF' => '1st + 2nd + 4th',
+ 'INTIF INT3IF INT4IF' => '1st + 3rd + 4th',
+ 'INT2IF INT3IF INT4IF' => '2nd + 3rd + 4th',
+ 'INTIF INT2IF INT3IF INT4IF' => '1st + 2nd + 3rd + 4th',
+ 'INTIF INT2IF~INTIF INT3IF' => '1st + 2nd, 1st + 3rd',
+ 'INTIF INT2IF~INTIF INT4IF' => '1st + 2nd, 1st + 4th',
+ 'INTIF INT2IF~INT2IF INT3IF' => '1st + 2nd, 2nd + 3rd',
+ 'INTIF INT2IF~INT2IF INT4IF' => '1st + 2nd, 2nd + 4th',
+ 'INTIF INT2IF~INT3IF INT4IF' => '1st + 2nd, 3rd + 4th',
+ 'INTIF INT3IF~INTIF INT4IF' => '1st + 3rd, 1st + 4th',
+ 'INTIF INT3IF~INT2IF INT3IF' => '1st + 3rd, 2nd + 3rd',
+ 'INTIF INT3IF~INT2IF INT4IF' => '1st + 3rd, 2nd + 4th',
+ 'INTIF INT3IF~INT3IF INT4IF' => '1st + 3rd, 3rd + 4th',
+ 'INTIF INT4IF~INT2IF INT3IF' => '1st + 4th, 2nd + 3rd',
+ 'INTIF INT4IF~INT2IF INT4IF' => '1st + 4th, 2nd + 4th',
+ 'INTIF INT4IF~INT3IF INT4IF' => '1st + 4th, 3rd + 4th',
+ 'INT2IF INT3IF~INT2IF INT4IF' => '2nd + 3rd, 2nd + 4th',
+ 'INT2IF INT3IF~INT3IF INT4IF' => '2nd + 3rd, 3rd + 4th',
+ 'INT2IF INT4IF~INT3IF INT4IF' => '2nd + 4th, 3rd + 4th'
);
$lan_default_policy_label = array (
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2016-07-16 13:22:59 UTC (rev 7755)
@@ -38,6 +38,7 @@
// 08-21-2015, Added Fossil - Software Configuration Management
// 11-01-2015, Added DHCPv6 support
// 06-07-2016, Added Avahi mDNS/DNS-SD support
+// 07-15-2016, Added 4th LAN Interface
//
// System location of rc.conf file
$CONFFILE = '/etc/rc.conf';
@@ -150,6 +151,7 @@
$eth[] = $_POST['int_eth'];
$eth[] = $_POST['int2_eth'];
$eth[] = $_POST['int3_eth'];
+ $eth[] = $_POST['int4_eth'];
$eth[] = $_POST['dmz_eth'];
foreach ($eth as $ki => $i) {
@@ -163,7 +165,7 @@
}
if ($_POST['dmz_eth'] !== '') {
- if ($_POST['int_eth'] === '' && $_POST['int2_eth'] === '' && $_POST['int3_eth'] === '') {
+ if ($_POST['int_eth'] === '' && $_POST['int2_eth'] === '' && $_POST['int3_eth'] === '' && $_POST['int4_eth'] === '') {
return(101);
}
}
@@ -333,6 +335,22 @@
$value = 'INT3IPV6="'.$value.'"';
fwrite($fp, "### 3rd LAN IPv6\n".$value."\n");
+ $value = 'INT4IF="'.$_POST['int4_eth'].'"';
+ fwrite($fp, "### 4th LAN Interface\n".$value."\n");
+
+ $value = 'INT4IP="'.tuq($_POST['int4_ip']).'"';
+ fwrite($fp, "### 4th LAN IPv4\n".$value."\n");
+
+ $value = 'INT4NM="'.tuq($_POST['int4_mask_ip']).'"';
+ fwrite($fp, "### 4th LAN NetMask\n".$value."\n");
+
+ $value = tuq($_POST['int4_ipv6']);
+ if ($value !== '' && strpos($value, '/') === FALSE) {
+ $value="$value/64";
+ }
+ $value = 'INT4IPV6="'.$value.'"';
+ fwrite($fp, "### 4th LAN IPv6\n".$value."\n");
+
$value = 'DMZIF="'.$_POST['dmz_eth'].'"';
fwrite($fp, "### DMZ Interface\n".$value."\n");
@@ -355,6 +373,7 @@
$x_value = $_POST['int_autoconf'];
$x_value .= $_POST['int2_autoconf'];
$x_value .= $_POST['int3_autoconf'];
+ $x_value .= $_POST['int4_autoconf'];
$x_value .= $_POST['dmz_autoconf'];
$value = 'IPV6_AUTOCONF="'.trim($x_value).'"';
fwrite($fp, "### IPv6 Autoconfig\n".$value."\n");
@@ -457,6 +476,9 @@
if (isset($_POST['netstat_INT3IF'])) {
$x_value .= ' INT3IF';
}
+ if (isset($_POST['netstat_INT4IF'])) {
+ $x_value .= ' INT4IF';
+ }
if (isset($_POST['netstat_DMZIF'])) {
$x_value .= ' DMZIF';
}
@@ -483,6 +505,9 @@
if (isset($_POST['upnp_INT3IF'])) {
$x_value .= ' INT3IF';
}
+ if (isset($_POST['upnp_INT4IF'])) {
+ $x_value .= ' INT4IF';
+ }
if (isset($_POST['upnp_DMZIF'])) {
$x_value .= ' DMZIF';
}
@@ -859,6 +884,7 @@
'int_dhcp' => 'int_eth',
'int2_dhcp' => 'int2_eth',
'int3_dhcp' => 'int3_eth',
+ 'int4_dhcp' => 'int4_eth',
'dmz_dhcp' => 'dmz_eth'
);
$rtn = '';
@@ -1560,6 +1586,38 @@
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml('<strong>4th LAN Interface:</strong>');
+ putHtml('<select name="int4_eth">');
+ putHtml('<option value="">none</option>');
+ $varif = getVARdef($db, 'INT4IF', $cur_db);
+ if (($n = count($eth)) > 0) {
+ for ($i = 0; $i < $n; $i++) {
+ $sel = ($varif === $eth[$i]) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$eth[$i].'"'.$sel.'>'.$eth[$i].'</option>');
+ }
+ }
+ putHtml('</select>');
+ putDNS_DHCP_Html($db, $cur_db, $varif, 'int4_dhcp');
+ $value = getVARdef($db, 'INT4IP', $cur_db);
+ putHtml('– IPv4:<input type="text" size="16" maxlength="15" value="'.$value.'" name="int4_ip" />');
+ if (($value = getVARdef($db, 'INT4NM', $cur_db)) === '') {
+ $value = '255.255.255.0';
+ }
+ putHtml('NetMask:<input type="text" size="16" maxlength="15" value="'.$value.'" name="int4_mask_ip" />');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml(' IPv6 Autoconfig:');
+ putHtml('<select name="int4_autoconf">');
+ putHtml('<option value="">disabled</option>');
+ $sel = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INT4IF') ? ' selected="selected"' : '';
+ putHtml('<option value=" INT4IF"'.$sel.'>enabled</option>');
+ putHtml('</select>');
+ $value = getVARdef($db, 'INT4IPV6', $cur_db);
+ putHtml('– IPv6/nn:<input type="text" size="45" maxlength="43" value="'.$value.'" name="int4_ipv6" />');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
putHtml('<strong>The DMZ Interface:</strong>');
putHtml('<select name="dmz_eth">');
putHtml('<option value="">none</option>');
@@ -1822,12 +1880,14 @@
putHtml('<input type="checkbox" value="netstat_INT2IF" name="netstat_INT2IF"'.$sel.' /> 2nd LAN');
$sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'INT3IF') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="netstat_INT3IF" name="netstat_INT3IF"'.$sel.' /> 3rd LAN');
+ $sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'INT4IF') ? ' checked="checked"' : '';
+ putHtml('<input type="checkbox" value="netstat_INT4IF" name="netstat_INT4IF"'.$sel.' /> 4th LAN');
$sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'DMZIF') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="netstat_DMZIF" name="netstat_DMZIF"'.$sel.' /> DMZ');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
- putHtml("Universal Plug'n'Play:");
+ putHtml("Universal Plug'n'Play Server:");
$upnp_natpmp = getVARdef($db, 'UPNP_ENABLE_NATPMP', $cur_db) === 'yes' ? 'yes' : 'no';
$upnp_upnp = getVARdef($db, 'UPNP_ENABLE_UPNP', $cur_db) === 'yes' ? 'yes' : 'no';
putHtml('<select name="upnp" onchange="upnp_change()">');
@@ -1836,13 +1896,18 @@
putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
}
putHtml('</select>');
- putHtml('– Interfaces:');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml("Universal Plug'n'Play Interfaces:");
$sel = isVARtype('UPNP_LISTEN', $db, $cur_db, 'INTIF') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="upnp_INTIF" name="upnp_INTIF"'.$sel.' /> 1st LAN');
$sel = isVARtype('UPNP_LISTEN', $db, $cur_db, 'INT2IF') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="upnp_INT2IF" name="upnp_INT2IF"'.$sel.' /> 2nd LAN');
$sel = isVARtype('UPNP_LISTEN', $db, $cur_db, 'INT3IF') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="upnp_INT3IF" name="upnp_INT3IF"'.$sel.' /> 3rd LAN');
+ $sel = isVARtype('UPNP_LISTEN', $db, $cur_db, 'INT4IF') ? ' checked="checked"' : '';
+ putHtml('<input type="checkbox" value="upnp_INT4IF" name="upnp_INT4IF"'.$sel.' /> 4th LAN');
$sel = isVARtype('UPNP_LISTEN', $db, $cur_db, 'DMZIF') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="upnp_DMZIF" name="upnp_DMZIF"'.$sel.' /> DMZ');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/admin/phoneprov.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/phoneprov.php 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/package/webinterface/altweb/admin/phoneprov.php 2016-07-16 13:22:59 UTC (rev 7755)
@@ -38,6 +38,7 @@
'INTIF' => '1st LAN Interface',
'INT2IF' => '2nd LAN Interface',
'INT3IF' => '3rd LAN Interface',
+ 'INT4IF' => '4th LAN Interface',
'EXTIF' => 'External Interface'
);
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert 2016-07-16 13:22:59 UTC (rev 7755)
@@ -49,7 +49,8 @@
Interface: $EXTIF (External) IPv4 Address: $(dev_to_ipv4_addresses $EXTIF)${INTIF:+
Interface: $INTIF (1st LAN) IPv4 Network: $(dev_to_ipv4_networks $INTIF)}${INT2IF:+
Interface: $INT2IF (2nd LAN) IPv4 Network: $(dev_to_ipv4_networks $INT2IF)}${INT3IF:+
- Interface: $INT3IF (3rd LAN) IPv4 Network: $(dev_to_ipv4_networks $INT3IF)}${DMZIF:+
+ Interface: $INT3IF (3rd LAN) IPv4 Network: $(dev_to_ipv4_networks $INT3IF)}${INT4IF:+
+ Interface: $INT4IF (4th LAN) IPv4 Network: $(dev_to_ipv4_networks $INT4IF)}${DMZIF:+
Interface: $DMZIF (The DMZ) IPv4 Network: $(dev_to_ipv4_networks $DMZIF)}
"
# Add a one second delay to allow the message to transmit since getty immediately
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc 2016-07-16 13:22:59 UTC (rev 7755)
@@ -11,7 +11,7 @@
local ip hostip hostipv6 IFS
# we deliberately leave out EXTIP
- for ip in $INTIP/$INTIPV6 $INT2IP/$INT2IPV6 $INT3IP/$INT3IPV6; do
+ for ip in $INTIP/$INTIPV6 $INT2IP/$INT2IPV6 $INT3IP/$INT3IPV6 $INT4IP/$INT4IPV6; do
hostip="$(echo $ip | cut -d'/' -f1)"
hostipv6="$(echo $ip | cut -d'/' -f2)"
if [ -n "$hostip" ]; then
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2016-07-16 13:22:59 UTC (rev 7755)
@@ -122,6 +122,11 @@
int="$INT3IF"
fi
;;
+ INT4IF)
+ if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" ]; then
+ int="$INT4IF"
+ fi
+ ;;
DMZIF)
if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
int="$DMZIF"
@@ -326,7 +331,7 @@
ip link set dev lo up
# look for nas[0123] being any one of our interfaces, and create it
- for IF in $PPPOEIF $BRIDGE0 $BRIDGE1 $BRIDGE2 $INTIF $INT2IF $INT3IF; do
+ for IF in $PPPOEIF $BRIDGE0 $BRIDGE1 $BRIDGE2 $INTIF $INT2IF $INT3IF $INT4IF; do
case $IF in
nas[0123])
create_nasX $IF ;;
@@ -462,6 +467,14 @@
ip link set dev $INT3IF up
fi
+ if [ -n "$INT4IF" -a -n "$INT4IP" -a -n "$INT4NM" -a "$INT4IF" != "none" ]; then
+ ip addr add $INT4IP/$INT4NM brd + dev $INT4IF
+ if [ "$IPV6" = "yes" -a -n "$INT4IPV6" ]; then
+ ip -6 addr add $INT4IPV6 dev $INT4IF
+ fi
+ ip link set dev $INT4IF up
+ fi
+
if [ -n "$WANDELAY" ]; then
echo "Sleeping for $WANDELAY seconds before I bring up $EXTIF..."
sleep $WANDELAY
@@ -742,6 +755,11 @@
ip link set dev $INT3IF down
fi
+ if [ -n "$INT4IF" -a "$INT4IF" != "none" ]; then
+ echo "Bringing down $INT4IF..."
+ ip link set dev $INT4IF down
+ fi
+
if [ -n "$DMZIF" -a "$DMZIF" != "none" ]; then
echo "Bringing down $DMZIF ..."
ip link set dev $DMZIF down
@@ -772,7 +790,7 @@
fi
# ATM interfaces
- for IF in $PPPOEIF $BRIDGE0 $BRIDGE1 $BRIDGE2 $INTIF $INT2IF $INT3IF; do
+ for IF in $PPPOEIF $BRIDGE0 $BRIDGE1 $BRIDGE2 $INTIF $INT2IF $INT3IF $INT4IF; do
case $IF in
nas[0123])
ip link set dev "$IF" down
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-07-13 19:33:30 UTC (rev 7754)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-07-16 13:22:59 UTC (rev 7755)
@@ -95,6 +95,10 @@
#INT3IP=192.168.103.1
#INT3NM=255.255.255.0
+#INT4IF=eth3
+#INT4IP=192.168.104.1
+#INT4NM=255.255.255.0
+
## DMZ Support
#DMZIF="eth2"
#DMZIP="192.168.102.1"
@@ -234,13 +238,14 @@
#INTIPV6="2001:db8:10::1/64"
#INT2IPV6="2001:db8:11::1/64"
#INT3IPV6="2001:db8:12::1/64"
+#INT4IPV6="2001:db8:13::1/64"
##
## DMZ IPv6 address
#DMZIPV6="2001:db8:20::1/64"
## Configure IPv6 Router Advertisement Daemon
## Define: Interface_Name, space separated for multiple
-## Interface_Name is "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
+## Interface_Name is "INTIF" for 1st, "INT2IF" for 2nd, "INT3IF" for 3rd, and "INT4IF" for 4th Internal Interface
## "DMZIF" for DMZ Interface
## Note: the autoconf prefix is derived from the IPv6 address on the interface, which must be defined.
#IPV6_AUTOCONF="INTIF"
@@ -291,15 +296,15 @@
#NAT_FOREIGN_NETWORK="192.168.6.0/24 192.168.7.0/24"
## Allow LAN to LAN traffic for internal interfaces, defaults to disallow.
-## Space separate "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
+## Space separate "INTIF" for 1st, "INT2IF" for 2nd, "INT3IF" for 3rd, and "INT4IF" for 4th Internal Interface
## Separate groups using a ~ (tilde)
#ALLOWLANS="INTIF INT2IF"
#ALLOWLANS="INTIF INT2IF~INTIF INT3IF"
-#ALLOWLANS="INTIF INT2IF INT3IF"
+#ALLOWLANS="INTIF INT2IF INT3IF INT4IF"
## Deny LAN to DMZ traffic for internal interfaces, defaults to allow.
-## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
-#DMZ_DENYLAN="INT2IF INT3IF"
+## Use "INTIF" for 1st, "INT2IF" for 2nd, "INT3IF" for 3rd, or "INT4IF" for 4th Internal Interface, space separated for multiple
+#DMZ_DENYLAN="INT2IF INT3IF INT4IF"
## Traffic Shaping
## Shapetype. This defines the qdisc type. Traffic shaping currently supports htb
@@ -353,7 +358,7 @@
## Capture interfaces, NETSTAT_CAPTURE, at least one must be specified.
## Define: Interface_Name, space separated for multiple
## Interface_Name is: "EXTIF" for External Interface
-## "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
+## "INTIF" for 1st, "INT2IF" for 2nd, "INT3IF" for 3rd, and "INT4IF" for 4th Internal Interface
## "DMZIF" for DMZ Interface
#NETSTAT_CAPTURE="EXTIF"
@@ -383,7 +388,7 @@
## Default base directory for phoneprov-tools scripts, default is "/mnt/kd/phoneprov"
#PHONEPROV_BASE_DIR="/mnt/kd/phoneprov"
## Default gateway interface for phoneprov-tools scripts.
-## Interface Name: "INTIF", "INT2IF", "INT3IF", "EXTIF", ethN, brN, defaults to "INTIF"
+## Interface Name: "INTIF", "INT2IF", "INT3IF", "INT4IF", "EXTIF", ethN, brN, defaults to "INTIF"
#PHONEPROV_GW_IF="INTIF"
## NTPd Server
@@ -513,7 +518,7 @@
#UPNP_ENABLE_UPNP="yes"
## UPnP internal interfaces, UPNP_LISTEN, at least one must be specified.
## Define: Interface_Name, space separated for multiple
-## Interface_Name is "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
+## Interface_Name is "INTIF" for 1st, "INT2IF" for 2nd, "INT3IF" for 3rd, and "INT4IF" for 4th Internal Interface
## "DMZIF" for DMZ Interface
#UPNP_LISTEN="INTIF"
## Optional, restrict allowed IPv4 addresses or CIDR's in UPNP_ALLOW, space separated for multiple.
@@ -658,7 +663,7 @@
#username2 password2
#"
## Allow OpenVPN Server tunnel to LAN Interface(s), defaults to disallow.
-## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
+## Use "INTIF" for 1st, "INT2IF" for 2nd, "INT3IF" for 3rd, or "INT4IF" for 4th Internal Interface, space separated for multiple
## Note: OpenVPN Server tunnel to DMZ Interface is allowed.
#OVPN_ALLOWLAN="INTIF"
##
@@ -698,7 +703,7 @@
## Define ns-cert-type if set
#OVPNC_NSCERTTYPE="server"
## Allow OpenVPN Client tunnel to LAN Interface(s), defaults to disallow.
-## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
+## Use "INTIF" for 1st, "INT2IF" for 2nd, "INT3IF" for 3rd, or "INT4IF" for 4th Internal Interface, space separated for multiple
## Note: OpenVPN Client tunnel to DMZ Interface is allowed.
#OVPNC_ALLOWLAN="INTIF"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-22 13:51:40
|
Revision: 7771
http://sourceforge.net/p/astlinux/code/7771
Author: abelbeck
Date: 2016-07-22 13:51:37 +0000 (Fri, 22 Jul 2016)
Log Message:
-----------
asterisk, version bump to 11.23.0, 13.10.0, add SILK CODEC support to Asterisk 13
Modified Paths:
--------------
branches/1.0/astlinux-ast13.config
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/x86_64-configs/astlinux-ast13.config
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/astlinux-ast13.config 2016-07-22 13:51:37 UTC (rev 7771)
@@ -169,7 +169,7 @@
# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
#
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-# BR2_PACKAGE_ASTERISK_CODEC_SILK is not set
+BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
Deleted: branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=apps%2Fapp_queue.c;h=fa432cb76f5e41ad1168b73d3cd415daf3c851c3;hp=4a8029080d4b88a34a84f8d2b20491ba1dcbf6f0;hb=32b4320d620ffff5c55f111fc22f22fdb07f8c60;hpb=981ed6091e513bc81d4863d409762638495c2ed1
-
-diff --git a/apps/app_queue.c b/apps/app_queue.c
-index 4a80290..fa432cb 100644
---- a/apps/app_queue.c
-+++ b/apps/app_queue.c
-@@ -3641,7 +3641,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
- return 0;
- }
-
-- if (call->member->in_call && call->lastqueue->wrapuptime) {
-+ if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
- ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
- call->interface, call->lastqueue->wrapuptime);
- return 0;
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2474,11 +2474,13 @@
+@@ -2473,11 +2473,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16781,7 +16781,7 @@
+@@ -16799,7 +16799,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-11.16.0/apps/app_voicemail.c.orig 2015-01-23 08:51:03.000000000 -0600
+++ asterisk-11.16.0/apps/app_voicemail.c 2015-02-10 09:58:04.000000000 -0600
-@@ -751,7 +751,7 @@
+@@ -753,7 +753,7 @@
char mailbox[AST_MAX_EXTENSION]; /*!< Mailbox id, unique within vm context */
char password[80]; /*!< Secret pin code, numbers only */
char fullname[80]; /*!< Full name, for directory app */
@@ -9,7 +9,7 @@
char *emailsubject; /*!< E-mail subject */
char *emailbody; /*!< E-mail body */
char pager[80]; /*!< E-mail address to pager (no attachment) */
-@@ -1194,6 +1194,8 @@
+@@ -1196,6 +1196,8 @@
vmu->maxdeletedmsg = maxdeletedmsg;
}
vmu->volgain = volgain;
@@ -18,7 +18,7 @@
ast_free(vmu->emailsubject);
vmu->emailsubject = NULL;
ast_free(vmu->emailbody);
-@@ -1505,7 +1507,8 @@
+@@ -1507,7 +1509,8 @@
} else if (!strcasecmp(var->name, "pager")) {
ast_copy_string(retval->pager, var->value, sizeof(retval->pager));
} else if (!strcasecmp(var->name, "email")) {
@@ -28,25 +28,26 @@
} else if (!strcasecmp(var->name, "fullname")) {
ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
} else if (!strcasecmp(var->name, "context")) {
-@@ -1642,6 +1645,7 @@
- if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
+@@ -1644,7 +1647,9 @@
+ if ((vmu = (ivm ? ivm : ast_calloc(1, sizeof(*vmu))))) {
++ ast_free(vmu->email);
+ ast_free(vmu->emailbody);
+ ast_free(vmu->emailsubject);
*vmu = *cur;
- if (!ivm) {
-+ vmu->email = ast_strdup(cur->email);
- vmu->emailbody = ast_strdup(cur->emailbody);
- vmu->emailsubject = ast_strdup(cur->emailsubject);
- }
-@@ -1924,6 +1928,9 @@
- {
- if (ast_test_flag(vmu, VM_ALLOCED)) {
++ vmu->email = ast_strdup(cur->email);
+ vmu->emailbody = ast_strdup(cur->emailbody);
+ vmu->emailsubject = ast_strdup(cur->emailsubject);
+ ast_set2_flag(vmu, !ivm, VM_ALLOCED);
+@@ -1928,6 +1932,8 @@
+ return;
+ }
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
-+
- ast_free(vmu->emailbody);
- vmu->emailbody = NULL;
-
-@@ -2571,7 +2578,7 @@
++ ast_free(vmu->email);
++ vmu->email = NULL;
+ ast_free(vmu->emailbody);
+ vmu->emailbody = NULL;
+ ast_free(vmu->emailsubject);
+@@ -2583,7 +2589,7 @@
* of this function, we will revert back to an empty string if tempcopy
* is 1.
*/
@@ -55,7 +56,7 @@
tempcopy = 1;
}
-@@ -2583,8 +2590,10 @@
+@@ -2595,8 +2601,10 @@
command hangs. */
if (!(p = vm_mkftemp(tmp))) {
ast_log(AST_LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
@@ -68,7 +69,7 @@
return -1;
}
-@@ -4929,6 +4938,9 @@
+@@ -4947,6 +4955,9 @@
struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
char *greeting_attachment;
char filename[256];
@@ -78,7 +79,7 @@
if (!str1 || !str2) {
ast_free(str1);
-@@ -4970,7 +4982,7 @@
+@@ -4988,7 +4999,7 @@
ast_str_substitute_variables(&str1, 0, ast, fromstring);
if (check_mime(ast_str_buffer(str1))) {
@@ -87,7 +88,7 @@
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
*ptr = '\0';
-@@ -4991,20 +5003,25 @@
+@@ -5009,20 +5020,25 @@
fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
}
@@ -126,7 +127,7 @@
}
if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -5014,7 +5031,7 @@
+@@ -5032,7 +5048,7 @@
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, category, flag);
ast_str_substitute_variables(&str1, 0, ast, e_subj);
if (check_mime(ast_str_buffer(str1))) {
@@ -135,7 +136,7 @@
char *ptr;
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -11766,7 +11783,7 @@
+@@ -11802,7 +11818,7 @@
ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
}
if (stringp && (s = strsep(&stringp, ","))) {
@@ -144,7 +145,7 @@
}
if (stringp && (s = strsep(&stringp, ","))) {
ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -14035,7 +14052,7 @@
+@@ -14084,7 +14100,7 @@
}
populate_defaults(vmu);
Added: branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -0,0 +1,346 @@
+From 28501051b47e6bb8968bb016abf0b3493c05fa21 Mon Sep 17 00:00:00 2001
+From: Mark Michelson <mmi...@di...>
+Date: Thu, 30 Jun 2016 15:58:53 -0500
+Subject: [PATCH] Update support for SILK format.
+
+This commit adds scaffolding in order to support the SILK audio format
+on calls. Roughly, this is what is added:
+
+* Cached silk formats. One for each possible sample rate.
+* ast_codec structures for each possible sample rate.
+* RTP payload mappings for "SILK".
+
+In addition, this change overhauls the res_format_attr_silk file in the
+following ways:
+
+* The "samplerate" attribute is scrapped. That's native to the format.
+* There are far more checks to ensure that attributes have been
+ allocated before attempting to reference them.
+* We do not SDP fmtp lines for attributes set to 0.
+
+These changes make way to be able to install a codec_silk module and
+have it actually work. It also should allow for passthrough silk calls
+in Asterisk.
+
+Change-Id: Ieeb39c95a9fecc9246bcfd3c45a6c9b51c59380e
+---
+ include/asterisk/format_cache.h | 8 +++++
+ main/codec_builtin.c | 63 ++++++++++++++++++++++++++++++++++++++
+ main/format_cache.c | 20 ++++++++++++
+ main/rtp_engine.c | 10 ++++++
+ res/res_format_attr_silk.c | 64 ++++++++++++++++++++-------------------
+ 5 files changed, 134 insertions(+), 31 deletions(-)
+
+diff --git a/include/asterisk/format_cache.h b/include/asterisk/format_cache.h
+index 9f4e06a..ff03bb4 100644
+--- a/include/asterisk/format_cache.h
++++ b/include/asterisk/format_cache.h
+@@ -224,6 +224,14 @@ extern struct ast_format *ast_format_t140_red;
+ extern struct ast_format *ast_format_none;
+
+ /*!
++ * \brief Built-in SILK format.
++ */
++extern struct ast_format *ast_format_silk8;
++extern struct ast_format *ast_format_silk12;
++extern struct ast_format *ast_format_silk16;
++extern struct ast_format *ast_format_silk24;
++
++/*!
+ * \brief Initialize format cache support within the core.
+ *
+ * \retval 0 success
+diff --git a/main/codec_builtin.c b/main/codec_builtin.c
+index d3f6517..1d329bc 100644
+--- a/main/codec_builtin.c
++++ b/main/codec_builtin.c
+@@ -772,6 +772,65 @@ static struct ast_codec t140 = {
+ .type = AST_MEDIA_TYPE_TEXT,
+ };
+
++static int silk_samples(struct ast_frame *frame)
++{
++ /* XXX This is likely not at all what's intended from this callback. However,
++ * since SILK is variable bit rate, I have no idea how to take a frame of data
++ * and determine the number of samples present. Instead, we base this on the
++ * sample rate of the codec and the expected number of samples to receive in 20ms.
++ * In testing, this has worked just fine.
++ */
++ return ast_format_get_sample_rate(frame->subclass.format) / 50;
++}
++
++static struct ast_codec silk8 = {
++ .name = "silk",
++ .description = "SILK Codec (8 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 8000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 160,
++ .samples_count = silk_samples
++};
++
++static struct ast_codec silk12 = {
++ .name = "silk",
++ .description = "SILK Codec (12 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 12000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 240,
++ .samples_count = silk_samples
++};
++
++static struct ast_codec silk16 = {
++ .name = "silk",
++ .description = "SILK Codec (16 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 16000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 320,
++ .samples_count = silk_samples
++};
++
++static struct ast_codec silk24 = {
++ .name = "silk",
++ .description = "SILK Codec (24 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 24000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 480,
++ .samples_count = silk_samples
++};
++
+ #define CODEC_REGISTER_AND_CACHE(codec) \
+ ({ \
+ int __res_ ## __LINE__ = 0; \
+@@ -843,6 +902,10 @@ int ast_codec_builtin_init(void)
+ res |= CODEC_REGISTER_AND_CACHE(t140red);
+ res |= CODEC_REGISTER_AND_CACHE(t140);
+ res |= CODEC_REGISTER_AND_CACHE(none);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk8", silk8);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk12", silk12);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk16", silk16);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk24", silk24);
+
+ return res;
+ }
+diff --git a/main/format_cache.c b/main/format_cache.c
+index 6638a78..74ebfe8 100644
+--- a/main/format_cache.c
++++ b/main/format_cache.c
+@@ -232,6 +232,14 @@ struct ast_format *ast_format_t140_red;
+ */
+ struct ast_format *ast_format_none;
+
++/*!
++ * \brief Built-in "silk" format
++ */
++struct ast_format *ast_format_silk8;
++struct ast_format *ast_format_silk12;
++struct ast_format *ast_format_silk16;
++struct ast_format *ast_format_silk24;
++
+ /*! \brief Number of buckets to use for the media format cache (should be prime for performance reasons) */
+ #define CACHE_BUCKETS 53
+
+@@ -331,6 +339,10 @@ static void format_cache_shutdown(void)
+ ao2_replace(ast_format_t140_red, NULL);
+ ao2_replace(ast_format_t140, NULL);
+ ao2_replace(ast_format_none, NULL);
++ ao2_replace(ast_format_silk8, NULL);
++ ao2_replace(ast_format_silk12, NULL);
++ ao2_replace(ast_format_silk16, NULL);
++ ao2_replace(ast_format_silk24, NULL);
+ }
+
+ int ast_format_cache_init(void)
+@@ -426,6 +438,14 @@ static void set_cached_format(const char *name, struct ast_format *format)
+ ao2_replace(ast_format_t140, format);
+ } else if (!strcmp(name, "none")) {
+ ao2_replace(ast_format_none, format);
++ } else if (!strcmp(name, "silk8")) {
++ ao2_replace(ast_format_silk8, format);
++ } else if (!strcmp(name, "silk12")) {
++ ao2_replace(ast_format_silk12, format);
++ } else if (!strcmp(name, "silk16")) {
++ ao2_replace(ast_format_silk16, format);
++ } else if (!strcmp(name, "silk24")) {
++ ao2_replace(ast_format_silk24, format);
+ }
+ }
+
+diff --git a/main/rtp_engine.c b/main/rtp_engine.c
+index 462d4c5..8d46bfd 100644
+--- a/main/rtp_engine.c
++++ b/main/rtp_engine.c
+@@ -2198,6 +2198,11 @@ int ast_rtp_engine_init(void)
+ /* Opus and VP8 */
+ set_next_mime_type(ast_format_opus, 0, "audio", "opus", 48000);
+ set_next_mime_type(ast_format_vp8, 0, "video", "VP8", 90000);
++ /* DA SILK */
++ set_next_mime_type(ast_format_silk8, 0, "audio", "silk", 8000);
++ set_next_mime_type(ast_format_silk12, 0, "audio", "silk", 12000);
++ set_next_mime_type(ast_format_silk16, 0, "audio", "silk", 16000);
++ set_next_mime_type(ast_format_silk24, 0, "audio", "silk", 24000);
+
+ /* Define the static rtp payload mappings */
+ add_static_payload(0, ast_format_ulaw, 0);
+@@ -2243,6 +2248,11 @@ int ast_rtp_engine_init(void)
+ add_static_payload(100, ast_format_vp8, 0);
+ add_static_payload(107, ast_format_opus, 0);
+
++ add_static_payload(108, ast_format_silk8, 0);
++ add_static_payload(109, ast_format_silk12, 0);
++ add_static_payload(113, ast_format_silk16, 0);
++ add_static_payload(114, ast_format_silk24, 0);
++
+ return 0;
+ }
+
+diff --git a/res/res_format_attr_silk.c b/res/res_format_attr_silk.c
+index dcbbe4c..d52ec74 100644
+--- a/res/res_format_attr_silk.c
++++ b/res/res_format_attr_silk.c
+@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ * \note The only attribute that affects compatibility here is the sample rate.
+ */
+ struct silk_attr {
+- unsigned int samplerate;
+ unsigned int maxbitrate;
+ unsigned int dtx;
+ unsigned int fec;
+@@ -54,10 +53,15 @@ static void silk_destroy(struct ast_format *format)
+ ast_free(attr);
+ }
+
++static void attr_init(struct silk_attr *attr)
++{
++ memset(attr, 0, sizeof(*attr));
++}
++
+ static int silk_clone(const struct ast_format *src, struct ast_format *dst)
+ {
+ struct silk_attr *original = ast_format_get_attribute_data(src);
+- struct silk_attr *attr = ast_calloc(1, sizeof(*attr));
++ struct silk_attr *attr = ast_malloc(sizeof(*attr));
+
+ if (!attr) {
+ return -1;
+@@ -65,6 +69,8 @@ static int silk_clone(const struct ast_format *src, struct ast_format *dst)
+
+ if (original) {
+ *attr = *original;
++ } else {
++ attr_init(attr);
+ }
+
+ ast_format_set_attribute_data(dst, attr);
+@@ -109,17 +115,17 @@ static void silk_generate_sdp_fmtp(const struct ast_format *format, unsigned int
+ ast_str_append(str, 0, "a=fmtp:%u maxaveragebitrate=%u\r\n", payload, attr->maxbitrate);
+ }
+
+- ast_str_append(str, 0, "a=fmtp:%u usedtx=%u\r\n", payload, attr->dtx);
+- ast_str_append(str, 0, "a=fmtp:%u useinbandfec=%u\r\n", payload, attr->fec);
++ if (attr->dtx) {
++ ast_str_append(str, 0, "a=fmtp:%u usedtx=%u\r\n", payload, attr->dtx);
++ }
++ if (attr->fec) {
++ ast_str_append(str, 0, "a=fmtp:%u useinbandfec=%u\r\n", payload, attr->fec);
++ }
+ }
+
+ static enum ast_format_cmp_res silk_cmp(const struct ast_format *format1, const struct ast_format *format2)
+ {
+- struct silk_attr *attr1 = ast_format_get_attribute_data(format1);
+- struct silk_attr *attr2 = ast_format_get_attribute_data(format2);
+-
+- if (((!attr1 || !attr1->samplerate) && (!attr2 || !attr2->samplerate)) ||
+- (attr1->samplerate == attr2->samplerate)) {
++ if (ast_format_get_sample_rate(format1) == ast_format_get_sample_rate(format2)) {
+ return AST_FORMAT_CMP_EQUAL;
+ }
+
+@@ -130,13 +136,10 @@ static struct ast_format *silk_getjoint(const struct ast_format *format1, const
+ {
+ struct silk_attr *attr1 = ast_format_get_attribute_data(format1);
+ struct silk_attr *attr2 = ast_format_get_attribute_data(format2);
+- unsigned int samplerate;
+ struct ast_format *jointformat;
+ struct silk_attr *attr_res;
+
+- samplerate = attr1->samplerate & attr2->samplerate;
+- /* sample rate is the only attribute that has any bearing on if joint capabilities exist or not */
+- if (samplerate) {
++ if (ast_format_get_sample_rate(format1) != ast_format_get_sample_rate(format2)) {
+ return NULL;
+ }
+
+@@ -145,22 +148,25 @@ static struct ast_format *silk_getjoint(const struct ast_format *format1, const
+ return NULL;
+ }
+ attr_res = ast_format_get_attribute_data(jointformat);
+- attr_res->samplerate = samplerate;
+
+- /* Take the lowest max bitrate */
+- attr_res->maxbitrate = MIN(attr1->maxbitrate, attr2->maxbitrate);
++ if (!attr1 || !attr2) {
++ attr_init(attr_res);
++ } else {
++ /* Take the lowest max bitrate */
++ attr_res->maxbitrate = MIN(attr1->maxbitrate, attr2->maxbitrate);
+
+- /* Only do dtx if both sides want it. DTX is a trade off between
+- * computational complexity and bandwidth. */
+- attr_res->dtx = attr1->dtx && attr2->dtx ? 1 : 0;
++ /* Only do dtx if both sides want it. DTX is a trade off between
++ * computational complexity and bandwidth. */
++ attr_res->dtx = attr1->dtx && attr2->dtx ? 1 : 0;
+
+- /* Only do FEC if both sides want it. If a peer specifically requests not
+- * to receive with FEC, it may be a waste of bandwidth. */
+- attr_res->fec = attr1->fec && attr2->fec ? 1 : 0;
++ /* Only do FEC if both sides want it. If a peer specifically requests not
++ * to receive with FEC, it may be a waste of bandwidth. */
++ attr_res->fec = attr1->fec && attr2->fec ? 1 : 0;
+
+- /* Use the maximum packetloss percentage between the two attributes. This affects how
+- * much redundancy is used in the FEC. */
+- attr_res->packetloss_percentage = MAX(attr1->packetloss_percentage, attr2->packetloss_percentage);
++ /* Use the maximum packetloss percentage between the two attributes. This affects how
++ * much redundancy is used in the FEC. */
++ attr_res->packetloss_percentage = MAX(attr1->packetloss_percentage, attr2->packetloss_percentage);
++ }
+
+ return jointformat;
+ }
+@@ -183,9 +189,7 @@ static struct ast_format *silk_set(const struct ast_format *format, const char *
+ }
+ attr = ast_format_get_attribute_data(cloned);
+
+- if (!strcasecmp(name, "sample_rate")) {
+- attr->samplerate = val;
+- } else if (!strcasecmp(name, "max_bitrate")) {
++ if (!strcasecmp(name, "max_bitrate")) {
+ attr->maxbitrate = val;
+ } else if (!strcasecmp(name, "dtx")) {
+ attr->dtx = val;
+@@ -205,9 +209,7 @@ static const void *silk_get(const struct ast_format *format, const char *name)
+ struct silk_attr *attr = ast_format_get_attribute_data(format);
+ unsigned int *val;
+
+- if (!strcasecmp(name, "sample_rate")) {
+- val = &attr->samplerate;
+- } else if (!strcasecmp(name, "max_bitrate")) {
++ if (!strcasecmp(name, "max_bitrate")) {
+ val = &attr->maxbitrate;
+ } else if (!strcasecmp(name, "dtx")) {
+ val = &attr->dtx;
+--
+1.7.9.5
Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-13.1.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-13.1.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2630,11 +2630,13 @@
+@@ -2636,11 +2636,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -17333,7 +17333,7 @@
+@@ -17351,7 +17351,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-07-22 13:51:37 UTC (rev 7771)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.22.0
+ASTERISK_VERSION := 11.23.0
else
-ASTERISK_VERSION := 13.9.1
+ASTERISK_VERSION := 13.10.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-07-22 13:51:37 UTC (rev 7771)
@@ -150,7 +150,7 @@
# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
#
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-# BR2_PACKAGE_ASTERISK_CODEC_SILK is not set
+BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-04 00:12:46
|
Revision: 7789
http://sourceforge.net/p/astlinux/code/7789
Author: abelbeck
Date: 2016-08-04 00:12:44 +0000 (Thu, 04 Aug 2016)
Log Message:
-----------
msmtp, allow an empty 'SMTP Cert File' (SMTP_CA) which will default to the system ca-bundle.crt
Modified Paths:
--------------
branches/1.0/package/msmtp/msmtp.init
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/msmtp/msmtp.init
===================================================================
--- branches/1.0/package/msmtp/msmtp.init 2016-08-03 17:35:08 UTC (rev 7788)
+++ branches/1.0/package/msmtp/msmtp.init 2016-08-04 00:12:44 UTC (rev 7789)
@@ -2,6 +2,8 @@
. /etc/rc.conf
+CA_BUNDLE="/usr/lib/ssl/certs/ca-bundle.crt"
+
ALIASES_FILE="/mnt/kd/msmtp-aliases.conf"
gen_msmtp_config() {
@@ -33,13 +35,16 @@
echo "tls_starttls $SMTP_STARTTLS"
fi
- if [ -n "$SMTP_CA" ]; then
- echo "tls_trust_file $SMTP_CA"
- fi
+ if [ "$SMTP_CERTCHECK" = "off" ]; then
+ echo "tls_certcheck off"
+ else
+ echo "tls_certcheck on"
- # may be 'off' or 'on'... use default if unset.
- if [ -n "$SMTP_CERTCHECK" ]; then
- echo "tls_certcheck $SMTP_CERTCHECK"
+ if [ -n "$SMTP_CA" ] && [ -f "$SMTP_CA" ]; then
+ echo "tls_trust_file $SMTP_CA"
+ else
+ echo "tls_trust_file $CA_BUNDLE"
+ fi
fi
fi
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2016-08-03 17:35:08 UTC (rev 7788)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2016-08-04 00:12:44 UTC (rev 7789)
@@ -1765,9 +1765,7 @@
putHtml('<option value="on"'.$sel.'>Check Cert</option>');
putHtml('</select>');
putHtml('</td><td style="text-align: left;" colspan="3">');
- if (($value = getVARdef($db, 'SMTP_CA', $cur_db)) === '') {
- $value = '/mnt/kd/ssl/ca-smtp.pem';
- }
+ $value = getVARdef($db, 'SMTP_CA', $cur_db);
putHtml('SMTP Cert File:<input type="text" size="24" maxlength="64" value="'.$value.'" name="smtp_ca_cert" /></td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
$value = getVARdef($db, 'SMTP_USER', $cur_db);
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-08-03 17:35:08 UTC (rev 7788)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-08-04 00:12:44 UTC (rev 7789)
@@ -460,22 +460,21 @@
## The From: of SMTP messages.
#SMTP_FROM="us...@my..."
##
-## If SMTP_TLS is defined, we will use TLS. You should have a trusted cert list and
-## define its location with SMTP_CA. Optionally, you can turn off the certificate
-## verification. This is a security risk!
-#SMTP_TLS=yes
+## Enable TLS by setting SMTP_TLS to "yes"
+#SMTP_TLS="yes"
## SMTP_STARTTLS 'on' (default) For TLS/STARTTLS, commonly TCP port 587
## SMTP_STARTTLS 'off' For SMTP over SSL, commonly TCP port 465
-#SMTP_STARTTLS=off
-## SMTP_CA file, one or more certificates of trusted CA's in PEM format
+#SMTP_STARTTLS="on"
+## SMTP_CA file, one or more certificates of trusted CA's in PEM format.
+## If SMTP_CA is not defined, the system ca-bundle.crt will be used by default.
#SMTP_CA="/mnt/kd/ssl/ca-smtp.pem"
-## SMTP_CERTCHECK 'off' or 'on' (default), must be 'off' if SMTP_CA is not defined
-#SMTP_CERTCHECK=off
+## SMTP_CERTCHECK 'off' or 'on' (default)
+#SMTP_CERTCHECK="on"
## The username and password for communicating with the SMTP server.
-#SMTP_USER=username
-#SMTP_PASS=password
+#SMTP_USER="username"
+#SMTP_PASS="password"
## The SMTP login method (plain or login are supported)
-#SMTP_AUTH=plain
+#SMTP_AUTH="plain"
## SMTP port to connect to SMTP_SERVER on. Defaults to 25
#SMTP_PORT="25"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-06 02:46:49
|
Revision: 7791
http://sourceforge.net/p/astlinux/code/7791
Author: abelbeck
Date: 2016-08-06 02:46:47 +0000 (Sat, 06 Aug 2016)
Log Message:
-----------
msmtp, add a functional '/bin/mail' script to emulate mail/mailx for sending mail, replace the previous NoOp script
Modified Paths:
--------------
branches/1.0/package/msmtp/msmtp.mk
Added Paths:
-----------
branches/1.0/package/msmtp/mail.sh
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/bin/mail
Added: branches/1.0/package/msmtp/mail.sh
===================================================================
--- branches/1.0/package/msmtp/mail.sh (rev 0)
+++ branches/1.0/package/msmtp/mail.sh 2016-08-06 02:46:47 UTC (rev 7791)
@@ -0,0 +1,270 @@
+#!/bin/bash
+##
+## mail
+##
+## Simple wrapper to emulate 'mail' or 'mailx'
+##
+## Only sending mail is supported
+##
+## Copyright (C) 2016 Lonnie Abelbeck
+##
+## This is free software, licensed under the GNU General Public License
+## version 3 as published by the Free Software Foundation; you can
+## redistribute it and/or modify it under the terms of the GNU
+## General Public License; and comes with ABSOLUTELY NO WARRANTY.
+
+VERSION="12.5 7/5/10"
+
+usage()
+{
+ echo '
+Usage: mail [options...] to_addr
+
+Options:
+ -a file Attach the given file to the message.
+ --mime type Optionally define the MIME Type of the attached file.
+ -b address Send blind carbon copies to a comma-separated list of email addresses.
+ -c address Send carbon copies to a comma-separated list of email addresses.
+ -e Check if mail is present. (Always exit status of "1")
+ -H Print header summaries for all messages and exit. (Always no mail)
+ -r address Define the From address.
+ -S var=val Sets the internal option variable, from= and replyto= are supported.
+ -s subject Define the subject text.
+ -t The sending message is expected to contain "To:", "Cc:" or "Bcc:" fields.
+ -u user Reads the mailbox of the given user name. (Always no mail)
+ -V Print version and exit.
+ -v Verbose mode.
+ --help Show this help text
+ Note: Additional mail/mailx options are silently ignored for compatibility.
+'
+ exit 1
+}
+
+check_mailbox()
+{
+ local user="${1:-$USER}"
+
+ echo "No mail for $user"
+ return 1
+}
+
+address_header()
+{
+ local header="$1" addresses="$2" address IFS
+
+ IFS=','
+ for address in $addresses; do
+ echo "$header $address"
+ done
+}
+
+set_var_header()
+{
+ local var="$1" header="" addresses="" address IFS
+
+ case "$var" in
+ from=*) header="From:" ; addresses="${var#from=}" ;;
+ replyto=*) header="Reply-To:" ; addresses="${var#replyto=}" ;;
+ esac
+
+ IFS=','
+ for address in $addresses; do
+ echo "$header $address"
+ done
+}
+
+mime_header()
+{
+ echo "MIME-Version: 1.0"
+ echo "Content-Type: multipart/mixed; boundary=\"$BOUNDARY\""
+ echo ""
+ echo ""
+ echo "This is a multi-part message in MIME format."
+ echo ""
+ echo "--$BOUNDARY"
+ echo "Content-Type: text/plain; charset=ISO-8859-1; format=flowed"
+ echo "Content-Transfer-Encoding: 7bit"
+ echo "Content-Disposition: inline"
+}
+
+gen_message_header()
+{
+ if [ $message_recipients -eq 0 ]; then
+ address_header "To:" "$to_addr"
+ address_header "Cc:" "$cc_addr"
+ address_header "Bcc:" "$bcc_addr"
+ fi
+ if [ -n "$from_addr" ]; then
+ echo "From: $from_addr"
+ fi
+ if [ -n "$set_var" ]; then
+ set_var_header "$set_var"
+ fi
+ echo "Subject: $subject"
+ if [ -n "$attach_file" ]; then
+ mime_header
+ fi
+
+ if [ $message_recipients -eq 0 ]; then
+ echo ""
+ fi
+}
+
+mime_content_type()
+{
+ local filename="$1" suffix mime
+
+ suffix="${filename##*/}"
+ suffix="${suffix##*.}"
+ suffix="$(echo "$suffix" | tr '[:upper:]' '[:lower:]')"
+
+ case $suffix in
+ txt|text|conf|log|cpp|c|asc) mime="text/plain" ;;
+ pdf) mime="application/pdf" ;;
+ sig) mime="application/pgp-signature" ;;
+ ps) mime="application/postscript" ;;
+ gz) mime="application/x-gzip" ;;
+ tgz) mime="application/x-tgz" ;;
+ tar) mime="application/x-tar" ;;
+ zip) mime="application/zip" ;;
+ bz2) mime="application/x-bzip" ;;
+ tbz) mime="application/x-bzip-compressed-tar" ;;
+ crt|der) mime="application/x-x509-ca-cert" ;;
+ wav) mime="audio/x-wav" ;;
+ gif) mime="image/gif" ;;
+ tiff|tif) mime="image/tiff" ;;
+ jpeg|jpg) mime="image/jpeg" ;;
+ png) mime="image/png" ;;
+ css) mime="text/css" ;;
+ html|htm) mime="text/html" ;;
+ js) mime="text/javascript" ;;
+ xml|dtd) mime="text/xml" ;;
+ mpeg|mpg) mime="video/mpeg" ;;
+ *) mime="application/octet-stream" ;;
+ esac
+
+ echo "$mime"
+}
+
+mime_data()
+{
+ echo ""
+ echo ""
+ echo "--$BOUNDARY"
+ echo "Content-Type: $mime_type; name=\"${attach_file##*/}\""
+ echo "Content-Transfer-Encoding: base64"
+ echo "Content-Disposition: attachment; filename=\"${attach_file##*/}\""
+ echo ""
+
+ openssl base64 -in "$attach_file"
+
+ echo ""
+ echo "--$BOUNDARY--"
+ echo "."
+ echo ""
+}
+
+ARGS="$(getopt --name mail \
+ --long mime:,help \
+ --options Aa:Bb:c:DdEeFf:Hh:IilNnq:Rr:S:s:T:tu:vV \
+ -- "$@")"
+if [ $? -ne 0 ]; then
+ usage
+fi
+eval set -- $ARGS
+
+attach_file=""
+mime_type=""
+bcc_addr=""
+cc_addr=""
+exists_mail=0
+headers=0
+from_addr=""
+set_var=""
+subject=""
+message_recipients=0
+mail_user=""
+version=0
+verbose=0
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -a) attach_file="$2"; shift ;;
+ --mime) mime_type="$2"; shift ;;
+ -b) bcc_addr="$2"; shift ;;
+ -c) cc_addr="$2"; shift ;;
+ -e) exists_mail=1 ;;
+ -f) shift ;;
+ -H) headers=1 ;;
+ -h) shift ;;
+ -q) shift ;;
+ -r) from_addr="$2"; shift ;;
+ -S) set_var="$2"; shift ;;
+ -s) subject="$2"; shift ;;
+ -T) shift ;;
+ -t) message_recipients=1 ;;
+ -u) mail_user="$2"; shift ;;
+ -V) version=1 ;;
+ -v) verbose=1 ;;
+ --help) usage ;;
+ --) shift; break ;;
+ esac
+ shift
+done
+to_addr="$1"
+
+if [ $version -eq 1 ]; then
+ echo "$VERSION"
+ exit 0
+fi
+
+if [ $headers -eq 1 ]; then
+ check_mailbox "$mail_user"
+ exit 0
+fi
+
+if [ $exists_mail -eq 1 ]; then
+ check_mailbox "$mail_user" >/dev/null
+ exit $?
+fi
+
+if [ -z "$to_addr" -o "$to_addr" = "--" ] && [ $message_recipients -eq 0 ]; then
+ check_mailbox "$mail_user"
+ exit $?
+fi
+
+if [ -n "$attach_file" ]; then
+ if [ ! -f "$attach_file" ]; then
+ echo "mail: Attachment file not found: $attach_file" >&2
+ exit 1
+ fi
+ if [ $message_recipients -eq 1 ]; then
+ echo "mail: The '-t' option is not compatible with the '-a file' option." >&2
+ exit 1
+ fi
+
+ if [ -z "$mime_type" ]; then
+ mime_type="$(mime_content_type "$attach_file")"
+ fi
+
+ BOUNDARY="$(date "+%s" | md5sum | cut -b1-32)"
+fi
+
+# Check if this is an interactive session
+if tty -s; then
+ interactive=1
+else
+ interactive=0
+fi
+
+if [ $interactive -eq 1 -a -z "$subject" ]; then
+ read -p "Subject: " subject
+fi
+
+(
+ gen_message_header
+ cat # copy stdin to stdout until ^D (EOT)
+ if [ -n "$attach_file" ]; then
+ mime_data
+ fi
+) | sendmail -t
+
Property changes on: branches/1.0/package/msmtp/mail.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/msmtp/msmtp.mk
===================================================================
--- branches/1.0/package/msmtp/msmtp.mk 2016-08-04 00:29:38 UTC (rev 7790)
+++ branches/1.0/package/msmtp/msmtp.mk 2016-08-06 02:46:47 UTC (rev 7791)
@@ -24,6 +24,8 @@
$(INSTALL) -m 0755 -D package/msmtp/sendmail.sh $(TARGET_DIR)/usr/sbin/sendmail
$(INSTALL) -m 0755 -D package/msmtp/testmail.sh $(TARGET_DIR)/usr/sbin/testmail
$(INSTALL) -m 0755 -D package/msmtp/mime-pack.sh $(TARGET_DIR)/usr/sbin/mime-pack
+ $(INSTALL) -m 0755 -D package/msmtp/mail.sh $(TARGET_DIR)/bin/mail
+ ln -sf ../../bin/mail $(TARGET_DIR)/usr/bin/mail
ln -sf /tmp/etc/msmtprc $(TARGET_DIR)/etc/msmtprc
endef
@@ -34,6 +36,8 @@
rm $(TARGET_DIR)/usr/sbin/sendmail
rm $(TARGET_DIR)/usr/sbin/testmail
rm $(TARGET_DIR)/usr/sbin/mime-pack
+ rm $(TARGET_DIR)/bin/mail
+ rm $(TARGET_DIR)/usr/bin/mail
rm $(TARGET_DIR)/etc/msmtprc
endef
Deleted: branches/1.0/project/astlinux/target_skeleton/bin/mail
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/bin/mail 2016-08-04 00:29:38 UTC (rev 7790)
+++ branches/1.0/project/astlinux/target_skeleton/bin/mail 2016-08-06 02:46:47 UTC (rev 7791)
@@ -1,4 +0,0 @@
-#!/bin/sh
-#Mail wrapper for things that insist on calling /bin/mail...
-#For now, just /dev/null everything
-echo -n ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-27 15:03:29
|
Revision: 7808
http://sourceforge.net/p/astlinux/code/7808
Author: abelbeck
Date: 2016-08-27 15:03:28 +0000 (Sat, 27 Aug 2016)
Log Message:
-----------
asterisk-fop2, version bump to 2.31.03
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 2016-08-24 17:23:21 UTC (rev 7807)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2016-08-27 15:03:28 UTC (rev 7808)
@@ -3,9 +3,9 @@
# asterisk-fop2
#
#############################################################
-ASTERISK_FOP2_VERSION = 2.28
+ASTERISK_FOP2_VERSION = 2.31.03
ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
-ASTERISK_FOP2_SITE = http://download.fop2.com
+ASTERISK_FOP2_SITE = http://download2.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
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-08-24 17:23:21 UTC (rev 7807)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-08-27 15:03:28 UTC (rev 7808)
@@ -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="https://files.astlinux-project.org/fop2-2.28-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
+ SRC_URL="https://files.astlinux-project.org/fop2-2.31.03-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.
|
|
From: <abe...@us...> - 2016-09-07 14:18:21
|
Revision: 7820
http://sourceforge.net/p/astlinux/code/7820
Author: abelbeck
Date: 2016-09-07 14:18:19 +0000 (Wed, 07 Sep 2016)
Log Message:
-----------
asterisk-fop2, version bump to 2.31.04
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 2016-09-05 21:17:32 UTC (rev 7819)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2016-09-07 14:18:19 UTC (rev 7820)
@@ -3,7 +3,7 @@
# asterisk-fop2
#
#############################################################
-ASTERISK_FOP2_VERSION = 2.31.03
+ASTERISK_FOP2_VERSION = 2.31.04
ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
ASTERISK_FOP2_SITE = http://download2.fop2.com
# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-09-05 21:17:32 UTC (rev 7819)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-09-07 14:18:19 UTC (rev 7820)
@@ -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="https://files.astlinux-project.org/fop2-2.31.03-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
+ SRC_URL="https://files.astlinux-project.org/fop2-2.31.04-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.
|
Thanks for helping keep SourceForge clean.
X