astlinux-commits — Commits to the AstLinux SVN repository

[Astlinux-commits] SF.net SVN: astlinux:[8377] branches/1.0/package/wide-dhcpv6/dhcp6c.script

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

Revision: 8377
          http://sourceforge.net/p/astlinux/code/8377
Author:   abelbeck
Date:     2017-06-07 11:47:22 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
wide-dhcpv6, dhcp6c.script, call the optional user script at the end and always perform basic logging and NPTv6 updates.  Filter out ULA's.

Modified Paths:
--------------
    branches/1.0/package/wide-dhcpv6/dhcp6c.script

Modified: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script	2017-06-06 18:41:06 UTC (rev 8376)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script	2017-06-07 11:47:22 UTC (rev 8377)
@@ -14,6 +14,7 @@
 
   ip -6 -o addr show dev $interface scope global 2>/dev/null | \
     sed -n -r -e 's|^.* inet6 ([0-9a-fA-F:]+)/.*$|\1|p' | \
+    grep -i -v '^fd' | \
     head -n1
 }
 
@@ -132,6 +133,21 @@
 ## Create dhcp6c_cache file
 setup_env
 
+if [ -n "$dhcp6c_prefix" ]; then
+  case "$dhcp6c_changed" in
+    yes) changed=" (changed)" ;;
+     no) changed=" (no change)" ;;
+      *) changed="" ;;
+  esac
+  logger -t dhcp6c -p kern.info "IPv6 Prefix$changed: $dhcp6c_prefix"
+
+  if [ "$dhcp6c_changed" != "no" ]; then
+    if [ -f /var/tmp/aif-net-prefix-translation-global-ipv6 ]; then
+      arno-iptables-firewall status-plugins net-prefix-translation >/dev/null 2>&1
+    fi
+  fi
+fi
+
 if [ -x $SCRIPTFILE ]; then
   export dhcp6c_interface dhcp6c_address dhcp6c_changed
   export dhcp6c_prefix_interfaces dhcp6c_prefix_addresses
@@ -138,21 +154,6 @@
   export dhcp6c_prefix dhcp6c_prefix_base dhcp6c_prefix_len
 
   $SCRIPTFILE >/dev/null 2>&1 &
-else
-  if [ -n "$dhcp6c_prefix" ]; then
-    case "$dhcp6c_changed" in
-      yes) changed=" (changed)" ;;
-       no) changed=" (no change)" ;;
-        *) changed="" ;;
-    esac
-    logger -t dhcp6c -p kern.info "IPv6 Prefix$changed: $dhcp6c_prefix"
-
-    if [ "$dhcp6c_changed" != "no" ]; then
-      if [ -f /var/tmp/aif-net-prefix-translation-global-ipv6 ]; then
-        arno-iptables-firewall status-plugins net-prefix-translation >/dev/null 2>&1 &
-      fi
-    fi
-  fi
 fi
 
 exit 0

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

[Astlinux-commits] SF.net SVN: astlinux:[8376] branches/1.0/package/ddclient/ ddclient-0001-upstream-add-ipv6-address-type-selector.patch

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

Revision: 8376
          http://sourceforge.net/p/astlinux/code/8376
Author:   abelbeck
Date:     2017-06-06 18:41:06 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
ddclient, get-ipv6-from-ipv4, add optional options: gua, ula, lla or all. Defaults to: gua

Added Paths:
-----------
    branches/1.0/package/ddclient/ddclient-0001-upstream-add-ipv6-address-type-selector.patch

Added: branches/1.0/package/ddclient/ddclient-0001-upstream-add-ipv6-address-type-selector.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-0001-upstream-add-ipv6-address-type-selector.patch	                        (rev 0)
+++ branches/1.0/package/ddclient/ddclient-0001-upstream-add-ipv6-address-type-selector.patch	2017-06-06 18:41:06 UTC (rev 8376)
@@ -0,0 +1,176 @@
+From e1b846ed6058b292766d5f94df6bfb62b2fb4a49 Mon Sep 17 00:00:00 2001
+From: Lonnie Abelbeck <lo...@ab...>
+Date: Tue, 6 Jun 2017 13:08:57 -0500
+Subject: [PATCH] get-ipv6-from-ipv4.pl, add optional options: gua, ula, lla or
+ all. Defaults to: gua
+
+---
+ contrib/get-ipv6-from-ipv4/get-ipv6-from-ipv4.pl | 97 +++++++++++++++++++-----
+ 1 file changed, 76 insertions(+), 21 deletions(-)
+
+diff --git a/contrib/get-ipv6-from-ipv4/get-ipv6-from-ipv4.pl b/contrib/get-ipv6-from-ipv4/get-ipv6-from-ipv4.pl
+index fc6209b..32781b9 100644
+--- a/contrib/get-ipv6-from-ipv4/get-ipv6-from-ipv4.pl
++++ b/contrib/get-ipv6-from-ipv4/get-ipv6-from-ipv4.pl
+@@ -3,7 +3,7 @@
+ ##
+ ## Get IPv6 global address given it's IPv4 address or hostname
+ ##
+-## Usage: get-ipv6-from-ipv4 address|hostname
++## Usage: get-ipv6-from-ipv4 address|hostname [gua|ula|lla|all]
+ ##
+ ## Return IPv6 global address in stdout
+ ##
+@@ -13,8 +13,10 @@
+ 
+ my $hostv4 = $ARGV[0];
+ 
++my $type = $ARGV[1];
++
+ sub usage {
+-  print STDERR "Usage: get-ipv6-from-ipv4 address|hostname\n";
++  print STDERR "Usage: get-ipv6-from-ipv4 address|hostname [gua|ula|lla|all]\n";
+   exit 1;
+ }
+ 
+@@ -28,6 +30,10 @@ sub error {
+   usage;
+ }
+ 
++if (!defined $type || ($type ne 'ula' && $type ne 'lla' && $type ne 'all')) {
++  $type = 'gua';
++}
++
+ # Add hostv4 entry to ARP table
+ `fping -c 1 $hostv4 >/dev/null 2>&1`;
+ 
+@@ -41,9 +47,29 @@ sub error {
+   error "No entry in ARP table for host: $hostv4";
+ }
+ 
++my $gua_srcv6;
++my $ula_srcv6;
++my $srcv6;
++my $ipv6;
+ my $ip_cmd = `ip -6 -o addr show dev $int scope global 2>/dev/null`;
+-
+-my $srcv6 = $1 if $ip_cmd =~ /^.*? inet6 ([0-9a-fA-F:]+)\//s;
++my @lines = split('\n', $ip_cmd);
++foreach my $line (@lines) {
++  if ($line =~ /^.* inet6 ([0-9a-fA-F:]+)\//) {
++    $ipv6 = $1;
++    if ($ipv6 =~ /^fd/i) {
++      $ula_srcv6 = $ipv6 if !defined $ula_srcv6;
++    } else {
++      $gua_srcv6 = $ipv6 if !defined $gua_srcv6;
++    }
++  }
++}
++if ($type eq 'ula') {
++  $srcv6 = $gua_srcv6 if defined $gua_srcv6;
++  $srcv6 = $ula_srcv6 if defined $ula_srcv6;
++} else {
++  $srcv6 = $ula_srcv6 if defined $ula_srcv6;
++  $srcv6 = $gua_srcv6 if defined $gua_srcv6;
++}
+ 
+ if (!defined $srcv6) {
+   error "No IPv6 global address for interface: $int";
+@@ -56,51 +82,80 @@ sub error {
+ sleep 5;
+ 
+ # Output the first IPv6 global address matching the MAC address
+-my $llhostv6;
+-my $hostv6;
++my $gua_hostv6;
++my $ula_hostv6;
++my $lla_hostv6;
+ $ip_cmd = `ip -6 neigh show dev $int`;
+-my @lines = split('\n', $ip_cmd);
++@lines = split('\n', $ip_cmd);
+ foreach my $line (@lines) {
+   if ($line =~ /^fe80::/i) {
+     if ($line =~ /^([0-9a-f:]+) .*lladdr ${mac}/i) {
+-      $llhostv6 = $1;
++      $lla_hostv6 = $1 if !defined $lla_hostv6;
+     }
+   } else {
+     if ($line =~ /^([0-9a-f:]+) .*lladdr ${mac}/i) {
+-      $hostv6 = $1;
+-      last;
++      $ipv6 = $1;
++      if ($ipv6 =~ /^fd/i) {
++        $ula_hostv6 = $ipv6 if !defined $ula_hostv6;
++      } else {
++        $gua_hostv6 = $ipv6 if !defined $gua_hostv6;
++      }
+     }
+   }
+ }
+-if (defined $hostv6) {
+-  print "$hostv6\n";
++if (defined $gua_hostv6 && $type eq 'gua') {
++  print "$gua_hostv6\n";
++  exit 0;
++} elsif (defined $ula_hostv6 && $type eq 'ula') {
++  print "$ula_hostv6\n";
+   exit 0;
+-} elsif (!defined $llhostv6) {
++} elsif (defined $lla_hostv6 && $type eq 'lla') {
++  print "$lla_hostv6\n";
++  exit 0;
++}
++if (!defined $lla_hostv6) {
+   exit 1;
+ }
+ 
+ # Generate the IPv6 EUI-64 format from the prefix and link-local host
+ my @p = split(':', $srcv6);
+-my @h = split(':', $llhostv6);
+-$hostv6 = join(':', $p[0], $p[1], $p[2], $p[3], $h[$#h-3], $h[$#h-2], $h[$#h-1], $h[$#h]);
++my @h = split(':', $lla_hostv6);
++$ipv6 = join(':', $p[0], $p[1], $p[2], $p[3], $h[$#h-3], $h[$#h-2], $h[$#h-1], $h[$#h]);
+ 
+ # Try again with the IPv6 EUI-64 format
+-`fping6 -I $int -c 2 -S $srcv6 $hostv6 >/dev/null 2>&1`;
++`fping6 -I $int -c 2 -S $srcv6 $ipv6 >/dev/null 2>&1`;
+ 
+ # Wait for Neighbor Discovery to settle
+ sleep 1;
+ 
+ # Output the first IPv6 global address matching the MAC address
+-undef $hostv6;
++undef $gua_hostv6;
++undef $ula_hostv6;
+ $ip_cmd = `ip -6 neigh show dev $int`;
+ @lines = split('\n', $ip_cmd);
+ foreach my $line (@lines) {
+   if (!($line =~ /^fe80::/i)) {
+     if ($line =~ /^([0-9a-f:]+) .*lladdr ${mac}/i) {
+-      $hostv6 = $1;
+-      last;
++      $ipv6 = $1;
++      if ($ipv6 =~ /^fd/i) {
++        $ula_hostv6 = $ipv6 if !defined $ula_hostv6;
++      } else {
++        $gua_hostv6 = $ipv6 if !defined $gua_hostv6;
++      }
+     }
+   }
+ }
+-print "$hostv6\n" if defined $hostv6;
+-exit 0;
++if ($type eq 'all') {
++  print "$gua_hostv6\n" if defined $gua_hostv6;
++  print "$ula_hostv6\n" if defined $ula_hostv6;
++  print "$lla_hostv6\n" if defined $lla_hostv6;
++  exit 0;
++}
++if (defined $gua_hostv6 && $type eq 'gua') {
++  print "$gua_hostv6\n";
++  exit 0;
++} elsif (defined $ula_hostv6 && $type eq 'ula') {
++  print "$ula_hostv6\n";
++  exit 0;
++}
++exit 1;

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

[Astlinux-commits] SF.net SVN: astlinux:[8375] branches/1.0/package/wide-dhcpv6/ wide-dhcpv6-0004-GNU-libc6-fixes.patch

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

Revision: 8375
          http://sourceforge.net/p/astlinux/code/8375
Author:   abelbeck
Date:     2017-06-05 21:56:40 +0000 (Mon, 05 Jun 2017)
Log Message:
-----------
wide-dhcpv6, change 'failed to open /etc/wide-dhcpv6/dhcp6cctlkey:' from LOG_ERR to LOG_NOTICE so it no longer confuses users.

Modified Paths:
--------------
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch

Modified: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch	2017-06-04 16:06:36 UTC (rev 8374)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch	2017-06-05 21:56:40 UTC (rev 8375)
@@ -2420,7 +2420,7 @@
  
  	if ((fp = fopen(keyfile, "r")) == NULL) {
 -		dprintf(LOG_ERR, FNAME, "failed to open %s: %s", keyfile,
-+		debug_printf(LOG_ERR, FNAME, "failed to open %s: %s", keyfile,
++		debug_printf(LOG_NOTICE, FNAME, "failed to open %s: %s", keyfile,
  		    strerror(errno));
  		return (-1);
  	}

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

[Astlinux-commits] SF.net SVN: astlinux:[8374] branches/1.0/project/astlinux/kernel-patches/ linux-510-x86-HPET-force-enable-for-e6xx-based-systems.patch

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

Revision: 8374
          http://sourceforge.net/p/astlinux/code/8374
Author:   abelbeck
Date:     2017-06-04 16:06:36 +0000 (Sun, 04 Jun 2017)
Log Message:
-----------
kernel, add patch for x86: HPET force enable for e6xx based systems, Available in Linux 3.18 and later
As the Soekris net6501 and other e6xx based systems do not have any ACPI implementation, HPET won't get enabled.
This patch enables HPET on such platforms.

Added Paths:
-----------
    branches/1.0/project/astlinux/kernel-patches/linux-510-x86-HPET-force-enable-for-e6xx-based-systems.patch

Added: branches/1.0/project/astlinux/kernel-patches/linux-510-x86-HPET-force-enable-for-e6xx-based-systems.patch
===================================================================
--- branches/1.0/project/astlinux/kernel-patches/linux-510-x86-HPET-force-enable-for-e6xx-based-systems.patch	                        (rev 0)
+++ branches/1.0/project/astlinux/kernel-patches/linux-510-x86-HPET-force-enable-for-e6xx-based-systems.patch	2017-06-04 16:06:36 UTC (rev 8374)
@@ -0,0 +1,41 @@
+diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
+index ff898bb..176a0f9 100644
+--- a/arch/x86/kernel/quirks.c
++++ b/arch/x86/kernel/quirks.c
+@@ -498,6 +498,24 @@ void force_hpet_resume(void)
+ }
+
+ /*
++ * According to the datasheet e6xx systems have the HPET hardwired to
++ * 0xfed00000
++ */
++static void e6xx_force_enable_hpet(struct pci_dev *dev)
++{
++	if (hpet_address || force_hpet_address)
++		return;
++
++	force_hpet_address = 0xFED00000;
++	force_hpet_resume_type = NONE_FORCE_HPET_RESUME;
++	dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at "
++		"0x%lx\n", force_hpet_address);
++	return;
++}
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E6XX_CU,
++			 e6xx_force_enable_hpet);
++
++/*
+  * HPET MSI on some boards (ATI SB700/SB800) has side effect on
+  * floppy DMA. Disable HPET MSI on such platforms.
+  * See erratum #27 (Misinterpreted MSI Requests May Result in
+diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
+index 6ed0bb7..aa0d390 100644
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -2859,6 +2859,7 @@
+ #define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
+ #define PCI_DEVICE_ID_INTEL_SCH_LPC	0x8119
+ #define PCI_DEVICE_ID_INTEL_SCH_IDE	0x811a
++#define PCI_DEVICE_ID_INTEL_E6XX_CU	0x8183
+ #define PCI_DEVICE_ID_INTEL_ITC_LPC	0x8186
+ #define PCI_DEVICE_ID_INTEL_82454GX	0x84c4
+ #define PCI_DEVICE_ID_INTEL_82450GX	0x84c5

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

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

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

Revision: 8373
          http://sourceforge.net/p/astlinux/code/8373
Author:   abelbeck
Date:     2017-06-03 12:19:20 +0000 (Sat, 03 Jun 2017)
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	2017-06-03 12:16:09 UTC (rev 8372)
+++ branches/1.0/docs/ChangeLog.txt	2017-06-03 12:19:20 UTC (rev 8373)
@@ -27,6 +27,8 @@
    Added kernel drivers: virtio_net and virtio-scsi
    Note: Now uses a PAE kernel for full RAM support
 
+-- igb, version bump to 5.3.5.4, Intel Gigabit Ethernet Network Driver
+
 -- r8168 version bump to 8.044.02 RealTek PCI-Express Gigabit Ethernet Linux driver
 
 -- genx86_64-vm board type, add support for virtio-scsi as a bootable disk driver, also added to RUNNIX.
@@ -39,6 +41,8 @@
 
 -- sudo, version bump to 1.8.20p2, security fix: CVE-2017-1000367
 
+-- ethtool, version bump to 4.11
+
 -- dialog, version bump to 1.3-20170509
 
 -- strace, version bump to 4.17

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

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

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

Revision: 8372
          http://sourceforge.net/p/astlinux/code/8372
Author:   abelbeck
Date:     2017-06-03 12:16:09 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
dmidecode (custom build), version bump to 3.1

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

Modified: branches/1.0/package/dmidecode/dmidecode.mk
===================================================================
--- branches/1.0/package/dmidecode/dmidecode.mk	2017-06-03 12:07:27 UTC (rev 8371)
+++ branches/1.0/package/dmidecode/dmidecode.mk	2017-06-03 12:16:09 UTC (rev 8372)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DMIDECODE_VERSION = 3.0
+DMIDECODE_VERSION = 3.1
 DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
 
 define DMIDECODE_BUILD_CMDS

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

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

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

Revision: 8371
          http://sourceforge.net/p/astlinux/code/8371
Author:   abelbeck
Date:     2017-06-03 12:07:27 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
ethtool, version bump to 4.11

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

Modified: branches/1.0/package/ethtool/ethtool.mk
===================================================================
--- branches/1.0/package/ethtool/ethtool.mk	2017-06-03 11:57:04 UTC (rev 8370)
+++ branches/1.0/package/ethtool/ethtool.mk	2017-06-03 12:07:27 UTC (rev 8371)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 4.8
+ETHTOOL_VERSION = 4.11
 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.

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

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

Revision: 8370
          http://sourceforge.net/p/astlinux/code/8370
Author:   abelbeck
Date:     2017-06-03 11:57:04 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
igb NIC driver, version bump to 5.3.5.4

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

Modified: branches/1.0/package/igb/igb.mk
===================================================================
--- branches/1.0/package/igb/igb.mk	2017-06-02 22:05:01 UTC (rev 8369)
+++ branches/1.0/package/igb/igb.mk	2017-06-03 11:57:04 UTC (rev 8370)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IGB_VERSION = 5.3.5.3
+IGB_VERSION = 5.3.5.4
 IGB_SOURCE:=igb-$(IGB_VERSION).tar.gz
 IGB_SITE = http://downloads.sourceforge.net/project/e1000/igb%20stable/$(IGB_VERSION)
 IGB_DEPENDENCIES = linux

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

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

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

Revision: 8369
          http://sourceforge.net/p/astlinux/code/8369
Author:   abelbeck
Date:     2017-06-02 22:05:01 +0000 (Fri, 02 Jun 2017)
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	2017-06-02 21:37:54 UTC (rev 8368)
+++ branches/1.0/docs/ChangeLog.txt	2017-06-02 22:05:01 UTC (rev 8369)
@@ -52,9 +52,10 @@
 -- dnscrypt-proxy, version bump to 1.9.5
 
 -- network, DHCPv6 Prefix Delegation, previously any Network tab -> 'IPv6 Autoconfig: [enabled]' received
-   a Prefix Delegation (PD) regardless if 'IPv6/nn' was defined or not. Now a change such that 'IPv6/nn' must not
-   be defined for that internal interface to receive a PD.
-   If 'IPv6 Autoconfig: [enabled]' and 'IPv6/nn' is defined, 'IPv6/nn' is used for Autoconfig for that interface.
+   a Prefix Delegation (PD). Now the added selection 'IPv6 Autoconfig: [Assign GUA Prefix]' is required
+   for the interface to receive a Prefix Delegation via the DHCPv6 client.  This is a change.
+   "Assign GUA Prefix" only applies if Network tab -> Connection Type: includes DHCPv6.
+   New rc.conf variable: IPV6_PREFIX_DELEGATION
 
 -- arnofw (AIF), added "net-prefix-translation" plugin.  Provides NPTv6 (Network Prefix Translation) for IPv6
 
@@ -81,7 +82,10 @@
 
 -- Status tab, RAM Memory, replaced "Free" with "Available" as per /proc/meminfo .
 
+-- Network tab, IPv6 Autoconfig, add selectable interfaces for Prefix Delegation by selecting "Assign GUA Prefix"
+   Note: "Assign GUA Prefix" only applies if Network tab -> Connection Type: includes DHCPv6.
 
+
 Additions for AstLinux 1.2.10:
 =============================
 

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

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

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

Revision: 8368
          http://sourceforge.net/p/astlinux/code/8368
Author:   abelbeck
Date:     2017-06-02 21:37:54 +0000 (Fri, 02 Jun 2017)
Log Message:
-----------
rhino, build system, define 'LD' as 'TARGET_LD'

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

Modified: branches/1.0/package/rhino/rhino.mk
===================================================================
--- branches/1.0/package/rhino/rhino.mk	2017-06-02 21:25:01 UTC (rev 8367)
+++ branches/1.0/package/rhino/rhino.mk	2017-06-02 21:37:54 UTC (rev 8368)
@@ -29,7 +29,7 @@
 
 $(RHINO_DIR)/.built: $(RHINO_DIR)/.patched
 	$(MAKE) -C $(RHINO_DIR) \
-		HOSTCC=gcc CC=$(TARGET_CC) ARCH=$(KERNEL_ARCH) \
+		HOSTCC=gcc CC=$(TARGET_CC) LD=$(TARGET_LD) ARCH=$(KERNEL_ARCH) \
 		KVER=$(LINUX_VERSION_PROBED) PWD=$(RHINO_DIR)  \
 		KSRC=$(LINUX_DIR) LEGACY_MODULES="$(RHINO_LEGACY_MODULES)" \
 		MODULES="$(RHINO_MODULES)" KMOD=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \
@@ -42,7 +42,7 @@
 
 $(TARGET_DIR)/$(RHINO_TARGET_BINARY): $(RHINO_DIR)/.built
 	$(MAKE) -C $(RHINO_DIR) \
-		HOSTCC=gcc CC=$(TARGET_CC) ARCH=$(KERNEL_ARCH) \
+		HOSTCC=gcc CC=$(TARGET_CC) LD=$(TARGET_LD) ARCH=$(KERNEL_ARCH) \
 		KVER=$(LINUX_VERSION_PROBED) PWD=$(RHINO_DIR) \
 		KSRC=$(LINUX_DIR) LEGACY_MODULES="$(RHINO_LEGACY_MODULES)" \
 		MODULES="$(RHINO_MODULES)" KMOD=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \

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

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

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

Revision: 8367
          http://sourceforge.net/p/astlinux/code/8367
Author:   abelbeck
Date:     2017-06-02 21:25:01 +0000 (Fri, 02 Jun 2017)
Log Message:
-----------
network, add IPV6_PREFIX_DELEGATION rc.conf variable to select which interfaces get Prefix Delegation
web interface, Network tab, IPv6 Autoconfig, add selectable interfaces for Prefix Delegation by selecting 'Assign GUA Prefix'

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.init
    branches/1.0/package/webinterface/altweb/admin/network.php
    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/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2017-06-01 22:08:01 UTC (rev 8366)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2017-06-02 21:25:01 UTC (rev 8367)
@@ -5,6 +5,23 @@
 . /etc/init.d/functions.d/network
 . /etc/init.d/functions.d/misc
 
+is_prefix_delegation()
+{
+  local dhcpv6_pd="" x IFS
+
+  if [ "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+    unset IFS
+    for x in $IPV6_PREFIX_DELEGATION; do
+      if [ "$x" = "$1" ]; then
+        dhcpv6_pd="yes"
+        break
+      fi
+    done
+  fi
+
+  echo "$dhcpv6_pd"
+}
+
 addr_to_prefix64()
 {
   local cnt=1 prefix="" next
@@ -118,7 +135,7 @@
 addIPV6net()
 {
   # args: IF, tag, leasetime
-  local interface="$1" tag="$2" leasetime="$3" dhcpv6="" prefix="" iname IFS
+  local interface="$1" tag="$2" leasetime="$3" dhcpv6_pd="" prefix="" iname IFS
 
   if [ "$IPV6" != "yes" ]; then
     return 2
@@ -129,7 +146,7 @@
     case $iname in
       INTIF)
         if [ "$tag" = "lan" ]; then
-          dhcpv6="$DHCPV6_CLIENT_ENABLE"
+          dhcpv6_pd="$(is_prefix_delegation "$iname")"
           prefix="$(addr_to_prefix64 "$INTIPV6")"
           break
         fi
@@ -136,7 +153,7 @@
         ;;
       INT2IF)
         if [ "$tag" = "lan2" ]; then
-          dhcpv6="$DHCPV6_CLIENT_ENABLE"
+          dhcpv6_pd="$(is_prefix_delegation "$iname")"
           prefix="$(addr_to_prefix64 "$INT2IPV6")"
           break
         fi
@@ -143,7 +160,7 @@
         ;;
       INT3IF)
         if [ "$tag" = "lan3" ]; then
-          dhcpv6="$DHCPV6_CLIENT_ENABLE"
+          dhcpv6_pd="$(is_prefix_delegation "$iname")"
           prefix="$(addr_to_prefix64 "$INT3IPV6")"
           break
         fi
@@ -150,7 +167,7 @@
         ;;
       INT4IF)
         if [ "$tag" = "lan4" ]; then
-          dhcpv6="$DHCPV6_CLIENT_ENABLE"
+          dhcpv6_pd="$(is_prefix_delegation "$iname")"
           prefix="$(addr_to_prefix64 "$INT4IPV6")"
           break
         fi
@@ -157,7 +174,7 @@
         ;;
       DMZIF)
         if [ "$tag" = "dmz" ]; then
-          dhcpv6="$DHCPV6_CLIENT_ENABLE"
+          dhcpv6_pd="$(is_prefix_delegation "$iname")"
           prefix="$(addr_to_prefix64 "$DMZIPV6")"
           break
         fi
@@ -165,7 +182,7 @@
     esac
   done
 
-  if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" -a -z "$prefix" ]; then
+  if [ "$dhcpv6_pd" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
     echo "
 dhcp-range=$tag,::1,constructor:$interface,ra-only,$leasetime"
     return 0

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2017-06-01 22:08:01 UTC (rev 8366)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2017-06-02 21:25:01 UTC (rev 8367)
@@ -43,6 +43,7 @@
 // 01-22-2017, Removed Dynamic DNS 'getip.krisk.org', map to default
 // 01-29-2017, Added DDGETIPV6 support
 // 02-16-2017, Added Restart FTP Server support
+// 06-02-2017, Added selectable Prefix Delegation interfaces
 //
 // System location of rc.conf file
 $CONFFILE = '/etc/rc.conf';
@@ -382,15 +383,29 @@
 
   $value = 'NODHCP="'.getNODHCP_value().'"';
   fwrite($fp, "### No DHCP on interfaces\n".$value."\n");
-  
-  $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'];
+
+  $tokens = explode('~', $_POST['int_autoconf']);
+  $x_value = $tokens[0];
+  $y_value = $tokens[1];
+  $tokens = explode('~', $_POST['int2_autoconf']);
+  $x_value .= $tokens[0];
+  $y_value .= $tokens[1];
+  $tokens = explode('~', $_POST['int3_autoconf']);
+  $x_value .= $tokens[0];
+  $y_value .= $tokens[1];
+  $tokens = explode('~', $_POST['int4_autoconf']);
+  $x_value .= $tokens[0];
+  $y_value .= $tokens[1];
+  $tokens = explode('~', $_POST['dmz_autoconf']);
+  $x_value .= $tokens[0];
+  $y_value .= $tokens[1];
+
   $value = 'IPV6_AUTOCONF="'.trim($x_value).'"';
   fwrite($fp, "### IPv6 Autoconfig\n".$value."\n");
-  
+
+  $value = 'IPV6_PREFIX_DELEGATION="'.trim($y_value).'"';
+  fwrite($fp, "### IPv6 Prefix Delegation\n".$value."\n");
+
   $value = 'FWVERS="'.$_POST['firewall'].'"';
   fwrite($fp, "### Firewall Type\n".$value."\n");
 
@@ -1564,8 +1579,15 @@
   putHtml('  IPv6 Autoconfig:');
   putHtml('<select name="int_autoconf">');
   putHtml('<option value="">disabled</option>');
-  $sel = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INTIF') ? ' selected="selected"' : '';
-  putHtml('<option value=" INTIF"'.$sel.'>enabled</option>');
+  if (isVARtype('IPV6_PREFIX_DELEGATION', $db, $cur_db, 'INTIF')) {
+    $sel1 = '';
+    $sel2 = ' selected="selected"';
+  } else {
+    $sel1 = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INTIF') ? ' selected="selected"' : '';
+    $sel2 = '';
+  }
+  putHtml('<option value=" INTIF~"'.$sel1.'>enabled</option>');
+  putHtml('<option value=" INTIF~ INTIF"'.$sel2.'>Assign GUA Prefix</option>');
   putHtml('</select>');
   $value = getVARdef($db, 'INTIPV6', $cur_db);
   putHtml('&ndash;&nbsp;IPv6/nn:<input type="text" size="45" maxlength="43" value="'.$value.'" name="int_ipv6" />');
@@ -1596,8 +1618,15 @@
   putHtml('&nbsp;&nbsp;IPv6 Autoconfig:');
   putHtml('<select name="int2_autoconf">');
   putHtml('<option value="">disabled</option>');
-  $sel = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INT2IF') ? ' selected="selected"' : '';
-  putHtml('<option value=" INT2IF"'.$sel.'>enabled</option>');
+  if (isVARtype('IPV6_PREFIX_DELEGATION', $db, $cur_db, 'INT2IF')) {
+    $sel1 = '';
+    $sel2 = ' selected="selected"';
+  } else {
+    $sel1 = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INT2IF') ? ' selected="selected"' : '';
+    $sel2 = '';
+  }
+  putHtml('<option value=" INT2IF~"'.$sel1.'>enabled</option>');
+  putHtml('<option value=" INT2IF~ INT2IF"'.$sel2.'>Assign GUA Prefix</option>');
   putHtml('</select>');
   $value = getVARdef($db, 'INT2IPV6', $cur_db);
   putHtml('&ndash;&nbsp;IPv6/nn:<input type="text" size="45" maxlength="43" value="'.$value.'" name="int2_ipv6" />');
@@ -1628,8 +1657,15 @@
   putHtml('&nbsp;&nbsp;IPv6 Autoconfig:');
   putHtml('<select name="int3_autoconf">');
   putHtml('<option value="">disabled</option>');
-  $sel = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INT3IF') ? ' selected="selected"' : '';
-  putHtml('<option value=" INT3IF"'.$sel.'>enabled</option>');
+  if (isVARtype('IPV6_PREFIX_DELEGATION', $db, $cur_db, 'INT3IF')) {
+    $sel1 = '';
+    $sel2 = ' selected="selected"';
+  } else {
+    $sel1 = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INT3IF') ? ' selected="selected"' : '';
+    $sel2 = '';
+  }
+  putHtml('<option value=" INT3IF~"'.$sel1.'>enabled</option>');
+  putHtml('<option value=" INT3IF~ INT3IF"'.$sel2.'>Assign GUA Prefix</option>');
   putHtml('</select>');
   $value = getVARdef($db, 'INT3IPV6', $cur_db);
   putHtml('&ndash;&nbsp;IPv6/nn:<input type="text" size="45" maxlength="43" value="'.$value.'" name="int3_ipv6" />');
@@ -1660,8 +1696,15 @@
   putHtml('&nbsp;&nbsp;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>');
+  if (isVARtype('IPV6_PREFIX_DELEGATION', $db, $cur_db, 'INT4IF')) {
+    $sel1 = '';
+    $sel2 = ' selected="selected"';
+  } else {
+    $sel1 = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'INT4IF') ? ' selected="selected"' : '';
+    $sel2 = '';
+  }
+  putHtml('<option value=" INT4IF~"'.$sel1.'>enabled</option>');
+  putHtml('<option value=" INT4IF~ INT4IF"'.$sel2.'>Assign GUA Prefix</option>');
   putHtml('</select>');
   $value = getVARdef($db, 'INT4IPV6', $cur_db);
   putHtml('&ndash;&nbsp;IPv6/nn:<input type="text" size="45" maxlength="43" value="'.$value.'" name="int4_ipv6" />');
@@ -1692,8 +1735,15 @@
   putHtml('&nbsp;&nbsp;IPv6 Autoconfig:');
   putHtml('<select name="dmz_autoconf">');
   putHtml('<option value="">disabled</option>');
-  $sel = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'DMZIF') ? ' selected="selected"' : '';
-  putHtml('<option value=" DMZIF"'.$sel.'>enabled</option>');
+  if (isVARtype('IPV6_PREFIX_DELEGATION', $db, $cur_db, 'DMZIF')) {
+    $sel1 = '';
+    $sel2 = ' selected="selected"';
+  } else {
+    $sel1 = isVARtype('IPV6_AUTOCONF', $db, $cur_db, 'DMZIF') ? ' selected="selected"' : '';
+    $sel2 = '';
+  }
+  putHtml('<option value=" DMZIF~"'.$sel1.'>enabled</option>');
+  putHtml('<option value=" DMZIF~ DMZIF"'.$sel2.'>Assign GUA Prefix</option>');
   putHtml('</select>');
   $value = getVARdef($db, 'DMZIPV6', $cur_db);
   putHtml('&ndash;&nbsp;IPv6/nn:<input type="text" size="45" maxlength="43" value="'.$value.'" name="dmz_ipv6" />');

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2017-06-01 22:08:01 UTC (rev 8366)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2017-06-02 21:25:01 UTC (rev 8367)
@@ -105,31 +105,31 @@
 
     id=0
     unset IFS
-    for iname in $IPV6_AUTOCONF; do
+    for iname in $IPV6_PREFIX_DELEGATION; do
       int=""
       case $iname in
         INTIF)
-          if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" -a -z "$INTIPV6" ]; then
+          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" -a -z "$INT2IPV6" ]; then
+          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" -a -z "$INT3IPV6" ]; then
+          if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" ]; then
             int="$INT3IF"
           fi
           ;;
         INT4IF)
-          if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" -a -z "$INT4IPV6" ]; then
+          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" -a -z "$DMZIPV6" ]; then
+          if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
             int="$DMZIF"
           fi
           ;;

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2017-06-01 22:08:01 UTC (rev 8366)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2017-06-02 21:25:01 UTC (rev 8367)
@@ -255,6 +255,9 @@
 ## "DMZIF" for DMZ Interface
 ## Note: the autoconf prefix is derived from the IPv6 address on the interface, which must be defined.
 #IPV6_AUTOCONF="INTIF"
+## Specify what Interface_Name is given a DHCPv6-Prefix Delegation, same format as with IPV6_AUTOCONF
+## Note: DHCPv6 Client must be enabled for this to apply
+#IPV6_PREFIX_DELEGATION="INTIF"
 
 ## DHCPv6 Client
 ## Enable DHCPv6 client on EXTIF by setting DHCPV6_CLIENT_ENABLE="yes"

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

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

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

Revision: 8366
          http://sourceforge.net/p/astlinux/code/8366
Author:   abelbeck
Date:     2017-06-01 22:08:01 +0000 (Thu, 01 Jun 2017)
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	2017-06-01 21:56:03 UTC (rev 8365)
+++ branches/1.0/docs/ChangeLog.txt	2017-06-01 22:08:01 UTC (rev 8366)
@@ -37,14 +37,18 @@
 
 -- tiff, version bump to 4.0.8, security fixes: 13 CVE's
 
--- sudo, version bump to 1.8.20
+-- sudo, version bump to 1.8.20p2, security fix: CVE-2017-1000367
 
 -- dialog, version bump to 1.3-20170509
 
+-- strace, version bump to 4.17
+
 ** Networking
 
 -- OpenSSL, version bump to 1.0.2l, security fixes: none
 
+-- strongSwan, version bump to 5.5.3, security fixes: CVE-2017-9022, CVE-2017-9023
+
 -- dnscrypt-proxy, version bump to 1.9.5
 
 -- network, DHCPv6 Prefix Delegation, previously any Network tab -> 'IPv6 Autoconfig: [enabled]' received
@@ -54,6 +58,8 @@
 
 -- arnofw (AIF), added "net-prefix-translation" plugin.  Provides NPTv6 (Network Prefix Translation) for IPv6
 
+-- arnofw (AIF), "traffic-shaper" plugin, use fq_codel (Fair Queueing CoDel) for both 'htb' and 'hfsc' types.
+
 -- wide-dhcpv6, when the optional script '/mnt/kd/dhcp6c.script' does not exist, by default generate a syslog
    and reload the "net-prefix-translation" plugin (if enabled) on a prefix change.
 

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

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

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

Revision: 8365
          http://sourceforge.net/p/astlinux/code/8365
Author:   abelbeck
Date:     2017-06-01 21:56:03 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
strongswan, version bump to 5.5.3, security fixes: CVE-2017-9022, CVE-2017-9023

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

Modified: branches/1.0/package/strongswan/strongswan.mk
===================================================================
--- branches/1.0/package/strongswan/strongswan.mk	2017-06-01 21:39:14 UTC (rev 8364)
+++ branches/1.0/package/strongswan/strongswan.mk	2017-06-01 21:56:03 UTC (rev 8365)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STRONGSWAN_VERSION = 5.5.2
+STRONGSWAN_VERSION = 5.5.3
 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
 STRONGSWAN_SITE = https://download.strongswan.org
 STRONGSWAN_DEPENDENCIES = openssl host-pkg-config

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

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

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

Revision: 8364
          http://sourceforge.net/p/astlinux/code/8364
Author:   abelbeck
Date:     2017-06-01 21:39:14 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
strace, version bump to 4.17

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

Modified: branches/1.0/package/strace/strace.mk
===================================================================
--- branches/1.0/package/strace/strace.mk	2017-06-01 21:28:13 UTC (rev 8363)
+++ branches/1.0/package/strace/strace.mk	2017-06-01 21:39:14 UTC (rev 8364)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-STRACE_VERSION = 4.16
+STRACE_VERSION = 4.17
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
 

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

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

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

Revision: 8363
          http://sourceforge.net/p/astlinux/code/8363
Author:   abelbeck
Date:     2017-06-01 21:28:13 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
sudo, version bump to 1.8.20p2, security fix: CVE-2017-1000367

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

Modified: branches/1.0/package/sudo/sudo.mk
===================================================================
--- branches/1.0/package/sudo/sudo.mk	2017-06-01 16:15:11 UTC (rev 8362)
+++ branches/1.0/package/sudo/sudo.mk	2017-06-01 21:28:13 UTC (rev 8363)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.20
+SUDO_VERSION = 1.8.20p2
 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.

[Astlinux-commits] SF.net SVN: astlinux:[8362] branches/1.0/package/arnofw/traffic-shaper/ 60traffic-shaper.plugin.sh

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

Revision: 8362
          http://sourceforge.net/p/astlinux/code/8362
Author:   abelbeck
Date:     2017-06-01 16:15:11 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
arnofw, traffic-shaper plugin, add fq_codel to both 'htb' and 'hfsc'.  Give 'hfsc' another look with this addition.

Modified Paths:
--------------
    branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh

Modified: branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh
===================================================================
--- branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh	2017-06-01 13:02:20 UTC (rev 8361)
+++ branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh	2017-06-01 16:15:11 UTC (rev 8362)
@@ -2,11 +2,11 @@
 #      -= Arno's iptables firewall - HTB & HFSC traffic shaper plugin =-
 #
 PLUGIN_NAME="Traffic-Shaper plugin"
-PLUGIN_VERSION="1.2.09-astlinux"
+PLUGIN_VERSION="1.3.00"
 PLUGIN_CONF_FILE="traffic-shaper.conf"
 #
-# Last changed          : December 30, 2015
-# Requirements          : kernel 2.6 + iproute2
+# Last changed          : June 1, 2017
+# Requirements          : kernel 3.16 + iproute2
 # Comments              : This plugin will shape traffic. It borrows heavily on
 #                         the logic of Maciej's original script (below), with
 #                         some minor changes to the actual bins that traffic
@@ -15,6 +15,7 @@
 #                         transfer).
 #                  [LRA]: Added htb support from astshape in AstLinux
 #                  [LRA]: Classify by DSCP class
+#                  [LRA]: Use sch_fq_codel instead of sch_sfq
 # Author                : (C) Copyright 2008-2010 by Philip Prindeville
 # Credits               : Maciej Blizinski
 # Credits               : Kristian Kielhofner
@@ -185,6 +186,16 @@
   iptables -t mangle -A SHAPER_CHAIN -m dscp --dscp-class CS1 -j CLASSIFY --set-class 1:60
 }
 
+outgoing_fair_queueing_codel()
+{
+  tc qdisc add dev $1 parent 1:10 handle 10: fq_codel quantum 300 noecn
+  tc qdisc add dev $1 parent 1:20 handle 20: fq_codel quantum 300 noecn
+  tc qdisc add dev $1 parent 1:30 handle 30: fq_codel quantum 300 noecn
+  tc qdisc add dev $1 parent 1:40 handle 40: fq_codel noecn
+  tc qdisc add dev $1 parent 1:50 handle 50: fq_codel noecn
+  tc qdisc add dev $1 parent 1:60 handle 60: fq_codel noecn
+}
+
 incoming_traffic_limit()
 {
   # Skip if DOWNLINK is 0
@@ -236,6 +247,7 @@
   modprobe_multi nf_nat ip_nat
 
   modprobe sch_hfsc
+  modprobe sch_fq_codel
 
   printf "${INDENT}Shaping as (Down/Up) %d/%d kb/s using '%s' for interface: %s\n" $DOWNLINK $UPLINK hfsc "$SHAPER_IF"
 
@@ -292,6 +304,8 @@
         sc m1           0 d    4s m2 1kbit \
         ul rate ${UPLINK}kbit
 
+      outgoing_fair_queueing_codel $eif1
+
       incoming_traffic_limit $eif1
 
       disable_ethernet_offloading $eif1
@@ -310,6 +324,9 @@
   # Some required modules are already loaded by the main script:
   modprobe_multi nf_nat ip_nat
 
+  modprobe sch_htb
+  modprobe sch_fq_codel
+
   printf "${INDENT}Shaping as (Down/Up) %d/%d kb/s using '%s' for interface: %s\n" $DOWNLINK $UPLINK htb "$SHAPER_IF"
 
   iptables -t mangle -N SHAPER_CHAIN
@@ -351,13 +368,7 @@
       # p2p class 1:60
       tc class add dev $eif1 parent 1:1 classid 1:60 htb rate $((5*$UPLINK/10))kbit burst 6k prio 6
 
-      # all get Stochastic Fairness
-      tc qdisc add dev $eif1 parent 1:10 handle 10: sfq perturb 10
-      tc qdisc add dev $eif1 parent 1:20 handle 20: sfq perturb 10
-      tc qdisc add dev $eif1 parent 1:30 handle 30: sfq perturb 10
-      tc qdisc add dev $eif1 parent 1:40 handle 40: sfq perturb 10
-      tc qdisc add dev $eif1 parent 1:50 handle 50: sfq perturb 10
-      tc qdisc add dev $eif1 parent 1:60 handle 60: sfq perturb 10
+      outgoing_fair_queueing_codel $eif1
 
       incoming_traffic_limit $eif1
 

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

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

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

Revision: 8361
          http://sourceforge.net/p/astlinux/code/8361
Author:   abelbeck
Date:     2017-06-01 13:02:20 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
core system, never remove a directory in the path '/oldroot/mnt/asturw/...' as unionfs with kernel 3.16 has an issue with that.  Removing a file in the '/oldroot/mnt/asturw/...' path appears to be OK.  The 'show-union' command now only shows files, so as not to encourage directory removal, except 'show-union all' shows directories as well

Modified Paths:
--------------
    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/show-union

Modified: branches/1.0/package/asterisk/upgrade-asterisk-sounds
===================================================================
--- branches/1.0/package/asterisk/upgrade-asterisk-sounds	2017-05-30 22:55:04 UTC (rev 8360)
+++ branches/1.0/package/asterisk/upgrade-asterisk-sounds	2017-06-01 13:02:20 UTC (rev 8361)
@@ -110,7 +110,7 @@
 
   unset IFS
   cat "$file" | while read filename; do
-    rm -f "$ASTURW$dir/$filename"
+    rm -f "$dir/$filename"
   done
 }
 
@@ -221,14 +221,6 @@
   reload_asterisk_moh $type
 }
 
-remove_all() {
-
-  rm -rf $ASTURW$BASE/sounds/
-  rm -rf $ASTURW$BASE/moh/
-  
-  reload_asterisk_moh moh
-}
-
 show() {
   local str=""
 
@@ -291,22 +283,12 @@
   exit $GREEN
   ;;
 
-remove-all)
-  if [ -n "$2" ]; then
-    echo "Usage: upgrade-asterisk-sounds remove-all"
-    exit 1
-  fi
-  remove_all
-  echo "Successful remove-all, all ASTURW sounds and moh files have been removed."
-  exit $GREEN
-  ;;
-
 show)
   show
   ;;
 
 *)
-  echo "Usage: upgrade-asterisk-sounds upgrade|remove|remove-all|show"
+  echo "Usage: upgrade-asterisk-sounds upgrade|remove|show"
   echo "                                 core|extra|moh"
   echo "                                   $LANGUAGES"
   echo "                                     $CODECS"

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2017-05-30 22:55:04 UTC (rev 8360)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2017-06-01 13:02:20 UTC (rev 8361)
@@ -90,8 +90,8 @@
 
 remove()
 {
-  if [ -d "$ASTURW$BASE" ]; then
-    rm -rf "$ASTURW$BASE"
+  if [ -d "$BASE" ]; then
+    rm -rf "$BASE"
   fi
 }
 

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union	2017-05-30 22:55:04 UTC (rev 8360)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union	2017-06-01 13:02:20 UTC (rev 8361)
@@ -11,11 +11,12 @@
 
 system()
 {
-  find $ASTURW | grep -v -e "^$ASTURW/$KD" \
-                         -e "^$ASTURW/$ASTERISK_SOUNDS" \
-                         -e "^$ASTURW/$ASTERISK_MOH" \
-                         -e "^$ASTURW/$PACKAGES" \
-                         -e "^$ASTURW/$LOCALE"
+  find $ASTURW -type f | \
+    grep -v -e "^$ASTURW/$KD" \
+            -e "^$ASTURW/$ASTERISK_SOUNDS" \
+            -e "^$ASTURW/$ASTERISK_MOH" \
+            -e "^$ASTURW/$PACKAGES" \
+            -e "^$ASTURW/$LOCALE"
 }
 
 kd()
@@ -23,7 +24,7 @@
   if mount | grep -q "/$KD"; then
     echo "/$KD is not on ASTURW. /$KD is a separate partition." >&2
   else
-    find $ASTURW/$KD
+    find $ASTURW/$KD -type f
   fi
 }
 
@@ -30,12 +31,12 @@
 asterisk_sounds()
 {
   if [ -d $ASTURW/$ASTERISK_SOUNDS ]; then
-    find $ASTURW/$ASTERISK_SOUNDS
+    find $ASTURW/$ASTERISK_SOUNDS -type f
   else
     echo "No Asterisk Sounds on ASTURW." >&2
   fi
   if [ -d $ASTURW/$ASTERISK_MOH ]; then
-    find $ASTURW/$ASTERISK_MOH
+    find $ASTURW/$ASTERISK_MOH -type f
   else
     echo "No Asterisk MOH Sounds on ASTURW." >&2
   fi
@@ -44,7 +45,7 @@
 packages()
 {
   if [ -d $ASTURW/$PACKAGES ]; then
-    find $ASTURW/$PACKAGES
+    find $ASTURW/$PACKAGES -type f
   else
     echo "No Installed Packages on ASTURW." >&2
   fi
@@ -53,7 +54,7 @@
 locale()
 {
   if [ -d $ASTURW/$LOCALE ]; then
-    find $ASTURW/$LOCALE
+    find $ASTURW/$LOCALE -type f
   else
     echo "No Installed Locale on ASTURW." >&2
   fi

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

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

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

Revision: 8360
          http://sourceforge.net/p/astlinux/code/8360
Author:   abelbeck
Date:     2017-05-30 22:55:04 +0000 (Tue, 30 May 2017)
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	2017-05-30 22:47:14 UTC (rev 8359)
+++ branches/1.0/docs/ChangeLog.txt	2017-05-30 22:55:04 UTC (rev 8360)
@@ -43,6 +43,8 @@
 
 ** Networking
 
+-- OpenSSL, version bump to 1.0.2l, security fixes: none
+
 -- dnscrypt-proxy, version bump to 1.9.5
 
 -- network, DHCPv6 Prefix Delegation, previously any Network tab -> 'IPv6 Autoconfig: [enabled]' received
@@ -52,6 +54,9 @@
 
 -- arnofw (AIF), added "net-prefix-translation" plugin.  Provides NPTv6 (Network Prefix Translation) for IPv6
 
+-- wide-dhcpv6, when the optional script '/mnt/kd/dhcp6c.script' does not exist, by default generate a syslog
+   and reload the "net-prefix-translation" plugin (if enabled) on a prefix change.
+
 ** Asterisk
 
 -- Asterisk 11.25.1 (no change) and 13.15.1 (no change)

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

[Astlinux-commits] SF.net SVN: astlinux:[8359] branches/1.0/package/wide-dhcpv6/dhcp6c.script

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

Revision: 8359
          http://sourceforge.net/p/astlinux/code/8359
Author:   abelbeck
Date:     2017-05-30 22:47:14 +0000 (Tue, 30 May 2017)
Log Message:
-----------
wide-dhcpv6, /etc/dhcp6c.script, enable a default action if /mnt/kd/dhcp6c.script does not exist

Modified Paths:
--------------
    branches/1.0/package/wide-dhcpv6/dhcp6c.script

Modified: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script	2017-05-30 22:36:33 UTC (rev 8358)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script	2017-05-30 22:47:14 UTC (rev 8359)
@@ -138,6 +138,21 @@
   export dhcp6c_prefix dhcp6c_prefix_base dhcp6c_prefix_len
 
   $SCRIPTFILE >/dev/null 2>&1 &
+else
+  if [ -n "$dhcp6c_prefix" ]; then
+    case "$dhcp6c_changed" in
+      yes) changed=" (changed)" ;;
+       no) changed=" (no change)" ;;
+        *) changed="" ;;
+    esac
+    logger -t dhcp6c -p kern.info "IPv6 Prefix$changed: $dhcp6c_prefix"
+
+    if [ "$dhcp6c_changed" != "no" ]; then
+      if [ -f /var/tmp/aif-net-prefix-translation-global-ipv6 ]; then
+        arno-iptables-firewall status-plugins net-prefix-translation >/dev/null 2>&1 &
+      fi
+    fi
+  fi
 fi
 
 exit 0

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

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

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

Revision: 8358
          http://sourceforge.net/p/astlinux/code/8358
Author:   abelbeck
Date:     2017-05-30 22:36:33 +0000 (Tue, 30 May 2017)
Log Message:
-----------
openssl, version bump to 1.0.2l, no security fixes

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

Modified: branches/1.0/package/openssl/openssl-do-not-build-docs.patch
===================================================================
--- branches/1.0/package/openssl/openssl-do-not-build-docs.patch	2017-05-30 18:35:23 UTC (rev 8357)
+++ branches/1.0/package/openssl/openssl-do-not-build-docs.patch	2017-05-30 22:36:33 UTC (rev 8358)
@@ -1,6 +1,6 @@
 --- openssl-1.0.2j/Makefile.org.orig	2016-11-03 11:36:09.000000000 -0500
 +++ openssl-1.0.2j/Makefile.org	2016-11-03 11:36:17.000000000 -0500
-@@ -532,7 +532,7 @@
+@@ -540,7 +540,7 @@
  	@$(MAKE) SDIRS='$(SDIRS)' clean
  	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
  

Modified: branches/1.0/package/openssl/openssl.mk
===================================================================
--- branches/1.0/package/openssl/openssl.mk	2017-05-30 18:35:23 UTC (rev 8357)
+++ branches/1.0/package/openssl/openssl.mk	2017-05-30 22:36:33 UTC (rev 8358)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.2k
+OPENSSL_VERSION = 1.0.2l
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

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

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

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

Revision: 8357
          http://sourceforge.net/p/astlinux/code/8357
Author:   abelbeck
Date:     2017-05-30 18:35:23 +0000 (Tue, 30 May 2017)
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	2017-05-30 18:33:52 UTC (rev 8356)
+++ branches/1.0/docs/ChangeLog.txt	2017-05-30 18:35:23 UTC (rev 8357)
@@ -45,6 +45,13 @@
 
 -- dnscrypt-proxy, version bump to 1.9.5
 
+-- network, DHCPv6 Prefix Delegation, previously any Network tab -> 'IPv6 Autoconfig: [enabled]' received
+   a Prefix Delegation (PD) regardless if 'IPv6/nn' was defined or not. Now a change such that 'IPv6/nn' must not
+   be defined for that internal interface to receive a PD.
+   If 'IPv6 Autoconfig: [enabled]' and 'IPv6/nn' is defined, 'IPv6/nn' is used for Autoconfig for that interface.
+
+-- arnofw (AIF), added "net-prefix-translation" plugin.  Provides NPTv6 (Network Prefix Translation) for IPv6
+
 ** Asterisk
 
 -- Asterisk 11.25.1 (no change) and 13.15.1 (no change)

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

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

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

Revision: 8356
          http://sourceforge.net/p/astlinux/code/8356
Author:   abelbeck
Date:     2017-05-30 18:33:52 +0000 (Tue, 30 May 2017)
Log Message:
-----------
arnofw, add flush IPv6 NAT tables to the main script

Modified Paths:
--------------
    branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh

Added Paths:
-----------
    branches/1.0/package/arnofw/arnofw-0003-flush-ipv6-nat-tables.patch

Added: branches/1.0/package/arnofw/arnofw-0003-flush-ipv6-nat-tables.patch
===================================================================
--- branches/1.0/package/arnofw/arnofw-0003-flush-ipv6-nat-tables.patch	                        (rev 0)
+++ branches/1.0/package/arnofw/arnofw-0003-flush-ipv6-nat-tables.patch	2017-05-30 18:33:52 UTC (rev 8356)
@@ -0,0 +1,111 @@
+From bee4d9337f40c015091af45a752abb6a7dc7f24d Mon Sep 17 00:00:00 2001
+From: Lonnie Abelbeck <lo...@ab...>
+Date: Tue, 30 May 2017 11:43:49 -0500
+Subject: [PATCH 1/3] changed: better method to truncate/create a file
+
+---
+ bin/arno-iptables-firewall | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/arno-iptables-firewall b/bin/arno-iptables-firewall
+index 1ee713f..592b90b 100755
+--- a/bin/arno-iptables-firewall
++++ b/bin/arno-iptables-firewall
+@@ -4758,7 +4758,7 @@ plugins_start()
+   local plugin_count=0
+ 
+   # Truncate/create file
+-  cp -f /dev/null "$PLUGIN_LOAD_FILE"
++  : > "$PLUGIN_LOAD_FILE"
+ 
+   printf "Checking for (user) plugins in $PLUGIN_BIN_PATH..."
+ 
+
+From 824e33d67a8d8e636aaf30885698ce1c49d1c044 Mon Sep 17 00:00:00 2001
+From: Lonnie Abelbeck <lo...@ab...>
+Date: Tue, 30 May 2017 12:31:51 -0500
+Subject: [PATCH 2/3] fixed: IPv6 NAT table was not flushed, Issue #36
+
+---
+ bin/arno-iptables-firewall | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/bin/arno-iptables-firewall b/bin/arno-iptables-firewall
+index 592b90b..53408ec 100755
+--- a/bin/arno-iptables-firewall
++++ b/bin/arno-iptables-firewall
+@@ -744,8 +744,10 @@ init_firewall_chains()
+     ip6tables -F OUTPUT
+     ip6tables -F FORWARD
+ 
+-    # Flush rules in mangle table
++    # Flush rules in nat/mangle table
+     #############################
++    try_ip6tables -t nat -F
++    try_ip6tables -t nat -X
+     ip6tables -t mangle -F
+     ip6tables -t mangle -X
+   fi
+@@ -5592,11 +5594,11 @@ stop_firewall()
+   ip4tables -F OUTPUT
+   ip4tables -F FORWARD
+ 
+-  # Flush rules in the mangle/nat tables
+-  ip4tables -t mangle -F
+-  ip4tables -t mangle -X
++  # Flush rules in the nat/mangle tables
+   ip4tables -t nat -F
+   ip4tables -t nat -X
++  ip4tables -t mangle -F
++  ip4tables -t mangle -X
+ 
+   # Attempt to flush all IPv4 chains
+   ip4tables -F
+@@ -5613,7 +5615,9 @@ stop_firewall()
+     ip6tables -F OUTPUT
+     ip6tables -F FORWARD
+ 
+-    # Flush rules in the mangle table
++    # Flush rules in the nat/mangle table
++    try_ip6tables -t nat -F
++    try_ip6tables -t nat -X
+     ip6tables -t mangle -F
+     ip6tables -t mangle -X
+ 
+@@ -5662,6 +5666,11 @@ reinit_firewall_chains()
+     ip6tables -F OUTPUT
+     ip6tables -F FORWARD
+ 
++    # Flush builtin IPv6 nat chains
++    try_ip6tables -t nat -F PREROUTING
++    try_ip6tables -t nat -F OUTPUT
++    try_ip6tables -t nat -F POSTROUTING
++
+     # Flush builtin IPv6 mangle chains
+     #   We don't have to be selective by chain since we don't
+     #   expect any external, dynamically managed mangle chains
+@@ -5692,10 +5701,10 @@ stop_block_firewall()
+   ip4tables -F FORWARD
+ 
+   # Flush nat/mangle table rules
+-  ip4tables -t mangle -F
+-  ip4tables -t mangle -X
+   ip4tables -t nat -F
+   ip4tables -t nat -X
++  ip4tables -t mangle -F
++  ip4tables -t mangle -X
+ 
+   # Attempt to flush all IPv4 chains
+   ip4tables -F
+@@ -5714,7 +5723,9 @@ stop_block_firewall()
+     ip6tables -F OUTPUT
+     ip6tables -F FORWARD
+ 
+-    # Flush mangle table rules
++    # Flush nat/mangle table rules
++    try_ip6tables -t nat -F
++    try_ip6tables -t nat -X
+     ip6tables -t mangle -F
+     ip6tables -t mangle -X
+ 
+

Modified: branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh
===================================================================
--- branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh	2017-05-30 16:28:34 UTC (rev 8355)
+++ branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh	2017-05-30 18:33:52 UTC (rev 8356)
@@ -101,11 +101,6 @@
 {
   local global_prefix local_prefix eif IFS
 
-  #### remove when in main script ####
-  ip6tables -t nat -F
-  ip6tables -t nat -X
-  ####
-
   ip6tables -t nat -N NET_PREFIX_TRANSLATION_IN 2>/dev/null
   ip6tables -t nat -F NET_PREFIX_TRANSLATION_IN
 

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

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

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

Revision: 8355
          http://sourceforge.net/p/astlinux/code/8355
Author:   abelbeck
Date:     2017-05-30 16:28:34 +0000 (Tue, 30 May 2017)
Log Message:
-----------
arnofs, net-prefix-translation plugin, make sure the NET_PREFIX_TRANSLATION_GLOBAL_IPV6 file is created as an indication the plugin is active, and documentation comment tweaks

Modified Paths:
--------------
    branches/1.0/package/arnofw/arnofw.serial
    branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh
    branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf

Modified: branches/1.0/package/arnofw/arnofw.serial
===================================================================
--- branches/1.0/package/arnofw/arnofw.serial	2017-05-29 23:44:38 UTC (rev 8354)
+++ branches/1.0/package/arnofw/arnofw.serial	2017-05-30 16:28:34 UTC (rev 8355)
@@ -1 +1 @@
-0002~0033~0000~0000~0000~
+0002~0034~0000~0000~0000~

Modified: branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh
===================================================================
--- branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh	2017-05-29 23:44:38 UTC (rev 8354)
+++ branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh	2017-05-30 16:28:34 UTC (rev 8355)
@@ -114,6 +114,10 @@
 
   global_prefix="$(net_prefix_translation_global_prefix)"
 
+  if [ ! -f "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6" ]; then
+    : > "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6"
+  fi
+
   if [ -z "$global_prefix" ]; then
     echo "${INDENT}Network Prefix Translation Global Prefix: Not Found"
     return 1
@@ -207,6 +211,7 @@
     done
 
     echo "$global_prefix" > "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6"
+
     echo "  Network Prefix Translation Global Prefix (updated): $global_prefix"
   else
     echo "  Network Prefix Translation Global Prefix needs updating to: $global_prefix"

Modified: branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf
===================================================================
--- branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf	2017-05-29 23:44:38 UTC (rev 8354)
+++ branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf	2017-05-30 16:28:34 UTC (rev 8355)
@@ -16,6 +16,8 @@
 # The simplest case is where the GUA prefix is static, or seldom changes,
 # specify the global prefix with NET_PREFIX_TRANSLATION_GLOBAL_PREFIX.
 #
+# Supported prefix lengths: /64, /60, /56, /52 and /48
+#
 # Example:
 #   NET_PREFIX_TRANSLATION_GLOBAL_PREFIX="2001:db8:abcd:1230::/60"
 # (IPv6 Only)
@@ -36,11 +38,15 @@
 # You must define NET_PREFIX_TRANSLATION_LOCAL_PREFIX by generating a ULA,
 # using a script or web site, whatever you are most comfortable with.
 #
+# Note: ULA's are /48's but you typically want a symmetric mapping so inbound
+# firewall rules work. Only special situations may desire non-symmetric mapping.
+# In general use the same _LOCAL_PREFIX length as the _GLOBAL_PREFIX length.
+#
 # Example: (generate your own, random, ULA)
 #   NET_PREFIX_TRANSLATION_LOCAL_PREFIX="fd04:928b:f87e::/48"
 # (IPv6 Only)
 # ------------------------------------------------------------------------------
-NET_PREFIX_TRANSLATION_LOCAL_PREFIX="fd04:928b:f87e::/48"
+NET_PREFIX_TRANSLATION_LOCAL_PREFIX="fd04:928b:f87e::/60"
 
 # When this plugin's status is called, if the global IPv6 prefix has changed,
 # noted by the IPv6 prefix associated with NET_PREFIX_TRANSLATION_IF, the

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

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

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

Revision: 8354
          http://sourceforge.net/p/astlinux/code/8354
Author:   abelbeck
Date:     2017-05-29 23:44:38 +0000 (Mon, 29 May 2017)
Log Message:
-----------
DHCPv6 Prefix Delegation, previously any 'IPv6 Autoconfig: [enabled]' got a PD regardless if 'IPv6/nn' was defined, this commit makes it such that 'IPv6/nn' must be undefined for it to get a PD, while any defined 'IPv6/nn' is used for Autoconfig for that interface.

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.init
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/network

Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2017-05-29 16:04:48 UTC (rev 8353)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2017-05-29 23:44:38 UTC (rev 8354)
@@ -165,7 +165,7 @@
     esac
   done
 
-  if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
+  if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" -a -z "$prefix" ]; then
     echo "
 dhcp-range=$tag,::1,constructor:$interface,ra-only,$leasetime"
     return 0

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2017-05-29 16:04:48 UTC (rev 8353)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2017-05-29 23:44:38 UTC (rev 8354)
@@ -109,27 +109,27 @@
       int=""
       case $iname in
         INTIF)
-          if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" ]; then
+          if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" -a -z "$INTIPV6" ]; then
             int="$INTIF"
           fi
           ;;
         INT2IF)
-          if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" ]; then
+          if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" -a -z "$INT2IPV6" ]; then
             int="$INT2IF"
           fi
           ;;
         INT3IF)
-          if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" ]; then
+          if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" -a -z "$INT3IPV6" ]; then
             int="$INT3IF"
           fi
           ;;
         INT4IF)
-          if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" ]; then
+          if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" -a -z "$INT4IPV6" ]; then
             int="$INT4IF"
           fi
           ;;
         DMZIF)
-          if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
+          if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" -a -z "$DMZIPV6" ]; then
             int="$DMZIF"
           fi
           ;;

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

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

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

Revision: 8353
          http://sourceforge.net/p/astlinux/code/8353
Author:   abelbeck
Date:     2017-05-29 16:04:48 +0000 (Mon, 29 May 2017)
Log Message:
-----------
arnofw, add 'Network Prefix Translation' plugin (NPTv6)

Modified Paths:
--------------
    branches/1.0/package/arnofw/arnofw.mk
    branches/1.0/package/arnofw/arnofw.serial

Added Paths:
-----------
    branches/1.0/package/arnofw/net-prefix-translation/
    branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh
    branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf

Modified: branches/1.0/package/arnofw/arnofw.mk
===================================================================
--- branches/1.0/package/arnofw/arnofw.mk	2017-05-28 18:37:02 UTC (rev 8352)
+++ branches/1.0/package/arnofw/arnofw.mk	2017-05-29 16:04:48 UTC (rev 8353)
@@ -163,6 +163,13 @@
 		$(TARGET_DIR)$(ARNOFW_PLUGIN_SCRIPT_DIR)/50miniupnpd.plugin
 	$(INSTALL) -m 0644 package/arnofw/miniupnpd/miniupnpd-astlinux.conf \
 		$(TARGET_DIR)/stat$(ARNOFW_PLUGIN_CONFIG_DIR)/miniupnpd.conf
+	@echo
+	@echo "Install local version of net-prefix-translation plugin."
+	@echo
+	$(INSTALL) -m 0644 package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh \
+		$(TARGET_DIR)$(ARNOFW_PLUGIN_SCRIPT_DIR)/20net-prefix-translation.plugin
+	$(INSTALL) -m 0644 package/arnofw/net-prefix-translation/net-prefix-translation.conf \
+		$(TARGET_DIR)/stat$(ARNOFW_PLUGIN_CONFIG_DIR)/net-prefix-translation.conf
 
 arnofw: $(TARGET_DIR)$(ARNOFW_TARGET_BINARY)
 

Modified: branches/1.0/package/arnofw/arnofw.serial
===================================================================
--- branches/1.0/package/arnofw/arnofw.serial	2017-05-28 18:37:02 UTC (rev 8352)
+++ branches/1.0/package/arnofw/arnofw.serial	2017-05-29 16:04:48 UTC (rev 8353)
@@ -1 +1 @@
-0002~0032~0000~0000~0000~
+0002~0033~0000~0000~0000~

Added: branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh
===================================================================
--- branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh	                        (rev 0)
+++ branches/1.0/package/arnofw/net-prefix-translation/20net-prefix-translation.plugin.sh	2017-05-29 16:04:48 UTC (rev 8353)
@@ -0,0 +1,286 @@
+# ------------------------------------------------------------------------------
+#      -= Arno's iptables firewall - Network Prefix Translation plugin =-
+#
+PLUGIN_NAME="Network Prefix Translation plugin"
+PLUGIN_VERSION="1.00"
+PLUGIN_CONF_FILE="net-prefix-translation.conf"
+#
+# Last changed          : May 28, 2017
+# Requirements          : AIF 2.0.1g+, ip6tables NETMAP support
+# Comments              : NPTv6 (Network Prefix Translation) for IPv6
+#                         Perform a 1:1 mapping of ULA <-> GUA prefixes
+#                         via the external interface.
+#
+# Author                : (C) Copyright 2017 by Lonnie Abelbeck & Arno van Amersfoort
+# Homepage              : http://rocky.eld.leidenuniv.nl/
+# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+#                         (note: you must remove all spaces and substitute the @ and the .
+#                         at the proper locations!)
+# ------------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# ------------------------------------------------------------------------------
+
+NET_PREFIX_TRANSLATION_GLOBAL_IPV6="/var/tmp/aif-net-prefix-translation-global-ipv6"
+
+net_prefix_translation_global_ipv6()
+{
+  local lan IFS
+
+  IFS=' ,'
+  for lan in $NET_PREFIX_TRANSLATION_IF; do
+    ip -6 -o addr show dev $lan scope global 2>/dev/null \
+      | awk '$3 == "inet6" { print $4; }'
+  done
+}
+
+net_prefix_translation_global_prefix()
+{
+  local global_prefix prefix len cut_chars prefix_label prefix_len ipv6 ipv6_ex IFS
+
+  global_prefix=""
+  if [ -n "$NET_PREFIX_TRANSLATION_IF" ]; then
+    prefix_len="$(echo "$NET_PREFIX_TRANSLATION_GLOBAL_PREFIX" | cut -s -d'/' -f2)"
+    case $prefix_len in
+      64) cut_chars="1-19"
+          prefix_label="::/64"
+          ;;
+      60) cut_chars="1-18"
+          prefix_label="0::/60"
+          ;;
+      56) cut_chars="1-17"
+          prefix_label="00::/56"
+          ;;
+      52) cut_chars="1-16"
+          prefix_label="000::/52"
+          ;;
+      48) cut_chars="1-15"
+          prefix_label="0000::/48"
+          ;;
+       *) cut_chars=""
+          prefix_label=""
+          ;;
+    esac
+
+    if [ -n "$cut_chars" -a -n "$prefix_label" ]; then
+      unset IFS
+      for prefix in $(net_prefix_translation_global_ipv6); do
+        len="$(echo "$prefix" | sed -n -r -e 's/^[0-9a-fA-F:]+\/([0-9]+)$/\1/p')"
+        if [ -n "$len" ]; then
+          if [ $len -ge 32 -a $len -le 64 ]; then
+            ipv6="$(echo "$prefix" | cut -d'/' -f1)"
+            ipv6_ex="$(netcalc "$ipv6" | sed -n -r -e 's/^Expanded IPv6 *: *([0-9a-fA-F:]+).*$/\1/p')"
+            global_prefix="$(echo "$ipv6_ex" | cut -c $cut_chars)"
+            if [ -n "$global_prefix" ]; then
+              global_prefix="$global_prefix$prefix_label"
+              break
+            fi
+          fi
+        fi
+      done
+    fi
+  else
+    global_prefix="$NET_PREFIX_TRANSLATION_GLOBAL_PREFIX"
+  fi
+
+  echo "$global_prefix"
+}
+
+# Plugin start function
+plugin_start()
+{
+  local global_prefix local_prefix eif IFS
+
+  #### remove when in main script ####
+  ip6tables -t nat -F
+  ip6tables -t nat -X
+  ####
+
+  ip6tables -t nat -N NET_PREFIX_TRANSLATION_IN 2>/dev/null
+  ip6tables -t nat -F NET_PREFIX_TRANSLATION_IN
+
+  ip6tables -t nat -N NET_PREFIX_TRANSLATION_OUT 2>/dev/null
+  ip6tables -t nat -F NET_PREFIX_TRANSLATION_OUT
+
+  global_prefix="$(net_prefix_translation_global_prefix)"
+
+  if [ -z "$global_prefix" ]; then
+    echo "${INDENT}Network Prefix Translation Global Prefix: Not Found"
+    return 1
+  fi
+
+  local_prefix="$NET_PREFIX_TRANSLATION_LOCAL_PREFIX"
+
+  echo "${INDENT}Network Prefix Translation Global Prefix: $global_prefix"
+  echo "${INDENT}Network Prefix Translation Local Prefix: $local_prefix"
+
+  IFS=' ,'
+  for eif in $EXT_IF; do
+    ip6tables -t nat -A NET_PREFIX_TRANSLATION_IN -i $eif -d $global_prefix -j NETMAP --to $local_prefix
+    ip6tables -t nat -A NET_PREFIX_TRANSLATION_OUT -o $eif -s $local_prefix -j NETMAP --to $global_prefix
+  done
+
+  echo "$global_prefix" > "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6"
+
+  ip6tables -t nat -A PREROUTING -j NET_PREFIX_TRANSLATION_IN
+  ip6tables -t nat -A POSTROUTING -j NET_PREFIX_TRANSLATION_OUT
+
+  return 0
+}
+
+
+# Plugin restart function
+plugin_restart()
+{
+
+  # Skip plugin_stop on a restart
+  plugin_start
+
+  return 0
+}
+
+
+# Plugin stop function
+plugin_stop()
+{
+
+  ip6tables -t nat -D PREROUTING -j NET_PREFIX_TRANSLATION_IN
+  ip6tables -t nat -D POSTROUTING -j NET_PREFIX_TRANSLATION_OUT
+
+  ip6tables -t nat -F NET_PREFIX_TRANSLATION_IN
+  ip6tables -t nat -X NET_PREFIX_TRANSLATION_IN 2>/dev/null
+
+  ip6tables -t nat -F NET_PREFIX_TRANSLATION_OUT
+  ip6tables -t nat -X NET_PREFIX_TRANSLATION_OUT 2>/dev/null
+
+  rm -f "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6"
+
+  return 0
+}
+
+
+# Plugin status function
+plugin_status()
+{
+  local old_prefix global_prefix local_prefix eif IFS
+
+  if [ -f "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6" ]; then
+    old_prefix="$(cat "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6")"
+  else
+    old_prefix=""
+  fi
+
+  global_prefix="$(net_prefix_translation_global_prefix)"
+
+  if [ -z "$global_prefix" ]; then
+    echo "  Network Prefix Translation Global Prefix: Not Found"
+    return 0
+  fi
+
+  if [ "$old_prefix" = "$global_prefix" ]; then
+    echo "  Network Prefix Translation Global Prefix did not change: $global_prefix"
+    return 0
+  fi
+
+  local_prefix="$NET_PREFIX_TRANSLATION_LOCAL_PREFIX"
+
+  if [ "$NET_PREFIX_TRANSLATION_UPDATE_ON_STATUS" != "0" ]; then
+    # update rules
+
+    ip6tables -t nat -F NET_PREFIX_TRANSLATION_IN
+    ip6tables -t nat -F NET_PREFIX_TRANSLATION_OUT
+
+    IFS=' ,'
+    for eif in $EXT_IF; do
+      ip6tables -t nat -A NET_PREFIX_TRANSLATION_IN -i $eif -d $global_prefix -j NETMAP --to $local_prefix
+      ip6tables -t nat -A NET_PREFIX_TRANSLATION_OUT -o $eif -s $local_prefix -j NETMAP --to $global_prefix
+    done
+
+    echo "$global_prefix" > "$NET_PREFIX_TRANSLATION_GLOBAL_IPV6"
+    echo "  Network Prefix Translation Global Prefix (updated): $global_prefix"
+  else
+    echo "  Network Prefix Translation Global Prefix needs updating to: $global_prefix"
+  fi
+
+  return 0
+}
+
+
+# Check sanity of eg. environment
+plugin_sanity_check()
+{
+  # Sanity check
+
+  if [ -z "$(echo "$NET_PREFIX_TRANSLATION_GLOBAL_PREFIX" | cut -s -d'/' -f2)" ]; then
+    printf "\033[40m\033[1;31m${INDENT}ERROR: NET_PREFIX_TRANSLATION_GLOBAL_PREFIX is missing a /nn prefix!\033[0m\n" >&2
+    return 1
+  fi
+
+  if [ -z "$(echo "$NET_PREFIX_TRANSLATION_LOCAL_PREFIX" | cut -s -d'/' -f2)" ]; then
+    printf "\033[40m\033[1;31m${INDENT}ERROR: NET_PREFIX_TRANSLATION_LOCAL_PREFIX is missing a /nn prefix!\033[0m\n" >&2
+    return 1
+  fi
+
+  if [ -n "$NET_PREFIX_TRANSLATION_IF" ] && ! check_command netcalc; then
+    printf "\033[40m\033[1;31m${INDENT}ERROR: Required binary \"netcalc\" is not available!\033[0m\n" >&2
+    return 1
+  fi
+
+  return 0
+}
+
+
+############
+# Mainline #
+############
+
+# Check where to find the config file
+CONF_FILE=""
+if [ -n "$PLUGIN_CONF_PATH" ]; then
+  CONF_FILE="$PLUGIN_CONF_PATH/$PLUGIN_CONF_FILE"
+fi
+
+# Preinit to success:
+PLUGIN_RET_VAL=0
+
+# Check if the config file exists
+if [ ! -e "$CONF_FILE" ]; then
+  printf "NOTE: Config file \"$CONF_FILE\" not found!\n        Plugin \"$PLUGIN_NAME v$PLUGIN_VERSION\" ignored!\n" >&2
+else
+  # Source the plugin config file
+  . "$CONF_FILE"
+
+  if [ "$ENABLED" = "1" -a "$PLUGIN_CMD" != "stop-restart" ] ||
+     [ "$ENABLED" = "0" -a "$PLUGIN_CMD" = "stop-restart" ] ||
+     [ -n "$PLUGIN_LOAD_FILE" -a "$PLUGIN_CMD" = "stop" ] ||
+     [ -n "$PLUGIN_LOAD_FILE" -a "$PLUGIN_CMD" = "status" ]; then
+    # Show who we are:
+    echo "${INDENT}$PLUGIN_NAME v$PLUGIN_VERSION"
+
+    # Increment indention
+    INDENT="$INDENT "
+
+    # Only proceed if environment ok
+    if ! plugin_sanity_check; then
+      PLUGIN_RET_VAL=1
+    else
+      case $PLUGIN_CMD in
+        start|'') plugin_start; PLUGIN_RET_VAL=$? ;;
+        restart ) plugin_restart; PLUGIN_RET_VAL=$? ;;
+        stop|stop-restart) plugin_stop; PLUGIN_RET_VAL=$? ;;
+        status  ) plugin_status; PLUGIN_RET_VAL=$? ;;
+        *       ) PLUGIN_RET_VAL=1; printf "\033[40m\033[1;31m  ERROR: Invalid plugin option \"$PLUGIN_CMD\"!\033[0m\n" >&2 ;;
+      esac
+    fi
+  fi
+fi

Added: branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf
===================================================================
--- branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf	                        (rev 0)
+++ branches/1.0/package/arnofw/net-prefix-translation/net-prefix-translation.conf	2017-05-29 16:04:48 UTC (rev 8353)
@@ -0,0 +1,56 @@
+# ------------------------------------------------------------------------------
+#      -= Arno's iptables firewall - Network Prefix Translation plugin =-
+# ------------------------------------------------------------------------------
+
+# To actually enable this plugin make ENABLED=1:
+# ------------------------------------------------------------------------------
+ENABLED=0
+
+# NPTv6 (Network Prefix Translation) for IPv6
+#
+# Commonly used to assign fixed ULA (Unique Local IPv6 Unicast Addresses)
+# (RFC4193) prefixes to local networks and perform a 1:1 mapping to a
+# GUA (IPv6 Global Unicast Address) (RFC3587) prefix provided by your ISP.
+# Should the GUA prefix change, the local ULA prefix can remain the same.
+#
+# The simplest case is where the GUA prefix is static, or seldom changes,
+# specify the global prefix with NET_PREFIX_TRANSLATION_GLOBAL_PREFIX.
+#
+# Example:
+#   NET_PREFIX_TRANSLATION_GLOBAL_PREFIX="2001:db8:abcd:1230::/60"
+# (IPv6 Only)
+# ------------------------------------------------------------------------------
+NET_PREFIX_TRANSLATION_GLOBAL_PREFIX="::/60"
+
+# The more common case is where the GUA prefix is dynamic, using DHCPv6-PD.
+# In this case monitor an interface that is automatically assgined a prefix.
+# The value of NET_PREFIX_TRANSLATION_GLOBAL_PREFIX is used only to determine
+# the prefix length.  When NET_PREFIX_TRANSLATION_IF is not defined,
+# NET_PREFIX_TRANSLATION_GLOBAL_PREFIX is used, and must be fully specified.
+#
+# Example: (first INT_IF interface will be used)
+#   NET_PREFIX_TRANSLATION_IF="$INT_IF"
+# ------------------------------------------------------------------------------
+NET_PREFIX_TRANSLATION_IF="$INT_IF"
+
+# You must define NET_PREFIX_TRANSLATION_LOCAL_PREFIX by generating a ULA,
+# using a script or web site, whatever you are most comfortable with.
+#
+# Example: (generate your own, random, ULA)
+#   NET_PREFIX_TRANSLATION_LOCAL_PREFIX="fd04:928b:f87e::/48"
+# (IPv6 Only)
+# ------------------------------------------------------------------------------
+NET_PREFIX_TRANSLATION_LOCAL_PREFIX="fd04:928b:f87e::/48"
+
+# When this plugin's status is called, if the global IPv6 prefix has changed,
+# noted by the IPv6 prefix associated with NET_PREFIX_TRANSLATION_IF, the
+# rules will be updated. Set NET_PREFIX_TRANSLATION_UPDATE_ON_STATUS to "0"
+# to disable this automatic update on status.
+#
+# Example:
+#   $ arno-iptables-firewall status-plugins net-prefix-translation
+#
+# Defaults to update on status if not set to "0"
+# ------------------------------------------------------------------------------
+NET_PREFIX_TRANSLATION_UPDATE_ON_STATUS=1
+

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