astlinux-commits — Commits to the AstLinux SVN repository

[Astlinux-commits] SF.net SVN: astlinux:[7870] branches/1.0/package/lighttpd/lighttpd.conf

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

Revision: 7870
          http://sourceforge.net/p/astlinux/code/7870
Author:   abelbeck
Date:     2016-09-30 03:57:26 +0000 (Fri, 30 Sep 2016)
Log Message:
-----------
lighttpd, web interface, force HTTP / to HTTPS /, followup to r7868

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/7868

Modified Paths:
--------------
    branches/1.0/package/lighttpd/lighttpd.conf

Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf	2016-09-29 20:30:48 UTC (rev 7869)
+++ branches/1.0/package/lighttpd/lighttpd.conf	2016-09-30 03:57:26 UTC (rev 7870)
@@ -163,7 +163,8 @@
 ## Redirect HTTP to HTTPS for /admin/ Authentication
 $HTTP["scheme"] == "http" {
     $HTTP["host"] =~ "^(.*)$" {
-        url.redirect = ( "^/(admin/.*)$" => "https://%1/$1" )
+        url.redirect = ( "^/(admin/.*)$" => "https://%1/$1",
+                                   "^/$" => "https://%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:[7869] branches/1.0/docs/ChangeLog.txt

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

Revision: 7869
          http://sourceforge.net/p/astlinux/code/7869
Author:   abelbeck
Date:     2016-09-29 20:30:48 +0000 (Thu, 29 Sep 2016)
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	2016-09-29 17:07:42 UTC (rev 7868)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-29 20:30:48 UTC (rev 7869)
@@ -53,7 +53,7 @@
 
 -- mac2vendor, oui.txt database snapshot 2016-08-21
 
--- Time Zone Database update, tzdata2016f and php-timezonedb-2016.6
+-- Time Zone Database update, tzdata2016g and php-timezonedb-2016.7
 
 ** Networking
 
@@ -67,7 +67,7 @@
 
 -- unbound (host), version bump to 1.5.10
 
--- lighttpd, version bump to 1.4.41
+-- lighttpd, version bump to 1.4.41, web interface, force HTTPS for /admin/ Authentication
 
 -- OpenVPN, version bump to 2.3.12
 

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

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

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

Revision: 7868
          http://sourceforge.net/p/astlinux/code/7868
Author:   abelbeck
Date:     2016-09-29 17:07:42 +0000 (Thu, 29 Sep 2016)
Log Message:
-----------
lighttpd, web interface, force HTTPS for /admin/ Authentication, default to both HTTP and HTTPS serving the web interace

Modified Paths:
--------------
    branches/1.0/package/lighttpd/lighttpd.conf
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf	2016-09-29 13:45:11 UTC (rev 7867)
+++ branches/1.0/package/lighttpd/lighttpd.conf	2016-09-29 17:07:42 UTC (rev 7868)
@@ -7,7 +7,8 @@
                                 "mod_auth",
                                 "mod_alias",
                                 "mod_fastcgi",
-                                "mod_proxy" )
+                                "mod_proxy",
+                                "mod_redirect" )
 
 server.document-root        = "@HTTPDIR@"
 server.errorlog-use-syslog  = "enable"
@@ -124,7 +125,10 @@
 
 auth.backend               = "htpasswd"
 auth.backend.htpasswd.userfile = "/var/www/admin/.htpasswd"
-auth.require               = ( "/admin/cli/" =>
+
+## Require HTTPS for /admin/ Authentication
+$HTTP["scheme"] == "https" {
+    auth.require           = ( "/admin/cli/" =>
                                (
                                  "method"  => "basic",
                                  "realm"   => "admin",
@@ -155,6 +159,13 @@
                                  "require" => "valid-user"
                                )
                              )
+}
+## Redirect HTTP to HTTPS for /admin/ Authentication
+$HTTP["scheme"] == "http" {
+    $HTTP["host"] =~ "^(.*)$" {
+        url.redirect = ( "^/(admin/.*)$" => "https://%1/$1" )
+    }
+}
 
 @CLI_PROXY_SERVER@$HTTP["scheme"] == "https" {
 @CLI_PROXY_SERVER@     proxy.server += ( "/admin/cli/" =>

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2016-09-29 13:45:11 UTC (rev 7867)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2016-09-29 17:07:42 UTC (rev 7868)
@@ -371,10 +371,10 @@
 
 ## HTTP Server
 ## If you set HTTPDIR, serve files from that directory.
-HTTPDIR="/tftpboot"
+HTTPDIR="/stat/var/www"    # Define the location to serve HTTP from
 HTTP_LISTING="yes"
 HTTP_ACCESSLOG="no"        # Enable access logging in /var/log/lighttpd/access.log
-HTTPCGI="no"
+HTTPCGI="yes"
 
 ## HTTP and HTTPS /phoneprov/ directory server, useful for IP Phone provisioning
 ## If the directory "/mnt/kd/phoneprov/" exists, this will be served as /phoneprov/

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

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

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

Revision: 7867
          http://sourceforge.net/p/astlinux/code/7867
Author:   abelbeck
Date:     2016-09-29 13:45:11 +0000 (Thu, 29 Sep 2016)
Log Message:
-----------
zoneinfo, version bump to 2016g and PHP_TIMEZONEDB 2016.7

Modified Paths:
--------------
    branches/1.0/package/php/php.mk
    branches/1.0/package/zoneinfo/zoneinfo.mk

Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk	2016-09-28 16:29:56 UTC (rev 7866)
+++ branches/1.0/package/php/php.mk	2016-09-29 13:45:11 UTC (rev 7867)
@@ -13,7 +13,7 @@
 PHP_DEPENDENCIES = host-pkg-config
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_TIMEZONEDB),y)
-PHP_TIMEZONEDB_VERSION = 2016.6
+PHP_TIMEZONEDB_VERSION = 2016.7
 PHP_TIMEZONEDB_SITE = http://files.astlinux-project.org
 PHP_TIMEZONEDB_SOURCE = timezonedb-$(PHP_TIMEZONEDB_VERSION).tar.gz
 

Modified: branches/1.0/package/zoneinfo/zoneinfo.mk
===================================================================
--- branches/1.0/package/zoneinfo/zoneinfo.mk	2016-09-28 16:29:56 UTC (rev 7866)
+++ branches/1.0/package/zoneinfo/zoneinfo.mk	2016-09-29 13:45:11 UTC (rev 7867)
@@ -3,7 +3,7 @@
 # zoneinfo
 #
 ##############################################################
-ZONEINFO_VERSION := 2016f
+ZONEINFO_VERSION := 2016g
 ZONEINFO_DATA := tzdata$(ZONEINFO_VERSION).tar.gz
 ZONEINFO_SOURCE := tzcode$(ZONEINFO_VERSION).tar.gz
 ZONEINFO_SITE := http://www.iana.org/time-zones/repository/releases

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

[Astlinux-commits] SF.net SVN: astlinux:[7866] branches/1.0/project/astlinux/target_skeleton/ stat/etc/rc.conf

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

Revision: 7866
          http://sourceforge.net/p/astlinux/code/7866
Author:   abelbeck
Date:     2016-09-28 16:29:56 +0000 (Wed, 28 Sep 2016)
Log Message:
-----------
/stat/etc/rc.conf, enclose alphanumeric strings in double-quotes, no functional change just consistency

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2016-09-27 18:24:41 UTC (rev 7865)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2016-09-28 16:29:56 UTC (rev 7866)
@@ -25,8 +25,8 @@
 
 
 ## Domain and Hostname
-DOMAIN=astlinux
-HOSTNAME=pbx
+DOMAIN="astlinux"
+HOSTNAME="pbx"
 
 ## Timezone
 ## Set the Timezone using the zoneinfo database. Defining TIMEZONE will:
@@ -53,7 +53,7 @@
 
 ## Persistent Logs
 ## If this variable is defined, logs are saved to the keydisk instead of RAM
-#PERSISTLOG=yes
+#PERSISTLOG="yes"
 
 
 #####################################################################
@@ -62,7 +62,7 @@
 
 
 ## External Interface
-EXTIF=eth0
+EXTIF="eth0"
 
 ## If EXTIP is set, a 'static' config is used instead of the default,
 ## which is DHCP client on $EXTIF. If you are using a T1/E1
@@ -78,26 +78,26 @@
 #EXTDHCP="no"  # "no" or "yes", defaults to "no"
 
 ## Internal Interface
-#INTIF=eth1
+#INTIF="eth1"
 
 ## Internal IP address and netmask
-INTIP=192.168.101.1
-INTNM=255.255.255.0
+INTIP="192.168.101.1"
+INTNM="255.255.255.0"
 
 ## Additional "Internal" interfaces
 ## By default they will be brought up identically to INTIF.
 ## They will be able to access the AstLinux machine and go out via EXTIF.
-#INT2IF=eth1
-#INT2IP=192.168.102.1
-#INT2NM=255.255.255.0
+#INT2IF="eth1"
+#INT2IP="192.168.102.1"
+#INT2NM="255.255.255.0"
 
-#INT3IF=eth2
-#INT3IP=192.168.103.1
-#INT3NM=255.255.255.0
+#INT3IF="eth2"
+#INT3IP="192.168.103.1"
+#INT3NM="255.255.255.0"
 
-#INT4IF=eth3
-#INT4IP=192.168.104.1
-#INT4NM=255.255.255.0
+#INT4IF="eth3"
+#INT4IP="192.168.104.1"
+#INT4NM="255.255.255.0"
 
 ## DMZ Support
 #DMZIF="eth2"
@@ -108,14 +108,14 @@
 ## This setting controls whether or not we will use the local dnsmasq instance
 ## for DNS resolution on THIS machine.
 ## By default this is enabled provided dnsmasq is started, disable by setting to "no".
-#LOCALDNS=no
+#LOCALDNS="no"
 ##
 ## By default the DNS lookup for DOMAIN is local-only, recommended with local interfaces and/or
 ## a unique local DOMAIN.  If there are no local interfaces defined, it may be useful
 ## to define DOMAIN the same as an upstream DNS server, in that case
 ## disabling LOCALDNS_LOCAL_DOMAIN would be desirable.
 ## By default this is enabled providing local-only lookups for DOMAIN, disable by setting to "no".
-#LOCALDNS_LOCAL_DOMAIN=no
+#LOCALDNS_LOCAL_DOMAIN="no"
 
 ## You don't have to use DHCP with all of your internal interfaces.
 ## Here you can specify a list of interfaces that will not have a DHCP range
@@ -126,7 +126,7 @@
 ## Here you can define the range of IP addresses for your local networks.
 ## This value will apply to all of your INTIFs. We will automatically calculate
 ## the first three octets. Just tell me which range I should give out leases for.
-## In this example, if INTIP=192.168.0.1, we will give out leases for
+## In this example, if INTIP="192.168.0.1", we will give out leases for
 ## 192.168.0.100 - 192.168.0.220
 #DHCPRANGE="100:220"
 
@@ -334,13 +334,13 @@
 
 ## FTP Server (vsftpd)
 ## To start vsftpd, set 'vsftpd'.
-FTPD=vsftpd
+FTPD="vsftpd"
 
 ## TFTPD Server
 ## Use the built-in dnsmasq tftpd server, set 'dnsmasq'.
 ## (Deprecated) standalone tftpd server, set 'tftpd'. Defaults to 'dnsmasq' if
 ## tftpd package is not installed.
-TFTPD=dnsmasq
+TFTPD="dnsmasq"
 
 ## CLI (Command Line Interface) Proxy Server (shellinaboxd)
 ## Provides a 'login' prompt via the URL, https://pbx/admin/cli/
@@ -395,7 +395,7 @@
 ## Note: also see NTPSERVS in the "General Configuration" section.
 ## Enable NTP broadcasts to local 1st LAN Interface (INTIF). Use with something like
 ## Tardis (win32) or ntpd (listen mode).
-#NTPBROADCAST=yes
+#NTPBROADCAST="yes"
 
 ## DNSCrypt Proxy Server
 ## Note: dnsmasq must be restarted when DNSCRYPT_PROXY changes.
@@ -709,12 +709,8 @@
 ## Racoon support - VPN above must include "racoon"
 ## ESP Tunnel Mode
 ##
-## Keys may be generated randomly as:
+## Keys may be generated randomly using: openssl rand -base64 33
 ##
-## dd if=/dev/random count=$(($bits / 8)) bs=1 | (echo -n "0x" ; xxd -ps -c64)
-##  -or-
-## openssl rand -base64 33
-##
 #IPSEC_LOGLEVEL="info"      # "debug" or "debug2" or "info" or "notify" or "warning" or "error"
 ##
 ## Define 15 ~ (tilde) separated arguments for Pre-Shared-Key authentication
@@ -971,27 +967,27 @@
 
 ## Fancy External interface support
 ## You will still need to set EXTIF to your external interface (wp*).
-## If EXTIF=hdlc0, I will start dahdi and run sethdlc.
-## If EXTIF=pvc0. I will start dahdi and run sethdlc. You will also need to
+## If EXTIF="hdlc0", I will start dahdi and run sethdlc.
+## If EXTIF="pvc0". I will start dahdi and run sethdlc. You will also need to
 ## fill in HDLCLMI and HDLCDLCI
 ## See more options below.
 ##
 ## Use wancfg first!
-#EXTIF=wp1chdlc
+#EXTIF="wp1chdlc"
 ##
 ## Use cisco encapsulation and be done
-#EXTIF=hdlc0
+#EXTIF="hdlc0"
 #EXTENC="cisco"
 ##
 ## Dahdi Data Support
-## If you set EXTIF=hdlc0 above, you will probably need to set the
+## If you set EXTIF="hdlc0" above, you will probably need to set the
 ## protocol here.  See sethdlc for valid types, but you PROBABLY want
 ## "cisco".  DO NOT USE THIS WITH SANGOMA HARDWARE!!! Use wancfg!!!
 #EXTENC="cisco"
 ##
 ## Frame relay with LMI and DLCI (will use hdlc0)
-#EXTIF=pvc0
-#HDLCLMI=ansi
+#EXTIF="pvc0"
+#HDLCLMI="ansi"
 #HDLCDLCI=100
 
 ## Sometimes it takes a while for the WAN interface to come up...

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

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

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

Revision: 7865
          http://sourceforge.net/p/astlinux/code/7865
Author:   abelbeck
Date:     2016-09-27 18:24:41 +0000 (Tue, 27 Sep 2016)
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	2016-09-27 18:19:29 UTC (rev 7864)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-27 18:24:41 UTC (rev 7865)
@@ -65,6 +65,8 @@
 
 -- libcurl (curl) version bump to 7.50.3, security fixes: CVE-2016-5419, CVE-2016-5420, CVE-2016-5421, CVE-2016-7167
 
+-- unbound (host), version bump to 1.5.10
+
 -- lighttpd, version bump to 1.4.41
 
 -- OpenVPN, version bump to 2.3.12

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

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

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

Revision: 7864
          http://sourceforge.net/p/astlinux/code/7864
Author:   abelbeck
Date:     2016-09-27 18:19:29 +0000 (Tue, 27 Sep 2016)
Log Message:
-----------
unbound, version bump to 1.5.10

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

Modified: branches/1.0/package/unbound/unbound.mk
===================================================================
--- branches/1.0/package/unbound/unbound.mk	2016-09-24 12:45:45 UTC (rev 7863)
+++ branches/1.0/package/unbound/unbound.mk	2016-09-27 18:19:29 UTC (rev 7864)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-UNBOUND_VERSION = 1.5.9
+UNBOUND_VERSION = 1.5.10
 UNBOUND_SITE = https://www.unbound.net/downloads
 UNBOUND_SOURCE = unbound-$(UNBOUND_VERSION).tar.gz
 UNBOUND_INSTALL_STAGING = YES

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

[Astlinux-commits] SF.net SVN: astlinux:[7863] branches/1.0/package/arnofw/ reload-blocklist-netset

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

Revision: 7863
          http://sourceforge.net/p/astlinux/code/7863
Author:   abelbeck
Date:     2016-09-24 12:45:45 +0000 (Sat, 24 Sep 2016)
Log Message:
-----------
reload-blocklist-netset, count IP/Nets beginning with a 'zero'

Modified Paths:
--------------
    branches/1.0/package/arnofw/reload-blocklist-netset

Modified: branches/1.0/package/arnofw/reload-blocklist-netset
===================================================================
--- branches/1.0/package/arnofw/reload-blocklist-netset	2016-09-23 15:51:18 UTC (rev 7862)
+++ branches/1.0/package/arnofw/reload-blocklist-netset	2016-09-24 12:45:45 UTC (rev 7863)
@@ -150,7 +150,7 @@
     rm -f "$tmp_file"
     UPDATES=$((UPDATES + 1))
 
-    count=$(grep -c '^[1-9a-fA-F]' "$DIR/$netset.netset")
+    count=$(grep -c '^[0-9a-fA-F]' "$DIR/$netset.netset")
     mesg="Netset '$netset' has been updated. Contains $count addresses/nets."
     logger -t reload-blocklist-netset -p kern.info "$mesg"
     echo "$mesg"

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

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

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

Revision: 7862
          http://sourceforge.net/p/astlinux/code/7862
Author:   abelbeck
Date:     2016-09-23 15:51:18 +0000 (Fri, 23 Sep 2016)
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	2016-09-23 15:50:01 UTC (rev 7861)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-23 15:51:18 UTC (rev 7862)
@@ -32,7 +32,7 @@
 
 -- ethtool, version bump to 4.6
 
--- sudo, version bump to 1.8.17p1
+-- sudo, version bump to 1.8.18
 
 -- nano, version bump to 2.7.0
 
@@ -61,7 +61,7 @@
 
 -- Added a 4th LAN Interface configuration entry
 
--- arnofw (AIF), version bump to 2.0.1g-RC6, added support for 'ipset'
+-- arnofw (AIF), version bump to 2.0.1g-RC7, added support for 'ipset'
 
 -- libcurl (curl) version bump to 7.50.3, security fixes: CVE-2016-5419, CVE-2016-5420, CVE-2016-5421, CVE-2016-7167
 

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

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

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

Revision: 7861
          http://sourceforge.net/p/astlinux/code/7861
Author:   abelbeck
Date:     2016-09-23 15:50:01 +0000 (Fri, 23 Sep 2016)
Log Message:
-----------
sudo, version bump to 1.8.18

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

Modified: branches/1.0/package/sudo/sudo.mk
===================================================================
--- branches/1.0/package/sudo/sudo.mk	2016-09-23 15:23:53 UTC (rev 7860)
+++ branches/1.0/package/sudo/sudo.mk	2016-09-23 15:50:01 UTC (rev 7861)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.17p1
+SUDO_VERSION = 1.8.18
 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:[7860] branches/1.0/package/arnofw

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

Revision: 7860
          http://sourceforge.net/p/astlinux/code/7860
Author:   abelbeck
Date:     2016-09-23 15:23:53 +0000 (Fri, 23 Sep 2016)
Log Message:
-----------
arnofw, version bump to 2.0.1g-RC7, minor tweaks

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

Modified: branches/1.0/package/arnofw/arnofw.mk
===================================================================
--- branches/1.0/package/arnofw/arnofw.mk	2016-09-22 18:17:07 UTC (rev 7859)
+++ branches/1.0/package/arnofw/arnofw.mk	2016-09-23 15:23:53 UTC (rev 7860)
@@ -3,7 +3,7 @@
 # Arno's IPtables Firewall Script
 #
 #############################################################
-ARNOFW_VER := 2.0.1g-RC6
+ARNOFW_VER := 2.0.1g-RC7
 ARNOFW_ROOT := arno-iptables-firewall
 ARNOFW_SOURCE := $(ARNOFW_ROOT)_$(ARNOFW_VER).tar.gz
 #ARNOFW_SITE := http://rocky.eld.leidenuniv.nl/arno-iptables-firewall

Modified: branches/1.0/package/arnofw/arnofw.serial
===================================================================
--- branches/1.0/package/arnofw/arnofw.serial	2016-09-22 18:17:07 UTC (rev 7859)
+++ branches/1.0/package/arnofw/arnofw.serial	2016-09-23 15:23:53 UTC (rev 7860)
@@ -1 +1 @@
-0002~0027~0000~0000~0000~
+0002~0028~0000~0000~0000~

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

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

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

Revision: 7859
          http://sourceforge.net/p/astlinux/code/7859
Author:   abelbeck
Date:     2016-09-22 18:17:07 +0000 (Thu, 22 Sep 2016)
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	2016-09-22 18:16:00 UTC (rev 7858)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-22 18:17:07 UTC (rev 7859)
@@ -61,7 +61,7 @@
 
 -- Added a 4th LAN Interface configuration entry
 
--- arnofw (AIF), version bump to 2.0.1g-RC5, added support for 'ipset'
+-- arnofw (AIF), version bump to 2.0.1g-RC6, added support for 'ipset'
 
 -- libcurl (curl) version bump to 7.50.3, security fixes: CVE-2016-5419, CVE-2016-5420, CVE-2016-5421, CVE-2016-7167
 

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

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

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

Revision: 7858
          http://sourceforge.net/p/astlinux/code/7858
Author:   abelbeck
Date:     2016-09-22 18:16:00 +0000 (Thu, 22 Sep 2016)
Log Message:
-----------
arnofw, version bump to 2.0.1g-RC6, allows leading '0' IP/Nets in .netset file and whitelists 0.0.0.0/8 by default

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

Modified: branches/1.0/package/arnofw/arnofw.mk
===================================================================
--- branches/1.0/package/arnofw/arnofw.mk	2016-09-22 13:27:11 UTC (rev 7857)
+++ branches/1.0/package/arnofw/arnofw.mk	2016-09-22 18:16:00 UTC (rev 7858)
@@ -3,7 +3,7 @@
 # Arno's IPtables Firewall Script
 #
 #############################################################
-ARNOFW_VER := 2.0.1g-RC5
+ARNOFW_VER := 2.0.1g-RC6
 ARNOFW_ROOT := arno-iptables-firewall
 ARNOFW_SOURCE := $(ARNOFW_ROOT)_$(ARNOFW_VER).tar.gz
 #ARNOFW_SITE := http://rocky.eld.leidenuniv.nl/arno-iptables-firewall

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

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

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

Revision: 7857
          http://sourceforge.net/p/astlinux/code/7857
Author:   abelbeck
Date:     2016-09-22 13:27:11 +0000 (Thu, 22 Sep 2016)
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	2016-09-22 13:24:00 UTC (rev 7856)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-22 13:27:11 UTC (rev 7857)
@@ -57,6 +57,8 @@
 
 ** Networking
 
+-- OpenSSL, version bump to 1.0.1u, security fixes: CVE-2016-6304, and 10 "Low" Severity CVE's
+
 -- Added a 4th LAN Interface configuration entry
 
 -- arnofw (AIF), version bump to 2.0.1g-RC5, added support for 'ipset'

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

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

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

Revision: 7856
          http://sourceforge.net/p/astlinux/code/7856
Author:   abelbeck
Date:     2016-09-22 13:24:00 +0000 (Thu, 22 Sep 2016)
Log Message:
-----------
openssl, version bump to 1.0.1u, security fixes: CVE-2016-6304, and 10 Low: Severity

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

Modified: branches/1.0/package/openssl/openssl.mk
===================================================================
--- branches/1.0/package/openssl/openssl.mk	2016-09-21 20:22:09 UTC (rev 7855)
+++ branches/1.0/package/openssl/openssl.mk	2016-09-22 13:24:00 UTC (rev 7856)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.1t
+OPENSSL_VERSION = 1.0.1u
 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:[7855] branches/1.0/docs/ChangeLog.txt

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

Revision: 7855
          http://sourceforge.net/p/astlinux/code/7855
Author:   abelbeck
Date:     2016-09-21 20:22:09 +0000 (Wed, 21 Sep 2016)
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	2016-09-21 20:17:34 UTC (rev 7854)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-21 20:22:09 UTC (rev 7855)
@@ -117,7 +117,9 @@
 
 -- Network tab, SMTP Mail Relay, allow an empty "SMTP Cert File" which will default to the system ca-bundle.crt .
 
+-- Edit tab, add "Reload Firewall Blocklist" action menu item, along with editing special .netset files.
 
+
 Additions for AstLinux 1.2.7:
 =============================
 

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

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

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

Revision: 7854
          http://sourceforge.net/p/astlinux/code/7854
Author:   abelbeck
Date:     2016-09-21 20:17:34 +0000 (Wed, 21 Sep 2016)
Log Message:
-----------
web interface, Edit tab, add 'Reload Firewall Blocklist' action menu item

Modified Paths:
--------------
    branches/1.0/package/iptables/iptables.init
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/common/functions.php

Modified: branches/1.0/package/iptables/iptables.init
===================================================================
--- branches/1.0/package/iptables/iptables.init	2016-09-21 11:50:29 UTC (rev 7853)
+++ branches/1.0/package/iptables/iptables.init	2016-09-21 20:17:34 UTC (rev 7854)
@@ -7,7 +7,6 @@
   if [ ! -e /tmp/etc/arno-iptables-firewall ]; then
     ln -s /mnt/kd/arno-iptables-firewall /tmp/etc/arno-iptables-firewall
   fi
-
 }
 
 start () {
@@ -21,37 +20,34 @@
   files, and create a firewall configuration corresponding to this version of Arno's Firewall.
   NO FIREWALL IS ACTIVE!!!"
     fi
-
   else
-
     echo "Firewall is disabled."
-
   fi
-
 }
 
 stop () {
 
   if [ "$FWVERS" = "arno" ] || [ -z "$FWVERS" ]; then
-
     /usr/sbin/arno-iptables-firewall stop
-
   fi
-
 }
 
 restart () {
 
   if [ "$FWVERS" = "arno" ]; then
-
     /usr/sbin/arno-iptables-firewall restart
-
   else
-
     /usr/sbin/arno-iptables-firewall stop
+  fi
+}
 
+reload () {
+
+  if [ "$FWVERS" = "arno" ]; then
+    /usr/sbin/arno-iptables-firewall force-reload
+  else
+    echo "Firewall is disabled."
   fi
-
 }
 
 case $1 in
@@ -73,8 +69,12 @@
   restart
   ;;
 
+reload)
+  reload
+  ;;
+
 *)
-  echo "Usage: start|stop|restart"
+  echo "Usage: start|stop|restart|reload"
   ;;
 
 esac

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2016-09-21 11:50:29 UTC (rev 7853)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2016-09-21 20:17:34 UTC (rev 7854)
@@ -12,6 +12,7 @@
 // 02-18-2013, Added OpenVPN Client Config editing
 // 09-06-2013, Added Shortcut support
 // 06-07-2016, Added Avahi mDNS/DNS-SD support
+// 09-21-2016, Added Reload Firewall Blocklist
 //
 
 $myself = $_SERVER['PHP_SELF'];
@@ -50,6 +51,7 @@
 if (is_file('/etc/init.d/kamailio')) {
   $select_reload['kamailio'] = 'Restart Kamailio';
 }
+$select_reload['IPTABLES'] = 'Reload Firewall Blocklist';
 $select_reload['cron'] = 'Reload Cron for root';
 
 $sys_label = array (
@@ -260,6 +262,8 @@
         $result = restartPROCESS($process, 47, $result, 'init');
       } elseif ($process === 'avahi') {
         $result = restartPROCESS($process, 48, $result, 'init');
+      } elseif ($process === 'IPTABLES') {
+        $result = restartPROCESS('iptables', 66, $result, 'reload');
       } elseif ($process === 'cron') {
         $result = updateCRON('root', 30, $result);
       }
@@ -401,6 +405,8 @@
       putHtml('<p style="color: green;">Fossil Server'.statusPROCESS('fossil').'.</p>');
     } elseif ($result == 48) {
       putHtml('<p style="color: green;">mDNS/DNS-SD (Avahi)'.statusPROCESS('avahi').'.</p>');
+    } elseif ($result == 66) {
+      putHtml('<p style="color: green;">Firewall Blocklist has been Reloaded.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2016-09-21 11:50:29 UTC (rev 7853)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2016-09-21 20:17:34 UTC (rev 7854)
@@ -65,11 +65,11 @@
     $cmd .= ';sleep '.$wait;
     $cmd .= ';/usr/sbin/gen-rc-conf';
     $cmd .= ';service '.$process.' '.$start.' >/dev/null 2>/dev/null';
+  } elseif ($start === 'reload') {
+    $cmd .= ';service '.$process.' '.$start.' >/dev/null 2>/dev/null';
   } elseif ($process === 'iptables') {
     $cmd .= ';/usr/sbin/gen-rc-conf';
     $cmd .= ';service iptables restart >/dev/null 2>/dev/null';
-  } elseif ($start === 'reload') {
-    $cmd .= ';service '.$process.' '.$start.' >/dev/null 2>/dev/null';
   } else {
     $cmd .= ';service '.$process.' stop >/dev/null 2>/dev/null';
     $cmd .= ';sleep '.$wait;

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

[Astlinux-commits] SF.net SVN: astlinux:[7853] branches/1.0/package/arnofw/ reload-blocklist-netset

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

Revision: 7853
          http://sourceforge.net/p/astlinux/code/7853
Author:   abelbeck
Date:     2016-09-21 11:50:29 +0000 (Wed, 21 Sep 2016)
Log Message:
-----------
arnofw, reload-blocklist-netset, add 'voipbl' blocklist

Modified Paths:
--------------
    branches/1.0/package/arnofw/reload-blocklist-netset

Modified: branches/1.0/package/arnofw/reload-blocklist-netset
===================================================================
--- branches/1.0/package/arnofw/reload-blocklist-netset	2016-09-20 14:10:14 UTC (rev 7852)
+++ branches/1.0/package/arnofw/reload-blocklist-netset	2016-09-21 11:50:29 UTC (rev 7853)
@@ -5,14 +5,14 @@
 ## Regularly update .netset IP/Net entries to be used by Arno's Iptables Firewall (AIF)
 ##
 ## Cron may be used to run this script once or twice every day.  Example:
-## 15 05,15 * * * reload-blocklist-netset /mnt/kd/blocklists firehol_level1 spamhaus_dropv6 >/dev/null 2>&1
+## 15 05,15 * * * reload-blocklist-netset /mnt/kd/blocklists firehol_level1 voipbl >/dev/null 2>&1
 ##
 ## Important: Do not use the cron time schedule as above, make changes so the servers are not hit at the same time.
 ##
 ## Multiple netset entries may be space or comma separated.
 ##
 ## In this example, a /mnt/kd/blocklists/firehol_level1.netset
-##              and a /mnt/kd/blocklists/spamhaus_dropv6.netset file will be created.
+##              and a /mnt/kd/blocklists/voipbl.netset file will be created.
 ## Note: The specified directory must pre-exist, it will not be created.
 ##
 ## This script prevents any netset from being updated more often than
@@ -31,6 +31,7 @@
  firehol_level1: Blacklist composed from IP lists, providing maximum protection with minimum false positives.
  firehol_level2: Blacklist that track attacks, during about the last 48 hours.
  firehol_level3: Blacklist that track attacks, spyware, viruses, reported or detected in the last 30 days.
+         voipbl: VoIP Blacklist - sponsored by ScopServ International - http://www.voipbl.org/
   spamhaus_drop: Spamhaus DROP (Don't Route Or Peer), consisting of netblocks that are "hijacked" by cyber-crime operations.
  spamhaus_edrop: Spamhaus EDROP is an extension of the DROP list that includes suballocated netblocks.
 
@@ -61,6 +62,11 @@
       ALT_URL=""
       AGE=3600
       ;;
+     voipbl)
+      URL="http://www.voipbl.org/update/"
+      ALT_URL="https://raw.githubusercontent.com/firehol/blocklist-ipsets/master/voipbl.netset"
+      AGE=43200
+      ;;
     spamhaus_drop)
       URL="https://www.spamhaus.org/drop/drop.txt"
       ALT_URL="https://raw.githubusercontent.com/firehol/blocklist-ipsets/master/spamhaus_drop.netset"

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

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

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

Revision: 7852
          http://sourceforge.net/p/astlinux/code/7852
Author:   abelbeck
Date:     2016-09-20 14:10:14 +0000 (Tue, 20 Sep 2016)
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	2016-09-20 14:03:20 UTC (rev 7851)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-20 14:10:14 UTC (rev 7852)
@@ -36,6 +36,8 @@
 
 -- nano, version bump to 2.7.0
 
+-- acpid, version bump to 2.0.28
+
 -- logrotate, version bump to 3.10.0
 
 -- screen, version bump to 4.4.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:[7851] branches/1.0/package/acpid/acpid.mk

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

Revision: 7851
          http://sourceforge.net/p/astlinux/code/7851
Author:   abelbeck
Date:     2016-09-20 14:03:20 +0000 (Tue, 20 Sep 2016)
Log Message:
-----------
acpid, version bump to 2.0.28

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

Modified: branches/1.0/package/acpid/acpid.mk
===================================================================
--- branches/1.0/package/acpid/acpid.mk	2016-09-18 20:12:18 UTC (rev 7850)
+++ branches/1.0/package/acpid/acpid.mk	2016-09-20 14:03:20 UTC (rev 7851)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ACPID_VERSION = 2.0.26
+ACPID_VERSION = 2.0.28
 ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
 ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
 

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

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

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

Revision: 7850
          http://sourceforge.net/p/astlinux/code/7850
Author:   abelbeck
Date:     2016-09-18 20:12:18 +0000 (Sun, 18 Sep 2016)
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	2016-09-18 18:55:40 UTC (rev 7849)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-18 20:12:18 UTC (rev 7850)
@@ -45,10 +45,7 @@
 -- libsodium, version bump to 1.0.11
 
 -- reload-blocklist-netset (optional CRON script), new command added to generate .netset files for the firewall blocklist.
-   Issue "reload-blocklist-netset" for details.
-   == Cron may be used to run this script once or twice every day.  Example:
-   == 05 05,15 * * * reload-blocklist-netset /mnt/kd/blocklists firehol_level1 spamhaus_dropv6 >/dev/null 2>&1
-   More Info: http://iplists.firehol.org/?ipset=firehol_level1
+   More Info: http://doc.astlinux.org/userdoc:tt_firewall_external_block_list
 
 -- ca-certificates, update trusted root certificates 2016-09-14
 
@@ -114,6 +111,7 @@
 -- Network -> Firewall sub-tab, add "Deny LAN to DMZ" option for specified LAN Interfaces.
 
 -- Network -> Firewall sub-tab, add Block Host/CIDR using *.netset file(s) in the directory /mnt/kd/blocklists .
+   More Info: http://doc.astlinux.org/userdoc:tt_firewall_external_block_list
 
 -- Network tab, SMTP Mail Relay, allow an empty "SMTP Cert File" which will default to the system ca-bundle.crt .
 

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

[Astlinux-commits] SF.net SVN: astlinux:[7849] branches/1.0/package/arnofw/ reload-blocklist-netset

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

Revision: 7849
          http://sourceforge.net/p/astlinux/code/7849
Author:   abelbeck
Date:     2016-09-18 18:55:40 +0000 (Sun, 18 Sep 2016)
Log Message:
-----------
reload-blocklist-netset, tweak script comments

Modified Paths:
--------------
    branches/1.0/package/arnofw/reload-blocklist-netset

Modified: branches/1.0/package/arnofw/reload-blocklist-netset
===================================================================
--- branches/1.0/package/arnofw/reload-blocklist-netset	2016-09-17 23:37:42 UTC (rev 7848)
+++ branches/1.0/package/arnofw/reload-blocklist-netset	2016-09-18 18:55:40 UTC (rev 7849)
@@ -2,9 +2,13 @@
 ##
 ## reload-blocklist-netset
 ##
+## Regularly update .netset IP/Net entries to be used by Arno's Iptables Firewall (AIF)
+##
 ## Cron may be used to run this script once or twice every day.  Example:
-## 05 05,15 * * * reload-blocklist-netset /mnt/kd/blocklists firehol_level1 spamhaus_dropv6 >/dev/null 2>&1
+## 15 05,15 * * * reload-blocklist-netset /mnt/kd/blocklists firehol_level1 spamhaus_dropv6 >/dev/null 2>&1
 ##
+## Important: Do not use the cron time schedule as above, make changes so the servers are not hit at the same time.
+##
 ## Multiple netset entries may be space or comma separated.
 ##
 ## In this example, a /mnt/kd/blocklists/firehol_level1.netset

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

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

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

Revision: 7848
          http://sourceforge.net/p/astlinux/code/7848
Author:   abelbeck
Date:     2016-09-17 23:37:42 +0000 (Sat, 17 Sep 2016)
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	2016-09-17 23:36:28 UTC (rev 7847)
+++ branches/1.0/docs/ChangeLog.txt	2016-09-17 23:37:42 UTC (rev 7848)
@@ -60,7 +60,7 @@
 
 -- Added a 4th LAN Interface configuration entry
 
--- arnofw (AIF), version bump to 2.0.1g-RC4, added support for 'ipset'
+-- arnofw (AIF), version bump to 2.0.1g-RC5, added support for 'ipset'
 
 -- libcurl (curl) version bump to 7.50.3, security fixes: CVE-2016-5419, CVE-2016-5420, CVE-2016-5421, CVE-2016-7167
 

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

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

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

Revision: 7847
          http://sourceforge.net/p/astlinux/code/7847
Author:   abelbeck
Date:     2016-09-17 23:36:28 +0000 (Sat, 17 Sep 2016)
Log Message:
-----------
arnofw, version bump to 2.0.1g-RC5, the default aif_whitelist should include 224.0.0.0/3 instead of 224.0.0.0/4

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

Modified: branches/1.0/package/arnofw/arnofw.mk
===================================================================
--- branches/1.0/package/arnofw/arnofw.mk	2016-09-17 16:55:38 UTC (rev 7846)
+++ branches/1.0/package/arnofw/arnofw.mk	2016-09-17 23:36:28 UTC (rev 7847)
@@ -3,7 +3,7 @@
 # Arno's IPtables Firewall Script
 #
 #############################################################
-ARNOFW_VER := 2.0.1g-RC4
+ARNOFW_VER := 2.0.1g-RC5
 ARNOFW_ROOT := arno-iptables-firewall
 ARNOFW_SOURCE := $(ARNOFW_ROOT)_$(ARNOFW_VER).tar.gz
 #ARNOFW_SITE := http://rocky.eld.leidenuniv.nl/arno-iptables-firewall

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

[Astlinux-commits] SF.net SVN: astlinux:[7846] branches/1.0/package/webinterface/altweb/admin/ edit.php

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

Revision: 7846
          http://sourceforge.net/p/astlinux/code/7846
Author:   abelbeck
Date:     2016-09-17 16:55:38 +0000 (Sat, 17 Sep 2016)
Log Message:
-----------
web interface, Edit tab, add blocked-hosts.netset, blocked-hostsv6.netset support

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/edit.php

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2016-09-17 16:18:25 UTC (rev 7845)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2016-09-17 16:55:38 UTC (rev 7846)
@@ -503,6 +503,14 @@
     $sel = ($file === $openfile) ? ' selected="selected"' : '';
     putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Firewall Blocked Hosts</option>');
   }
+  if (is_writable($file = '/mnt/kd/blocklists/blocked-hosts.netset')) {
+    $sel = ($file === $openfile) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Firewall IPv4 Blocklist Set</option>');
+  }
+  if (is_writable($file = '/mnt/kd/blocklists/blocked-hostsv6.netset')) {
+    $sel = ($file === $openfile) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Firewall IPv6 Blocklist Set</option>');
+  }
   if (is_writable($file = '/mnt/kd/blocklists/whitelist.netset')) {
     $sel = ($file === $openfile) ? ' selected="selected"' : '';
     putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Firewall IPv4 Whitelist Set</option>');

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