Menu
▾
▴
astlinux-commits — Commits to the AstLinux SVN repository
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
(14) |
Aug
(156) |
Sep
(35) |
Oct
(48) |
Nov
(55) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(154) |
Mar
(139) |
Apr
(175) |
May
(87) |
Jun
(34) |
Jul
(42) |
Aug
(68) |
Sep
(41) |
Oct
(76) |
Nov
(77) |
Dec
(50) |
| 2008 |
Jan
(98) |
Feb
(43) |
Mar
(102) |
Apr
(27) |
May
(55) |
Jun
(13) |
Jul
(58) |
Aug
(62) |
Sep
(61) |
Oct
(43) |
Nov
(87) |
Dec
(134) |
| 2009 |
Jan
(175) |
Feb
(106) |
Mar
(58) |
Apr
(41) |
May
(74) |
Jun
(123) |
Jul
(252) |
Aug
(192) |
Sep
(69) |
Oct
(38) |
Nov
(117) |
Dec
(95) |
| 2010 |
Jan
(146) |
Feb
(76) |
Mar
(90) |
Apr
(60) |
May
(23) |
Jun
(19) |
Jul
(208) |
Aug
(140) |
Sep
(103) |
Oct
(114) |
Nov
(50) |
Dec
(47) |
| 2011 |
Jan
(59) |
Feb
(47) |
Mar
(61) |
Apr
(58) |
May
(41) |
Jun
(11) |
Jul
(17) |
Aug
(49) |
Sep
(34) |
Oct
(166) |
Nov
(38) |
Dec
(70) |
| 2012 |
Jan
(87) |
Feb
(37) |
Mar
(28) |
Apr
(25) |
May
(29) |
Jun
(30) |
Jul
(43) |
Aug
(27) |
Sep
(46) |
Oct
(27) |
Nov
(51) |
Dec
(70) |
| 2013 |
Jan
(92) |
Feb
(34) |
Mar
(58) |
Apr
(37) |
May
(46) |
Jun
(9) |
Jul
(38) |
Aug
(22) |
Sep
(28) |
Oct
(42) |
Nov
(44) |
Dec
(34) |
| 2014 |
Jan
(63) |
Feb
(39) |
Mar
(48) |
Apr
(31) |
May
(21) |
Jun
(43) |
Jul
(36) |
Aug
(69) |
Sep
(53) |
Oct
(56) |
Nov
(46) |
Dec
(49) |
| 2015 |
Jan
(63) |
Feb
(35) |
Mar
(30) |
Apr
(38) |
May
(27) |
Jun
(42) |
Jul
(42) |
Aug
(63) |
Sep
(18) |
Oct
(45) |
Nov
(65) |
Dec
(71) |
| 2016 |
Jan
(54) |
Feb
(79) |
Mar
(59) |
Apr
(38) |
May
(32) |
Jun
(46) |
Jul
(42) |
Aug
(30) |
Sep
(58) |
Oct
(33) |
Nov
(98) |
Dec
(59) |
| 2017 |
Jan
(79) |
Feb
(12) |
Mar
(43) |
Apr
(32) |
May
(76) |
Jun
(59) |
Jul
(44) |
Aug
(14) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <abe...@us...> - 2015-11-07 15:02:36
|
Revision: 7320
http://sourceforge.net/p/astlinux/code/7320
Author: abelbeck
Date: 2015-11-07 15:02:33 +0000 (Sat, 07 Nov 2015)
Log Message:
-----------
asterisk, revert back to 11.19.0 and 13.5.0, later versions have stability issues as doucmented in ASTERISK-25476
Ref: https://issues.asterisk.org/jira/browse/ASTERISK-25476
Modified Paths:
--------------
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-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
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -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
-@@ -2404,11 +2404,13 @@
+@@ -2398,11 +2398,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 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -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
-@@ -16767,7 +16767,7 @@
+@@ -16743,7 +16743,7 @@
}
if (!force) {
Deleted: branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -1,20 +0,0 @@
---- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500
-+++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500
-@@ -4635,7 +4635,7 @@
- return;
- } else {
- if (rtp->rtcp) {
-- if (rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* Successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
-@@ -4863,7 +4863,7 @@
- }
- #endif
-
-- if (rtp->rtcp && rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp && rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
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 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -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
-@@ -2517,11 +2517,13 @@
+@@ -2511,11 +2511,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 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -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
-@@ -16911,7 +16911,7 @@
+@@ -16894,7 +16894,7 @@
}
if (!force) {
Deleted: branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -1,20 +0,0 @@
---- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500
-+++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500
-@@ -4780,7 +4780,7 @@
- return;
- } else {
- if (rtp->rtcp) {
-- if (rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* Successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
-@@ -4997,7 +4997,7 @@
- }
- #endif
-
-- if (rtp->rtcp && rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp && rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-11-07 15:02:33 UTC (rev 7320)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.20.0
+ASTERISK_VERSION := 11.19.0
else
-ASTERISK_VERSION := 13.6.0
+ASTERISK_VERSION := 13.5.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-06 17:50:31
|
Revision: 7319
http://sourceforge.net/p/astlinux/code/7319
Author: abelbeck
Date: 2015-11-06 17:50:29 +0000 (Fri, 06 Nov 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-11-06 17:48:11 UTC (rev 7318)
+++ branches/1.0/docs/ChangeLog.txt 2015-11-06 17:50:29 UTC (rev 7319)
@@ -12,6 +12,8 @@
** System
+-- linux, add kernel patch allowing Geode LX (alix and net5501) to use tsc clocksource instead of pit clocksource
+
-- tg3, version bump to 3.137k, Broadcom NetLink 10/100/1000 Mbps PCI/PCI-X/PCI Express Ethernet Linux driver
-- Fossil, version bump to 1.34
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-06 17:48:12
|
Revision: 7318
http://sourceforge.net/p/astlinux/code/7318
Author: abelbeck
Date: 2015-11-06 17:48:11 +0000 (Fri, 06 Nov 2015)
Log Message:
-----------
linux, add kernel patch allowing Geode LX (alix and net5501) to use tsc clocksource instead of pit clocksource.
Ref: x86/platform: Fix Geode LX timekeeping in the generic x86 build
https://lkml.org/lkml/2015/9/16/432
https://dev.openwrt.org/ticket/20531
Added Paths:
-----------
branches/1.0/project/astlinux/kernel-patches/linux-920-fix-Geode-LX-timekeeping.patch
Added: 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 (rev 0)
+++ branches/1.0/project/astlinux/kernel-patches/linux-920-fix-Geode-LX-timekeeping.patch 2015-11-06 17:48:11 UTC (rev 7318)
@@ -0,0 +1,73 @@
+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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-04 19:18:56
|
Revision: 7317
http://sourceforge.net/p/astlinux/code/7317
Author: abelbeck
Date: 2015-11-04 19:18:54 +0000 (Wed, 04 Nov 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-11-04 19:15:17 UTC (rev 7316)
+++ branches/1.0/docs/ChangeLog.txt 2015-11-04 19:18:54 UTC (rev 7317)
@@ -18,6 +18,8 @@
-- Monit, version bump to 5.15
+-- perl, version bump to 5.22.0 using perlcross 1.0.1
+
-- sudo, version bump to 1.8.15
-- libsodium, version bump to 1.0.6
@@ -38,6 +40,8 @@
-- sipgrep, version bump to 2.1.0
+-- stunnel, version bump to 5.25
+
-- arnofw (AIF), added upstream patch for Issue #21, Leave the IPv6 sysctl accept_ra setting alone when forwarding=1
** Asterisk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-04 19:15:19
|
Revision: 7316
http://sourceforge.net/p/astlinux/code/7316
Author: abelbeck
Date: 2015-11-04 19:15:17 +0000 (Wed, 04 Nov 2015)
Log Message:
-----------
perl, version bump to 5.22.0 using perl-cross 1.0.1, now 2 MB (uncompressed) smaller with more target pruning
Modified Paths:
--------------
branches/1.0/package/perl/perl.mk
Removed Paths:
-------------
branches/1.0/package/perl/perl-dynaloader-hints.patch
branches/1.0/package/perl/perl-fix-Module-Build.patch
branches/1.0/package/perl/perl-ifprefixed.patch
Deleted: branches/1.0/package/perl/perl-dynaloader-hints.patch
===================================================================
--- branches/1.0/package/perl/perl-dynaloader-hints.patch 2015-11-04 15:53:18 UTC (rev 7315)
+++ branches/1.0/package/perl/perl-dynaloader-hints.patch 2015-11-04 19:15:17 UTC (rev 7316)
@@ -1,13 +0,0 @@
-Buildroot puts nlist.h into sysroot/usr/include,
-which is in the default include path.
-
-Signed-off-by: Alex Suykov <ale...@gm...>
-
---- a/ext/DynaLoader/hints/linux.pl
-+++ b/ext/DynaLoader/hints/linux.pl
-@@ -1,5 +1 @@
--# XXX Configure test needed.
--# Some Linux releases like to hide their <nlist.h>
--$self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf'
-- if -f "/usr/include/libelf/nlist.h";
- 1;
Deleted: branches/1.0/package/perl/perl-fix-Module-Build.patch
===================================================================
--- branches/1.0/package/perl/perl-fix-Module-Build.patch 2015-11-04 15:53:18 UTC (rev 7315)
+++ branches/1.0/package/perl/perl-fix-Module-Build.patch 2015-11-04 19:15:17 UTC (rev 7316)
@@ -1,16 +0,0 @@
-
-Signed-off-by: Francois Perrad <fra...@ga...>
-
-Index: b/cpan/Module-Build/lib/Module/Build/Base.pm
-===================================================================
---- a/cpan/Module-Build/lib/Module/Build/Base.pm
-+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -459,7 +459,7 @@
- my $proto = shift;
- my $c = ref($proto) ? $proto->{config} : 'Module::Build::Config';
-
-- my $perl = $^X;
-+ my $perl = $ENV{RUN_PERL} || $^X;
- my $perl_basename = File::Basename::basename($perl);
-
- my @potential_perls;
Deleted: branches/1.0/package/perl/perl-ifprefixed.patch
===================================================================
--- branches/1.0/package/perl/perl-ifprefixed.patch 2015-11-04 15:53:18 UTC (rev 7315)
+++ branches/1.0/package/perl/perl-ifprefixed.patch 2015-11-04 19:15:17 UTC (rev 7316)
@@ -1,11 +0,0 @@
---- perl-5.16.2/Makefile.config.SH.orig 2012-12-21 23:52:27.000000000 -0600
-+++ perl-5.16.2/Makefile.config.SH 2012-12-21 23:53:11.000000000 -0600
-@@ -40,7 +40,7 @@
- fi
-
- function ifprefixed() {
-- val=`echo "$2" | sed -e "s/^$1//"`
-+ val=`echo "$2" | sed -e "s|^$1||"`
- if [ "$1$val" == "$2" ]; then
- echo "\$(CROSS)$val"
- else
Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk 2015-11-04 15:53:18 UTC (rev 7315)
+++ branches/1.0/package/perl/perl.mk 2015-11-04 19:15:17 UTC (rev 7316)
@@ -4,22 +4,23 @@
#
#############################################################
-PERL_VERSION_MAJOR = 20
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
+PERL_VERSION_MAJOR = 22
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0
PERL_SITE = http://www.cpan.org/src/5.0
PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
PERL_INSTALL_STAGING = YES
# Depend on linux to define LINUX_VERSION_PROBED
PERL_DEPENDENCIES = linux
+PERL_ARCHNAME = $(ARCH)-linux
+
PERL_MODULES = constant version Carp Errno Fcntl PathTools POSIX Digest Socket IO XSLoader Exporter File-Find
PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Long Time/Local File/Glob Sys/Hostname
-PERL_CROSS_VERSION = 0.9.7
-PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).2
-#PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases
+PERL_CROSS_VERSION = 1.0.1
+#PERL_CROSS_SITE = --no-check-certificate https://raw.github.com/arsv/perl-cross/releases
PERL_CROSS_SITE = http://files.astlinux.org
-PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_SOURCE = perl-$(PERL_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
# We use the perlcross hack to cross-compile perl. It should
# be extracted over the perl sources, so we don't define that
@@ -86,7 +87,11 @@
endef
define PERL_INSTALL_TARGET_CMDS
+ # Undefine utils.lst file so cpan, corelist, ... perlthanks are not installed, keep shasum
+ echo "utils/shasum" > $(@D)/utils.lst
$(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl
+ # Remove CORE dir
+ rm -rf $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE
# Remove all .pod files
find $(TARGET_DIR)/usr/lib/perl5/ -name '*.pod' -print0 | xargs -0 rm -f
# Remove many unicore files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-04 15:53:21
|
Revision: 7315
http://sourceforge.net/p/astlinux/code/7315
Author: abelbeck
Date: 2015-11-04 15:53:18 +0000 (Wed, 04 Nov 2015)
Log Message:
-----------
stunnel, version bump to 5.25
Modified Paths:
--------------
branches/1.0/package/stunnel/stunnel.mk
Modified: branches/1.0/package/stunnel/stunnel.mk
===================================================================
--- branches/1.0/package/stunnel/stunnel.mk 2015-11-04 14:21:39 UTC (rev 7314)
+++ branches/1.0/package/stunnel/stunnel.mk 2015-11-04 15:53:18 UTC (rev 7315)
@@ -4,7 +4,7 @@
#
#############################################################
-STUNNEL_VERSION = 5.24
+STUNNEL_VERSION = 5.25
STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/5.x
STUNNEL_DEPENDENCIES = openssl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-04 14:21:42
|
Revision: 7314
http://sourceforge.net/p/astlinux/code/7314
Author: abelbeck
Date: 2015-11-04 14:21:39 +0000 (Wed, 04 Nov 2015)
Log Message:
-----------
fossil, add upstream patch to display Release Version in footer
Modified Paths:
--------------
branches/1.0/package/fossil/fossil.mk
Added Paths:
-----------
branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch
Added: branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch (rev 0)
+++ branches/1.0/package/fossil/fossil-0101-skin-footer-release-version.patch 2015-11-04 14:21:39 UTC (rev 7314)
@@ -0,0 +1,107 @@
+Index: skins/black_and_white/footer.txt
+==================================================================
+--- fossil-1.34/skins/black_and_white/footer.txt
++++ fossil-1.34/skins/black_and_white/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/blitz/footer.txt
+==================================================================
+--- fossil-1.34/skins/blitz/footer.txt
++++ fossil-1.34/skins/blitz/footer.txt
+@@ -1,12 +1,12 @@
+ </div> <!-- end div container -->
+ </div> <!-- end div middle max-full-width -->
+ <div class="footer">
+ <div class="container">
+ <div class="pull-right">
+- <a href="http://fossil-scm.org">Fossil version $manifest_version $manifest_date</a>
++ <a href="http://fossil-scm.org">Fossil $release_version $manifest_version $manifest_date</a>
+ </div>
+ This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s
+ </div>
+ </div>
+ </body>
+ </html>
+
+Index: skins/blitz_no_logo/footer.txt
+==================================================================
+--- fossil-1.34/skins/blitz_no_logo/footer.txt
++++ fossil-1.34/skins/blitz_no_logo/footer.txt
+@@ -1,12 +1,12 @@
+ </div> <!-- end div container -->
+ </div> <!-- end div middle max-full-width -->
+ <div class="footer">
+ <div class="container">
+ <div class="pull-right">
+- <a href="http://fossil-scm.org">Fossil version $manifest_version $manifest_date</a>
++ <a href="http://fossil-scm.org">Fossil $release_version $manifest_version $manifest_date</a>
+ </div>
+ This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s
+ </div>
+ </div>
+ </body>
+ </html>
+
+Index: skins/default/footer.txt
+==================================================================
+--- fossil-1.34/skins/default/footer.txt
++++ fossil-1.34/skins/default/footer.txt
+@@ -1,6 +1,6 @@
+ <div class="footer">
+ This page was generated in about
+ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/khaki/footer.txt
+==================================================================
+--- fossil-1.34/skins/khaki/footer.txt
++++ fossil-1.34/skins/khaki/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/original/footer.txt
+==================================================================
+--- fossil-1.34/skins/original/footer.txt
++++ fossil-1.34/skins/original/footer.txt
+@@ -1,6 +1,6 @@
+ <div class="footer">
+ This page was generated in about
+ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/plain_gray/footer.txt
+==================================================================
+--- fossil-1.34/skins/plain_gray/footer.txt
++++ fossil-1.34/skins/plain_gray/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
+
+Index: skins/rounded1/footer.txt
+==================================================================
+--- fossil-1.34/skins/rounded1/footer.txt
++++ fossil-1.34/skins/rounded1/footer.txt
+@@ -1,4 +1,4 @@
+ <div class="footer">
+-Fossil version $manifest_version $manifest_date
++Fossil $release_version $manifest_version $manifest_date
+ </div>
+ </body></html>
Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk 2015-11-03 16:49:26 UTC (rev 7313)
+++ branches/1.0/package/fossil/fossil.mk 2015-11-04 14:21:39 UTC (rev 7314)
@@ -17,6 +17,7 @@
--prefix=/usr \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
+ --disable-fusefs \
--with-openssl="$(STAGING_DIR)/usr" \
--with-zlib="$(STAGING_DIR)/usr" \
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-03 16:49:28
|
Revision: 7313
http://sourceforge.net/p/astlinux/code/7313
Author: abelbeck
Date: 2015-11-03 16:49:26 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
web interface, Network tab, increase 'PPPoE Username' text width
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/network.php
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-03 14:03:27 UTC (rev 7312)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-03 16:49:26 UTC (rev 7313)
@@ -1410,7 +1410,7 @@
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
$value = getVARdef($db, 'PPPOEUSER', $cur_db);
- putHtml('PPPoE Username:<input type="text" size="24" maxlength="64" value="'.$value.'" name="user_pppoe" /></td>');
+ putHtml('PPPoE Username:<input type="text" size="38" maxlength="64" value="'.$value.'" name="user_pppoe" /></td>');
putHtml('<td style="text-align: left;" colspan="3">');
$value = getVARdef($db, 'PPPOEPASS', $cur_db);
$value = htmlspecialchars(RCconfig2string($value));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-03 14:03:29
|
Revision: 7312
http://sourceforge.net/p/astlinux/code/7312
Author: abelbeck
Date: 2015-11-03 14:03:27 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-11-03 14:01:28 UTC (rev 7311)
+++ branches/1.0/docs/ChangeLog.txt 2015-11-03 14:03:27 UTC (rev 7312)
@@ -55,7 +55,7 @@
== External Interface supports Prefix Delegation and Request IPv6 Address
== WAN Failover Interface does not support Prefix Delegation, only Request IPv6 Address
--- Network tab -> "IPv6 DHCPv6 Client Options:" adds External Interface DHCPv6 configuration options.
+-- Network tab -> "External DHCPv6 Client Settings:" adds External Interface DHCPv6 configuration options.
Additions for AstLinux 1.2.4.1:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-03 14:01:30
|
Revision: 7311
http://sourceforge.net/p/astlinux/code/7311
Author: abelbeck
Date: 2015-11-03 14:01:28 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
web interface, Network tab, move DHCPv6 options into the External Interface section, Thanks Michael
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/network.php
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-03 00:11:36 UTC (rev 7310)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-03 14:01:28 UTC (rev 7311)
@@ -1363,6 +1363,49 @@
putHtml('IPv6 Gateway:<input type="text" size="38" maxlength="39" value="'.$value.'" name="gateway_ipv6" /></td></tr>');
putHtml('<tr class="dtrow1"><td class="dialogText" style="text-align: left;" colspan="6">');
+ putHtml('<strong>External DHCPv6 Client Settings:</strong>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
+ $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_ADDRESS', $cur_db);
+ putHtml('DHCPv6 Client Address:');
+ putHtml('<select name="dhcpv6_client_request_address">');
+ putHtml('<option value="no">disabled</option>');
+ $sel = ($value !== 'no') ? ' selected="selected"' : '';
+ putHtml('<option value="yes"'.$sel.'>enabled</option>');
+ putHtml('</select></td>');
+ putHtml('<td style="text-align: left;" colspan="3">');
+ if (($dhcpv6_client_prefix_len = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_LEN', $cur_db)) === '') {
+ $dhcpv6_client_prefix_len = '60';
+ }
+ putHtml('DHCPv6 Prefix Length:');
+ putHtml('<select name="dhcpv6_client_prefix_len">');
+ foreach ($select_dhcpv6_prefix_len as $key => $value) {
+ $sel = ($dhcpv6_client_prefix_len == $value) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
+ }
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
+ $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_PREFIX', $cur_db);
+ putHtml('DHCPv6 Prefix Delegation:');
+ putHtml('<select name="dhcpv6_client_request_prefix">');
+ putHtml('<option value="no">disabled</option>');
+ $sel = ($value !== 'no') ? ' selected="selected"' : '';
+ putHtml('<option value="yes"'.$sel.'>enabled</option>');
+ putHtml('</select></td>');
+ putHtml('<td style="text-align: left;" colspan="3">');
+ $value = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_HINT', $cur_db);
+ putHtml('DHCPv6 Prefix Length Hint:');
+ putHtml('<select name="dhcpv6_client_prefix_hint">');
+ putHtml('<option value="no">disabled</option>');
+ $sel = ($value !== 'no') ? ' selected="selected"' : '';
+ putHtml('<option value="yes"'.$sel.'>enabled</option>');
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td class="dialogText" style="text-align: left;" colspan="6">');
putHtml('<strong>External PPPoE Settings:</strong>');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
@@ -1881,51 +1924,6 @@
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
- putHtml('<strong>IPv6 DHCPv6 Client Options:</strong>');
- putHtml('</td></tr>');
-
- putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
- $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_ADDRESS', $cur_db);
- putHtml('DHCPv6 Client Address:');
- putHtml('<select name="dhcpv6_client_request_address">');
- putHtml('<option value="no">disabled</option>');
- $sel = ($value !== 'no') ? ' selected="selected"' : '';
- putHtml('<option value="yes"'.$sel.'>enabled</option>');
- putHtml('</select></td>');
- putHtml('<td style="text-align: left;" colspan="3">');
- if (($dhcpv6_client_prefix_len = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_LEN', $cur_db)) === '') {
- $dhcpv6_client_prefix_len = '60';
- }
- putHtml('DHCPv6 Prefix Length:');
- putHtml('<select name="dhcpv6_client_prefix_len">');
- foreach ($select_dhcpv6_prefix_len as $key => $value) {
- $sel = ($dhcpv6_client_prefix_len == $value) ? ' selected="selected"' : '';
- putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
- }
- putHtml('</select>');
- putHtml('</td></tr>');
-
- putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
- $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_PREFIX', $cur_db);
- putHtml('DHCPv6 Prefix Delegation:');
- putHtml('<select name="dhcpv6_client_request_prefix">');
- putHtml('<option value="no">disabled</option>');
- $sel = ($value !== 'no') ? ' selected="selected"' : '';
- putHtml('<option value="yes"'.$sel.'>enabled</option>');
- putHtml('</select></td>');
- putHtml('<td style="text-align: left;" colspan="3">');
- $value = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_HINT', $cur_db);
- putHtml('DHCPv6 Prefix Length Hint:');
- putHtml('<select name="dhcpv6_client_prefix_hint">');
- putHtml('<option value="no">disabled</option>');
- $sel = ($value !== 'no') ? ' selected="selected"' : '';
- putHtml('<option value="yes"'.$sel.'>enabled</option>');
- putHtml('</select>');
- putHtml('</td></tr>');
-
- putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
-
- putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
putHtml('<strong>IPv6 Tunnel (6in4, 6to4):</strong>');
putHtml('</td></tr>');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-03 00:11:39
|
Revision: 7310
http://sourceforge.net/p/astlinux/code/7310
Author: abelbeck
Date: 2015-11-03 00:11:36 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-11-02 23:34:30 UTC (rev 7309)
+++ branches/1.0/docs/ChangeLog.txt 2015-11-03 00:11:36 UTC (rev 7310)
@@ -12,10 +12,18 @@
** System
+-- tg3, version bump to 3.137k, Broadcom NetLink 10/100/1000 Mbps PCI/PCI-X/PCI Express Ethernet Linux driver
+
+-- Fossil, version bump to 1.34
+
-- Monit, version bump to 5.15
--- libsodium, version bump to 1.0.5
+-- sudo, version bump to 1.8.15
+-- libsodium, version bump to 1.0.6
+
+-- ethtool, version bump to 4.2
+
** Networking
-- ntpd/sntp, version bump to 4.2.8p4, security fixes: CVE-2015-7871 plus 12 other low/medium-severity vulnerabilities
@@ -43,6 +51,7 @@
** Web Interface
-- Network tab and and WAN Failover sub-tab, add DHCPv6 support with Connection Type: [DHCP/DHCPv6]
+ and Connection Type: [Static IPv4/DHCPv6]
== External Interface supports Prefix Delegation and Request IPv6 Address
== WAN Failover Interface does not support Prefix Delegation, only Request IPv6 Address
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 23:34:32
|
Revision: 7309
http://sourceforge.net/p/astlinux/code/7309
Author: abelbeck
Date: 2015-11-02 23:34:30 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
fossil, version bump to 1.34
Modified Paths:
--------------
branches/1.0/package/fossil/fossil-0001-proxy-base.patch
branches/1.0/package/fossil/fossil-0002-tmp-file.patch
branches/1.0/package/fossil/fossil.mk
Removed Paths:
-------------
branches/1.0/package/fossil/fossil-reports-segfault-fix.patch
Modified: branches/1.0/package/fossil/fossil-0001-proxy-base.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0001-proxy-base.patch 2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil-0001-proxy-base.patch 2015-11-02 23:34:30 UTC (rev 7309)
@@ -15,7 +15,7 @@
for(i=0; zToken[i] && zToken[i]!='?'; i++){}
--- fossil-1.33/src/main.c.orig 2015-08-17 10:47:53.000000000 -0500
+++ fossil-1.33/src/main.c 2015-08-17 11:19:43.000000000 -0500
-@@ -1331,8 +1331,8 @@
+@@ -1387,8 +1387,8 @@
zCur = PD("SCRIPT_NAME","/");
i = strlen(zCur);
while( i>0 && zCur[i-1]=='/' ) i--;
@@ -28,7 +28,7 @@
}else{
--- fossil-1.33/src/login.c.orig 2015-08-17 23:35:08.000000000 -0500
+++ fossil-1.33/src/login.c 2015-08-17 23:47:02.000000000 -0500
-@@ -1249,9 +1249,9 @@
+@@ -1251,9 +1251,9 @@
Blob redir;
blob_init(&redir, 0, 0);
if( login_wants_https_redirect() ){
Modified: branches/1.0/package/fossil/fossil-0002-tmp-file.patch
===================================================================
--- branches/1.0/package/fossil/fossil-0002-tmp-file.patch 2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil-0002-tmp-file.patch 2015-11-02 23:34:30 UTC (rev 7309)
@@ -1,6 +1,6 @@
--- fossil-1.33/src/sqlite3.c.orig 2015-08-17 12:26:08.000000000 -0500
+++ fossil-1.33/src/sqlite3.c 2015-08-17 12:34:29.000000000 -0500
-@@ -30883,8 +30883,8 @@
+@@ -32061,8 +32061,8 @@
0,
0,
0,
Deleted: branches/1.0/package/fossil/fossil-reports-segfault-fix.patch
===================================================================
--- branches/1.0/package/fossil/fossil-reports-segfault-fix.patch 2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil-reports-segfault-fix.patch 2015-11-02 23:34:30 UTC (rev 7309)
@@ -1,29 +0,0 @@
-Index: src/statrep.c
-==================================================================
---- fossil-1.33/src/statrep.c
-+++ fossil-1.33/src/statrep.c
-@@ -691,10 +691,11 @@
- HQuery url; /* URL for various branch links */
- const char *zView = P("view"); /* Which view/report to show. */
- int eType = RPT_NONE; /* Numeric code for view/report to show */
- int i; /* Loop counter */
- const char *zUserName; /* Name of user */
-+ const char *azView[16]; /* Drop-down menu of view types */
- const struct {
- const char *zName; /* Name of view= screen type */
- const char *zVal; /* Value of view= query parameter */
- int eType; /* Corresponding RPT_* define */
- } aViewType[] = {
-@@ -731,11 +732,10 @@
- }
- url_initialize(&url, "reports");
- cgi_query_parameters_to_url(&url);
- if( eType!=RPT_NONE ){
- int nView = 0; /* Slots used in azView[] */
-- const char *azView[16]; /* Drop-down menu of view types */
- for(i=0; i<ArraySize(aViewType); i++){
- azView[nView++] = aViewType[i].zVal;
- azView[nView++] = aViewType[i].zName;
- }
- if( eType!=RPT_BYFILE ){
-
Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk 2015-11-02 18:55:16 UTC (rev 7308)
+++ branches/1.0/package/fossil/fossil.mk 2015-11-02 23:34:30 UTC (rev 7309)
@@ -4,7 +4,7 @@
#
################################################################################
-FOSSIL_VERSION = 1.33
+FOSSIL_VERSION = 1.34
FOSSIL_SOURCE = fossil-src-$(FOSSIL_VERSION).tar.gz
FOSSIL_SITE = http://www.fossil-scm.org/download
FOSSIL_DEPENDENCIES = zlib openssl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 18:55:19
|
Revision: 7308
http://sourceforge.net/p/astlinux/code/7308
Author: abelbeck
Date: 2015-11-02 18:55:16 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
tg3, version bump to 3.137k
Modified Paths:
--------------
branches/1.0/package/tg3/tg3.mk
Modified: branches/1.0/package/tg3/tg3.mk
===================================================================
--- branches/1.0/package/tg3/tg3.mk 2015-11-02 18:02:33 UTC (rev 7307)
+++ branches/1.0/package/tg3/tg3.mk 2015-11-02 18:55:16 UTC (rev 7308)
@@ -4,7 +4,7 @@
#
#############################################################
-TG3_VERSION = 3.137h
+TG3_VERSION = 3.137k
TG3_SOURCE:=tg3-$(TG3_VERSION).tar.gz
TG3_SITE = http://files.astlinux.org
TG3_DEPENDENCIES = linux
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 18:02:36
|
Revision: 7307
http://sourceforge.net/p/astlinux/code/7307
Author: abelbeck
Date: 2015-11-02 18:02:33 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
sudo, version bump to 1.8.15
Modified Paths:
--------------
branches/1.0/package/sudo/sudo.mk
Modified: branches/1.0/package/sudo/sudo.mk
===================================================================
--- branches/1.0/package/sudo/sudo.mk 2015-11-02 17:36:39 UTC (rev 7306)
+++ branches/1.0/package/sudo/sudo.mk 2015-11-02 18:02:33 UTC (rev 7307)
@@ -4,7 +4,7 @@
#
#############################################################
-SUDO_VERSION = 1.8.14p3
+SUDO_VERSION = 1.8.15
SUDO_SITE = http://www.sudo.ws/sudo/dist
# This is to avoid sudo's make install from chown()ing files which fails
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 17:36:42
|
Revision: 7306
http://sourceforge.net/p/astlinux/code/7306
Author: abelbeck
Date: 2015-11-02 17:36:39 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
ethtool, version bump to 4.2
Modified Paths:
--------------
branches/1.0/package/ethtool/ethtool.mk
Modified: branches/1.0/package/ethtool/ethtool.mk
===================================================================
--- branches/1.0/package/ethtool/ethtool.mk 2015-11-02 17:27:22 UTC (rev 7305)
+++ branches/1.0/package/ethtool/ethtool.mk 2015-11-02 17:36:39 UTC (rev 7306)
@@ -4,7 +4,7 @@
#
#############################################################
-ETHTOOL_VERSION = 4.0
+ETHTOOL_VERSION = 4.2
ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
$(eval $(call AUTOTARGETS,package,ethtool))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 17:27:25
|
Revision: 7305
http://sourceforge.net/p/astlinux/code/7305
Author: abelbeck
Date: 2015-11-02 17:27:22 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
libsodium, version bump to 1.0.6
Modified Paths:
--------------
branches/1.0/package/libsodium/libsodium.mk
Modified: branches/1.0/package/libsodium/libsodium.mk
===================================================================
--- branches/1.0/package/libsodium/libsodium.mk 2015-11-02 16:56:08 UTC (rev 7304)
+++ branches/1.0/package/libsodium/libsodium.mk 2015-11-02 17:27:22 UTC (rev 7305)
@@ -3,7 +3,7 @@
# libsodium
#
#############################################################
-LIBSODIUM_VERSION = 1.0.5
+LIBSODIUM_VERSION = 1.0.6
LIBSODIUM_SOURCE = libsodium-$(LIBSODIUM_VERSION).tar.gz
LIBSODIUM_SITE = http://download.dnscrypt.org/libsodium/releases
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 16:56:11
|
Revision: 7304
http://sourceforge.net/p/astlinux/code/7304
Author: abelbeck
Date: 2015-11-02 16:56:08 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
crond, pad 0's for logrotate entry, request from Michael Keuter
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond 2015-11-02 16:51:20 UTC (rev 7303)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond 2015-11-02 16:56:08 UTC (rev 7304)
@@ -17,7 +17,7 @@
echo "
##
## logrotate - Do not remove, comment-out to disable
-0 4 * * * /usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1" >> /var/spool/cron/crontabs/root
+00 04 * * * /usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1" >> /var/spool/cron/crontabs/root
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 16:51:23
|
Revision: 7303
http://sourceforge.net/p/astlinux/code/7303
Author: abelbeck
Date: 2015-11-02 16:51:20 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
web interface, add support for Connection Type: [Static IPv4/DHCPv6]
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/failover.php
branches/1.0/package/webinterface/altweb/admin/network.php
Modified: branches/1.0/package/webinterface/altweb/admin/failover.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/failover.php 2015-11-02 15:51:26 UTC (rev 7302)
+++ branches/1.0/package/webinterface/altweb/admin/failover.php 2015-11-02 16:51:20 UTC (rev 7303)
@@ -148,7 +148,7 @@
}
fwrite($fp, "### Static IPv4 Gateway\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+ if ($_POST['ip_type'] === 'dhcp-dhcpv6' || $_POST['ip_type'] === 'static-dhcpv6') {
$value = 'EXT2DHCPV6_CLIENT_ENABLE="yes"';
} else {
$value = 'EXT2DHCPV6_CLIENT_ENABLE="no"';
@@ -404,8 +404,10 @@
putHtml('<option value="dhcp">DHCP</option>');
$sel = (getVARdef($db, 'EXT2IP', $cur_db) === '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
- $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '') ? ' selected="selected"' : '';
+ $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) !== 'yes') ? ' selected="selected"' : '';
putHtml('<option value="static"'.$sel.'>Static IP</option>');
+ $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+ putHtml('<option value="static-dhcpv6"'.$sel.'>Static IPv4/DHCPv6</option>');
putHtml('</select>');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-02 15:51:26 UTC (rev 7302)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-02 16:51:20 UTC (rev 7303)
@@ -230,7 +230,7 @@
}
fwrite($fp, "### External Static IPv4 Gateway\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+ if ($_POST['ip_type'] === 'dhcp-dhcpv6' || $_POST['ip_type'] === 'static-dhcpv6') {
$value = 'DHCPV6_CLIENT_ENABLE="yes"';
} else {
$value = 'DHCPV6_CLIENT_ENABLE="no"';
@@ -1110,7 +1110,7 @@
} elseif ($result == 10) {
putHtml('<p style="color: green;">System is Rebooting... back in <span id="count_down"><script language="JavaScript" type="text/javascript">document.write(count_down_secs);</script></span> seconds.</p>');
} elseif ($result == 11) {
- putHtml('<p style="color: green;">Settings saved, click "Reboot/Restart" to apply any changed settings.</p>');
+ putHtml('<p style="color: green;">Settings saved, click "Reboot/Restart" to apply any changed settings, a "Reboot System" is required for Interface changes.</p>');
} elseif ($result == 21) {
putHtml('<p style="color: green;">PPPoE has Restarted.</p>');
} elseif ($result == 22) {
@@ -1307,8 +1307,10 @@
putHtml('<option value="dhcp">DHCP</option>');
$sel = (getVARdef($db, 'EXTIP', $cur_db) === '' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
- $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0') ? ' selected="selected"' : '';
+ $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) !== 'yes') ? ' selected="selected"' : '';
putHtml('<option value="static"'.$sel.'>Static IP</option>');
+ $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+ putHtml('<option value="static-dhcpv6"'.$sel.'>Static IPv4/DHCPv6</option>');
$sel = (getVARdef($db, 'EXTIF', $cur_db) === 'ppp0') ? ' selected="selected"' : '';
putHtml('<option value="pppoe"'.$sel.'>PPPoE</option>');
putHtml('</select>');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 15:51:28
|
Revision: 7302
http://sourceforge.net/p/astlinux/code/7302
Author: abelbeck
Date: 2015-11-02 15:51:26 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
dhcpv6, add support for [IPv4/DHCPv6], seems some ISP's will do this to pull static prefixes on business accounts
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action
Added: branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action 2015-11-02 15:51:26 UTC (rev 7302)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+interface="$1"
+
+action="$2"
+
+kill_dhcp6c()
+{
+ if [ -f "/var/run/dhcp6c-${interface}.pid" ]; then
+ kill $(cat "/var/run/dhcp6c-${interface}.pid") 2>/dev/null
+ sleep 1
+ fi
+}
+
+case $action in
+
+ up)
+ if [ -f "/etc/wide-dhcpv6/dhcp6c-${interface}.conf" ]; then
+ kill_dhcp6c
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-${interface}.conf -p /var/run/dhcp6c-${interface}.pid ${interface}
+ fi
+ ;;
+
+ down)
+ kill_dhcp6c
+ ;;
+
+esac
+
+exit 0
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/dhcp6c.action
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-11-01 23:55:07 UTC (rev 7301)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-11-02 15:51:26 UTC (rev 7302)
@@ -540,38 +540,7 @@
rm -f /tmp/etc/ppp/pppoe.conf
fi
- #Static IP
- if [ -n "$EXTIP" -a -n "$EXTIF" ] && ! isextppp extif; then
-
- case $EXTIF in
- wp)
- ;;
- hdlc0|pvc0)
- ip tunnel add $EXTIF mode ipip remote $EXTGW local $EXTIP
- ip link set dev $EXTIF up
- ;;
- *)
- ip addr add $EXTIP/$EXTNM brd + dev $EXTIF
- if [ -n "$EXTIP_ALIAS" ]; then
- alias_interface add $EXTIF "$EXTIP_ALIAS"
- fi
- if [ "$IPV6" = "yes" -a -n "$EXTIPV6" ]; then
- ip -6 addr add $EXTIPV6 dev $EXTIF
- fi
- ip link set dev $EXTIF up
- ;;
- esac
-
- if [ -n "$EXTGW" ]; then
- ip route add default via $EXTGW dev $EXTIF
- fi
- if [ "$IPV6" = "yes" -a -n "$EXTGWIPV6" ]; then
- ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
- fi
- #end static IP
- fi
-
- #Static IP on 2nd IF
+ #Static IP Failover Interface
if [ -n "$EXT2IP" -a -n "$EXT2IF" ] && ! isextppp ext2if; then
case $EXT2IF in
@@ -582,14 +551,24 @@
ip link set dev $EXT2IF up
;;
*)
+ up_delay=0
ip addr add $EXT2IP/$EXT2NM brd + dev $EXT2IF
if [ -n "$EXT2IP_ALIAS" ]; then
alias_interface add $EXT2IF "$EXT2IP_ALIAS"
fi
- if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" ]; then
- ip -6 addr add $EXT2IPV6 dev $EXT2IF
+ if [ "$IPV6" = "yes" ]; then
+ if [ "$EXT2DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ up_delay=4
+ init_dhcp6c ext2if $EXT2IF
+ ifplugd -apq -t2 -u3 -d3 -i $EXT2IF -r /etc/ifplugd/dhcp6c.action
+ elif [ -n "$EXT2IPV6" ]; then
+ ip -6 addr add $EXT2IPV6 dev $EXT2IF
+ fi
fi
ip link set dev $EXT2IF up
+ if [ $up_delay -gt 0 ]; then
+ sleep $up_delay
+ fi
;;
esac
@@ -606,6 +585,46 @@
#end static ip on 2nd if
fi
+ #Static IP
+ if [ -n "$EXTIP" -a -n "$EXTIF" ] && ! isextppp extif; then
+
+ case $EXTIF in
+ wp)
+ ;;
+ hdlc0|pvc0)
+ ip tunnel add $EXTIF mode ipip remote $EXTGW local $EXTIP
+ ip link set dev $EXTIF up
+ ;;
+ *)
+ ip addr add $EXTIP/$EXTNM brd + dev $EXTIF
+ if [ -n "$EXTIP_ALIAS" ]; then
+ alias_interface add $EXTIF "$EXTIP_ALIAS"
+ fi
+ if [ "$IPV6" = "yes" -a -n "$EXTIPV6" ] && \
+ [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
+ ip -6 addr add $EXTIPV6 dev $EXTIF
+ fi
+ ip link set dev $EXTIF up
+ if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ sleep 4
+ init_dhcp6c extif $EXTIF
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-$EXTIF.conf -p /var/run/dhcp6c-$EXTIF.pid $EXTIF
+ ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/dhcp6c.action
+ sleep 2
+ fi
+ ;;
+ esac
+
+ if [ -n "$EXTGW" ]; then
+ ip route add default via $EXTGW dev $EXTIF
+ fi
+ if [ "$IPV6" = "yes" -a -n "$EXTGWIPV6" ] && \
+ [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
+ ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
+ fi
+ #end static IP
+ fi
+
#DHCP Failover Interface
if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && ! isextppp ext2if; then
if [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" = "yes" ]; then
@@ -616,12 +635,15 @@
sleep 4
# No DHCPv6 - Static IPv6 if defined
- if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ] && \
- [ "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" ]; then
- ip -6 addr add $EXT2IPV6 dev $EXT2IF
- for x in $EXT2ROUTESIPV6; do
- ip -6 route add $x via $EXT2GWIPV6 dev $EXT2IF metric 1
- done
+ if [ "$IPV6" = "yes" ]; then
+ if [ -n "$EXT2IPV6" -a "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" ]; then
+ ip -6 addr add $EXT2IPV6 dev $EXT2IF
+ fi
+ if [ -n "$EXT2GWIPV6" ]; then
+ for x in $EXT2ROUTESIPV6; do
+ ip -6 route add $x via $EXT2GWIPV6 dev $EXT2IF metric 1
+ done
+ fi
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-01 23:55:09
|
Revision: 7301
http://sourceforge.net/p/astlinux/code/7301
Author: abelbeck
Date: 2015-11-01 23:55:07 +0000 (Sun, 01 Nov 2015)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2015-11-01 23:40:18 UTC (rev 7300)
+++ branches/1.0/docs/ChangeLog.txt 2015-11-01 23:55:07 UTC (rev 7301)
@@ -18,14 +18,20 @@
** Networking
+-- ntpd/sntp, version bump to 4.2.8p4, security fixes: CVE-2015-7871 plus 12 other low/medium-severity vulnerabilities
+
+-- wide-dhcpv6, new package, added support for DHCPv6 using dhcp6c for External and WAN Failover interfaces.
+ New rc.conf variables are: DHCPV6_CLIENT_ENABLE, DHCPV6_CLIENT_REQUEST_ADDRESS, DHCPV6_CLIENT_REQUEST_PREFIX,
+ DHCPV6_CLIENT_PREFIX_LEN, DHCPV6_CLIENT_PREFIX_HINT, EXT2DHCPV6_CLIENT_ENABLE
+
-- iperf3, new package, iperf3 is becomming more common, sits along side the old iperf since they are not compatible
--- ntpd/sntp, version bump to 4.2.8p4, security fixes: CVE-2015-7871 plus 12 other low/medium-severity vulnerabilities
-
-- fping, version bump to 3.13
-- sipgrep, version bump to 2.1.0
+-- arnofw (AIF), added upstream patch for Issue #21, Leave the IPv6 sysctl accept_ra setting alone when forwarding=1
+
** Asterisk
-- Asterisk 1.8.32.3 (no change), 11.20.0 (version bump) and 13.6.0 (version bump)
@@ -36,9 +42,13 @@
** Web Interface
--- No Change
+-- Network tab and and WAN Failover sub-tab, add DHCPv6 support with Connection Type: [DHCP/DHCPv6]
+ == External Interface supports Prefix Delegation and Request IPv6 Address
+ == WAN Failover Interface does not support Prefix Delegation, only Request IPv6 Address
+-- Network tab -> "IPv6 DHCPv6 Client Options:" adds External Interface DHCPv6 configuration options.
+
Additions for AstLinux 1.2.4.1:
===============================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-01 23:40:20
|
Revision: 7300
http://sourceforge.net/p/astlinux/code/7300
Author: abelbeck
Date: 2015-11-01 23:40:18 +0000 (Sun, 01 Nov 2015)
Log Message:
-----------
dhcpv6, support special case when DHCP/DHCPv6 is enabled but DHCPV6_CLIENT_REQUEST_ADDRESS=no, then allow a static IPv6 address to be assigned.
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-11-01 19:24:21 UTC (rev 7299)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-11-01 23:40:18 UTC (rev 7300)
@@ -616,7 +616,8 @@
sleep 4
# No DHCPv6 - Static IPv6 if defined
- if [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ]; then
+ if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ] && \
+ [ "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" ]; then
ip -6 addr add $EXT2IPV6 dev $EXT2IF
for x in $EXT2ROUTESIPV6; do
ip -6 route add $x via $EXT2GWIPV6 dev $EXT2IF metric 1
@@ -636,7 +637,8 @@
ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/udhcpc.action
# No DHCPv6 - Static IPv6 if defined
- if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" != "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ]; then
+ if [ "$IPV6" = "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ] && \
+ [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
ip -6 addr add $EXTIPV6 dev $EXTIF
ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-01 19:24:23
|
Revision: 7299
http://sourceforge.net/p/astlinux/code/7299
Author: abelbeck
Date: 2015-11-01 19:24:21 +0000 (Sun, 01 Nov 2015)
Log Message:
-----------
web interface, add DHCPv6 support, Network and Failover tabs
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/failover.php
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/common/license-packages.txt
branches/1.0/package/webinterface/altweb/common/version.php
Modified: branches/1.0/package/webinterface/altweb/admin/failover.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/failover.php 2015-11-01 15:26:48 UTC (rev 7298)
+++ branches/1.0/package/webinterface/altweb/admin/failover.php 2015-11-01 19:24:21 UTC (rev 7299)
@@ -8,6 +8,7 @@
// failover.php for AstLinux
// 11-06-2014
+// 11-01-2015, Added DHCPv6 option
//
// System location of rc.conf file
$CONFFILE = '/etc/rc.conf';
@@ -126,27 +127,34 @@
$value = 'WAN_FAILOVER_SECONDARY_GWIPV6="'.tuq($_POST['secondary_gw_ipv6']).'"';
fwrite($fp, $value."\n");
- if ($_POST['ip_type'] === 'dhcp') {
+ if ($_POST['ip_type'] === 'dhcp' || $_POST['ip_type'] === 'dhcp-dhcpv6') {
$value = 'EXT2IP=""';
} else {
$value = 'EXT2IP="'.tuq($_POST['static_ip']).'"';
}
fwrite($fp, "### Static IPv4\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp') {
+ if ($_POST['ip_type'] === 'dhcp' || $_POST['ip_type'] === 'dhcp-dhcpv6') {
$value = 'EXT2NM=""';
} else {
$value = 'EXT2NM="'.tuq($_POST['mask_ip']).'"';
}
fwrite($fp, "### Static IPv4 NetMask\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp') {
+ if ($_POST['ip_type'] === 'dhcp' || $_POST['ip_type'] === 'dhcp-dhcpv6') {
$value = 'EXT2GW=""';
} else {
$value = 'EXT2GW="'.tuq($_POST['gateway_ip']).'"';
}
fwrite($fp, "### Static IPv4 Gateway\n".$value."\n");
+ if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+ $value = 'EXT2DHCPV6_CLIENT_ENABLE="yes"';
+ } else {
+ $value = 'EXT2DHCPV6_CLIENT_ENABLE="no"';
+ }
+ fwrite($fp, "### DHCPv6\n".$value."\n");
+
$value = tuq($_POST['static_ipv6']);
if ($value !== '' && strpos($value, '/') === FALSE) {
$value="$value/64";
@@ -394,6 +402,8 @@
putHtml('</td><td style="text-align: left;" colspan="4">');
putHtml('<select name="ip_type">');
putHtml('<option value="dhcp">DHCP</option>');
+ $sel = (getVARdef($db, 'EXT2IP', $cur_db) === '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+ putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
$sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '') ? ' selected="selected"' : '';
putHtml('<option value="static"'.$sel.'>Static IP</option>');
putHtml('</select>');
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-01 15:26:48 UTC (rev 7298)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-01 19:24:21 UTC (rev 7299)
@@ -36,6 +36,7 @@
// 01-04-2014, Added NUT UPS Monitoring support
// 12-16-2014, Added Monit Monitoring support
// 08-21-2015, Added Fossil - Software Configuration Management
+// 11-01-2015, Added DHCPv6 support
//
// System location of rc.conf file
$CONFFILE = '/etc/rc.conf';
@@ -67,6 +68,18 @@
'africa.pool.ntp.org' => 'africa.pool.ntp.org'
);
+$select_dhcpv6_prefix_len = array (
+ '64' => '64',
+ '60' => '60',
+ '56' => '56',
+ '52' => '52',
+ '48' => '48',
+ '44' => '44',
+ '40' => '40',
+ '36' => '36',
+ '32' => '32'
+);
+
$select_dyndns = array (
'User Defined >>>' => '',
'DNS-O-Matic' => 'de...@dn...',
@@ -196,26 +209,33 @@
fwrite($fp, "### External PPPoE Interface\n".$x_value."\n");
fwrite($fp, "### External Interface\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp') {
+ if ($_POST['ip_type'] === 'dhcp' || $_POST['ip_type'] === 'dhcp-dhcpv6') {
$value = 'EXTIP=""';
} else {
$value = 'EXTIP="'.tuq($_POST['static_ip']).'"';
}
fwrite($fp, "### External Static IPv4\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp') {
+ if ($_POST['ip_type'] === 'dhcp' || $_POST['ip_type'] === 'dhcp-dhcpv6') {
$value = 'EXTNM=""';
} else {
$value = 'EXTNM="'.tuq($_POST['mask_ip']).'"';
}
fwrite($fp, "### External Static IPv4 NetMask\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp') {
+ if ($_POST['ip_type'] === 'dhcp' || $_POST['ip_type'] === 'dhcp-dhcpv6') {
$value = 'EXTGW=""';
} else {
$value = 'EXTGW="'.tuq($_POST['gateway_ip']).'"';
}
fwrite($fp, "### External Static IPv4 Gateway\n".$value."\n");
+
+ if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+ $value = 'DHCPV6_CLIENT_ENABLE="yes"';
+ } else {
+ $value = 'DHCPV6_CLIENT_ENABLE="no"';
+ }
+ fwrite($fp, "### DHCPv6\n".$value."\n");
$value = tuq($_POST['static_ipv6']);
if ($value !== '' && strpos($value, '/') === FALSE) {
@@ -540,6 +560,16 @@
$value = 'VPN="'.trim($x_value).'"';
fwrite($fp, "### VPN Type\n".$value."\n");
+ fwrite($fp, "### IPv6 DHCPv6 Client Options\n");
+ $value = 'DHCPV6_CLIENT_REQUEST_ADDRESS="'.$_POST['dhcpv6_client_request_address'].'"';
+ fwrite($fp, $value."\n");
+ $value = 'DHCPV6_CLIENT_REQUEST_PREFIX="'.$_POST['dhcpv6_client_request_prefix'].'"';
+ fwrite($fp, $value."\n");
+ $value = 'DHCPV6_CLIENT_PREFIX_LEN="'.$_POST['dhcpv6_client_prefix_len'].'"';
+ fwrite($fp, $value."\n");
+ $value = 'DHCPV6_CLIENT_PREFIX_HINT="'.$_POST['dhcpv6_client_prefix_hint'].'"';
+ fwrite($fp, $value."\n");
+
if (($value = $_POST['ipv6_tunnel_type']) !== '') {
$value .= '~'.($value === '6to4-relay' ? '0/0' : $_POST['ipv6_tunnel_server']);
$x_value = $_POST['ipv6_tunnel_endpoint'];
@@ -1275,6 +1305,8 @@
putHtml('Connection Type:');
putHtml('<select name="ip_type">');
putHtml('<option value="dhcp">DHCP</option>');
+ $sel = (getVARdef($db, 'EXTIP', $cur_db) === '' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+ putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
$sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0') ? ' selected="selected"' : '';
putHtml('<option value="static"'.$sel.'>Static IP</option>');
$sel = (getVARdef($db, 'EXTIF', $cur_db) === 'ppp0') ? ' selected="selected"' : '';
@@ -1847,6 +1879,51 @@
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
+ putHtml('<strong>IPv6 DHCPv6 Client Options:</strong>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
+ $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_ADDRESS', $cur_db);
+ putHtml('DHCPv6 Client Address:');
+ putHtml('<select name="dhcpv6_client_request_address">');
+ putHtml('<option value="no">disabled</option>');
+ $sel = ($value !== 'no') ? ' selected="selected"' : '';
+ putHtml('<option value="yes"'.$sel.'>enabled</option>');
+ putHtml('</select></td>');
+ putHtml('<td style="text-align: left;" colspan="3">');
+ if (($dhcpv6_client_prefix_len = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_LEN', $cur_db)) === '') {
+ $dhcpv6_client_prefix_len = '60';
+ }
+ putHtml('DHCPv6 Prefix Length:');
+ putHtml('<select name="dhcpv6_client_prefix_len">');
+ foreach ($select_dhcpv6_prefix_len as $key => $value) {
+ $sel = ($dhcpv6_client_prefix_len == $value) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
+ }
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
+ $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_PREFIX', $cur_db);
+ putHtml('DHCPv6 Prefix Delegation:');
+ putHtml('<select name="dhcpv6_client_request_prefix">');
+ putHtml('<option value="no">disabled</option>');
+ $sel = ($value !== 'no') ? ' selected="selected"' : '';
+ putHtml('<option value="yes"'.$sel.'>enabled</option>');
+ putHtml('</select></td>');
+ putHtml('<td style="text-align: left;" colspan="3">');
+ $value = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_HINT', $cur_db);
+ putHtml('DHCPv6 Prefix Length Hint:');
+ putHtml('<select name="dhcpv6_client_prefix_hint">');
+ putHtml('<option value="no">disabled</option>');
+ $sel = ($value !== 'no') ? ' selected="selected"' : '';
+ putHtml('<option value="yes"'.$sel.'>enabled</option>');
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
+
+ putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
putHtml('<strong>IPv6 Tunnel (6in4, 6to4):</strong>');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt 2015-11-01 15:26:48 UTC (rev 7298)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt 2015-11-01 19:24:21 UTC (rev 7299)
@@ -55,3 +55,5 @@
sqlite~Copyright (c) 1995-2015, SQLite Consortium
sqliteodbc~Copyright (c) 2001-2015, Christian Werner
Fossil~Copyright (c) 2007-2015 D. Richard Hipp. All rights reserved.
+BusyBox~Copyright (c) 1998-2011 Erik Andersen, Rob Landley, Denys Vlasenko, et al.
+dhcp6c~Copyright (c) 1998-2008 WIDE Project.
Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php 2015-11-01 15:26:48 UTC (rev 7298)
+++ branches/1.0/package/webinterface/altweb/common/version.php 2015-11-01 19:24:21 UTC (rev 7299)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.8.34';
+$GUI_VERSION = '1.8.35';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-01 15:26:51
|
Revision: 7298
http://sourceforge.net/p/astlinux/code/7298
Author: abelbeck
Date: 2015-11-01 15:26:48 +0000 (Sun, 01 Nov 2015)
Log Message:
-----------
dhcpv6, add support for the Failover Interface, no Prefix Delegation, only Request IPv6 Address
Modified Paths:
--------------
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/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-10-31 02:54:00 UTC (rev 7297)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-11-01 15:26:48 UTC (rev 7298)
@@ -54,6 +54,20 @@
return 0
}
+gen_nopd_dhcp6c_conf()
+{
+ local interface="$1"
+
+ echo "# Autogenerated. Do not edit.
+interface $interface {
+ send ia-na 1;
+ send rapid-commit;
+};
+
+id-assoc na 1 { };"
+
+}
+
gen_dhcp6c_conf()
{
local interface="$1" len id iname int IFS
@@ -135,14 +149,18 @@
init_dhcp6c()
{
- local interface="$1"
+ local iname="$1" interface="$2"
sysctl -w net/ipv6/conf/${interface}/accept_ra=2 >/dev/null
# Make DUID persistant
ln -sf /mnt/kd/dhcp6c_duid /var/db/dhcp6c_duid
- gen_dhcp6c_conf $interface > /etc/wide-dhcpv6/dhcp6c-${interface}.conf
+ if [ "$iname" = "ext2if" ]; then
+ gen_nopd_dhcp6c_conf $interface > /etc/wide-dhcpv6/dhcp6c-${interface}.conf
+ else
+ gen_dhcp6c_conf $interface > /etc/wide-dhcpv6/dhcp6c-${interface}.conf
+ fi
}
ipv6_tunnel()
@@ -590,12 +608,15 @@
#DHCP Failover Interface
if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && ! isextppp ext2if; then
+ if [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ init_dhcp6c ext2if $EXT2IF
+ fi
ifplugd -apq -t2 -u3 -d3 -i $EXT2IF -r /etc/ifplugd/udhcpc.action
ip link set dev $EXT2IF up
sleep 4
# No DHCPv6 - Static IPv6 if defined
- if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ]; then
+ if [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" != "yes" -a -n "$EXT2IPV6" -a -n "$EXT2GWIPV6" ]; then
ip -6 addr add $EXT2IPV6 dev $EXT2IF
for x in $EXT2ROUTESIPV6; do
ip -6 route add $x via $EXT2GWIPV6 dev $EXT2IF metric 1
@@ -608,7 +629,7 @@
ip link set dev $EXTIF up
sleep 4
if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
- init_dhcp6c $EXTIF
+ init_dhcp6c extif $EXTIF
dhcp6c -c /etc/wide-dhcpv6/dhcp6c-$EXTIF.conf -p /var/run/dhcp6c-$EXTIF.pid $EXTIF
fi
udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXTIF.pid -i $EXTIF
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-10-31 02:54:00 UTC (rev 7297)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-11-01 15:26:48 UTC (rev 7298)
@@ -242,12 +242,16 @@
#IPV6_AUTOCONF="INTIF"
## DHCPv6 Client
-## Enable DHCPv6 client by setting DHCPV6_CLIENT_ENABLE="yes"
+## Enable DHCPv6 client on EXTIF by setting DHCPV6_CLIENT_ENABLE="yes"
#DHCPV6_CLIENT_ENABLE="yes"
#DHCPV6_CLIENT_REQUEST_ADDRESS="yes" # Request IPv6 Address, disable with "no", defaults to "yes"
#DHCPV6_CLIENT_REQUEST_PREFIX="yes" # Request Prefix Delegation, disable with "no", defaults to "yes"
#DHCPV6_CLIENT_PREFIX_LEN="60" # Prefix Delegation Length, defaults to "60"
#DHCPV6_CLIENT_PREFIX_HINT="yes" # Request the Prefix Delegation Length, disable with "no", defaults to "yes"
+##
+## Enable DHCPv6 client on EXT2IF by setting EXT2DHCPV6_CLIENT_ENABLE="yes"
+## Note: No Prefix Delegation, only Request IPv6 Address
+#EXT2DHCPV6_CLIENT_ENABLE="yes"
## Configure IPv6 tunnel gateway for 6in4 and 6to4
## Supported Types: "6in4-static" "6to4-relay"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-10-31 02:54:02
|
Revision: 7297
http://sourceforge.net/p/astlinux/code/7297
Author: abelbeck
Date: 2015-10-31 02:54:00 +0000 (Sat, 31 Oct 2015)
Log Message:
-----------
dhcpv6, special-case tweak in config file creation
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-10-30 22:06:14 UTC (rev 7296)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-10-31 02:54:00 UTC (rev 7297)
@@ -121,11 +121,11 @@
ifid 1;
};"
id=$((id+1))
- fi
- # Only assign one interface given only a /64 prefix
- if [ $len -eq 64 ]; then
- break
+ # Only assign one interface given only a /64 prefix
+ if [ $len -eq 64 ]; then
+ break
+ fi
fi
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-10-30 22:06:16
|
Revision: 7296
http://sourceforge.net/p/astlinux/code/7296
Author: abelbeck
Date: 2015-10-30 22:06:14 +0000 (Fri, 30 Oct 2015)
Log Message:
-----------
Add DHCPv6 Client, including Prefix Delegation. Enable with DHCPV6_CLIENT_ENABLE="yes" and reboot, needs testing
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/astlinux-ast11.config 2015-10-30 22:06:14 UTC (rev 7296)
@@ -799,7 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIDE_DHCPV6 is not set
+BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/astlinux-ast13.config 2015-10-30 22:06:14 UTC (rev 7296)
@@ -799,7 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIDE_DHCPV6 is not set
+BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/astlinux18.config 2015-10-30 22:06:14 UTC (rev 7296)
@@ -799,7 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIDE_DHCPV6 is not set
+BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Added: branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch
===================================================================
--- branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch (rev 0)
+++ branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch 2015-10-30 22:06:14 UTC (rev 7296)
@@ -0,0 +1,11 @@
+--- arno-iptables-firewall_2.0.1f/bin/arno-iptables-firewall.orig 2015-10-30 15:52:23.000000000 -0500
++++ arno-iptables-firewall_2.0.1f/bin/arno-iptables-firewall 2015-10-30 16:00:37.000000000 -0500
+@@ -495,7 +495,7 @@
+ sysctl_set_all "net.ipv6.conf" "forwarding" 1
+ echo " Disabling Local IPv6 Auto-Configuration"
+ sysctl_set_all "net.ipv6.conf" "autoconf" 0
+- sysctl_set_all "net.ipv6.conf" "accept_ra" 0
++ ## Setting accept_ra=0 is not needed with forwarding=1, don't overwrite any existing accept_ra=2 values
+ fi
+ elif [ "$IP_FORWARDING" = "0" ]; then
+ echo " DISABLING packet forwarding"
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-10-30 22:06:14 UTC (rev 7296)
@@ -119,7 +119,7 @@
addIPV6net()
{
# args: IF, tag
- local interface="$1" tag="$2" prefix="" iname IFS
+ local interface="$1" tag="$2" dhcpv6="" prefix="" iname IFS
if [ "$IPV6" != "yes" ]; then
return 2
@@ -130,24 +130,28 @@
case $iname in
INTIF)
if [ "$tag" = "lan" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$INTIPV6")"
break
fi
;;
INT2IF)
if [ "$tag" = "lan2" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$INT2IPV6")"
break
fi
;;
INT3IF)
if [ "$tag" = "lan3" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$INT3IPV6")"
break
fi
;;
DMZIF)
if [ "$tag" = "dmz" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$DMZIPV6")"
break
fi
@@ -155,8 +159,12 @@
esac
done
- if [ -n "$prefix" ]; then
+ if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
echo "
+dhcp-range=$tag,::1,constructor:$interface,ra-only,24h"
+ return 0
+ elif [ -n "$prefix" ]; then
+ echo "
dhcp-range=$tag,$prefix,ra-only,64,24h"
return 0
fi
Modified: branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action 2015-10-30 22:06:14 UTC (rev 7296)
@@ -4,6 +4,14 @@
action="$2"
+kill_dhcp6c()
+{
+ if [ -f "/var/run/dhcp6c-${interface}.pid" ]; then
+ kill $(cat "/var/run/dhcp6c-${interface}.pid") 2>/dev/null
+ sleep 1
+ fi
+}
+
kill_udhcpc()
{
if [ -f "/var/run/udhcpc-${interface}.pid" ]; then
@@ -15,11 +23,16 @@
case $action in
up)
+ if [ -f "/etc/wide-dhcpv6/dhcp6c-${interface}.conf" ]; then
+ kill_dhcp6c
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-${interface}.conf -p /var/run/dhcp6c-${interface}.pid ${interface}
+ fi
kill_udhcpc
udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $(uname -n) -p /var/run/udhcpc-${interface}.pid -i ${interface}
;;
down)
+ kill_dhcp6c
kill_udhcpc
;;
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-10-30 22:06:14 UTC (rev 7296)
@@ -54,6 +54,97 @@
return 0
}
+gen_dhcp6c_conf()
+{
+ local interface="$1" len id iname int IFS
+
+ len="${DHCPV6_CLIENT_PREFIX_LEN:-60}"
+
+ # Sanity check the prefix length
+ if [ $len -lt 8 -o $len -gt 64 ]; then
+ len="60"
+ fi
+
+ echo "# Autogenerated. Do not edit.
+interface $interface {"
+ if [ "$DHCPV6_CLIENT_REQUEST_ADDRESS" != "no" ]; then
+ echo " send ia-na 1;"
+ fi
+ if [ "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
+ echo " send ia-pd 1;"
+ fi
+ echo " send rapid-commit;"
+ echo "};"
+
+ if [ "$DHCPV6_CLIENT_REQUEST_ADDRESS" != "no" ]; then
+ echo "
+id-assoc na 1 { };"
+ fi
+
+ if [ "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
+ echo "
+id-assoc pd 1 {"
+ if [ "$DHCPV6_CLIENT_PREFIX_HINT" != "no" ]; then
+ echo " prefix ::/$len infinity;"
+ fi
+
+ id=0
+ unset IFS
+ for iname in $IPV6_AUTOCONF; do
+ int=""
+ case $iname in
+ INTIF)
+ if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" ]; then
+ int="$INTIF"
+ fi
+ ;;
+ INT2IF)
+ if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" ]; then
+ int="$INT2IF"
+ fi
+ ;;
+ INT3IF)
+ if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" ]; then
+ int="$INT3IF"
+ fi
+ ;;
+ DMZIF)
+ if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
+ int="$DMZIF"
+ fi
+ ;;
+ esac
+ if [ -n "$int" ]; then
+ echo " prefix-interface $int {
+ sla-id $id;
+ sla-len $((64-len));
+ ifid 1;
+ };"
+ id=$((id+1))
+ fi
+
+ # Only assign one interface given only a /64 prefix
+ if [ $len -eq 64 ]; then
+ break
+ fi
+ done
+
+ echo "};"
+ fi
+}
+
+init_dhcp6c()
+{
+ local interface="$1"
+
+ sysctl -w net/ipv6/conf/${interface}/accept_ra=2 >/dev/null
+
+ # Make DUID persistant
+ ln -sf /mnt/kd/dhcp6c_duid /var/db/dhcp6c_duid
+
+ gen_dhcp6c_conf $interface > /etc/wide-dhcpv6/dhcp6c-${interface}.conf
+}
+
ipv6_tunnel()
{
local action="$1" type local_addr remote_addr endpoint_addr
@@ -135,6 +226,8 @@
init () {
+ mkdir -p /tmp/etc/wide-dhcpv6
+
if [ -n "$IFRENAME" ]; then
#clear existing iftabs
@@ -514,11 +607,15 @@
if [ -n "$EXTIF" -a -z "$EXTIP" ] && ! isextppp extif; then
ip link set dev $EXTIF up
sleep 4
+ if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ init_dhcp6c $EXTIF
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-$EXTIF.conf -p /var/run/dhcp6c-$EXTIF.pid $EXTIF
+ fi
udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXTIF.pid -i $EXTIF
ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/udhcpc.action
# No DHCPv6 - Static IPv6 if defined
- if [ "$IPV6" = "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ]; then
+ if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" != "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ]; then
ip -6 addr add $EXTIPV6 dev $EXTIF
ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
fi
@@ -555,6 +652,11 @@
kill $(cat "$PID")
done
+ for PID in $(ls -1 /var/run/dhcp6c-*.pid 2>/dev/null); do
+ echo "Stopping dhcp6c..."
+ kill $(cat "$PID")
+ done
+
for PID in $(ls -1 /var/run/udhcpc-*.pid 2>/dev/null); do
echo "Stopping udhcpc..."
kill $(cat "$PID")
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-10-30 22:06:14 UTC (rev 7296)
@@ -234,13 +234,21 @@
## DMZ IPv6 address
#DMZIPV6="2001:db8:20::1/64"
-## Configure IPv6 Router Advertisement Daemon (radvd)
+## 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
## "DMZIF" for DMZ Interface
## Note: the autoconf prefix is derived from the IPv6 address on the interface, which must be defined.
#IPV6_AUTOCONF="INTIF"
+## DHCPv6 Client
+## Enable DHCPv6 client by setting DHCPV6_CLIENT_ENABLE="yes"
+#DHCPV6_CLIENT_ENABLE="yes"
+#DHCPV6_CLIENT_REQUEST_ADDRESS="yes" # Request IPv6 Address, disable with "no", defaults to "yes"
+#DHCPV6_CLIENT_REQUEST_PREFIX="yes" # Request Prefix Delegation, disable with "no", defaults to "yes"
+#DHCPV6_CLIENT_PREFIX_LEN="60" # Prefix Delegation Length, defaults to "60"
+#DHCPV6_CLIENT_PREFIX_HINT="yes" # Request the Prefix Delegation Length, disable with "no", defaults to "yes"
+
## Configure IPv6 tunnel gateway for 6in4 and 6to4
## Supported Types: "6in4-static" "6to4-relay"
## Define 3 ~ (tilde) separated arguments
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
