Index: npl/buildroot.list
===================================================================
--- npl/buildroot.list	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/buildroot.list	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -30,5 +30,4 @@
 glibc
 glibc_solibs
-glibc_zoneinfo
 gmp
 grep
@@ -79,5 +78,4 @@
 expect
 network_scripts
-libmpfr
 xz
 gmp
@@ -93,2 +91,3 @@
 attr
 bc
+gpm
Index: npl/fileserver/git/git.SlackBuild
===================================================================
--- npl/fileserver/git/git.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/fileserver/git/git.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -8,4 +8,5 @@
 #DEP:zlib
 #DEP:python
+#DEP:curl
 
 #######Essential package info.
Index: npl/fileserver/git/git.build
===================================================================
--- npl/fileserver/git/git.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/fileserver/git/git.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6528
+6529
Index: npl/fileserver/git/git.depver
===================================================================
--- npl/fileserver/git/git.depver	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/fileserver/git/git.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -2,2 +2,3 @@
 zlib	0
 python	2
+curl	1
Index: npl/fileserver/git/git.md5
===================================================================
--- npl/fileserver/git/git.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/fileserver/git/git.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,4 +1,4 @@
 a84938bccf9220c7e5ec290b242ae53b  ./git-2.11.0.tar.gz
-83861121f72bac8df3b65a4518788a35  ./git.pkg
-92e8651adf2d874ef9b679547f9d4452  ./git.SlackBuild
-f9b26423a41ddc11884196fd8353549a  ./git.SlackBuild.log.gz
+af848a0ae240ccebee9f1485fe7e88d8  ./git.pkg
+7e22fea0ad7a6ae81e361c66cbcf8d90  ./git.SlackBuild
+8a4e73d5524169ae2e750d452c09886d  ./git.SlackBuild.log.gz
Index: npl/internetserver/apache_conf/apache_conf.build
===================================================================
--- npl/internetserver/apache_conf/apache_conf.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/apache_conf/apache_conf.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6437
+6439
Index: npl/internetserver/apache_conf/apache_conf.md5
===================================================================
--- npl/internetserver/apache_conf/apache_conf.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/apache_conf/apache_conf.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,5 +1,5 @@
-3401dd091aa9cdaff2a4045393ddbef4  ./apache_conf.pkg
+a9fc66761161a1df13f80f74df72c521  ./apache_conf.pkg
 42016730303eef15aafe66cc3d793c8b  ./apache_conf.SlackBuild
-449826fbb49a494aed99e2fbf10b7945  ./apache_conf.SlackBuild.log.gz
+16fe6d19f1cb00b83fc6c4213cf19c09  ./apache_conf.SlackBuild.log.gz
 338c8fb6cb12a77c1147519347f0cfbe  ./root/etc/apache2/conf.d/httpd-autoindex.conf
 718f54d560d303c8f6d82484977d5acf  ./root/etc/apache2/conf.d/httpd-dav.conf
@@ -20,5 +20,5 @@
 30baa04580b9a53bf204dc1164221241  ./root/etc/logrotate.d/apache2
 4b30e6ab44455cf3094ca6273700001b  ./root/etc/php5/pear.conf
-ff28eb1ad94185eb0517af39c39d4c8d  ./root/etc/php5/php.ini
+d7c01829b4c122eb2e269c126aa6ab70  ./root/etc/php5/php.ini
 b54388d73ed4dc4198fc7f04bed5daa3  ./root/etc/postinst.d/post.apache_conf
 11658bab7bd1a7380827f7c73f85a753  ./root/service/apache2/run
Index: npl/internetserver/apache_conf/root/etc/php5/php.ini
===================================================================
--- npl/internetserver/apache_conf/root/etc/php5/php.ini	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/apache_conf/root/etc/php5/php.ini	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -304,6 +304,6 @@
 max_input_time = 60	; Maximum amount of time each script may spend parsing request data
 ;max_input_nesting_level = 64 ; Maximum input variable nesting level
-;512M neccesary for z-push -a fixstates
-memory_limit = 512M      ; Maximum amount of memory a script may consume 
+;1024M neccesary for z-push -a fixstates
+memory_limit = 1024M      ; Maximum amount of memory a script may consume 
 
 
Index: npl/internetserver/libreswan_conf/libreswan_conf.build
===================================================================
--- npl/internetserver/libreswan_conf/libreswan_conf.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/libreswan_conf/libreswan_conf.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6552
+6556
Index: npl/internetserver/libreswan_conf/libreswan_conf.md5
===================================================================
--- npl/internetserver/libreswan_conf/libreswan_conf.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/libreswan_conf/libreswan_conf.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,9 +1,9 @@
-544cf91ec7a3987868055d7eeb063aed  ./libreswan_conf.pkg
+4d48ba9ca2bafc2d8c6cad067cc10f96  ./libreswan_conf.pkg
 42016730303eef15aafe66cc3d793c8b  ./libreswan_conf.SlackBuild
-7dc0067eced4d98f26cb9b532dc61691  ./libreswan_conf.SlackBuild.log.gz
-811bbe5f8db6bf1ffff4ed5b66fc05f2  ./root/etc/ipsec.conf
+dc356298edb5594410a30833681746dc  ./libreswan_conf.SlackBuild.log.gz
+84184b6c712f668b04ef8edb785c01a1  ./root/etc/ipsec.conf
 53d9d2008956917a02c0c670100165f6  ./root/etc/ipsec.secrets
 f0188fc8f667dc97590f885fd1adfc7d  ./root/etc/pam.d/pluto
-c72a5d7a716724e4f8a2e4f28421f0ae  ./root/etc/postinst.d/post.libreswan
+1a5e15db17d1250abb2596361383d0d1  ./root/etc/postinst.d/post.libreswan
 60ae7c5340247d26161043df4e361722  ./root/home/system/ipsec.d/policies/block
 9e6cbaea66c6f14c9f8e7a6e6b4d720e  ./root/home/system/ipsec.d/policies/clear
@@ -13,4 +13,5 @@
 68b329da9893e34099c7d8ad5cb9c940  ./root/home/system/ipsec.d/tunnels/dummy.conf
 87a28e77aef254bdb8259f4388b40d45  ./root/sbin/syn3-ipseccheck
+a33b03980a28bb1ca9089298f0db1bcf  ./root/sbin/syn3-ipsecpubkey
 9d6f0923366b4e95a8a9fcd85dcaaf56  ./root/service/ipsec/run
 e458545ffca980b0a2d4d8106680f4b0  ./root/service/ipsec/start
Index: npl/internetserver/libreswan_conf/root/etc/ipsec.conf
===================================================================
--- npl/internetserver/libreswan_conf/root/etc/ipsec.conf	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/libreswan_conf/root/etc/ipsec.conf	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -15,5 +15,5 @@
         dpddelay=30
         dpdtimeout=120
-
+        ikev2=never
+        
 include /etc/ipsec.d/tunnels/*.conf
-
Index: npl/internetserver/libreswan_conf/root/etc/postinst.d/post.libreswan
===================================================================
--- npl/internetserver/libreswan_conf/root/etc/postinst.d/post.libreswan	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/libreswan_conf/root/etc/postinst.d/post.libreswan	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -9,11 +9,11 @@
 
 
-KEY=/etc/ipsec.d/ipsec.pub
-if ! egrep '(ckaid|CKA_ID)' $KEY >/dev/null; then
-    rm $KEY 2>/dev/null
+if ! syn3-ipsecpubkey; then
+    #obsolete
+    rm /etc/ipsec.d/ipsec.pub 2>/dev/null
+
     echo Generating ipsec key
-    ipsec newhostkey --bits 2192 --output $KEY || exit 1
-    #previous command can fail without proper exit code, so check it:
-    egrep '(ckaid|CKA_ID)' $KEY >/dev/null || exit 1
+    ipsec newhostkey --bits 2192 || exit 1
+    syn3-ipsecpubkey || exit 1
 fi
 depmod -a
Index: npl/internetserver/libreswan_conf/root/sbin/syn3-ipsecpubkey
===================================================================
--- npl/internetserver/libreswan_conf/root/sbin/syn3-ipsecpubkey	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/libreswan_conf/root/sbin/syn3-ipsecpubkey	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+CKAID=`ipsec showhostkey --list |tail -n1 |sed 's/.* //'` 
+[ "$CKAID" ] || exit 1
+ipsec showhostkey --ckaid $CKAID --left |grep leftrsasigkey= | sed 's/.*leftrsasigkey=//'
+
Index: npl/internetserver/ntop/no_zc.patch
===================================================================
--- npl/internetserver/ntop/no_zc.patch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/ntop/no_zc.patch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,226 @@
+diff -r -u ntopng-dev/include/ntop_includes.h ntopng-dev.new/include/ntop_includes.h
+--- ntopng-dev/include/ntop_includes.h	2017-04-24 14:19:03.000000000 +0000
++++ ntopng-dev.new/include/ntop_includes.h	2017-04-25 10:48:47.000000000 +0000
+@@ -106,7 +106,6 @@
+ #include "lualib.h"
+ #ifdef HAVE_PF_RING
+ #include "pfring.h"
+-#include "pfring_zc.h"
+ #endif
+ #ifdef HAVE_NETFILTER
+ #include <linux/types.h>
+@@ -234,7 +233,6 @@
+ #endif
+ #include "ParserInterface.h"
+ #include "CollectorInterface.h"
+-#include "ZCCollectorInterface.h"
+ #include "DummyInterface.h"
+ #include "ExportInterface.h"
+ #include "Geolocation.h"
+diff -r -u ntopng-dev/src/ZCCollectorInterface.cpp ntopng-dev.new/src/ZCCollectorInterface.cpp
+--- ntopng-dev/src/ZCCollectorInterface.cpp	2017-04-24 14:19:03.000000000 +0000
++++ ntopng-dev.new/src/ZCCollectorInterface.cpp	2017-04-25 10:45:24.000000000 +0000
+@@ -1,176 +0,0 @@
+-/*
+- *
+- * (C) 2016-17 - ntop.org
+- *
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * 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.
+- *
+- */
+-
+-#include "ntop_includes.h"
+-
+-#if defined(HAVE_PF_RING) && (!defined(__mips)) && (!defined(__arm__)) && (!defined(__i686__))
+-
+-/* **************************************************** */
+-
+-ZCCollectorInterface::ZCCollectorInterface(const char *name) : ParserInterface(name) {
+-  char ifname[32];
+-  char *at;
+-
+-  cluster_id = queue_id = 0;
+-
+-  snprintf(ifname, sizeof(ifname), "%s", &name[7]);
+-
+-  at = strchr(ifname, '@');
+-
+-  if(at != NULL) {
+-    queue_id = atoi(&at[1]);
+-    at[0] = '\0';
+-  }
+-
+-  cluster_id = atoi(ifname);
+-
+-  zq = pfring_zc_ipc_attach_queue(cluster_id, queue_id, rx_only);
+-
+-  if(zq == NULL)
+-    throw("pfring_zc_ipc_attach_queue error");
+-
+-  zp = pfring_zc_ipc_attach_buffer_pool(cluster_id, queue_id);
+-
+-  if(zp == NULL)
+-    throw("pfring_zc_ipc_attach_buffer_pool error");
+-
+-  buffer = pfring_zc_get_packet_handle_from_pool(zp);
+-
+-  if(buffer == NULL)
+-    throw("pfring_zc_get_packet_handle_from_pool error");
+-
+-  memset(&last_pfring_zc_stat, 0, sizeof(last_pfring_zc_stat));
+-}
+-
+-/* **************************************************** */
+-
+-ZCCollectorInterface::~ZCCollectorInterface() {
+-  pfring_zc_sync_queue(zq, rx_only);
+-  pfring_zc_release_packet_handle_to_pool(zp, buffer);
+-  pfring_zc_ipc_detach_queue(zq);
+-  pfring_zc_ipc_detach_buffer_pool(zp);
+-}
+-
+-/* **************************************************** */
+-
+-void ZCCollectorInterface::collect_flows() {
+-  int rc;
+-
+-  ntop->getTrace()->traceEvent(TRACE_NORMAL, "Collecting flows from ZC queue %u@%u", cluster_id, queue_id);
+-
+-  while(isRunning()) {
+-    while(idle()) {
+-      purgeIdle(time(NULL));
+-      sleep(1);
+-      if(ntop->getGlobals()->isShutdown()) return;
+-    }
+-
+-    rc = pfring_zc_recv_pkt(zq, &buffer, 0 /* wait_for_packet */);
+-
+-    if(rc > 0) {
+-      u_char *json = pfring_zc_pkt_buff_data(buffer, zq);
+-      const char *master = "{ \"if.name\"";
+-      
+-      ntop->getTrace()->traceEvent(TRACE_INFO, "%s", json);
+-      // fprintf(stdout, "+"); fflush(stdout);
+-
+-      if(strncmp((char*)json, master, strlen(master)) == 0) {
+-	parseEvent((char*)json, buffer->len, 0, (void*)this);
+-      } else
+-	parseFlow((char*)json, buffer->len, 0, (void*)this);
+-      // fprintf(stdout, "."); fflush(stdout);
+-    } else if(rc == 0) {
+-      usleep(1);
+-      purgeIdle(time(NULL));
+-      // fprintf(stdout, "*"); fflush(stdout);
+-    } else {
+-      /* rc < 0 */
+-      break;
+-    }
+-  }
+-
+-  ntop->getTrace()->traceEvent(TRACE_NORMAL, "ZC Flow collection is over.");
+-
+-  pfring_zc_sync_queue(zq, rx_only);
+-}
+-
+-/* **************************************************** */
+-
+-static void *packetPollLoop(void *ptr) {
+-  ZCCollectorInterface *iface = (ZCCollectorInterface *) ptr;
+-
+-  /* Wait until the initialization completes */
+-  while(!iface->isRunning()) sleep(1);
+-
+-  iface->collect_flows();
+-  return(NULL);
+-}
+-
+-/* **************************************************** */
+-
+-void ZCCollectorInterface::startPacketPolling() {
+-  pthread_create(&pollLoop, NULL, packetPollLoop, (void *) this);
+-  pollLoopCreated = true;
+-  NetworkInterface::startPacketPolling();
+-}
+-
+-/* **************************************************** */
+-
+-void ZCCollectorInterface::shutdown() {
+-  if(running) {
+-    void *res;
+-
+-    NetworkInterface::shutdown();
+-    pfring_zc_queue_breakloop(zq);
+-    pthread_join(pollLoop, &res);
+-  }
+-}
+-
+-/* **************************************************** */
+-
+-bool ZCCollectorInterface::set_packet_filter(char *filter) {
+-  ntop->getTrace()->traceEvent(TRACE_ERROR,
+-			       "No filter can be set on a collector interface. Ignored %s", filter);
+-  return(false);
+-}
+-
+-/* **************************************************** */
+-
+-u_int32_t ZCCollectorInterface::getNumDroppedPackets() {
+-  pfring_zc_stat stats;
+-
+-  if(pfring_zc_stats(zq, &stats) >= 0) {
+-#if 0
+-    ntop->getTrace()->traceEvent(TRACE_NORMAL, "[%s][Sent: %llu]"
+-				 "[Rcvd: %llu][Drops: %llu][QueueLen: %d]",
+-				 ifname, stats.sent, stats.recv, stats.drop,
+-				 stats.sent-stats.recv);
+-#endif
+-    return(stats.drop);
+-  }
+-
+-  return 0;
+-}
+-
+-/* **************************************************** */
+-
+-#endif
+-
+diff -r -u ntopng-dev/src/main.cpp ntopng-dev.new/src/main.cpp
+--- ntopng-dev/src/main.cpp	2017-04-24 14:19:03.000000000 +0000
++++ ntopng-dev.new/src/main.cpp	2017-04-25 10:45:24.000000000 +0000
+@@ -161,10 +161,6 @@
+ 	  endpoint = ifName;
+ 
+ 	iface = new CollectorInterface(endpoint);
+-#if defined(HAVE_PF_RING) && (!defined(__mips)) && (!defined(__arm__)) && (!defined(__i686__))
+-      } else if(strstr(ifName, "zcflow:")) {
+-	iface = new ZCCollectorInterface(ifName);
+-#endif
+       } else {
+ 	iface = NULL;
+ 
+diff -r -u ntopng-dev/third-party/json-c/config.h.in ntopng-dev.new/third-party/json-c/config.h.in
+--- ntopng-dev/third-party/json-c/config.h.in	2017-04-24 14:19:03.000000000 +0000
++++ ntopng-dev.new/third-party/json-c/config.h.in	2017-04-25 10:46:33.000000000 +0000
+@@ -104,8 +104,7 @@
+ /* Public define for json_inttypes.h */
+ #undef JSON_C_HAVE_INTTYPES_H
+ 
+-/* Define to the sub-directory in which libtool stores uninstalled libraries.
+-   */
++/* Define to the sub-directory where libtool stores uninstalled libraries. */
+ #undef LT_OBJDIR
+ 
+ /* Name of package */
Index: npl/internetserver/ntop/ntop.SlackBuild
===================================================================
--- npl/internetserver/ntop/ntop.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/ntop/ntop.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+#NEED:git
+##DEP:ndpi
+#DEP:libpcap
+#DEP:sqlite
+#DEP:mysql56
+#DEP:glib2
+#DEP:libxml2
+#DEP:rrdtool
+#NEED:groff
+#DEP:zlib
+#DEP:curl
+##DEP:drv_pf_ring
+
+#######Essential package info.
+#Change these if autodetection fails.
+
+#Name of the Syn-3 package that we are going to create
+NAME=`basename $0|sed 's/.SlackBuild//'`
+
+#git clone http://github.com/ntop/ntopng.git || exit 1
+
+
+#Archive of the sourcefiles to unpack 
+#SRC_ARC=`ls *.tar.* *.zip 2>/dev/null`
+SRC_ARC=ntopng-dev.zip
+
+#Version of the sourcefiles
+VER=`echo $SRC_ARC| sed 's/.*-//g' | sed 's/\.tar\..*$//g' | sed 's/\.zip$//g'`
+#VER=`cd ntopng; git describe --tags|sed 's/-/_/g'`
+
+#Architecture that the created binaries run on.
+#Use noarch for scripts.
+ARCH=`uname -m`
+
+#from this point on, exit on errors:
+set -e
+
+########Build and create the pacakge.
+#Uncomment the stuff that you dont want or need
+
+#Unpack source 
+#(uncomment if not needed)
+syn3_unpack $SRC_ARC 
+
+#Directory where the sourcefiles are unpacked. 
+#(you might have to adjust this if autodetection fails)
+SRC_DIR=`ls -c|head -1`
+#SRC_DIR=ntopng
+
+#apply patches
+#patch -p1 -d $SRC_DIR < no_zc.patch || exit 1
+
+pushd $SRC_DIR 
+
+#AUTOMAKE: Configure
+#Some usefull stuff you sometimes need to set:
+#export LDFLAGS="-L/usr/X11/lib/ -L/usr/lib/mysql/"
+#export LD_LIBRARY_PATH=/usr/lib/mysql
+#export VPATH=$LD_LIBRARY_PATH
+#export CFLAGS="-std=c89"
+#export CFLAGS="-fgnu89-inline" #If "multiple definition of `foo'" Also see http://gcc.gnu.org/gcc-4.3/porting_to.html
+
+#get ndpi sources
+pushd ..
+#git clone http://github.com/ntop/nDPI.git 
+unzip nDPI-dev.zip 
+mv nDPI-dev nDPI
+#git clone -b 1.8 https://github.com/ntop/nDPI.git 
+cd nDPI
+./autogen.sh
+make $MAKE_OPTS
+popd
+
+
+MAKE_OPTS=""
+./autogen.sh
+./configure --prefix=/usr  || exit 1
+
+#AUTOMAKE: Compile
+make $MAKE_OPTS || exit 1
+
+#AUTOMAKE: Test (optional)
+if grep ^test: Makefile; then
+	make pkgconfigdir=/usr/lib/pkgconfig $MAKE_OPTS install || exit 1
+	make $MAKE_OPTS test || exit 1
+elif grep ^check: Makefile; then
+	make pkgconfigdir=/usr/lib/pkgconfig $MAKE_OPTS install || exit 1
+	make $MAKE_OPTS check || exit 1 
+fi
+
+#AUTOMAKE: Install
+mkdir -p /tmp/pkg &>/dev/null
+make pkgconfigdir=/usr/lib/pkgconfig install_prefix=/tmp/pkg DESTDIR=/tmp/pkg INSTALL_ROOT=/tmp/pkg install_root=/tmp/pkg $MAKE_OPTS install || exit 1
+popd
+
+#strip bins and other stuff
+syn3_strip /tmp/pkg || exit 1
+
+#move development stuff and create seperate development package
+syn3_move_dev /tmp/pkg /tmp/pkgdev || exit 1
+syn3_makepkg /tmp/pkgdev $NAME""_dev $VER $ARCH || exit 1
+
+#make main package
+syn3_makepkg /tmp/pkg $NAME $VER $ARCH || exit 1
+
+
+
Index: npl/internetserver/ntop/ntop.arch
===================================================================
--- npl/internetserver/ntop/ntop.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/ntop/ntop.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i686
Index: npl/internetserver/ntop/ntop.build
===================================================================
--- npl/internetserver/ntop/ntop.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/ntop/ntop.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+5
Index: npl/internetserver/ntop/ntop.depver
===================================================================
--- npl/internetserver/ntop/ntop.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/ntop/ntop.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,8 @@
+libpcap	0107
+sqlite	2
+mysql56	1
+glib2	2
+libxml2	1
+rrdtool	0
+zlib	0
+curl	1
Index: npl/internetserver/ntop/ntop.md5
===================================================================
--- npl/internetserver/ntop/ntop.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/ntop/ntop.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,6 @@
+cdae3046a4f1750a8b94f1c5f8c0d533  ./nDPI-dev.zip
+1b0a9a81677926e892b364c89715220f  ./no_zc.patch
+124698b38a905aba53020b5a0566657b  ./ntopng-dev.zip
+9f2dc5ab9048d4f2cafb95d9d3df8961  ./ntop.pkg
+a6150b476ea199994fc5c24b5e5f5835  ./ntop.SlackBuild
+7592823fd4b8fefe57b2be2c9871a56f  ./ntop.SlackBuild.log.gz
Index: npl/internetserver/ntop/ntop.version
===================================================================
--- npl/internetserver/ntop/ntop.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/ntop/ntop.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+dev
Index: npl/internetserver/openvpn_conf/openvpn_conf.build
===================================================================
--- npl/internetserver/openvpn_conf/openvpn_conf.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/openvpn_conf/openvpn_conf.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6559
+6560
Index: npl/internetserver/openvpn_conf/openvpn_conf.md5
===================================================================
--- npl/internetserver/openvpn_conf/openvpn_conf.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/openvpn_conf/openvpn_conf.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,9 +1,11 @@
-96d33d19dd2dd7c62653830905f56392  ./openvpn_conf.pkg
+c944c634d7d393d656a8bc72981d857d  ./openvpn_conf.pkg
 729b418d4c2197708760319d4097906e  ./openvpn_conf.SlackBuild
-989f13e22e0775af613932f97f671994  ./openvpn_conf.SlackBuild.log.gz
+9642ef78f7a58f409156e4e23271ae51  ./openvpn_conf.SlackBuild.log.gz
 02590f2d27b9254da5877e03719a9228  ./root/etc/firewall/services.openvpn
 5d08314120a94191e539c792b1c410a2  ./root/etc/openvpn/easyrsa
 d6cb374d0d7d5b7b87d74f9976362a70  ./root/etc/openvpn/openssl-1.0.cnf
-5a93266250a72d36d413e11784cbfb20  ./root/etc/openvpn/openvpn.conf
+88937c4fed1e288bcedfc2975792c331  ./root/etc/openvpn/openvpn.conf
+587c47cd3871a89b73f07716e722e953  ./root/etc/openvpn/openvpn_custom.conf.new
+d41d8cd98f00b204e9800998ecf8427e  ./root/etc/openvpn/openvpn_syn3.conf.new
 f3bdb2484e8eee18be1cb25093d1d19a  ./root/etc/openvpn/pam_ldap.conf
 a7956355ff8cb69cc5ee0ed476380149  ./root/etc/openvpn/syn3-client
@@ -16,3 +18,3 @@
 d0d7a06379af67505bf5dae59d3e7afb  ./root/etc/openvpn/x509-types/server
 c8fadda104656594f3ceadbb13d9d178  ./root/etc/pam.d/openvpn
-152c8cb4320ada777fdb72d8c75f6eeb  ./root/service/openvpn/run
+a6e8a68a743fe6448c01ccba1db33569  ./root/service/openvpn/run
Index: npl/internetserver/openvpn_conf/root/etc/openvpn/openvpn.conf
===================================================================
--- npl/internetserver/openvpn_conf/root/etc/openvpn/openvpn.conf	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/openvpn_conf/root/etc/openvpn/openvpn.conf	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,23 +1,8 @@
-#################################################
-# Sample OpenVPN 2.0 config file for            #
-# multi-client server.                          #
-#                                               #
-# This file is for the server side              #
-# of a many-clients  one-server                 #
-# OpenVPN configuration.                        #
-#                                               #
-# OpenVPN also supports                         #
-# single-machine  single-machine                #
-# configurations (See the Examples page         #
-# on the web site for more info).               #
-#                                               #
-# This config should work on Windows            #
-# or Linux/BSD systems.  Remember on            #
-# Windows to quote pathnames and use            #
-# double backslashes, e.g.:                     #
-# "C:\\Program Files\\OpenVPN\\config\\foo.key" #
-#                                               #
-# Comments are preceded with '#' or ';'         #
-#################################################
+#########################################
+### SYN-3 openvpn configuration
+### This file will be overwritten by updates.
+### Please make changes in /etc/openvpn/openvpn_custom.conf
+##########################################
+
 
 # Which local IP address should OpenVPN
@@ -86,5 +71,5 @@
 #   openssl dhparam -out dh1024.pem 1024
 # Substitute 2048 for 1024 if you are using
-# 2048 bit keys. 
+# 2048 bit keys.
 dh /etc/openvpn/pki/dh.pem
 
@@ -183,5 +168,5 @@
 # a more specific route than the default route
 # of 0.0.0.0/0.0.0.0.
-push "redirect-gateway"
+;push "redirect-gateway"
 
 # Certain Windows-specific network settings
@@ -189,5 +174,5 @@
 # or WINS server addresses.  CAVEAT:
 # http://openvpn.net/faq.html#dhcpcaveats
-push "dhcp-option DNS 10.8.0.1"
+;push "dhcp-option DNS 10.8.0.1"
 ;push "dhcp-option WINS 10.8.0.1"
 
@@ -300,3 +285,2 @@
 # pam_ldap authentication (need to be member of group with uid 521)
 plugin /usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so "openvpn login USERNAME password PASSWORD"
-
Index: npl/internetserver/openvpn_conf/root/etc/openvpn/openvpn_custom.conf.new
===================================================================
--- npl/internetserver/openvpn_conf/root/etc/openvpn/openvpn_custom.conf.new	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/internetserver/openvpn_conf/root/etc/openvpn/openvpn_custom.conf.new	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+# Put your custom openvpn setting here. This will not be overwritten by updates.
Index: npl/internetserver/openvpn_conf/root/service/openvpn/run
===================================================================
--- npl/internetserver/openvpn_conf/root/service/openvpn/run	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/internetserver/openvpn_conf/root/service/openvpn/run	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -52,4 +52,3 @@
 modprobe tun
 
-exec openvpn --config openvpn.conf
-
+exec openvpn --config openvpn.conf --config openvpn_syn3.conf  --config openvpn_custom.conf
Index: npl/kernel/drv_pf_ring/drv_pf_ring.SlackBuild
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+##NEED:...
+#DEP:linux_src
+#DEP:linux
+
+#######Essential package info.
+#Change these if autodetection fails.
+
+#Name of the Syn-3 package that we are going to create
+NAME=`basename $0|sed 's/.SlackBuild//'`
+
+#Archive of the sourcefiles to unpack 
+SRC_ARC=`ls *.tar.* *.zip 2>/dev/null`
+
+#Version of the sourcefiles
+VER=`echo $SRC_ARC| sed 's/.*-//g' | sed 's/\.tar\..*$//g' | sed 's/\.zip$//g'`
+
+#Architecture that the created binaries run on.
+#Use noarch for scripts.
+ARCH=`uname -m`
+
+#from this point on, exit on errors:
+set -e
+
+########Build and create the pacakge.
+#Uncomment the stuff that you dont want or need
+
+#Unpack source 
+#(uncomment if not needed)
+syn3_unpack $SRC_ARC 
+
+#Directory where the sourcefiles are unpacked. 
+#(you might have to adjust this if autodetection fails)
+SRC_DIR=`ls -c|head -1`
+
+#apply patches
+#patch -p1 -d $SRC_DIR < fluxkiosk.patch || exit 1
+
+pushd $SRC_DIR 
+
+
+#AUTOMAKE: Compile
+cd kernel
+make -j1 || exit 1
+make pkgconfigdir=/usr/lib/pkgconfig install_prefix=/tmp/pkg DESTDIR=/tmp/pkg INSTALL_ROOT=/tmp/pkg install_root=/tmp/pkg -j1 install || exit 1
+
+cd ../userland
+make -j1 || exit 1
+make pkgconfigdir=/usr/lib/pkgconfig install_prefix=/tmp/pkg DESTDIR=/tmp/pkg INSTALL_ROOT=/tmp/pkg install_root=/tmp/pkg -j1 install || exit 1
+
+popd
+
+#strip bins and other stuff
+syn3_strip /tmp/pkg || exit 1
+
+#move development stuff and create seperate development package
+syn3_move_dev /tmp/pkg /tmp/pkgdev || exit 1
+syn3_makepkg /tmp/pkgdev $NAME""_dev $VER $ARCH || exit 1
+
+#make main package
+syn3_makepkg /tmp/pkg $NAME $VER $ARCH || exit 1
+
+
+
Index: npl/kernel/drv_pf_ring/drv_pf_ring.arch
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i686
Index: npl/kernel/drv_pf_ring/drv_pf_ring.build
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+5
Index: npl/kernel/drv_pf_ring/drv_pf_ring.depver
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,2 @@
+linux_src	404033004
+linux	0
Index: npl/kernel/drv_pf_ring/drv_pf_ring.md5
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,5 @@
+66b8002a8f28c949e8c2acd4b79fbfdc  ./drv_pf_ring_dev.pkg
+924448bf7dfb0532cd4f78deedec0f95  ./drv_pf_ring.pkg
+8ab1d083c9ef0fea7a2d5fb2663252e1  ./drv_pf_ring.SlackBuild
+80c69602597e4ab836436772966c55b9  ./drv_pf_ring.SlackBuild.log.gz
+4199f896b822fbe87afc76c31505c371  ./pf-ring-6.6.0.tar.gz
Index: npl/kernel/drv_pf_ring/drv_pf_ring.version
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+6.6.0
Index: npl/kernel/drv_pf_ring/drv_pf_ring_dev.arch
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i686
Index: npl/kernel/drv_pf_ring/drv_pf_ring_dev.build
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+5
Index: npl/kernel/drv_pf_ring/drv_pf_ring_dev.version
===================================================================
--- npl/kernel/drv_pf_ring/drv_pf_ring_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/kernel/drv_pf_ring/drv_pf_ring_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+6.6.0
Index: npl/mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean
===================================================================
--- npl/mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -34,4 +34,20 @@
 zarafa-admin --purge-softdelete 30 || abort "softdelete mislukt"
 
+
+
+syn3-state zarafa OK "$TXT z-push cleanup"
+z-push-admin -a fixstates || abort "z-push cleanup mislukt"
+
+NEEDED=`du  -b -s  /home/system/mysql5/|cut -f 1`
+(( FREE = `stat -f /home -c  %f` * 4096 ))
+
+if [ $NEEDED -gt $FREE ]; then
+	#human readable
+	(( NEEDED = NEEDED / 1000000000 ))
+	(( NEEDED = NEEDED + 1 ))
+	abort "Te weinig diskruimte voor optimalisatie ($NEEDED Gb ruimte nodig voor deze operatie)"
+fi
+
+
 syn3-state zarafa OK "$TXT database optimalisatie"
 mysqlcheck --optimize -p`cat /etc/my.passwd` zarafa || abort "database optimalisatie mislukt"
@@ -44,7 +60,4 @@
 
 
-syn3-state zarafa OK "$TXT z-push cleanup"
-z-push-admin -a fixstates || abort "z-push cleanup mislukt"
-
 syn3-state zarafa OK "Zarafa onderhoud succesvol voltooid."
 
Index: npl/mailserver/zarafa_conf7/zarafa_conf7.build
===================================================================
--- npl/mailserver/zarafa_conf7/zarafa_conf7.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/mailserver/zarafa_conf7/zarafa_conf7.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6541
+6542
Index: npl/mailserver/zarafa_conf7/zarafa_conf7.md5
===================================================================
--- npl/mailserver/zarafa_conf7/zarafa_conf7.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/mailserver/zarafa_conf7/zarafa_conf7.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,3 +1,3 @@
-e8893e32484009ca0556d0ec47070b17  ./root/etc/cron.weekly/zarafa_clean
+5168e7ee74e660a07889b5a2638971e0  ./root/etc/cron.weekly/zarafa_clean
 d0d5938e40c70afc06b0d1296fc064a2  ./root/etc/cyrus-conv.conf
 3c834f9018b56c5d738ea2641366f0db  ./root/etc/mapi/zarafa.inf
@@ -36,5 +36,5 @@
 e0acc0d2e7774f234b72a110e86057a7  ./root/var/www/htdocs/syn3/zarafa_webapp/webportal.desc
 a4cd55d9e54997e1ab8c7d8b1f89ee47  ./root/var/www/htdocs/syn3/zarafa_webapp/webportal.png
-f85e76f4432415666a5a9ddb413078a4  ./zarafa_conf7.pkg
+deb13959ac09cec840ba9a612f546d28  ./zarafa_conf7.pkg
 f4f9e3673e49bd56810ee75e666f51a0  ./zarafa_conf7.SlackBuild
-68340e47cee53a2ca0344d0442e52ec8  ./zarafa_conf7.SlackBuild.log.gz
+db342e26f18528b05d9dd85bfb84e00e  ./zarafa_conf7.SlackBuild.log.gz
Index: npl/overig/gawk/gawk-4.1.4.tar.xz.sig
===================================================================
--- npl/overig/gawk/gawk-4.1.4.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk-4.1.4.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJXvzSWAAoJEN9ZeBWTfsDSPP8H/1Naw13ybArprjJDgwU7kQ5X
+Yrwt40pQwehaxk+21kVlA+19O7qamHbKhX1etyRB4+KaBjTf9s3tOCdIIo4b3oTi
+XCMSXhyBRzOs47+p2l6MVtQLPNuQ5nNhqeuP6tmlSi0QyI43EAcP3cix0nsYriUH
+EAv2VffhdYawUrKgZE1sssRlDD47YoEelS4Gs1kC1HBRp/LnvuISItiP43JVGGeX
++SjgPh14oe8F7yVxIyAUFnK4zKEaNM/KDKvvZ7tDz1n7NtLxihtJPnvsticLhvDC
+w+upaY41YUx0nnIy2QXF2lLNRtceJJ5zhl/QMxME5nWnN1dNGZLAVnBQYUbU7oU=
+=8yeI
+-----END PGP SIGNATURE-----
Index: npl/overig/gawk/gawk.SlackBuild
===================================================================
--- npl/overig/gawk/gawk.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/a/gawk/
+# Created at Tue Jan 31 22:07:15 CET 2017
+
+
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./gawk.SlackBuild.orig
+
+
+############ make syn3 packages
+cd $CWD
+for PKG in /tmp/package-*; do
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
+
+        #seperate dev-package
+        syn3_move_dev $PKG $PKG""_dev
+        syn3_makepkg $PKG""_dev $NAME""_dev $VERSION $ARCH || exit 1
+
+        #make main package
+        syn3_makepkg $PKG $NAME $VERSION $ARCH || exit 1
+done
Index: npl/overig/gawk/gawk.SlackBuild.orig
===================================================================
--- npl/overig/gawk/gawk.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Copyright 2005-2014  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=gawk
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-gawk
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf gawk-$VERSION
+tar xvf $CWD/gawk-$VERSION.tar.xz
+cd gawk-$VERSION
+
+chown -R root:root .
+
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+( cd $PKG/usr/bin
+  ln -sf gawk-$VERSION gawk
+)
+
+mkdir -p $PKG/bin
+mv $PKG/usr/bin/gawk* $PKG/bin
+mv $PKG/usr/bin/awk $PKG/bin
+
+( cd $PKG/usr/bin
+  ln -sf ../../bin/awk .
+  ln -sf ../../bin/gawk .
+  ln -sf ../../bin/gawk-$VERSION .
+)
+
+( cd $PKG/usr/info
+  rm dir
+  gzip -9 *
+)
+
+( cd $PKG/usr/man/man1
+  ln -sf gawk.1 awk.1
+)
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+mkdir -p $PKG/usr/doc/gawk-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS POSIX.STD \
+  README* \
+  $PKG/usr/doc/gawk-$VERSION
+
+# We don't need to run the GPL:
+chmod 644 $PKG/usr/doc/gawk-$VERSION/COPYING*
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/gawk-$VERSION-$ARCH-$BUILD.txz
+
Index: npl/overig/gawk/gawk.arch
===================================================================
--- npl/overig/gawk/gawk.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/overig/gawk/gawk.build
===================================================================
--- npl/overig/gawk/gawk.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/overig/gawk/gawk.md5
===================================================================
--- npl/overig/gawk/gawk.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,8 @@
+4e7dbc81163e60fd4f0b52496e7542c9  ./gawk-4.1.4.tar.xz
+b07124955a73d46b4e8a52d35ace7e63  ./gawk-4.1.4.tar.xz.sig
+f4e096ad59f18c6239d00a3b6ed7f092  ./gawk_dev.pkg
+8a64ec9d32cf91d8cb5ee29c3bd777d0  ./gawk.pkg
+392c14fe9c8ee5b41cd23fa5b022852e  ./gawk.SlackBuild
+6afe99abe986a97d4113225d9366382b  ./gawk.SlackBuild.log.gz
+df7fbad02fa9a1ae7aa37667c4a583bb  ./gawk.SlackBuild.orig
+30ce4956a875595993f99cfc023f1e7a  ./slack-desc
Index: npl/overig/gawk/gawk.version
===================================================================
--- npl/overig/gawk/gawk.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+4.1.4
Index: npl/overig/gawk/gawk_dev.arch
===================================================================
--- npl/overig/gawk/gawk_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/overig/gawk/gawk_dev.build
===================================================================
--- npl/overig/gawk/gawk_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/overig/gawk/gawk_dev.version
===================================================================
--- npl/overig/gawk/gawk_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/gawk_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+4.1.4
Index: npl/overig/gawk/slack-desc
===================================================================
--- npl/overig/gawk/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/gawk/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+    |-----handy-ruler------------------------------------------------------|
+gawk: gawk (pattern scanning and processing language)
+gawk:
+gawk: Gawk is the GNU Project's implementation of the AWK programming
+gawk: language.  It conforms to the definition of the language in the POSIX
+gawk: 1003.2 Command Language And Utilities Standard.  This version in turn
+gawk: is based on the description in The AWK Programming Language, by Aho,
+gawk: Kernighan, and Weinberger, with the additional features found in the
+gawk: System V Release 4 version of UNIX awk.  Gawk also provides more
+gawk: recent Bell Labs awk extensions, and some GNU-specific extensions.
+gawk:
+gawk:
Index: npl/overig/mlocate/mlocate-run-updatedb
===================================================================
--- npl/overig/mlocate/mlocate-run-updatedb	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate-run-updatedb	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" && $2 != "zfs" { print $2 }')
+/usr/bin/updatedb -f "$nodevs"
Index: npl/overig/mlocate/mlocate.SlackBuild
===================================================================
--- npl/overig/mlocate/mlocate.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: https://mirrors.slackware.com/slackware/slackware-current/source/a/mlocate/
+# Created at Fri Jul 28 16:06:55 CEST 2017
+
+
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./mlocate.SlackBuild.orig
+
+
+############ make syn3 packages
+cd $CWD
+for PKG in /tmp/package-*; do
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
+
+        #seperate dev-package
+        syn3_move_dev $PKG $PKG""_dev
+        syn3_makepkg $PKG""_dev $NAME""_dev $VERSION $ARCH || exit 1
+
+        #make main package
+        syn3_makepkg $PKG $NAME $VERSION $ARCH || exit 1
+done
Index: npl/overig/mlocate/mlocate.SlackBuild.orig
===================================================================
--- npl/overig/mlocate/mlocate.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+# Copyright 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=mlocate
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var/lib \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS groupname=slocate || make groupname=slocate || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/etc
+cp -a $CWD/updatedb.conf.new $PKG/etc/updatedb.conf.new
+chown root:root $PKG/etc/updatedb.conf.new
+chmod 644 $PKG/etc/updatedb.conf.new
+
+mv $PKG/usr/bin/locate $PKG/usr/bin/mlocate
+( cd $PKG/usr/bin ; ln -sf mlocate locate )
+
+( cd $PKG/usr/man/man1
+  ln -sf locate.1 mlocate.1
+)
+
+mkdir -p $PKG/usr/libexec
+cp -a $CWD/mlocate-run-updatedb $PKG/usr/libexec/mlocate-run-updatedb
+chown root:root $PKG/usr/libexec/mlocate-run-updatedb
+chmod 755 $PKG/usr/libexec/mlocate-run-updatedb
+
+mkdir -p $PKG/etc/cron.daily
+cp -a $CWD/mlocate.cron $PKG/etc/cron.daily/mlocate
+chown root:root $PKG/etc/cron.daily/mlocate
+chmod 755 $PKG/etc/cron.daily/mlocate
+
+chown root:slocate $PKG/usr/bin/mlocate
+chmod 2711 $PKG/usr/bin/mlocate
+mkdir -p $PKG/var/lib/mlocate
+chown root:slocate $PKG/var/lib/mlocate
+chmod 750 $PKG/var/lib/mlocate
+
+# Strip binaries:
+( cd $PKG
+  #find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  #find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1 | grep -v '\.gz$') ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
Index: npl/overig/mlocate/mlocate.arch
===================================================================
--- npl/overig/mlocate/mlocate.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/overig/mlocate/mlocate.build
===================================================================
--- npl/overig/mlocate/mlocate.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/overig/mlocate/mlocate.cron
===================================================================
--- npl/overig/mlocate/mlocate.cron	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate.cron	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,2 @@
+#!/bin/sh
+ionice -c3 nice -n 19 /usr/libexec/mlocate-run-updatedb
Index: npl/overig/mlocate/mlocate.md5
===================================================================
--- npl/overig/mlocate/mlocate.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,11 @@
+91aa1afde3e9a34b920c4b023ab25e6a  ./doinst.sh.gz
+539e6f86bf387358aa2b14d5f880e49a  ./mlocate-0.26.tar.xz
+3abc0bd5f35788d0e1a7615ede743980  ./mlocate.cron
+8e338945d747f1e747f6f7468aed4dee  ./mlocate_dev.pkg
+89b1d8a0684f1a34da9e3056bf45c42d  ./mlocate.pkg
+cb8524542aad0b78775a4c644299c4f7  ./mlocate-run-updatedb
+ac8a738e76d22b31c7872b4f245ec05b  ./mlocate.SlackBuild
+1feb6b76592c2933b57058c8aa79c0a7  ./mlocate.SlackBuild.log.gz
+36ceb50c6937d68837828acc669a46c1  ./mlocate.SlackBuild.orig
+71b21a5fc393a0fc976c32860d03c957  ./slack-desc
+f88f45338d272e21ebdb93e7707538e1  ./updatedb.conf.new
Index: npl/overig/mlocate/mlocate.version
===================================================================
--- npl/overig/mlocate/mlocate.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+0.26
Index: npl/overig/mlocate/mlocate_dev.arch
===================================================================
--- npl/overig/mlocate/mlocate_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/overig/mlocate/mlocate_dev.build
===================================================================
--- npl/overig/mlocate/mlocate_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/overig/mlocate/mlocate_dev.version
===================================================================
--- npl/overig/mlocate/mlocate_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/mlocate_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+0.26
Index: npl/overig/mlocate/slack-desc
===================================================================
--- npl/overig/mlocate/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+mlocate: mlocate (locate/updatedb implementation)
+mlocate:
+mlocate: mlocate is a locate/updatedb implementation.  It keeps a database of
+mlocate: all existing files and allows you to lookup files by name.  The 'm'
+mlocate: stands for "merging": updatedb reuses the existing database to avoid
+mlocate: rereading most of the file system, which makes updatedb faster and
+mlocate: does not trash the system caches as much as traditional locate
+mlocate: implementations.  The locate(1) utility is intended to be completely
+mlocate: compatible to slocate.  It also attempts to be compatible to GNU
+mlocate: locate, when it does not conflict with slocate compatibility.
+mlocate:
Index: npl/overig/mlocate/updatedb.conf.new
===================================================================
--- npl/overig/mlocate/updatedb.conf.new	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/mlocate/updatedb.conf.new	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,4 @@
+PRUNE_BIND_MOUNTS = "yes"
+PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset debugfs devpts ecryptfs exofs fuse fuse.sshfs fusectl gfs gfs2 gpfs hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs sockfs sysfs tmpfs ubifs udf usbfs ceph fuse.ceph"
+PRUNENAMES = ".git .hg .svn .bzr .arch-ids {arch} CVS"
+PRUNEPATHS = "/afs /dev /media /mnt /net /proc /sys /tmp /usr/tmp /var/cache/ccache /var/lib/ceph /var/spool/cups /var/tmp"
Index: npl/overig/redis/redis.SlackBuild
===================================================================
--- npl/overig/redis/redis.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/redis/redis.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+##NEED:...
+##DEP:..
+#NEED:tcl
+
+
+#######Essential package info.
+#Change these if autodetection fails.
+
+#Name of the Syn-3 package that we are going to create
+NAME=`basename $0|sed 's/.SlackBuild//'`
+
+#Archive of the sourcefiles to unpack 
+SRC_ARC=`ls *.tar.* *.zip 2>/dev/null`
+
+#Version of the sourcefiles
+VER=`echo $SRC_ARC| sed 's/.*-//g' | sed 's/\.tar\..*$//g' | sed 's/\.zip$//g'`
+
+#Architecture that the created binaries run on.
+#Use noarch for scripts.
+ARCH=`uname -m`
+
+#from this point on, exit on errors:
+set -e
+
+########Build and create the pacakge.
+#Uncomment the stuff that you dont want or need
+
+#Unpack source 
+#(uncomment if not needed)
+syn3_unpack $SRC_ARC 
+
+#Directory where the sourcefiles are unpacked. 
+#(you might have to adjust this if autodetection fails)
+SRC_DIR=`ls -c|head -1`
+
+#apply patches
+#patch -p1 -d $SRC_DIR < fluxkiosk.patch || exit 1
+
+pushd $SRC_DIR 
+
+#AUTOMAKE: Configure
+#Some usefull stuff you sometimes need to set:
+#export LDFLAGS="-L/usr/X11/lib/ -L/usr/lib/mysql/"
+#export LD_LIBRARY_PATH=/usr/lib/mysql
+#export VPATH=$LD_LIBRARY_PATH
+#export CFLAGS="-std=c89"
+#export CFLAGS="-fgnu89-inline" #If "multiple definition of `foo'" Also see http://gcc.gnu.org/gcc-4.3/porting_to.html
+MAKE_OPTS=""
+#./configure --prefix=/usr  || exit 1
+
+#AUTOMAKE: Compile
+make $MAKE_OPTS || exit 1
+
+#AUTOMAKE: Test (optional)
+#if grep ^test: Makefile; then
+#	make pkgconfigdir=/usr/lib/pkgconfig $MAKE_OPTS install || exit 1
+#	make $MAKE_OPTS test || exit 1
+#elif grep ^check: Makefile; then
+#	make pkgconfigdir=/usr/lib/pkgconfig $MAKE_OPTS install || exit 1
+#	make $MAKE_OPTS check || exit 1 
+#fi
+
+#AUTOMAKE: Install
+mkdir -p /tmp/pkg &>/dev/null
+make PREFIX=/tmp/pkg/usr $MAKE_OPTS install || exit 1
+popd
+
+#strip bins and other stuff
+syn3_strip /tmp/pkg || exit 1
+
+#move development stuff and create seperate development package
+syn3_move_dev /tmp/pkg /tmp/pkgdev || exit 1
+syn3_makepkg /tmp/pkgdev $NAME""_dev $VER $ARCH || exit 1
+
+#make main package
+syn3_makepkg /tmp/pkg $NAME $VER $ARCH || exit 1
+
+
+
Index: npl/overig/redis/redis.arch
===================================================================
--- npl/overig/redis/redis.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/redis/redis.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/overig/redis/redis.build
===================================================================
--- npl/overig/redis/redis.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/redis/redis.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/overig/redis/redis.md5
===================================================================
--- npl/overig/redis/redis.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/redis/redis.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,4 @@
+c91867a18ae0c5f7bb61a7c1120d80b4  ./redis-3.2.8.tar.gz
+1d554475121c372c40551627eab30e3b  ./redis.pkg
+187c3d5a5b9bd90d69fc6328b7208693  ./redis.SlackBuild
+3c0357f5d977e16934a246c8facde9ee  ./redis.SlackBuild.log.gz
Index: npl/overig/redis/redis.version
===================================================================
--- npl/overig/redis/redis.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/redis/redis.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+3.2.8
Index: npl/overig/texinfo/slack-desc
===================================================================
--- npl/overig/texinfo/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/texinfo/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+texinfo: texinfo (GNU software documentation system)
+texinfo:
+texinfo: 'Texinfo' is a documentation system that uses a single source file to
+texinfo: produce both on-line information and printed output.  Using Texinfo,
+texinfo: you can create a printed document with the normal features of a book,
+texinfo: including chapters, sections, cross references, and indices.  From the
+texinfo: same Texinfo source file, you can create a menu-driven, on-line Info
+texinfo: file with nodes, menus, cross references, and indices.
+texinfo:
+texinfo: This package is needed to read the documentation files in /usr/info.
+texinfo:
Index: npl/overig/texinfo/texinfo-6.3.tar.xz.sig
===================================================================
--- npl/overig/texinfo/texinfo-6.3.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/texinfo/texinfo-6.3.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iF4EABEIAAYFAlfUbtEACgkQ3bxXnas3+6nd0AEAoEi1Bo+hlJXs2vdvbrfaPy+E
+2utGZqXTQ888tM8CzdUBAJjtwVXjVtd+Nwl/Qh+Qb8E7L6FoiyFKJriddaPwfRzM
+=0NEP
+-----END PGP SIGNATURE-----
Index: npl/overig/texinfo/texinfo.SlackBuild
===================================================================
--- npl/overig/texinfo/texinfo.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/overig/texinfo/texinfo.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,72 +1,25 @@
 #!/bin/bash
-#Gebruik deze file als voorbeeld. Plaats de source tar.gz file in de zelfde directory als deze slackbuild
-#Met de NEED en DEP opties is het mogelijk om build dependencies aan te geven.
-#Voor de meeste packages hoeft er verder niks aan de variabellen veranderd te worden.
-##################################### Build dependency info:
-
-#Strict build-dependencies. 
-#Only use when really neccesary, this will rebuild our package if the dependencie has changed:
-##DEP:linux
-##DEP:linux_src
-
-#Loose build-dependencies.
-#Use this to specify the packages that are required to build our package:
-##NEED:libcairo
-##NEED:glib
-##NEED:glib_dev
-##NEED:gtk+
-##NEED:gtk+_dev
-##NEED:xorg_lib
-##NEED:xorg_proto
-#DEP:ncurses
-
-#######Essential package info.
-#Change these if autodetection fails.
-
-#Name of the Syn-3 package that we are going to create
-NAME=`basename $0|sed 's/.SlackBuild//'`
-
-#Archive of the sourcefiles to unpack 
-SRC_ARC=`ls *.tar.*`
-
-#Version of the sourcefiles
-VER=`echo $SRC_ARC| sed 's/.*-//g' | sed 's/\.tar\..*$//g'`
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/ap/texinfo/
+# Created at Tue Feb  7 16:49:50 CET 2017
 
 
-#Directory of the sourcefiles to build (after optional unpacking)
-#SRC_DIR=`echo $SRC_ARC| sed 's/\.tar\..*$//g'`
-SRC_DIR=texinfo-4.8
-
-#Architecture that the created binaries run on.
-#Use noarch for scripts.
-ARCH=`arch`
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./texinfo.SlackBuild.orig
 
 
-########Build and create the pacakge.
-#Uncomment the stuff that you dont want or need
+############ make syn3 packages
+cd $CWD
+for PKG in /tmp/package-*; do
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
 
-#Unpack source 
-#(uncomment if not needed)
-syn3_unpack $SRC_ARC || exit 1
+        #seperate dev-package
+        syn3_move_dev $PKG $PKG""_dev
+        syn3_makepkg $PKG""_dev $NAME""_dev $VERSION $ARCH || exit 1
 
-#apply patches
-#patch -p1 -d $SRC_DIR < fluxkiosk.patch || exit 1
-
-#build and install sourcefiles
-#(use one of the other syn3_build_* scripts when needed)
-export CONFIGURE_OPTS=""
-export MAKE_OPTS=""
-#export NOTEST=1
-syn3_build_automake $SRC_DIR /tmp/pkg || exit 1
-
-#strip bins and other stuff
-syn3_strip /tmp/pkg || exit 1
-
-#move development stuff and create seperate development package
-syn3_move_dev /tmp/pkg /tmp/pkgdev || exit 1
-syn3_makepkg /tmp/pkgdev $NAME""_dev $VER $ARCH || exit 1
-
-#make main package
-syn3_makepkg /tmp/pkg $NAME $VER $ARCH || exit 1
-
-
+        #make main package
+        syn3_makepkg $PKG $NAME $VERSION $ARCH || exit 1
+done
Index: npl/overig/texinfo/texinfo.SlackBuild.orig
===================================================================
--- npl/overig/texinfo/texinfo.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/texinfo/texinfo.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=texinfo
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-texinfo
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+tar xvf $CWD/texinfo-$VERSION.tar.xz || exit 1
+cd texinfo-$VERSION
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-static \
+  --docdir=/usr/doc/texinfo-$VERSION \
+  --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+
+# Be sure this is "fresh"
+zcat $CWD/dir.gz > $PKG/usr/info/dir
+mv $PKG/usr/info/dir $PKG/usr/info/dir.new
+
+gzip -9 $PKG/usr/info/*info*
+gzip -9 $PKG/usr/man/man?/*
+
+mkdir -p $PKG/usr/doc/texinfo-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* TODO \
+  $PKG/usr/doc/texinfo-$VERSION
+chmod 644 $PKG/usr/doc/texinfo-$VERSION/*
+chown -R root:root $PKG/usr/doc/texinfo-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/texinfo-$VERSION-$ARCH-$BUILD.txz
+
Index: npl/overig/texinfo/texinfo.build
===================================================================
--- npl/overig/texinfo/texinfo.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/overig/texinfo/texinfo.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6526
+1
Index: npl/overig/texinfo/texinfo.depver
===================================================================
--- npl/overig/texinfo/texinfo.depver	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-ncurses	0
Index: npl/overig/texinfo/texinfo.md5
===================================================================
--- npl/overig/texinfo/texinfo.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/overig/texinfo/texinfo.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,4 +1,10 @@
-6611b6f95a5f133aa52889be93bfbf31  ./texinfo-4.8a.tar.gz
-d9983f4ebdd10e623468db86ab4644d7  ./texinfo.pkg
-f0e0d0f996213f85828ba9603ff6393c  ./texinfo.SlackBuild
-89ab5b7ba125171525b7c051a09d4ffe  ./texinfo.SlackBuild.log.gz
+14d61404e37a5878082ef3afbc90f865  ./dir.gz
+240acba05475d478fd9a91f3a70d60a0  ./doinst.sh.gz
+2e8a2647daab018a9b40d0955d4c4c84  ./slack-desc
+32baefe5c7080dfb512a4eac5ce67b2a  ./texinfo-6.3.tar.xz
+aca1ba19ab06e46e07cb3db6cf7aa397  ./texinfo-6.3.tar.xz.sig
+a583159f66967f89a7b6a9b8dc7363ce  ./texinfo_dev.pkg
+3caa850f0c4292ae03375f6a5974bca0  ./texinfo.pkg
+3219fe79b770b213a942f494c0cb7f0a  ./texinfo.SlackBuild
+bb149b065c91f15792b6821b3a041322  ./texinfo.SlackBuild.log.gz
+95d5941cf27f573845a445e2643ec619  ./texinfo.SlackBuild.orig
Index: npl/overig/texinfo/texinfo.version
===================================================================
--- npl/overig/texinfo/texinfo.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/overig/texinfo/texinfo.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8a
+6.3
Index: npl/overig/texinfo/texinfo_dev.arch
===================================================================
--- npl/overig/texinfo/texinfo_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/texinfo/texinfo_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/overig/texinfo/texinfo_dev.build
===================================================================
--- npl/overig/texinfo/texinfo_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/texinfo/texinfo_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/overig/texinfo/texinfo_dev.version
===================================================================
--- npl/overig/texinfo/texinfo_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/overig/texinfo/texinfo_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+6.3
Index: npl/syn3/backup/backup
===================================================================
--- npl/syn3/backup/backup	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/backup	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,13 +1,7 @@
 #!/bin/bash
-#Backup script for Syn3 (C)DatuX 
+#Backup script for Syn3 (C)DatuX
 
 name='backup'
-source /etc/backup.conf || exit 1
-source $SCRIPTDIR/backuplib || exit 1
-
-#load additional backup config file?
-if [ -e "$BACKUP_CONF" ]; then
-	source $BACKUP_CONF || exit 1
-fi
+source /usr/backup/backuplib || exit 1
 
 
@@ -21,5 +15,5 @@
 		#nope, so exit cleanly
 		exit 0
-	fi	
+	fi
 fi
 
@@ -66,8 +60,8 @@
 	echo "INFO:Backup session ended"
 	exit $1
-}	
-
-
-	
+}
+
+
+
 echo "INFO: Backup session started at `date`"
 if [ "$1" == "now" ]; then
@@ -97,8 +91,8 @@
         ROOTFS=$SNAPMNT
     fi
-    
+
     #rsync the root+boot filesystem data
     echo "INFO: Collecting / and /boot ..."
-    rsync -ax -q --ignore-errors --numeric-ids --delete --exclude=/tmp/* --exclude=/dev/.udev /boot $ROOTFS/. "$BACKUPMNT/.syn3systembackup" 
+    rsync -ax -q --ignore-errors --numeric-ids --delete --exclude=/tmp/* --exclude=/dev/.udev /boot $ROOTFS/. "$BACKUPMNT/.syn3systembackup"
     err=$?
     #ignore some errors (partial transfers, vanishing files)
@@ -128,8 +122,8 @@
     #note: on redundant systems /dev/home points to /dev/drbd.. instead of /dev/syn3/home, so this is why we need this extra variable:
     Snapshot $SNAPSOURCEDEV || terminated
-    
+
     #unfreeze the databases
     unfreeze
-	
+
     echo "INFO: Checking snapshots."
     if ! SnapshotValid; then
@@ -152,5 +146,5 @@
         fi
     done
-    sync 
+    sync
     #dump the normal location.
     DUMPMNT=$BACKUPMNT
@@ -174,13 +168,13 @@
 	while true; do
 		if [ $mode == "smb" ]; then
-			xfsdump -e -o -p 10 -F - $resumeflag $OPTS $DUMPMNT | gzip --fast | smbclient --timeout 3600 -s /dev/null -c "put - $FILE" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd" 
+			xfsdump -e -o -p 10 -F - $resumeflag $OPTS $DUMPMNT | gzip --fast | smbclient --timeout 3600 -s /dev/null -c "put - $FILE" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd"
 			#also check xfsdump exit code to prevent samba exit-code bug: https://bugzilla.samba.org/show_bug.cgi?id=7551
-			if [ "$?${PIPESTATUS[0]}" != "00" ]; then 
+			if [ "$?${PIPESTATUS[0]}" != "00" ]; then
 				terminated
 			fi
 		elif [ $mode == "tape" ]; then
-			xfsdump -e -L "$FILE" -o -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT 
+			xfsdump -e -L "$FILE" -o -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT
 		elif [ $mode == "usbtape" ]; then
-			xfsdump -e -L "$FILE" -o -b 65536 -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT 
+			xfsdump -e -L "$FILE" -o -b 65536 -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT
 		elif [ $mode == "rsync" ]; then
 			export PASSWD="$rsyncpasswd"
@@ -198,5 +192,5 @@
 		else
 			echo "Backupmode $mode is unknown!";
-			terminated 
+			terminated
 		fi
 		if [ $? == 0 ]; then
@@ -229,9 +223,9 @@
 		fi
 	done
-) 2>&1 | 
+) 2>&1 |
 #analyse the output of the above block
-while read LINE; do 
+while read LINE; do
 	ProcXfsOutput "$LINE" || terminated
-done 
+done
 
 #did something go wrong?
Index: npl/syn3/backup/backuplib
===================================================================
--- npl/syn3/backup/backuplib	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/backuplib	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,3 +1,11 @@
 #!/bin/bash
+
+source /etc/backup.conf || exit 1
+
+#load additional backup config file?
+if [ -e "$BACKUP_CONF" ]; then
+	source $BACKUP_CONF || exit 1
+fi
+
 
 #correct ssh command and parameters for rsync backups, to force passwords and disable pubkeyauthentication. (it seems wrong, but in this use-case it actually makes sense)
@@ -103,5 +111,5 @@
 CheckRunning()
 {
-	if [ `pgrep -o 'restore|backup'` != $$ ]; then
+	if [ `pgrep -xo 'restore|backup'` != $$ ]; then
 		echo "INFO: Backup/restore already running!";
 		exit 1
Index: npl/syn3/backup/cleanup
===================================================================
--- npl/syn3/backup/cleanup	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/cleanup	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,7 +1,5 @@
 #!/bin/bash
-#Backup script for Syn3 (C)DatuX 
-source /etc/backup.conf || exit 1
-source $SCRIPTDIR/backuplib || exit 1
-
+#Backup script for Syn3 (C)DatuX
+source /usr/backup/backuplib || exit 1
 #skip cleanup for tapes
 if [ $mode == "tape" ]; then
@@ -33,5 +31,5 @@
 
 echo "INFO:Checking for old backups that can be deleted.."
-for FILE in `$SCRIPTDIR/list`; do 
+for FILE in `$SCRIPTDIR/list`; do
 	[ "$FILE" == "$SKIPFILE" ] && continue;
 
@@ -53,9 +51,9 @@
 			fi
 		fi
-		
+
 		#not in future?
-		if [ $STAMP -lt $NOW ]; then 
+		if [ $STAMP -lt $NOW ]; then
 			if [ $DEL == 1 ]; then
-				echo "INFO:Deleting $FILE"	
+				echo "INFO:Deleting $FILE"
 				$SCRIPTDIR/delete "$FILE" || exit 1
 			fi
Index: npl/syn3/backup/delete
===================================================================
--- npl/syn3/backup/delete	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/delete	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,6 +1,5 @@
 #!/bin/bash
-#Backup script for Syn3 (C)DatuX 
-source /etc/backup.conf || exit 1
-source $SCRIPTDIR/backuplib || exit 1
+#Backup script for Syn3 (C)DatuX
+source /usr/backup/backuplib || exit 1
 
 FILE=$1
Index: npl/syn3/backup/list
===================================================================
--- npl/syn3/backup/list	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/list	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,6 +1,5 @@
 #!/bin/bash
-#Backup script for Syn3 (C)DatuX 
-source /etc/backup.conf || exit 1
-source $SCRIPTDIR/backuplib || exit 1
+#Backup script for Syn3 (C)DatuX
+source /usr/backup/backuplib || exit 1
 cd /
 
@@ -16,8 +15,8 @@
     /usr/backup/sshpass rsync $RSYNC_SETTINGS --rsh "$SSHCMD" -v -R -n --no-implied-dirs "$rsyncserver:$rsyncdir/syn3backupmeta/syn3_*" /tmp/backupmetadummy/ > /tmp/syn3backuplastest.$$;
     RET_LATEST=$?
-    
-    /usr/backup/sshpass rsync $RSYNC_SETTINGS --rsh "$SSHCMD" -v -R -n --no-implied-dirs "$rsyncserver:$rsyncsnapdir/syn3backupmeta/syn3_*" /tmp/backupmetadummy/ > /tmp/syn3backupsnapshots.$$; 
+
+    /usr/backup/sshpass rsync $RSYNC_SETTINGS --rsh "$SSHCMD" -v -R -n --no-implied-dirs "$rsyncserver:$rsyncsnapdir/syn3backupmeta/syn3_*" /tmp/backupmetadummy/ > /tmp/syn3backupsnapshots.$$;
     RET_SNAPSHOTS=$?
-    
+
     #TODO: create a nice way to do error feedback (needs webint changes)
 
@@ -30,5 +29,5 @@
     [ "${rsyncdir:0:1}" == "/" ] && SLASH="/"
     [ "$RET_LATEST" == "0" ] && grep syn3_ /tmp/syn3backuplastest.$$ | sed "s@^@$SLASH@"
-    
+
     rm /tmp/syn3backuplastest.$$ /tmp/syn3backupsnapshots.$$
     exit 0
Index: npl/syn3/backup/listfiles
===================================================================
--- npl/syn3/backup/listfiles	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/listfiles	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,6 +1,5 @@
 #!/bin/bash
-#Backup script for Syn3 (C)DatuX 
-source /etc/backup.conf || exit 1
-source $SCRIPTDIR/backuplib || exit 1
+#Backup script for Syn3 (C)DatuX
+source /usr/backup/backuplib || exit 1
 cd /
 
@@ -17,5 +16,5 @@
 		xfsrestore -p 10 -L "$FILE" -t -v 0 -f "$TAPEDEV" -F || exit 1;
 	elif [ $mode == "usbtape" ]; then
-		xfsrestore -p 10 -L "$FILE" -t -v 0 -f "$TAPEDEV" -F -b 65536  || exit 1; 
+		xfsrestore -p 10 -L "$FILE" -t -v 0 -f "$TAPEDEV" -F -b 65536  || exit 1;
 	else
 		echo "Backupmode $mode is unknown!";
@@ -24,5 +23,5 @@
 #Analyse the output of the above block
 #This will produce progress-information to filehandle 3 for the SCC to pickup.
-    tee "$FILELISTCACHEDIR/tmp" | 
+    tee "$FILELISTCACHEDIR/tmp" |
     grep --line-buffered "^xfsrestore:" | #only use lines that are important for procxfsoutput (because its slow!)
     while read LINE; do
@@ -34,5 +33,5 @@
 #filter the xfsrestore status messages from our precious listfile :)
 grep -v "^xfsrestore:" "$FILELISTCACHEDIR/tmp" > "$FILELISTCACHEDIR/$FILE" || exit 1
-rm "$FILELISTCACHEDIR/tmp" 
+rm "$FILELISTCACHEDIR/tmp"
 fi
 
Index: npl/syn3/backup/restore
===================================================================
--- npl/syn3/backup/restore	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/restore	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,6 +1,5 @@
 #!/bin/bash
-#Restore script for Syn-3 (C)DatuX 
-source /etc/backup.conf || exit 1
-source $SCRIPTDIR/backuplib || exit 1
+#Restore script for Syn-3 (C)DatuX
+source /usr/backup/backuplib || exit 1
 
 FILE=$1
@@ -41,5 +40,5 @@
 syn3-state backup ALERT "Disaster restore started. Your system is unusable until the restore has completed."
 
-############################# 
+#############################
 echo "STAT:Preparing $BACKUPDEV"
 
@@ -79,5 +78,5 @@
 (
 	if [ $mode == "smb" ]; then
-		smbclient --timeout 3600 -s /dev/null --stderr -c "get $FILE -" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd" | gunzip | xfsrestore -o -p 10 -F - $BACKUPMNT || terminated 
+		smbclient --timeout 3600 -s /dev/null --stderr -c "get $FILE -" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd" | gunzip | xfsrestore -o -p 10 -F - $BACKUPMNT || terminated
 		[ "${PIPESTATUS[0]}" != "0" ] && terminated "Error while reading from fileserver."
 		exit 0
@@ -92,11 +91,11 @@
 	else
 		echo "Backupmode $mode is unknown!";
-		terminated 
+		terminated
 	fi
-) 2>&1 | 
+) 2>&1 |
 #analyse the output of the above block
-while read LINE; do 
+while read LINE; do
 	ProcXfsOutput "$LINE" || terminated
-done 
+done
 
 #something went wrong?
@@ -109,5 +108,5 @@
 #Look at: http://open.syn3.nl/syn3/trac/default/wiki/SynBackup for technical details.
 
-#we have a systembackup to restore? 
+#we have a systembackup to restore?
 if [ -e $BACKUPMNT/.syn3systembackup ]; then
 	#touch this file so the initrd will format / and /boot and copy the data there.
Index: npl/syn3/backup/restorefiles
===================================================================
--- npl/syn3/backup/restorefiles	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/restorefiles	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,6 +1,5 @@
 #!/bin/bash
-#Backup script for Syn3 (C)DatuX 
-source /etc/backup.conf || exit 1
-source $SCRIPTDIR/backuplib || exit 1
+#Backup script for Syn3 (C)DatuX
+source /usr/backup/backuplib || exit 1
 
 FILENAME=$1;
@@ -30,5 +29,5 @@
 		smbclient --timeout 3600  -s /dev/null -c "get $FILENAME -" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd"  |gunzip| eval xfsrestore -p 10 - -o -F $FILEPATHS "$DESTINATION" || exit 1;
 	elif [ $mode == "tape" ]; then
-		#echo xfsrestore -p 10 -L "$FILENAME" -o -F $FILEPATHS -f "$TAPEDEV" "$DESTINATION" 
+		#echo xfsrestore -p 10 -L "$FILENAME" -o -F $FILEPATHS -f "$TAPEDEV" "$DESTINATION"
 		eval xfsrestore -p 10 -L "$FILENAME" -o -F $FILEPATHS -f "$TAPEDEV" "$DESTINATION" || exit 1;
 	elif [ $mode == "usbtape" ]; then
@@ -37,8 +36,7 @@
 		echo "Backupmode $mode is unknown!";
 	fi
-) 2>&1 | 
+) 2>&1 |
 #analyse the output of the above block
-while read LINE; do 
+while read LINE; do
 	ProcXfsOutput "$LINE" || exit 1
 done
-
Index: npl/syn3/backup/syn3backup.build
===================================================================
--- npl/syn3/backup/syn3backup.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/syn3backup.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6548
+6551
Index: npl/syn3/backup/syn3backup.md5
===================================================================
--- npl/syn3/backup/syn3backup.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/backup/syn3backup.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,9 +1,9 @@
-ecf10c7e2ebe7c09da6bae104fb0b3ca  ./backup
+17d2ccbdcf7937a1ef1134ba7c4b0378  ./backup
 779c5c089a832327ff56b7db1d89ea25  ./backup.conf
-609916f5b9856ac6c00229628e959bf0  ./backuplib
-00f891dd773d85750d8212f0ba02e246  ./cleanup
-3cdeb17172997c4ecc3c27fa187b0fa1  ./delete
-fadfc8742aed0b81297765b9e4350e3f  ./list
-137c782694746269699bb022b6b647e9  ./listfiles
+c50d0f5338e24eb7e4943557589fd562  ./backuplib
+5fd22ce56460e9ab76641f1f322bd30f  ./cleanup
+a65357fe969b583c6220300ae54316b4  ./delete
+b97e0e1bf8be8787d71c763f8fd56550  ./list
+8964fa790326d3924faf0a3a0253fe56  ./listfiles
 2016cc75fdc0fc52998a1d2291395879  ./modules/mysql.backup
 b07c8333373794830b95567130ffd821  ./modules/mysql.freeze
@@ -22,9 +22,9 @@
 cc0682867de94c1ccb2163e2fb1856e8  ./post.backup
 7158d3d4117bda9ee72ff6542bd141d7  ./post.restore
-5c6a3e0a4f34e7e9a30c534a4e3e44c5  ./restore
-a5c8f09a59ffb86f65344f20926f1b61  ./restorefiles
+bd04ec4ba9f753e1b36ecaec9be394e2  ./restore
+b42907f76531300850bad1104e2f6bdf  ./restorefiles
 478387d5e8c95cee3c270858e930b2ba  ./sshpass
-02c74cd009a095c929b0f182fe837990  ./syn3backup.pkg
+1dcce0b997d0c2b5568c564f86d38ff2  ./syn3backup.pkg
 6e3b8805854d12fd1b73056e96357640  ./syn3backup.SlackBuild
-0c7e2234bb90f7a43a8e9fd1b053eea5  ./syn3backup.SlackBuild.log.gz
+815f0fb042703caf20ef9cc1d31a1319  ./syn3backup.SlackBuild.log.gz
 ac50b66df20fa5fee5fb8ec431ede26e  ./updatelang.sh
Index: npl/syn3/syn3-scripts/scripts/syn3-heartbeatcheck
===================================================================
--- npl/syn3/syn3-scripts/scripts/syn3-heartbeatcheck	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/syn3-scripts/scripts/syn3-heartbeatcheck	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -7,5 +7,7 @@
 #We want to use drbd with heartbeat at all?
 if [ "$DRBD" == "1" ] && [ "$CLUSTER_ID" ]; then
-
+	#we want to receive/send heartbeats:
+	ifconfig $ETH up
+	
 	if HEARTBEATS="`syndog $CLUSTER_ID --cat`"; then
 
Index: npl/syn3/syn3-scripts/scripts/syn3-state
===================================================================
--- npl/syn3/syn3-scripts/scripts/syn3-state	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/syn3-scripts/scripts/syn3-state	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -63,5 +63,5 @@
 	retries=3;
 	if ! env MIBS="+SYN3-MIB" /usr/bin/snmptrap -v 2c -Ci -r $retries -c $snmptrap_community $snmptrap_receiver "" syn3FacilityTrap syn3FacilityName s "$TRAP_FACILITY" syn3FacilityStatus s "$TRAP_STATE" syn3FacilityDescription s "$TRAP_MSG" syn3FacilityAck s "$TRAP_ACK" &>/dev/null; then
-		exit 3;
+		echo "Error while sending snmptrap"
 	fi
 	return 0;
Index: npl/syn3/webint/src/backup/syn3backup.php
===================================================================
--- npl/syn3/webint/src/backup/syn3backup.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/backup/syn3backup.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -54,5 +54,5 @@
 	#try to create a directory and use all the rsync options we need, to make sure everything works
 	mkdir("/tmp/syn3backuptest");
-	$ret=Cmd("PASSWD='$new_rsyncpasswd' /usr/backup/sshpass rsync --rsh 'ssh -p $new_rsyncport -o NumberOfPasswordPrompts=1 -o StrictHostKeyChecking=no -o PubkeyAuthentication=no' -r --rsync-path='rsync --fake-super' /tmp/syn3backuptest/ '$new_rsyncserver:$new_rsyncdir/syn3backupmeta'", 
+	$ret=Cmd("PASSWD='$new_rsyncpasswd' /usr/backup/sshpass rsync --rsh 'ssh -p $new_rsyncport -o NumberOfPasswordPrompts=1 -o StrictHostKeyChecking=no -o PubkeyAuthentication=no' -r --rsync-path='rsync --fake-super' /tmp/syn3backuptest/ '$new_rsyncserver:$new_rsyncdir/syn3backupmeta'",
 			 '', $out, $err);
 	rmdir("/tmp/syn3backuptest");
@@ -70,5 +70,5 @@
 	global $bcksettings;
 	$raw=FileRead($bcksettings[LOG]);
-	if (!Cmd("pgrep -o 'restore|backup'", '', $out, $err))
+	if (!Cmd("pgrep -xo 'restore|backup'", '', $out, $err))
 	{
 		$running=1;
Index: npl/syn3/webint/src/error.php
===================================================================
--- npl/syn3/webint/src/error.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/error.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,13 +1,13 @@
-<? 
+<?
 /** Functions to validate user input a generate apporiate messages.
  *
- * These functions will check the given parameters and return false 
+ * These functions will check the given parameters and return false
  * if everything is allright. If something is wrong it will return an
  * errorstring that explains whats wrong in the users own language.
  * @package forms
- */ 
+ */
 
 	require_once("common.php");
-	
+
 	/** Check if filename name is valid.
 	 * Returns false if its valid
@@ -27,7 +27,7 @@
 	}
 
-	
+
 	/** Check if the tcp/ip $port number is valid.
-	 * 
+	 *
 	 * Returns false if its valid.
 	 * Returns a descriptive error message if its invalid.
@@ -36,11 +36,11 @@
 	{
 		if (!$port)
-			return (_ErrorPortnumberIsRequired());	
+			return (_ErrorPortnumberIsRequired());
 		elseif (!ValidPort($port))
-			return (_ErrorPortnumberIsInvalid($port));	
-		else
-			return false;
-	}
-	
+			return (_ErrorPortnumberIsInvalid($port));
+		else
+			return false;
+	}
+
 	/** Check if the ip address $ip is valid.
 	 *
@@ -51,7 +51,7 @@
 	{
 		if (!$ip)
-			return (_ErrorIPAdressIsRequired());	
+			return (_ErrorIPAdressIsRequired());
 		elseif (!ValidIP($ip))
-			return (_ErrorIPAdressIsInvalid($ip));	
+			return (_ErrorIPAdressIsInvalid($ip));
 		else
 			return false;
@@ -66,11 +66,25 @@
 	{
 		if (!$netmask)
-			return (_ErrorNetmaskIsRequired());	
+			return (_ErrorNetmaskIsRequired());
 		elseif (!ValidNetmask($netmask))
-			return (_ErrorNetmaskIsInvalid($netmask));	
-		else
-			return false;
-	}
-
+			return (_ErrorNetmaskIsInvalid($netmask));
+		else
+			return false;
+	}
+
+    /** Check if CIDR subnet is valid. Format is 10.0.0.0/24
+	 *
+	 * Returns false if its valid.
+	 * Returns a descriptive error message if its invalid.
+	 */
+	function Error_ValidSubnet($subnet)
+	{
+		if (!$subnet)
+			return (_ErrorSubnetIsRequired());
+		elseif (!ValidSubnet($subnet))
+			return (_ErrorSubnetIsInvalid($subnet));
+		else
+			return false;
+	}
 
 	/** Check if mac is valid. Format is HEXHEX:HEXHEX:HEXHEX:HEXHEX:HEXHEX:HEXHEX
@@ -89,5 +103,5 @@
 	}
 
-		 
+
 	/** Check if hostname is valid. A hostname has a minimum of 1 field.
 	 *
@@ -98,7 +112,7 @@
 	{
 		if (!$hostname)
-			return (_ErrorHostnameIsRequired());	
+			return (_ErrorHostnameIsRequired());
 		elseif (!ValidHostname($hostname))
-			return (_ErrorHostnameIsInvalid($hostname));	
+			return (_ErrorHostnameIsInvalid($hostname));
 		else
 			return false;
@@ -113,12 +127,12 @@
 	{
 		if (!$hostname)
-			return (_ErrorFQDNIsRequired());	
+			return (_ErrorFQDNIsRequired());
 		elseif (!ValidFQDN($hostname))
-			return (_ErrorFQDNIsInvalid($hostname));	
-		else
-			return false;
-	}
-
-		 
+			return (_ErrorFQDNIsInvalid($hostname));
+		else
+			return false;
+	}
+
+
 	/** Check if $address is a valid hostname OR ip adress.
 	 *
@@ -131,5 +145,5 @@
 			return (_ErrorHostnameOrIpAddressIsRequired());
 		elseif (!ValidHostname($address) && !ValidIp($address))
-			return (_ErrorInvalidHostnameOrIpAddress($address));	
+			return (_ErrorInvalidHostnameOrIpAddress($address));
 		else
 			return false;
@@ -144,12 +158,12 @@
 	{
 		if (!$domain)
-			return (_ErrorDomainIsRequired());	
+			return (_ErrorDomainIsRequired());
 		elseif (!ValidDomain($domain))
-			return (_ErrorDomainIsInvalid($domain));	
-		else
-			return false;
-	}
-
-	
+			return (_ErrorDomainIsInvalid($domain));
+		else
+			return false;
+	}
+
+
 	/** Check if $address:$port is actually connectable.
 	 *
@@ -163,5 +177,5 @@
 		if ($err)
 			return $err;
-	
+
 		$err=TestConnect($address,$port,$timeout);
 		if ($err)
@@ -170,5 +184,5 @@
 			return false;
 	}
-	
+
 	/** Check if email adress is valid.
 	 *
@@ -178,8 +192,8 @@
 	function Error_ValidEmail($address)
 	{
-		preg_match("/(.*)\@(.*)/",$address,$matches);	
+		preg_match("/(.*)\@(.*)/",$address,$matches);
 		$name=$matches[1];
 		$domain=$matches[2];
-		
+
 		if (!$domain)
 			return (_ErrorEmailAddressIsRequired());
@@ -187,5 +201,5 @@
 			return (_ErrorInvalidMailDomain($domain));
 		elseif (!ValidEmail($address))
-			return (_ErrorInvalidEmailAddress($address));	
+			return (_ErrorInvalidEmailAddress($address));
 		else
 			return false;
@@ -200,11 +214,11 @@
 	{
 		if (!$share)
-			return (_ErrorSharenameIsRequired());	
+			return (_ErrorSharenameIsRequired());
 		elseif (!ValidSmbShareName($share))
-			return (_ErrorSharenameIsInvalid($share));	
-		else
-			return false;
-	}
-	
+			return (_ErrorSharenameIsInvalid($share));
+		else
+			return false;
+	}
+
 	/** Check if $integer is a valid number between $min and $max inclusive
 	 *
@@ -222,9 +236,9 @@
 		elseif(is_numeric($max) && $integer>$max)
 			return(_ErrorIntToHigh($max));
-		else 
-			return false;
-		
-	}
-	
+		else
+			return false;
+
+	}
+
 	/** Check if $choice exists in the $choices hash array
 	 *
@@ -236,6 +250,5 @@
 		if(! isset($choices[$choice]))
 			return (_ErrorValidChoiceIsRequired());
-		else 
-			return false;
-	}
-	
+		else
+			return false;
+	}
Index: npl/syn3/webint/src/lang_de.php
===================================================================
--- npl/syn3/webint/src/lang_de.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_de.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -125,9 +125,9 @@
 
 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
+	"Filename has invalid characters"
 );}
 
 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+	"Enter filename"
 );}
 
@@ -244,4 +244,12 @@
 );}
 
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
+	"Subnet is required (in CIRD form)"
+);}
+
 function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { return (
 	"You need to make a valid choice!"
Index: npl/syn3/webint/src/lang_deD.php
===================================================================
--- npl/syn3/webint/src/lang_deD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_deD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -124,10 +124,10 @@
 );}
 
-function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsInvalid");return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
-);}
-
-function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsRequired");return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsInvalid");return (
+	"Filename has invalid characters"
+);}
+
+function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsRequired");return (
+	"Enter filename"
 );}
 
@@ -244,4 +244,12 @@
 );}
 
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorSubnetIsInvalid");return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorSubnetIsRequired");return (
+	"Subnet is required (in CIRD form)"
+);}
+
 function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { LangDebug("You need to make a valid choice!", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorValidChoiceIsRequired");return (
 	"You need to make a valid choice!"
Index: npl/syn3/webint/src/lang_en.php
===================================================================
--- npl/syn3/webint/src/lang_en.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_en.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -125,9 +125,9 @@
 
 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
+	"Filename has invalid characters"
 );}
 
 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+	"Enter filename"
 );}
 
@@ -242,4 +242,12 @@
 function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { return (
 	"Enter a share name."
+);}
+
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
+	"Subnet is required (in CIRD form)"
 );}
 
Index: npl/syn3/webint/src/lang_enD.php
===================================================================
--- npl/syn3/webint/src/lang_enD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_enD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -124,10 +124,10 @@
 );}
 
-function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=en&add_labelID=_ErrorFilenameIsInvalid");return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
-);}
-
-function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=en&add_labelID=_ErrorFilenameIsRequired");return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8319");return (
+	"Filename has invalid characters"
+);}
+
+function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8320");return (
+	"Enter filename"
 );}
 
@@ -242,4 +242,12 @@
 function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter a share name.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1082");return (
 	"Enter a share name."
+);}
+
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8322");return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8321");return (
+	"Subnet is required (in CIRD form)"
 );}
 
Index: npl/syn3/webint/src/lang_nl.php
===================================================================
--- npl/syn3/webint/src/lang_nl.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_nl.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -244,4 +244,12 @@
 );}
 
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
+	"Subnet is ongeldig (gebruik CIDR vorm, bijv. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
+	"Subnet is vereist. (in CIDR vorm)"
+);}
+
 function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { return (
 	"U moet een geldig keus maken!"
Index: npl/syn3/webint/src/lang_nlD.php
===================================================================
--- npl/syn3/webint/src/lang_nlD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_nlD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -244,4 +244,12 @@
 );}
 
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Subnet is ongeldig (gebruik CIDR vorm, bijv. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8307");return (
+	"Subnet is ongeldig (gebruik CIDR vorm, bijv. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is vereist. (in CIDR vorm)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8308");return (
+	"Subnet is vereist. (in CIDR vorm)"
+);}
+
 function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { LangDebug("U moet een geldig keus maken!", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=5426");return (
 	"U moet een geldig keus maken!"
Index: npl/syn3/webint/src/lang_pl.php
===================================================================
--- npl/syn3/webint/src/lang_pl.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_pl.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -126,9 +126,9 @@
 
 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
+	"Filename has invalid characters"
 );}
 
 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+	"Enter filename"
 );}
 
@@ -245,4 +245,12 @@
 );}
 
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
+	"Subnet is required (in CIRD form)"
+);}
+
 function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { return (
 	"You need to make a valid choice!"
Index: npl/syn3/webint/src/lang_plD.php
===================================================================
--- npl/syn3/webint/src/lang_plD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_plD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -126,10 +126,10 @@
 );}
 
-function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsInvalid");return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
-);}
-
-function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsRequired");return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsInvalid");return (
+	"Filename has invalid characters"
+);}
+
+function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsRequired");return (
+	"Enter filename"
 );}
 
@@ -246,4 +246,12 @@
 );}
 
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorSubnetIsInvalid");return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorSubnetIsRequired");return (
+	"Subnet is required (in CIRD form)"
+);}
+
 function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { LangDebug("You need to make a valid choice!", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorValidChoiceIsRequired");return (
 	"You need to make a valid choice!"
Index: npl/syn3/webint/src/lang_pt.php
===================================================================
--- npl/syn3/webint/src/lang_pt.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_pt.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -125,9 +125,9 @@
 
 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
+	"Filename has invalid characters"
 );}
 
 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+	"Enter filename"
 );}
 
@@ -242,4 +242,12 @@
 function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { return (
 	"Enter a share name."
+);}
+
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
+	"Subnet is required (in CIRD form)"
 );}
 
Index: npl/syn3/webint/src/lang_ptD.php
===================================================================
--- npl/syn3/webint/src/lang_ptD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/lang_ptD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -124,10 +124,10 @@
 );}
 
-function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsInvalid");return (
-	"_ErrorFilenameIsInvalid($a,$b,$c,$d)"
-);}
-
-function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsRequired");return (
-	"_ErrorFilenameIsRequired($a,$b,$c,$d)"
+function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsInvalid");return (
+	"Filename has invalid characters"
+);}
+
+function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsRequired");return (
+	"Enter filename"
 );}
 
@@ -242,4 +242,12 @@
 function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter a share name.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorSharenameIsRequired");return (
 	"Enter a share name."
+);}
+
+function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorSubnetIsInvalid");return (
+	"Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
+);}
+
+function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorSubnetIsRequired");return (
+	"Subnet is required (in CIRD form)"
 );}
 
Index: npl/syn3/webint/src/network/ifconfig.php
===================================================================
--- npl/syn3/webint/src/network/ifconfig.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/network/ifconfig.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -158,4 +158,7 @@
 		}
 		NetExec("$IFCONFIG lo 127.0.0.1");
+		//for zarafa spooler and others to allow other src adresses
+		NetExec("$IFCONFIG lo:2 127.0.0.2 netmask 255.255.255.255");
+		NetExec("$IFCONFIG lo:3 127.0.0.3 netmask 255.255.255.255");
 	}
 ?>
Index: npl/syn3/webint/src/openvpn/editsettings.php
===================================================================
--- npl/syn3/webint/src/openvpn/editsettings.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/editsettings.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -74,4 +74,58 @@
 
 
+echo "<tr><td>";
+echo _OpenVPNRouteMode();
+echo "<td>";
+
+form_FieldRadio(array(
+	"name"		=>"ROUTE_MODE",
+	"value"		=>$fields["ROUTE_MODE"],
+	"errors"	=>$errors,
+	"radiovalue"=>"all",
+	"autosubmit"=>"1"
+));
+echo _OpenVPNRouteModeAll();
+echo "<br>";
+
+form_FieldRadio(array(
+	"name"		=>"ROUTE_MODE",
+	"value"		=>$fields["ROUTE_MODE"],
+	"errors"	=>$errors,
+	"radiovalue"=>"subnet",
+	"autosubmit"=>"1"
+));
+echo _OpenVPNRouteModeSubnet();
+
+echo "</tr>";
+
+
+if ($fields['ROUTE_MODE']=="subnet")
+{
+    echo "<tr><td>";
+    echo _OpenVPNSubnetToRoute();
+    echo "<td>";
+    form_FieldText(array(
+    	"name"		=>"SUBNET",
+    	"value"		=>$fields[SUBNET],
+    	"errors"	=>$errors,
+    	"error"		=>"",
+    	"disabled"	=>0,
+    	"length"	=>30
+    ));
+    echo "</tr>";
+}
+
+echo "<tr><td>";
+echo _OpenVPNPushDNS();
+echo "<td>";
+form_FieldText(array(
+    "name"		=>"PUSH_DNS",
+    "value"		=>$fields[PUSH_DNS],
+    "errors"	=>$errors,
+    "error"		=>"",
+    "disabled"	=>0,
+    "length"	=>30
+));
+echo "</tr>";
 
 echo "</table>";
Index: npl/syn3/webint/src/openvpn/lang_de.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_de.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_de.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_deD.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_deD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_deD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNPushDNS");return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNRouteMode");return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNRouteModeAll");return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNRouteModeSubnet");return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNServerHost");return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNSubnetToRoute");return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_RemoteIP");return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_en.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_en.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_en.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_enD.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_enD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_enD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8314");return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8315");return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8318");return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8317");return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8290");return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8316");return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8294");return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_nl.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_nl.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_nl.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
+	"DNS server voor clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
+	"Routing modus"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
+	"Routeer al het internet verkeer via de server."
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
+	"Routeer alleen een bepaald subnet naar de server"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
+	"Routering subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_nlD.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_nlD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_nlD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server voor clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8309");return (
+	"DNS server voor clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing modus", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8310");return (
+	"Routing modus"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Routeer al het internet verkeer via de server.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8311");return (
+	"Routeer al het internet verkeer via de server."
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Routeer alleen een bepaald subnet naar de server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8312");return (
+	"Routeer alleen een bepaald subnet naar de server"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8274");return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routering subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8313");return (
+	"Routering subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8278");return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_pl.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_pl.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_pl.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_plD.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_plD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_plD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNPushDNS");return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNRouteMode");return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNRouteModeAll");return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNRouteModeSubnet");return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNServerHost");return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNSubnetToRoute");return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_RemoteIP");return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_pt.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_pt.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_pt.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/lang_ptD.php
===================================================================
--- npl/syn3/webint/src/openvpn/lang_ptD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/lang_ptD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,4 +64,20 @@
 );}
 
+function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNPushDNS");return (
+	"DNS server for clients"
+);}
+
+function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNRouteMode");return (
+	"Routing mode"
+);}
+
+function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNRouteModeAll");return (
+	"Route all internet traffic via server"
+);}
+
+function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNRouteModeSubnet");return (
+	"Route a specific subnet"
+);}
+
 function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNServerHost");return (
 	"OpenVPN server host"
@@ -80,4 +96,8 @@
 );}
 
+function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNSubnetToRoute");return (
+	"Routing subnet"
+);}
+
 function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_RemoteIP");return (
 	"Client IP"
Index: npl/syn3/webint/src/openvpn/model.php
===================================================================
--- npl/syn3/webint/src/openvpn/model.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/openvpn/model.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -54,6 +54,43 @@
 		return (array("SERVER"=>_InvalidHostname()));
 
+
 	FileWriteSettings("/etc/openvpn/syn3.conf", $data);
-	LogInfo(_OpenVPNSettingsChanged());
+
+    //generate additional config settings
+    $cfg=Array();
+    $cfg[]="### Additional SYN-3 OpenVPN settings";
+    $cfg[]="# will be overwritten when settings are saved in SCC";
+
+    if ($data['ROUTE_MODE']=="all")
+        $cfg[]="push 'redirect-gateway'";
+    else
+    {
+        if ($data['SUBNET'])
+        {
+            $err=Error_ValidSubnet($data['SUBNET']);
+            if ($err)
+                return (array("SUBNET"=>$err));
+
+            list($ip,$bits)=explode("/", $data['SUBNET']);
+            $netmask=CalcMask($bits);
+            $cfg[]="push 'route $ip $netmask'";
+        }
+    }
+
+    if ($data['PUSH_DNS']!="")
+    {
+        $err=Error_ValidIP($data['PUSH_DNS']);
+        if ($err)
+            return (array("PUSH_DNS"=>$err));
+
+        $cfg[]="push 'dhcp-option DNS ".$data['PUSH_DNS']."'";
+    }
+
+
+    FileWrite("/etc/openvpn/openvpn_syn3.conf",$cfg);
+    LogInfo(_OpenVPNSettingsChanged());
+
+    SvcRestart("openvpn");
+
 }
 
Index: npl/syn3/webint/src/vpn/autoconf_syn3.php
===================================================================
--- npl/syn3/webint/src/vpn/autoconf_syn3.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/autoconf_syn3.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,4 +1,4 @@
 <?
-/* 
+/*
 (C) 2004-2013 DatuX - info@datux.nl
 
@@ -23,5 +23,5 @@
 ?>
 
-<? 
+<?
 /*
 Redirection verhaal met betrekking tot auto configure:
@@ -33,5 +33,5 @@
 testtunnel							instellingen testen
 listtunnels.php						klaar :D
-	
+
 */
 	$name=$_REQUEST[name];
@@ -39,6 +39,6 @@
 	$passwd=$_REQUEST[passwd];
 
-	Title(_AutoVPNConfig($name)); 
-	
+	Title(_AutoVPNConfig($name));
+
 	//read tunnel
 	$tunnel=vpn_ReadTunnel($name);
@@ -52,18 +52,28 @@
 	$remote_par.="&new_right=$tunnel[leftid]";
 	$remote_par.="&new_rightsubnet=$tunnel[leftsubnet]";
+
 	if ($tunnel[compress]=='yes')
 		$remote_par.="&new_compress=on";
 	else
 		$remote_par.="&new_compress=off";
+
+	if ($tunnel[ikev2]=='insist')
+		$remote_par.="&new_ikev2=on";
+	else
+		$remote_par.="&new_ikev2=off";
+
+
+	if ($tunnel[pfs]=='yes')
+		$remote_par.="&new_pfs=on";
+	else
+		$remote_par.="&new_pfs=off";
+
 	$remote_par.="&new_authby=$tunnel[authby]";
 	$remote_par.="&new_rightrsasigkey=".rawurlencode(vpn_ReadPubKey());
 	$remote_par.="&new_secret=".rawurlencode($secret);
-	
+
 	// url aan ONZE kant, waar pubkey andere kant uiteindelijk heen moet
 	$remote_par.="&puburi=".rawurlencode("https://$_SERVER[HTTP_HOST]/vpn/edittunnel.php?name=$name&save=1");
-	
+
 	// jump naar de tunnel config aan de andere kant
 	Redirect("https://$ip:10000/vpn/edittunnel.php?$remote_par");
-
-	
-	
Index: npl/syn3/webint/src/vpn/edittunnel.php
===================================================================
--- npl/syn3/webint/src/vpn/edittunnel.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/edittunnel.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -28,5 +28,8 @@
 	Title(_VPNtunnelSettings($name));
 
+	//default settings
 	$new_pfs="on";
+	$new_ikev2="off";
+	$new_leftsourceip=GetFirstLanIp();
 
 	//read current configuration
@@ -38,4 +41,5 @@
 		$new_leftid=$tunnel[leftid];
 		$new_rightsubnet=$tunnel[rightsubnet];
+		$new_leftsourceip=$tunnel[leftsourceip];
 		$new_authby=$tunnel[authby];
 		$new_right=$tunnel[right];
@@ -52,4 +56,8 @@
 		 	$new_pfs="off";
 
+		if ($tunnel[ikev2]=='insist')
+			$new_ikev2="on";
+		else
+		 	$new_ikev2="off";
 	}
 
@@ -60,9 +68,9 @@
 	if (!vpn_ValidName($new_name))
 		$errors[new_name]=_EnterValidName();
-	elseif (!ValidIp($new_leftid))
+	elseif (!ValidIp($new_leftid) && !ValidHostname($new_leftid))
 		$errors[new_leftid]=_EnterValidIp();
 	elseif (!ValidSubnet($new_leftsubnet))
 		$errors[new_leftsubnet]=_EnterValidSubnet();
-	elseif (!ValidIp($new_right))
+	elseif (!ValidIp($new_right) && !ValidHostname($new_right))
 		$errors[new_right]=_EnterValidIp();
 	elseif (!ValidSubnet($new_rightsubnet))
@@ -89,4 +97,17 @@
 	)
 		$errors[new_secret]=_EnterValidPassword();
+	elseif ($new_leftsourceip && !ValidIp($new_leftsourceip))
+		$errors[new_leftsourceip]=_EnterValidIp();
+	else {
+		$tunnels=vpn_ReadTunnels();
+		foreach ($tunnels as $name=>$data)
+		{
+			if (($name != $new_name) && ($data[leftid]==$new_leftid) && ($data[right]==$new_right))
+			{
+				$errors[new_leftid]=_TunnelAlreadyExistsBetweenHosts($name);
+				break;
+			}
+		}
+	}
 
 
@@ -104,5 +125,15 @@
 		$tunnel[rightsubnet]=$new_rightsubnet;
 		$tunnel[right]=$new_right;
-		$tunnel[rightrsasigkey]=vpn_ReadableToPub($new_rightrsasigkey);
+
+		$rightrsasigkey=vpn_ReadableToPub($new_rightrsasigkey);
+		if ($rightrsasigkey)
+		{
+			$tunnel[rightrsasigkey]=$rightrsasigkey;
+		}
+		else
+		{
+			unset($tunnel[rightrsasigkey]);
+		}
+
 		if ($new_compress=="on")
 			$tunnel[compress]='yes';
@@ -118,4 +149,14 @@
 		else
 			$tunnel[pfs]="no";
+
+		if ($new_ikev2=='on')
+			$tunnel[ikev2]="insist";
+		else
+			$tunnel[ikev2]="never";
+
+		if ($new_leftsourceip)
+			$tunnel[leftsourceip]=$new_leftsourceip;
+		else
+			unset($tunnel[leftsourceip]);
 
 		vpn_WriteTunnel($new_name,$tunnel);
@@ -208,4 +249,13 @@
 
 <p>
+IKE v2:
+<?InputCheckBox("new_ikev2",$errors);?>
+
+
+<p>
+Source IP:
+<?InputText("new_leftsourceip",$errors);?>
+
+<p>
 <table>
 	<tr>
Index: npl/syn3/webint/src/vpn/lang_de.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_de.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_de.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { return (
-	"Starten des VPN ist fehlgeschlagen. Linux Fehlerbericht: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { return (
-	"VPN Systeme neu gestartet"
-);}
-
 function _LogVPNTunnelDeleted($name) { return (
 	"VPN Tunnel $Name gelÃ¶scht"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+	"Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
 	"Fehler beim Deaktivieren des Tunnels $a: $b"
Index: npl/syn3/webint/src/vpn/lang_deD.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_deD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_deD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { LangDebug("Starten des VPN ist fehlgeschlagen. Linux Fehlerbericht: $a", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=3915");return (
-	"Starten des VPN ist fehlgeschlagen. Linux Fehlerbericht: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { LangDebug("VPN Systeme neu gestartet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=4312");return (
-	"VPN Systeme neu gestartet"
-);}
-
 function _LogVPNTunnelDeleted($name) { LangDebug("VPN Tunnel $Name gelÃ¶scht", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=3888");return (
 	"VPN Tunnel $Name gelÃ¶scht"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_TunnelAlreadyExistsBetweenHosts");return (
+	"Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Fehler beim Deaktivieren des Tunnels $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=4301");return (
 	"Fehler beim Deaktivieren des Tunnels $a: $b"
Index: npl/syn3/webint/src/vpn/lang_en.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_en.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_en.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -65,5 +65,5 @@
 
 function _EnterValidKey($a='',$b='') { return (
-	"Enter the public key of the other server"
+	"Enter a valid public key."
 );}
 
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { return (
-	"Starting of VPN failed.  Linux error report: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { return (
-	"VPN systems restarted"
-);}
-
 function _LogVPNTunnelDeleted($name) { return (
 	"VPN tunnel $name removed"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+	"Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
 	"Error while disabling tunnel $a: $b"
Index: npl/syn3/webint/src/vpn/lang_enD.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_enD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_enD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,6 +64,6 @@
 );}
 
-function _EnterValidKey($a='',$b='') { LangDebug("Enter the public key of the other server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1361");return (
-	"Enter the public key of the other server"
+function _EnterValidKey($a='',$b='') { LangDebug("Enter a valid public key.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8325");return (
+	"Enter a valid public key."
 );}
 
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { LangDebug("Starting of VPN failed.  Linux error report: $a", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1380");return (
-	"Starting of VPN failed.  Linux error report: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { LangDebug("VPN systems restarted", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1382");return (
-	"VPN systems restarted"
-);}
-
 function _LogVPNTunnelDeleted($name) { LangDebug("VPN tunnel $name removed", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1379");return (
 	"VPN tunnel $name removed"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8326");return (
+	"Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Error while disabling tunnel $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1387");return (
 	"Error while disabling tunnel $a: $b"
Index: npl/syn3/webint/src/vpn/lang_nl.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_nl.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_nl.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -65,5 +65,5 @@
 
 function _EnterValidKey($a='',$b='') { return (
-	"Voer de publieke sleutel van de andere server in"
+	"Voer een geldige publieke sleutel in."
 );}
 
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { return (
-	"Starten van VPN mislukt. Linux foutmelding: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { return (
-	"VPN systeem opnieuw starten"
-);}
-
 function _LogVPNTunnelDeleted($name) { return (
 	"VPN tunnel $name verwijderd"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+	"Tunnel $a bestaat al tussen deze twee IP adressen."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
 	"Probleem tijdens het uitschakellen van tunnel $a: $b"
Index: npl/syn3/webint/src/vpn/lang_nlD.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_nlD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_nlD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,6 +64,6 @@
 );}
 
-function _EnterValidKey($a='',$b='') { LangDebug("Voer de publieke sleutel van de andere server in", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=397");return (
-	"Voer de publieke sleutel van de andere server in"
+function _EnterValidKey($a='',$b='') { LangDebug("Voer een geldige publieke sleutel in.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8324");return (
+	"Voer een geldige publieke sleutel in."
 );}
 
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { LangDebug("Starten van VPN mislukt. Linux foutmelding: $a", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=416");return (
-	"Starten van VPN mislukt. Linux foutmelding: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { LangDebug("VPN systeem opnieuw starten", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=418");return (
-	"VPN systeem opnieuw starten"
-);}
-
 function _LogVPNTunnelDeleted($name) { LangDebug("VPN tunnel $name verwijderd", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=415");return (
 	"VPN tunnel $name verwijderd"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a bestaat al tussen deze twee IP adressen.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8327");return (
+	"Tunnel $a bestaat al tussen deze twee IP adressen."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Probleem tijdens het uitschakellen van tunnel $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=423");return (
 	"Probleem tijdens het uitschakellen van tunnel $a: $b"
Index: npl/syn3/webint/src/vpn/lang_pl.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_pl.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_pl.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { return (
-	"Uruchamianie VPN niepowiod&#322;o si&#281;. System linux zg&#322;osi&#322; bl&#261;d: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { return (
-	"System VPN(wirtualna sieÃŠ prywatna)zrestartowany"
-);}
-
 function _LogVPNTunnelDeleted($name) { return (
 	"Tunel VPN $name usuni&#281;ty"
@@ -246,4 +238,8 @@
 function _ThisSide($a='',$b='') { return (
 	"Ustawienia 'tutaj'"
+);}
+
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+	"Tunnel $a already exists between these IP adresses."
 );}
 
Index: npl/syn3/webint/src/vpn/lang_plD.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_plD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_plD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { LangDebug("Uruchamianie VPN niepowiod&#322;o si&#281;. System linux zg&#322;osi&#322; bl&#261;d: $a", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=4706");return (
-	"Uruchamianie VPN niepowiod&#322;o si&#281;. System linux zg&#322;osi&#322; bl&#261;d: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { LangDebug("System VPN(wirtualna sieÃŠ prywatna)zrestartowany", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=2506");return (
-	"System VPN(wirtualna sieÃŠ prywatna)zrestartowany"
-);}
-
 function _LogVPNTunnelDeleted($name) { LangDebug("Tunel VPN $name usuni&#281;ty", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=5169");return (
 	"Tunel VPN $name usuni&#281;ty"
@@ -246,4 +238,8 @@
 function _ThisSide($a='',$b='') { LangDebug("Ustawienia \'tutaj\'", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=4726");return (
 	"Ustawienia 'tutaj'"
+);}
+
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_TunnelAlreadyExistsBetweenHosts");return (
+	"Tunnel $a already exists between these IP adresses."
 );}
 
Index: npl/syn3/webint/src/vpn/lang_pt.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_pt.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_pt.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -65,5 +65,5 @@
 
 function _EnterValidKey($a='',$b='') { return (
-	"Enter the public key of the other server"
+	"Enter a valid public key."
 );}
 
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { return (
-	"Starting of VPN failed.  Linux error report: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { return (
-	"VPN systems restarted"
-);}
-
 function _LogVPNTunnelDeleted($name) { return (
 	"VPN tunnel $name removed"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+	"Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
 	"Error while disabling tunnel $a: $b"
Index: npl/syn3/webint/src/vpn/lang_ptD.php
===================================================================
--- npl/syn3/webint/src/vpn/lang_ptD.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/lang_ptD.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -64,6 +64,6 @@
 );}
 
-function _EnterValidKey($a='',$b='') { LangDebug("Enter the public key of the other server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_EnterValidKey");return (
-	"Enter the public key of the other server"
+function _EnterValidKey($a='',$b='') { LangDebug("Enter a valid public key.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_EnterValidKey");return (
+	"Enter a valid public key."
 );}
 
@@ -128,12 +128,4 @@
 );}
 
-function _LogVPNstartErrors($a='',$b='') { LangDebug("Starting of VPN failed.  Linux error report: $a", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_LogVPNstartErrors");return (
-	"Starting of VPN failed.  Linux error report: $a"
-);}
-
-function _LogVPNStarting($a='',$b='') { LangDebug("VPN systems restarted", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_LogVPNStarting");return (
-	"VPN systems restarted"
-);}
-
 function _LogVPNTunnelDeleted($name) { LangDebug("VPN tunnel $name removed", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_LogVPNTunnelDeleted");return (
 	"VPN tunnel $name removed"
@@ -248,4 +240,8 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_TunnelAlreadyExistsBetweenHosts");return (
+	"Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Error while disabling tunnel $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_TunnelDownError");return (
 	"Error while disabling tunnel $a: $b"
Index: npl/syn3/webint/src/vpn/listtunnels.php
===================================================================
--- npl/syn3/webint/src/vpn/listtunnels.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/listtunnels.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -30,5 +30,5 @@
 <? Title(_VPNTunnels()); ?>
 
-<? Head($errors,'',10); ?>
+<? Head($errors,'',60); ?>
 
 <h1><?=$TITLE?></h1>
@@ -50,5 +50,5 @@
     $status=vpn_GetStatus();
 
-    // echo "<pre>";print_r($status);
+    //  echo "<pre>TEST ";print_r($status);
 
     $untested=0;
@@ -65,5 +65,5 @@
         {
             //status NOT ok?
-            if ($status[$name][state] != "STATE_QUICK_I2" && $status[$name][state] != "STATE_QUICK_R2" )
+            if ($status[$name][phase1] != "OK" || $status[$name][phase2] != "OK")
                 LinkDefault("testtunnel.php?name=$name&mode=down", _Started(), "<img src='../img/CAUTION.gif'>",_ConfirmDisable($name));
             else
@@ -87,28 +87,25 @@
 
 
+        //should be up?
         if ($data["auto"]=="up")
         {
-            //do we have actual status info?
-            if ($status[$name][state])
-            {
-                $statehtml=State_GetHtml("ipsec_$name",true);
-                echo "<a href='editvpnmon.php?tunnelName=$name'>";
-                if ($statehtml)
-                    echo $statehtml;
-                else
-                    echo "<img title='"._vpnMon()."' src='../img/mon.gif'>";
-                echo "</a>";
+            $statehtml=State_GetHtml("ipsec_$name",true);
+            echo "<a href='editvpnmon.php?tunnelName=$name'>";
+            if ($statehtml)
+                echo $statehtml;
+            else
+                echo "<img title='"._vpnMon()."' src='../img/mon.gif'>";
+            echo "</a>";
 
-                // if ($status[$name][state] != "STATE_QUICK_I2" &&
-                //         $status[$name][state] != "STATE_QUICK_R2" )
-                //     echo "<img src='../img/arrow_r.gif'>";
-                echo "<a href='tunnelstatus.php?name=$name'>";
-                echo $VPN_STATES[$status[$name][state]];
-                echo "</a>";
-            }
+            echo "<a href='tunnelstatus.php?name=$name'> ";
+
+            if ($status[$name][phase1]!="OK")
+                echo "Phase 1: ".$status[$name][phase1];
+            elseif ($status[$name][phase2]!="OK")
+                echo "Phase 2: ".$status[$name][phase2];
             else
-            {
-                echo "<b>Unknown</b>";
-            }
+                echo "OK";
+
+            echo "</a>";
         }
 
Index: npl/syn3/webint/src/vpn/openswan.php
===================================================================
--- npl/syn3/webint/src/vpn/openswan.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/openswan.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -23,5 +23,4 @@
 
 	$VPN_IPSEC_DIR="/etc/ipsec.d";
-	$VPN_PUB="$VPN_IPSEC_DIR/ipsec.pub";
 	$VPN_TUNNEL_DIR="$VPN_IPSEC_DIR/tunnels";
 	$VPN_LOG="/var/log/secure";
@@ -43,31 +42,6 @@
 			return false; //return ok-code
 
-		// global $VPN_STARTERRORS;
 		vpn_Stop();
-		// LogInfo(_LogVPNStarting());
 		SvcUp("ipsec");
-		// FileWriteRaw("/etc/sysconfig/pluto_updown", "DEFAULTSOURCE=".GetFirstLanIp()."\n");
-		// Cmd("pgrphack closefd /usr/sbin/ipsec setup start |grep 'FATAL:' 1>&2",'',$out,$err);
-
-		// if ($err)
-		// {
-		// 	FileWrite($VPN_STARTERRORS,$err);
-		// 	LogError(_LogVPNstartErrors(implode(" ",$err)));
-		// 	return ($err);
-		// }
-		// else
-		// {
-		// 	FileWrite($VPN_STARTERRORS,'');
-		// 	sleep(2); //wacht zodat VPN subsysteem up is
-		// 	//kijk of er tunnels up moeten
-		// 	$tunnels=vpn_ReadTunnels();
-		// 	foreach ($tunnels as $name=>$conf)
-		// 	{
-		// 		//hij moet up zijn, EN hij is reeds getest
-		// 		if ((!vpn_TunnelIsDownOnBoot($name)) && vpn_TunnelIsTested($name))
-		// 			vpn_TunnelUp($name);
-		// 	}
-		// 	return false;
-		// }
 	}
 
@@ -261,7 +235,7 @@
 		$key=vpn_ReadableToPub($key);
 		return (
-			(strlen($key)==370) &&
+			// (strlen($key)==370) && //varieert nu?
 			(substr($key,0,2)=='0s') &&
-			(!preg_match("/[^A-Za-z0-9+\/]/",substr($key,2)))
+			(!preg_match("/[^A-Za-z0-9+\/=]/",$key))
 		);
 	}
@@ -277,8 +251,5 @@
 	function vpn_ReadPubKey()
 	{
-		global $VPN_PUB;
-		$raw=FileReadMatches($VPN_PUB,"/#pubkey=/");
-		preg_match("/.*pubkey=(.*)/",$raw[0],$matches);
-		return ($matches[1]);
+		return(safeExec("syn3-ipsecpubkey")[0]);
 	}
 
@@ -307,5 +278,5 @@
 		foreach ($raw as $line)
 		{
-			if (preg_match("/^[^a-z]*([a-z]*)=(.*)$/",$line,$matches))
+			if (preg_match("/^[^a-z-0-9]*([a-z0-9]*)=(.*)$/",$line,$matches))
 				$ret[$matches[1]]=$matches[2];
 		}
@@ -359,57 +330,75 @@
 
 
-	$VPN_STATES=array(
-		'Main'=>"Connecting...",
+	$VPN_STATES_1=array(
+		//ike v1
 		'STATE_MAIN_I1'=>"Connecting...",
-			'STATE_MAIN_R1'=>"Connection accepted...",
-		'STATE_MAIN_I2'=>"Connection complete...",
+		'STATE_MAIN_R1'=>"Connecting...",
+		'STATE_MAIN_I2'=>"Connecting...",
+
 		'STATE_MAIN_I3'=>"Checking keys...",
-			'STATE_MAIN_R2'=>"Checking keys...",
-		'STATE_MAIN_I4'=>"Keys accepted...",
-			'STATE_MAIN_R3'=>"Waiting for tunnel request...",
-		'Quick'=>"Requesting tunnel...",
-		'STATE_QUICK_I1'=>"Requesting tunnel...",
-			'STATE_QUICK_R1'=>"Tunnel request received...",
-		'STATE_QUICK_I2'=>"Tunnel established",
-			'STATE_QUICK_R2'=>"Tunnel established",
+		'STATE_MAIN_R2'=>"Checking keys...",
+
+		'STATE_MAIN_I4'=>"OK",
+		'STATE_MAIN_R3'=>"OK",
+
+
+		//ike v2
+		'STATE_PARENT_I1'=>"Negotiating...",
+		'STATE_PARENT_I2'=>"Negotiating...",
+
+		'STATE_PARENT_I3'=>"OK",
+		'STATE_PARENT_R2'=>"OK",
+
 	);
 
-
-	$VPN_PRIO=array(
-			'Main'=>0,
-		'STATE_MAIN_I1'=>1,
-			'STATE_MAIN_R1'=>2,
-		'STATE_MAIN_I2'=>3,
-		'STATE_MAIN_I3'=>4,
-			'STATE_MAIN_R2'=>5,
-		'STATE_MAIN_I4'=>6,
-			'STATE_MAIN_R3'=>7,
-		'Quick'=>8,
-		'STATE_QUICK_I1'=>9,
-			'STATE_QUICK_R1'=>10,
-		'STATE_QUICK_I2'=>11,
-			'STATE_QUICK_R2'=>12,
+	$VPN_STATES_2=array(
+		//ike v1
+		'STATE_QUICK_I1'=>"Negotiating tunnel...",
+		'STATE_QUICK_R1'=>"Negotiating tunnel...",
+
+		'STATE_QUICK_I2'=>"OK",
+		'STATE_QUICK_R2'=>"OK",
+
+
+		//ike v2
+		'STATE_V2_IPSEC_I'=>"OK",
+		'STATE_V2_IPSEC_R'=>"OK",
+
 	);
 
-	//tries to determine state from a logline.
-	//returns false on no state found
+	//
+	//
+	// $VPN_PRIO=array(
+	// 		'Main'=>0,
+	// 	'STATE_MAIN_I1'=>1,
+	// 		'STATE_MAIN_R1'=>2,
+	// 	'STATE_MAIN_I2'=>3,
+	// 	'STATE_MAIN_I3'=>4,
+	// 		'STATE_MAIN_R2'=>5,
+	// 	'STATE_MAIN_I4'=>6,
+	// 		'STATE_MAIN_R3'=>7,
+	// 	'Quick'=>8,
+	// 	'STATE_QUICK_I1'=>9,
+	// 		'STATE_QUICK_R1'=>10,
+	// 	'STATE_QUICK_I2'=>11,
+	// 		'STATE_QUICK_R2'=>12,
+	// );
+
+	//determines phase1 and phase2 state from logline
 	function vpn_LogToState($logline)
 	{
-		global $VPN_STATES;
-
-		if (preg_match("/to state (.*)$/",$logline,$matches))
-		{
-			if (isset($VPN_STATES[$matches[1]]))
-				return ($matches[1]);
-		}
-		elseif (preg_match("/initiating (.*) Mode/",$logline,$matches))
-		{
-			if (isset($VPN_STATES[$matches[1]]))
-				return ($matches[1]);
-		}
-		else
-		{
-			return false;
-		}
+		global $VPN_STATES_1;
+		global $VPN_STATES_2;
+
+		$ret=[];
+		if (preg_match("/(STATE_[0-9_A-Z]*)/",$logline,$matches))
+		{
+			$state=$matches[1];
+			if ($VPN_STATES_1[$state])
+				$ret['phase1']=$VPN_STATES_1[$state];
+			if ($VPN_STATES_2[$state])
+				$ret['phase2']=$VPN_STATES_2[$state];
+		}
+		return($ret);
 	}
 	//read logging output of a tunnel
@@ -418,9 +407,9 @@
 	{
 		global $VPN_LOG;
-		$lines=SafeExec("grep '\]: \"$name\"' '$VPN_LOG'|tail -1000");
+		$lines=SafeExec("grep 'pluto.*\"$name\"' '$VPN_LOG'|tail -1000");
 		foreach ($lines as $line)
 		{
-			preg_match("/\]: \".*?\".(.*)/",$line,$matches);
-			$ret[]=array(vpn_LogToState($matches[1]),$matches[1]);
+			// preg_match("/\]: \".*?\".(.*)/",$line,$matches);
+			$ret[]=array(vpn_LogToState($line),$line);
 		}
 		return $ret;
@@ -432,6 +421,7 @@
 	function vpn_GetStatus()
 	{
-		global $VPN_STATES;
-		global $VPN_PRIO;
+		global $VPN_STATES_1;
+		global $VPN_STATES_2;
+		// global $VPN_PRIO;
 
 		if (Cmd("ipsec whack --status",'',$output)!=0)
@@ -444,28 +434,54 @@
 			foreach ($output as $line)
 			{
-				if (preg_match('/^.*#([0-9])*:.*"(.*?)"[:0-9]* ([A-Z0-9_]+) /',$line,$matches))
-				{
-					$nr=$matches[1];
-					$name=$matches[2];
-					$state=$matches[3];
-					if (
-						$name &&
-						$state &&
-						$VPN_PRIO[$state]>=$VPN_PRIO[$ret[$name]['state']]
-					)
-					{
-						$ret[$name]['state']=$state;
-						$ret[$name]['info'][]=$line;
-					}
-				}
-				elseif (preg_match('/^.*"(.*?)": *(.*)$/',$line,$matches))
+				if (preg_match('/\"(.*)\"/',$line,$matches))
 				{
 					$name=$matches[1];
-					$info=$matches[2];
-					if ($name && $info)
+					$ret[$name]['info'][]=$line;
+					$state=vpn_LogToState($line);
+					if ($state['phase1'] && !$ret[$name]['phase1_newest'])
 					{
-						$ret[$name]['info'][]=$info;
+						$ret[$name]['phase1']=$state['phase1'];
+						if (preg_match('/ newest /', $line))
+							$ret[$name]['phase1_newest']=true;
+
 					}
+					if ($state['phase2'] && !$ret[$name]['phase2_newest'])
+					{
+						$ret[$name]['phase2']=$state['phase2'];
+						if (preg_match('/ newest /', $line))
+							$ret[$name]['phase2_newest']=true;
+					}
+
 				}
+
+				// //state + info
+ 			// 	if (preg_match('/^.*#([0-9])*:.*"(.*?)"[:0-9]* ([A-Z0-9_]+) /',$line,$matches))
+				// {
+				// 	$nr=$matches[1];
+				// 	$name=$matches[2];
+				// 	$state=$matches[3];
+				// 	if (
+				// 		$name &&
+				// 		$state
+				// 	)
+				// 	{
+				// 		if ($VPN_STATES_1[$state])
+				// 			$ret[$name]['phase1']=$VPN_STATES_1[$state];
+				// 		if ($VPN_STATES_2[$state])
+				// 			$ret[$name]['phase2']=$VPN_STATES_2[$state];
+				//
+				// 		$ret[$name]['info'][]=$line;
+				// 	}
+				// }
+				// //info only
+				// elseif (preg_match('/^.*"(.*?)": *(.*)$/',$line,$matches))
+				// {
+				// 	$name=$matches[1];
+				// 	$info=$matches[2];
+				// 	if ($name && $info)
+				// 	{
+				// 		$ret[$name]['info'][]=$info;
+				// 	}
+				// }
 			}
 
Index: npl/syn3/webint/src/vpn/tunnelstatus.php
===================================================================
--- npl/syn3/webint/src/vpn/tunnelstatus.php	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/src/vpn/tunnelstatus.php	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,4 +1,4 @@
 <?
-/* 
+/*
 (C) 2004-2013 DatuX - info@datux.nl
 
@@ -17,10 +17,10 @@
 */
 
- 
+
 	$LEVEL=10;
 	include_once("../common.php");
 	require_once("openswan.php");
 	include_once("../form.php");
-		
+
 ?>
 
@@ -32,9 +32,9 @@
 
 <? Head(); ?>
- 
+
 <h1><?=$TITLE?></h1>
 
 <?
-/* 
+/*
 (C) 2004-2013 DatuX - info@datux.nl
 
@@ -60,5 +60,5 @@
 	<tr><th><?=_TechnicalInfoOpenswan() ?></tr>
 	<?
-	echo "<tr><td><b>State: ".$status[$name]['state']."</b> (".$VPN_STATES[$status[$name][state]].")";
+    echo "<tr><td><b>Phase 1: ".$status[$name]['phase1']."<br>"."Phase 2: ".$status[$name]['phase2']."</b></tr>";
 
 	foreach ($status[$name]['info'] as $info)
@@ -75,28 +75,23 @@
 		<th><?=_LogMessage()?></th>
 	</tr>
-			
+
 	<?
-	
+
 		foreach ($log as $logdata)
 		{
 			echo "<tr>";
 			echo "<td>";
-			if ($VPN_STATES[$logdata[0]])
-			{
-				/*if ($logdata[0] == "STATE_QUICK_I2" || $logdata[0] == "STATE_QUICK_R2")
-					echo "<img src='../img/enabled.gif'>";
-				else
-					echo "<img src='../img/disabled.gif'>";*/
-				echo $VPN_STATES[$logdata[0]];
-			}
+			if ($logdata[0]['phase1'])
+				echo "Phase 1: ".$logdata[0]['phase1'];
+
+			elseif ($logdata[0]['phase2'])
+				echo "Phase 2: ".$logdata[0]['phase2'];
 			else
-			{
 				echo "&nbsp;";
-			}
-			
+
 			echo "<td>$logdata[1]";
 			echo "</tr>";
 		}
-		
+
 		if (!$log)
 			echo "<tr colspan=5><td>"._NoLogMessagesForThisTunnel()."</tr>";
Index: npl/syn3/webint/webint.build
===================================================================
--- npl/syn3/webint/webint.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/webint.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6557
+6563
Index: npl/syn3/webint/webint.md5
===================================================================
--- npl/syn3/webint/webint.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syn3/webint/webint.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -119,5 +119,5 @@
 44e1f535bed6e7f16e41d96abeba5f56  ./src/backup/startrestorefiles.php
 678555e8cf13f518a7377cd39824a64d  ./src/backup/startrestore.php
-8ec333388d9150af5abc29a05c97e72e  ./src/backup/syn3backup.php
+f5f46a2712175be9659b2d227a6654f5  ./src/backup/syn3backup.php
 06540e48b49b2b69168ccda00e865e50  ./src/backup/wizardchoose.php
 818978bae75fd32160fbceb342002f2e  ./src/backup/wizardman.php
@@ -180,5 +180,5 @@
 d5cb9d2d33195df40cb123c61f52fc8a  ./src/drbd/model.php
 43acc40d7875c1924d237ddf0872de67  ./src/drbd/showstatus.php
-32135872ae36e1dba79874de82bdd7f5  ./src/error.php
+d71e291bca443a6e6266d24cbd15703c  ./src/error.php
 21b9c434d5f58aa75988263c34e745f8  ./src/examplemodule/editthing.php
 2a48cc5fb696d84bc6b29e544bcc6b7a  ./src/examplemodule/lang_deD.php
@@ -644,14 +644,14 @@
 a067ebdf2a2124c1bd33a21fbfa51e0e  ./src/kiosk/wizardman.php
 81768364614b8b9528b56948c233a706  ./src/lang2db.php
-bd42470ea5c5aa735df943b4bfcdd449  ./src/lang_deD.php
-3c168ff488cebb20f54e3f31017bb935  ./src/lang_de.php
-572fd9e5c47fadfe8bb68169c14c633e  ./src/lang_enD.php
-e84f01fe911d07604a3caba3600137ba  ./src/lang_en.php
-87243553b7081fa916ab7d34d50f62ce  ./src/lang_nlD.php
-3868f304bfb20934a81fc4022d833b76  ./src/lang_nl.php
-7a0e1100a0f985844bb94b0a55f03085  ./src/lang_plD.php
-ab406aa714bd25a98b9004677f1878cb  ./src/lang_pl.php
-ece19aaff8eb0f184168f3b975eb208e  ./src/lang_ptD.php
-e84f01fe911d07604a3caba3600137ba  ./src/lang_pt.php
+bd854f185ea0b47ae0a9395ffd9c1e9a  ./src/lang_deD.php
+ae32c30de35da1ce191722e76233d985  ./src/lang_de.php
+af6a9a69fb8588394986058c37bacbe8  ./src/lang_enD.php
+fbdc06bb25c821f74bb3e5a8ae0eb2ec  ./src/lang_en.php
+cdaaeca2f47dd9ce711d0102cc1a2cd4  ./src/lang_nlD.php
+374365305c6f8fe7ee31423c80cab7ef  ./src/lang_nl.php
+5526dc6ca7879f0bdae1a3e8122e0eaf  ./src/lang_plD.php
+a413d75d43918e96cb440f4244726520  ./src/lang_pl.php
+1eefaff0d886656768fafed54a081a58  ./src/lang_ptD.php
+fbdc06bb25c821f74bb3e5a8ae0eb2ec  ./src/lang_pt.php
 d32239bcb673463ab874e80d47fae504  ./src/LICENSE
 4daeb3b2e3d2a26dcc060225e1a36ceb  ./src/linux/kernel.php
@@ -800,5 +800,5 @@
 a7fe69ec33ed4093e5882703b61a3442  ./src/network/editip.php
 cd63ce495e365f60ccf418b68510ac3e  ./src/network/hostname.php
-221e93d9e9e3b070024b219d4ffd346f  ./src/network/ifconfig.php
+90e66eb78d30884056580800fe833ce2  ./src/network/ifconfig.php
 4bda27efa4ccec1ade0fdd09d46021a7  ./src/network/lang_deD.php
 37e41609106327c45c2f9a3c9958282d  ./src/network/lang_de.php
@@ -819,18 +819,18 @@
 0a37df395c27778ae47973e69e8326e4  ./src/openvpn/createcert.php
 33f0fff4c7a0b3dab49113ebcf4a3482  ./src/openvpn/downloadcert.php
-6b013ef33a9dec48eab4cc73f02fb61d  ./src/openvpn/editsettings.php
-06f734878630b41a0763443a3a0c0cd6  ./src/openvpn/lang_deD.php
-a5db483d67a0e9797f2176564d9de45c  ./src/openvpn/lang_de.php
-d0f6751b792f2fd89904df0b5b6ecfed  ./src/openvpn/lang_enD.php
-a5db483d67a0e9797f2176564d9de45c  ./src/openvpn/lang_en.php
-1482fb6d796ebd03433f40aba56695c1  ./src/openvpn/lang_nlD.php
-d78edf3e31794b15fc2699d16f0d5689  ./src/openvpn/lang_nl.php
-a1d2638926bca47272c3a9e9191279ea  ./src/openvpn/lang_plD.php
-a5db483d67a0e9797f2176564d9de45c  ./src/openvpn/lang_pl.php
-eac66ad70b034aa50d98836b99c1b733  ./src/openvpn/lang_ptD.php
-a5db483d67a0e9797f2176564d9de45c  ./src/openvpn/lang_pt.php
+1382bc315a700e91cfd93f4b023176ba  ./src/openvpn/editsettings.php
+fbadab36eda417b44e0748e9dae6cf0a  ./src/openvpn/lang_deD.php
+669bd1778c7102b7827fdc9ab999ebdc  ./src/openvpn/lang_de.php
+8504bcc4cc112d87174d480f58431bc7  ./src/openvpn/lang_enD.php
+669bd1778c7102b7827fdc9ab999ebdc  ./src/openvpn/lang_en.php
+a512810f8b24ab802b9b1bebcafe98f4  ./src/openvpn/lang_nlD.php
+2bb44a64babf7116b150c3834368b9b9  ./src/openvpn/lang_nl.php
+a0fe03b6cd6c9bc15536398776ac2e60  ./src/openvpn/lang_plD.php
+669bd1778c7102b7827fdc9ab999ebdc  ./src/openvpn/lang_pl.php
+f425cf7b7749eddbedfca5caa31af72a  ./src/openvpn/lang_ptD.php
+669bd1778c7102b7827fdc9ab999ebdc  ./src/openvpn/lang_pt.php
 16877f2ae40364c8db9b1536080a8ee6  ./src/openvpn/listcerts.php
 6bd817d4aa1565638e41d5bde02b3d2e  ./src/openvpn/menuman.php
-3ba06f9fb2054fd25e8c41f5979a3199  ./src/openvpn/model.php
+31a3d0abc641f4ed55691953b6209220  ./src/openvpn/model.php
 abfd99f18cd00c2149b5436ec912a2ec  ./src/openvpn/status.php
 3fb8ed50605a860855713f5836010ab4  ./src/openvpn/wizardman.php
@@ -1105,24 +1105,24 @@
 c08c7823d7c9de207a9a1e75621cbd57  ./src/vpn/autoconf_draytek.php
 ad32ca872755da67a35138a0dbfd84cc  ./src/vpn/autoconf.php
-d02ac3ebc12df2792bbd0b8eec8ef841  ./src/vpn/autoconf_syn3.php
+d96d653be443515a6c43e06b20f962e6  ./src/vpn/autoconf_syn3.php
 a802efaef2eaf69179bad9e814ac1dd8  ./src/vpn/autoconf_zyxel.php
-8fed57aa3f145e73021708a0b36f5854  ./src/vpn/edittunnel.php
+5e26b4f3009efb2757a62b2d1554ca2d  ./src/vpn/edittunnel.php
 4321ee1ddec6e6f076dd8d4f7ed1e5de  ./src/vpn/editvpnmon.php
-184a3f96b0cc133cd78bf6ebd41d884d  ./src/vpn/lang_deD.php
-7ae424fa9acd824660028b14a1485f57  ./src/vpn/lang_de.php
-a3a2b7fd25a225e67f19b9786e65afa4  ./src/vpn/lang_enD.php
-7eaca076f85554c43a8375360763fb70  ./src/vpn/lang_en.php
-c63b4951fc52293b01ba1eda47ecb1d4  ./src/vpn/lang_nlD.php
-f2ecee96475d2a6cb534693283f3b600  ./src/vpn/lang_nl.php
-866ce1cf69e6a441ad0a34e6582a330d  ./src/vpn/lang_plD.php
-b9e44a9a5743f4f80ccce35a939d28c3  ./src/vpn/lang_pl.php
-b70b7ef86690f87e3a84ab151cc553c2  ./src/vpn/lang_ptD.php
-7eaca076f85554c43a8375360763fb70  ./src/vpn/lang_pt.php
-3543f6a8e89deee510f936d478c7567d  ./src/vpn/listtunnels.php
+1becaa6bcb1d595c1e1672a8bb4b1b55  ./src/vpn/lang_deD.php
+92f0776665d370f3dbcc17ce69b1de6f  ./src/vpn/lang_de.php
+8f83c9ab25799c20c8e1597ea92c2d84  ./src/vpn/lang_enD.php
+cba89b2e4b8ea520108594bf1ad2f399  ./src/vpn/lang_en.php
+665384ee4d187821e35df7872565b1b0  ./src/vpn/lang_nlD.php
+e9f8c61ea3fd9dcffb6aedaa8e4a5b03  ./src/vpn/lang_nl.php
+ef80ff59357d9c6cf8e5223be0e3984e  ./src/vpn/lang_plD.php
+000326f37e6e1a0b10fe41f284637f93  ./src/vpn/lang_pl.php
+5005e0fa2bfa157c1dbcf721a1853a1b  ./src/vpn/lang_ptD.php
+cba89b2e4b8ea520108594bf1ad2f399  ./src/vpn/lang_pt.php
+fcdcdf546ccadad097a8d153d68d91ef  ./src/vpn/listtunnels.php
 e8e328c7c80bdad84edfdca5e551a97e  ./src/vpn/menuman.php
-f42c561eaebc78584ea89861b2873198  ./src/vpn/openswan.php
+c0dc6ee78264163328f86d67736df475  ./src/vpn/openswan.php
 a4d2e5a07f6551f63bfe48d784d4536c  ./src/vpn/testtunnel.php
 c0f4dcc6ed3c9f30ab336a850182fd1e  ./src/vpn/testtunnel.sh
-4948047241c566cc6cdb338cde3fa109  ./src/vpn/tunnelstatus.php
+8ec5bc7ef29f57d44316d51c5e0d262c  ./src/vpn/tunnelstatus.php
 44f1bb03b68c211e2043ceefd421cd9e  ./src/vpn/ZyXEL.php
 5cf70d23efc677ec6aaefd58f069c6e0  ./src/wizard/lang_deD.php
@@ -1153,1100 +1153,4 @@
 b3bafd683407d6bb90f9e8a66babd9e8  ./src/X/selectconf.php
 3dcc3c3508f5467e8578bc2c7993e02d  ./src/X/wizardman.php
-1cb655f2d5b6ae735104da0edf8231c5  ./src.zoneconf/activatie/funcs.php
-95c821f5cd62fc23ca076f935f5cf242  ./src.zoneconf/activatie/lang_deD.php
-67a1566caea36b26b5c0b0f510410d2c  ./src.zoneconf/activatie/lang_de.php
-3df3370b291c3b8169da8943f494c4ae  ./src.zoneconf/activatie/lang_enD.php
-842e77437c1fda2b9d12fa28855d8573  ./src.zoneconf/activatie/lang_en.php
-b0c3e9a18fc0d702fea19b58328e453c  ./src.zoneconf/activatie/lang_nlD.php
-7cfd3b9e5193b2395d0a011ebc7fe5aa  ./src.zoneconf/activatie/lang_nl.php
-0389d077fd6d320aefe0307b2db81d35  ./src.zoneconf/activatie/lang_plD.php
-9044151cbf575a5b0251a5d12712989d  ./src.zoneconf/activatie/lang_pl.php
-2a4a73ccf38ac0f2ab7edbbbaed26bb9  ./src.zoneconf/activatie/lang_ptD.php
-842e77437c1fda2b9d12fa28855d8573  ./src.zoneconf/activatie/lang_pt.php
-e3534d1905701677640e57cc03e08f28  ./src.zoneconf/activatie/menuman.php
-66aedd9081571111d57ba1a8a55bb53d  ./src.zoneconf/activatie/moduleneeded.php
-1786c5cdd59a911c7e5e87262ff462f2  ./src.zoneconf/activatie/regclient.php
-8c051990e962885892af87a72006972b  ./src.zoneconf/activatie/register.php
-9fa52b083d1be0c59fa3136312961472  ./src.zoneconf/activatie/showlicense.php
-ddd6396bc2017f0162f147bcb9618fc2  ./src.zoneconf/activatie/wizardman.php
-0e97f6948af265b800f50fca061ef336  ./src.zoneconf/amavis2dspam/editthing.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_deD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_de.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_enD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_en.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_nlD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_nl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_plD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_pl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_ptD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/amavis2dspam/lang_pt.php
-6b2bea94cf7eb2b2a436d75b4b96a234  ./src.zoneconf/amavis2dspam/listthings.php
-66d9187263a435ab8c47896861896193  ./src.zoneconf/amavis2dspam/menuman.php
-6553dd3725e18f703cf00b523de71415  ./src.zoneconf/amavis2dspam/model.php
-4fd435d32368d7dfdc0fc8d509a21c65  ./src.zoneconf/amavis2dspam/userman.php
-3fb8ed50605a860855713f5836010ab4  ./src.zoneconf/amavis2dspam/wizardman.php
-67817fa36db340a86207b612e052ddc2  ./src.zoneconf/asterisk/asterisk.php
-85500c71d28ca978389b03ce86bb1f36  ./src.zoneconf/asterisk/cli.php
-e1dfb32731abc49d8d286766571b4eed  ./src.zoneconf/asterisk/conf.php
-af16b811a3463cd4731bada3be91ca94  ./src.zoneconf/asterisk/draw.php
-b7ddc07d44ce7fb30951fdcffbb95af5  ./src.zoneconf/asterisk/extensions_conf.php
-bd3bc6b7e00f954629e009dd66b5e65e  ./src.zoneconf/asterisk/ivr_extension.php
-3025846c91d97d1e8b2ae582123d2023  ./src.zoneconf/asterisk/ivr_list.php
-1adb9bfb9d746e22329f6fb9ab6d4b95  ./src.zoneconf/asterisk/ivr.php
-90abce132de4eab8b2f69443b984da07  ./src.zoneconf/asterisk/ivr_recorder.php
-e6d9add9e02cff892cbfe3fbbd84d622  ./src.zoneconf/asterisk/ivr_settings.php
-d250ac052e76aa81693cfa26ce761914  ./src.zoneconf/asterisk/lang_deD.php
-567e57d35b218f9d99f6cffed26371c1  ./src.zoneconf/asterisk/lang_de.php
-0913055ea865fa82a75a74cd2881e598  ./src.zoneconf/asterisk/lang_enD.php
-9224c4573a336253b7486fc90e6262f5  ./src.zoneconf/asterisk/lang_en.php
-c4f044a3b7caa2fa661c03c8bbd77d06  ./src.zoneconf/asterisk/lang_nlD.php
-d356013a780ecaf3c3865ee36182d7f5  ./src.zoneconf/asterisk/lang_nl.php
-e87ca62f50451862cf9f2b6059fd63ef  ./src.zoneconf/asterisk/lang_plD.php
-9224c4573a336253b7486fc90e6262f5  ./src.zoneconf/asterisk/lang_pl.php
-007e373908a342258c3e55ed3d417f03  ./src.zoneconf/asterisk/lang_ptD.php
-9224c4573a336253b7486fc90e6262f5  ./src.zoneconf/asterisk/lang_pt.php
-31ff5f6b89bff1d905ecaf60c09e6fd5  ./src.zoneconf/asterisk/menuman.php
-78887fc83d7f3e1523dc3005a9d88393  ./src.zoneconf/asterisk/sip_ext_list.php
-cb502ab18020dde7bf08f75d69950b9b  ./src.zoneconf/asterisk/sip_ext_settings.php
-7c91c205e3827ee0e2d660810571b975  ./src.zoneconf/asterisk/sip_int_list.php
-dc4750566755d675f628c768d23741b6  ./src.zoneconf/asterisk/sip_int_settings.php
-c2c43b97e91d98a9d7ead1d61bf346f7  ./src.zoneconf/asterisk/sip.php
-fcc33bdeac50a34283d87fc21da67e3e  ./src.zoneconf/asterisk/uploader.php
-f054b29cc2a1e7163d066c8dc0cc000b  ./src.zoneconf/backup/backup.php
-29f8e7c9379e7289c294834dd425bbca  ./src.zoneconf/backup/lang_deD.php
-e6b40d87c841db50e80e36368ad9c864  ./src.zoneconf/backup/lang_de.php
-e7a8d27fd0627bca9be55e61f5ffeadb  ./src.zoneconf/backup/lang_enD.php
-17c349b2a2d3bc6e098d7c6124675c68  ./src.zoneconf/backup/lang_en.php
-1ae14c390c7adb2ffe30ac169409c979  ./src.zoneconf/backup/lang_nlD.php
-713a2a61f36678a86ebea26ccd97c2d5  ./src.zoneconf/backup/lang_nl.php
-2300aa74441e560b5848599889f6d56e  ./src.zoneconf/backup/lang_plD.php
-ce54290b45ac5f2002ac88fa26fa0eed  ./src.zoneconf/backup/lang_pl.php
-68af9f0844a26130d69c63424c336ced  ./src.zoneconf/backup/lang_ptD.php
-17c349b2a2d3bc6e098d7c6124675c68  ./src.zoneconf/backup/lang_pt.php
-38f10745b38782bb1c4da0aa5c12d8c0  ./src.zoneconf/backup/logs.php
-2822dce44415c1e9a88f02ce0914bae9  ./src.zoneconf/backup/menuman.php
-6f2849030c03dca8422ceaf326155978  ./src.zoneconf/backup/overview.php
-261786dbe3caef4e54ece4bd4db89334  ./src.zoneconf/backup/schema.php
-c90a750ac18d7769136a276e18af83fc  ./src.zoneconf/backup/settings.php
-5347742bcb20e5b39ee8928f385e0c0a  ./src.zoneconf/backup/startbackup.php
-44e1f535bed6e7f16e41d96abeba5f56  ./src.zoneconf/backup/startrestorefiles.php
-678555e8cf13f518a7377cd39824a64d  ./src.zoneconf/backup/startrestore.php
-923130021066490cfb09010f1175af71  ./src.zoneconf/backup/syn3backup.php
-06540e48b49b2b69168ccda00e865e50  ./src.zoneconf/backup/wizardchoose.php
-818978bae75fd32160fbceb342002f2e  ./src.zoneconf/backup/wizardman.php
-fa9dfbcf85d54bc22c2825e213d03aec  ./src.zoneconf/comments/ajax.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_deD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_de.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_enD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_en.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_nlD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_nl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_plD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_pl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_ptD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/comments/lang_pt.php
-ce4bd0c29bb27d46f779aaca6199aae6  ./src.zoneconf/comments/model.php
-b3b84b86a9c968beb518224d06b62a26  ./src.zoneconf/common.php
-4cfcf1103e1f033b2c95cb9fb629b570  ./src.zoneconf/dhcp/dhcpd.php
-08dbb729c65179061926f4e2253a11aa  ./src.zoneconf/dhcp/editdhcpd.php
-8c8196054693fc492eaf8b03ce640ffa  ./src.zoneconf/dhcp/lang_deD.php
-f79a5eda0ee0fa4c6e5256831de1dc22  ./src.zoneconf/dhcp/lang_de.php
-fc44b35f448bf72fc53ad6d149a2d8fe  ./src.zoneconf/dhcp/lang_enD.php
-73f291ab567c7a79c1f61acae1e9c654  ./src.zoneconf/dhcp/lang_en.php
-9531716865bffb290fa6b88c9606dd8a  ./src.zoneconf/dhcp/lang_nlD.php
-df719e15c3276d17766e1cf8355cb6a7  ./src.zoneconf/dhcp/lang_nl.php
-80b70c51e99539f220e6c8d25fe2e276  ./src.zoneconf/dhcp/lang_plD.php
-f13d95887db48f47e1e902a977699fcb  ./src.zoneconf/dhcp/lang_pl.php
-0eda25da260d237a8fdf770541a660a6  ./src.zoneconf/dhcp/lang_ptD.php
-73f291ab567c7a79c1f61acae1e9c654  ./src.zoneconf/dhcp/lang_pt.php
-62f43ba4e1297ddcb029bd6fed678738  ./src.zoneconf/dhcp/listdhcpd.php
-ad6b38a5b524b008dc769d2da6391502  ./src.zoneconf/dhcp/listleases.php
-b888f6541f0b7ce2df0756df8fb40d9b  ./src.zoneconf/dhcp/menuman.php
-3c6adb2f054d648913dd9041e48e0a07  ./src.zoneconf/dhcp/svcman.php
-5e055a315c5e3035f47a8222774021ce  ./src.zoneconf/dns/djbdns.php
-29ce7042d9696f835f8ade47d2a4470a  ./src.zoneconf/dns/editadr.php
-15aaefd5619801c074241f0b551ab612  ./src.zoneconf/dns/lang_deD.php
-ee40a3e422804ef2e5b629315c670e5c  ./src.zoneconf/dns/lang_de.php
-16bc62befa58e9834f2a5952ee070e2c  ./src.zoneconf/dns/lang_enD.php
-ade72ccbc88a9353d8882ecb23afc07d  ./src.zoneconf/dns/lang_en.php
-625c196c2192b329e04d8bf881242b62  ./src.zoneconf/dns/lang_nlD.php
-113315e822e8aa4cdd5f687ed7582266  ./src.zoneconf/dns/lang_nl.php
-b9123a4e3d4c3eabcc8dec38fad30d9e  ./src.zoneconf/dns/lang_plD.php
-8c9480228be39e1dec4ec89f5dc38603  ./src.zoneconf/dns/lang_pl.php
-af3451317a3b07e38e0fa06f5f4bf966  ./src.zoneconf/dns/lang_ptD.php
-ade72ccbc88a9353d8882ecb23afc07d  ./src.zoneconf/dns/lang_pt.php
-a6b27fe94967eb6b153638f9f8a41355  ./src.zoneconf/dns/listadr.php
-9bafe5dc96c977a2ba82a134dcfe5b39  ./src.zoneconf/dns/menuman.php
-d612826599e28bfab502f111907282f3  ./src.zoneconf/dns/svcman.php
-2e6e49bf57689ca14cacd21e90952534  ./src.zoneconf/drbd/edit.php
-edd2f4f3c965cd907e063f774b34e1d7  ./src.zoneconf/drbd/lang_deD.php
-b8a970b65b7512410714fa29f67fff43  ./src.zoneconf/drbd/lang_de.php
-3dd6fb25044c30123b5dbffd5d500184  ./src.zoneconf/drbd/lang_enD.php
-4ba74381f5c7e7efd478b2ba78f2d299  ./src.zoneconf/drbd/lang_en.php
-74f99d91ffb6953bd3f3d1fd442db0b6  ./src.zoneconf/drbd/lang_nlD.php
-b581b4100e70cb171b842db5484065d1  ./src.zoneconf/drbd/lang_nl.php
-c98786c363025e089f95c3366dc606f0  ./src.zoneconf/drbd/lang_plD.php
-4ba74381f5c7e7efd478b2ba78f2d299  ./src.zoneconf/drbd/lang_pl.php
-1e37fe36f2a9a68bb15b2eafbe160b08  ./src.zoneconf/drbd/lang_ptD.php
-4ba74381f5c7e7efd478b2ba78f2d299  ./src.zoneconf/drbd/lang_pt.php
-8e3b233fe68246978f9b438c067dbb55  ./src.zoneconf/drbd/menuman.php
-c2a46a2ab7ab3213b72fe1d1888cf38d  ./src.zoneconf/drbd/model.php
-c1186471f5a9ca1ef3f55ca04fd818db  ./src.zoneconf/drbd/showstatus.php
-32135872ae36e1dba79874de82bdd7f5  ./src.zoneconf/error.php
-21b9c434d5f58aa75988263c34e745f8  ./src.zoneconf/examplemodule/editthing.php
-2a48cc5fb696d84bc6b29e544bcc6b7a  ./src.zoneconf/examplemodule/lang_deD.php
-62909548245a045e94df3becf11b26e9  ./src.zoneconf/examplemodule/lang_de.php
-5dfcfff2a1845062da65907380697cf5  ./src.zoneconf/examplemodule/lang_enD.php
-62909548245a045e94df3becf11b26e9  ./src.zoneconf/examplemodule/lang_en.php
-3792cf35eb7f581fff0820370222bc1c  ./src.zoneconf/examplemodule/lang_nlD.php
-62909548245a045e94df3becf11b26e9  ./src.zoneconf/examplemodule/lang_nl.php
-c924526c8a6820b980d14302a4d81193  ./src.zoneconf/examplemodule/lang_plD.php
-62909548245a045e94df3becf11b26e9  ./src.zoneconf/examplemodule/lang_pl.php
-70cd85f4dd502d056f5110e84a96001b  ./src.zoneconf/examplemodule/lang_ptD.php
-62909548245a045e94df3becf11b26e9  ./src.zoneconf/examplemodule/lang_pt.php
-4bbfcb8ad6f010b4a2d60acf4eb12267  ./src.zoneconf/examplemodule/listthings.php
-d37e030e6d9bef9f1b86de1f533a97a8  ./src.zoneconf/examplemodule/menuman.php
-3bc952175233cbf2cbef0722833dd666  ./src.zoneconf/examplemodule/model.php
-a63f51d6e5d88c508d8dacadd4c36bc2  ./src.zoneconf/examplemodule/userman.php
-3fb8ed50605a860855713f5836010ab4  ./src.zoneconf/examplemodule/wizardman.php
-0ae0ac074ec96d4184545b12ee335ae1  ./src.zoneconf/favicon.ico
-686325f0e39ea2b16992cca2c7805706  ./src.zoneconf/fetchmail/editaccount.php
-5a6518cef3a4d3d0baf6f93e4896cca0  ./src.zoneconf/fetchmail/fetchmail.sh
-fef605062944dc1cad3f4bd87d015979  ./src.zoneconf/fetchmail/fm.php
-ba743fea268407f080bca4e306748493  ./src.zoneconf/fetchmail/lang_deD.php
-5f73887c0948c07cc2c612407926dac4  ./src.zoneconf/fetchmail/lang_de.php
-74f733e87993e8af6a729d3e80ad0d59  ./src.zoneconf/fetchmail/lang_enD.php
-ac9531f58518407245d1372e108e698c  ./src.zoneconf/fetchmail/lang_en.php
-e97bd2923fb3721b39e94a3313eb88d2  ./src.zoneconf/fetchmail/lang_nlD.php
-9abb75b39c0ac03572ddd682e4ab6264  ./src.zoneconf/fetchmail/lang_nl.php
-b25600daafd2bdcbecc5e92dfbaed9fb  ./src.zoneconf/fetchmail/lang_plD.php
-d8df8e9f7da6740573c6528d42379d16  ./src.zoneconf/fetchmail/lang_pl.php
-1b2bd1a9222fb956af33b4d2f57e90f6  ./src.zoneconf/fetchmail/lang_ptD.php
-ac9531f58518407245d1372e108e698c  ./src.zoneconf/fetchmail/lang_pt.php
-c3ebe72ded5bde6a5fb60b450b01efae  ./src.zoneconf/fetchmail/listaccounts.php
-9253f3ff63be98fb4b521fd7bc126468  ./src.zoneconf/fetchmail/menuman.php
-a1b108c5e90aab1f4c3b430486c5d55b  ./src.zoneconf/file.php
-486abaff68646edf89c07b81584ee089  ./src.zoneconf/firewall/editblock.php
-1bf27d86734051c93f9f30bb5f2a5e1b  ./src.zoneconf/firewall/editfirewall.php
-ec80e8eb13abb86834f3cb0c19c162b3  ./src.zoneconf/firewall/editservice.php
-eb14a0a73ce90ecd31e0f64bc60ad4df  ./src.zoneconf/firewall/firewall.php
-f63d3ab0fbe4b9d9aaaadcc998307e27  ./src.zoneconf/firewall/ipblocks.php
-c80ceb7e676339fc95d0160f86d2d453  ./src.zoneconf/firewall/iptables.php
-e175f025bd3f9953d6df3643f4c1c1f2  ./src.zoneconf/firewall/lang_deD.php
-552b6baf6b458082177b4e1b7ca1fcdc  ./src.zoneconf/firewall/lang_de.php
-7a07eee6b2189945417d43020f5e7ff4  ./src.zoneconf/firewall/lang_enD.php
-a8a7278b208f9d2811ae8a128918d95d  ./src.zoneconf/firewall/lang_en.php
-6de7a82a651058b93e19ad6ba0ba5d81  ./src.zoneconf/firewall/lang_nlD.php
-76b6ddd6cdef4455feacd4e8a3317a70  ./src.zoneconf/firewall/lang_nl.php
-50f1f73f387597577c414fd570e8533c  ./src.zoneconf/firewall/lang_plD.php
-1ceb14960e7042988b480429f833f25d  ./src.zoneconf/firewall/lang_pl.php
-650a464cf8860eade7f65ea8a02b5f88  ./src.zoneconf/firewall/lang_ptD.php
-a8a7278b208f9d2811ae8a128918d95d  ./src.zoneconf/firewall/lang_pt.php
-b4e77ff1a4ff1fd835bc458a5b1a9452  ./src.zoneconf/firewall/listadmins.php
-0995d8f4569dfef3ca9fba5641cea9f4  ./src.zoneconf/firewall/listblocks.php
-7fad3a929288299dda204f8c8f8c3a6a  ./src.zoneconf/firewall/listfirewall.php
-b26f04a60c4c89f15b5a668d8413f055  ./src.zoneconf/firewall/listservices.php
-d2da735d13cd9cb42a2539772dc44beb  ./src.zoneconf/firewall/menuman.php
-cb6db9a601e12b9f60d38f35da7a1cf9  ./src.zoneconf/firewall/services.php
-3b2249b285d60564c65207db89513567  ./src.zoneconf/firewall/wizardman.php
-e4bb7231937310c6e701eed8a95ed05a  ./src.zoneconf/form2.php
-97a5a483edfcdcbe317b761f66050c51  ./src.zoneconf/form.php
-661c0a536eba33582f58998fd4594075  ./src.zoneconf/graph/getimage.php
-221b606d288f50cc9ced555db4f56cf9  ./src.zoneconf/graph/graph.php
-6a036225406e6019fbb5d08c04e3e04f  ./src.zoneconf/graph/lang_deD.php
-9a40c6ede5c9e18a60a75ac4fc1ef96a  ./src.zoneconf/graph/lang_de.php
-a1e8a655f6675f6fa851837e7210cd59  ./src.zoneconf/graph/lang_enD.php
-9a40c6ede5c9e18a60a75ac4fc1ef96a  ./src.zoneconf/graph/lang_en.php
-1d913f54682ff7b245ccd37af7c82ae3  ./src.zoneconf/graph/lang_nlD.php
-72e33008c0809411865097e6b4f7e9be  ./src.zoneconf/graph/lang_nl.php
-6c498e58a15bc5ba8c7fe486337a8c1b  ./src.zoneconf/graph/lang_plD.php
-9a40c6ede5c9e18a60a75ac4fc1ef96a  ./src.zoneconf/graph/lang_pl.php
-e51d29199e88eb772496672ab23d2145  ./src.zoneconf/graph/lang_ptD.php
-9a40c6ede5c9e18a60a75ac4fc1ef96a  ./src.zoneconf/graph/lang_pt.php
-7702245d5c7d8d3bea8095833044b888  ./src.zoneconf/graph/menuman.php
-a4567edfd9330f32a175396c4907dbc5  ./src.zoneconf/graph/overview.php
-097a6b11fe2caf20ca13e890de9297f5  ./src.zoneconf/graph/show.php
-3a81d957519ac3dec08602d9352dd465  ./src.zoneconf/ie_hacks.css
-f2d0d267af5b10dd3be21835952e776f  ./src.zoneconf/img/add.gif
-f350e4b798e1ab4da52508f18f93d032  ./src.zoneconf/img/add.png
-ac3ef050a05d9fd6efee71f90abfc872  ./src.zoneconf/img/ad.gif
-7f802a2a360bb1bb4f29ff7a9a6c0bd7  ./src.zoneconf/img/ae.gif
-ccaf2f8cd19e558d2cb925e37b120f20  ./src.zoneconf/img/af.gif
-be31c36dc782f433b1b2f8f1ceccb27d  ./src.zoneconf/img/ag.gif
-a1993ae25cb4cf94b9b4c11165b05add  ./src.zoneconf/img/A.jpg
-d546110633c2913bf8aabbeb56e4923f  ./src.zoneconf/img/ALERT_ACK.gif
-0c70a620a0d2058417a5145578551669  ./src.zoneconf/img/ALERT.gif
-2379c017b4858d90f900b3564a88b72e  ./src.zoneconf/img/al.gif
-6a2e3d4ac7139f1665ec85daf905c4fb  ./src.zoneconf/img/am.gif
-3fe1ba098d2bd5f85c996ea0a5d7dd5a  ./src.zoneconf/img/an.gif
-3a30af9a98cf20e6619ee234e8c7f929  ./src.zoneconf/img/ao.gif
-3fbc8ae183a52674583a1cf90df29031  ./src.zoneconf/img/ap.gif
-2940a84a15b26e5ee37fa29a89947228  ./src.zoneconf/img/ar.gif
-317b92749bc86f38a8977288d9cee611  ./src.zoneconf/img/arrow_d.gif
-fb399f8361f52c6ef79542e61cdb331a  ./src.zoneconf/img/arrow_down.png
-9ae1fd4b2bc149de6d0bbc617f23b6cc  ./src.zoneconf/img/arrow_l.gif
-e040de53423ed46974b5ba02e16e3c94  ./src.zoneconf/img/arrow_r.gif
-20a7503771003ae01da1bb41cc82cdfe  ./src.zoneconf/img/arrow_u.gif
-e41fbf9a741894d22e8a8ae2d00a06f3  ./src.zoneconf/img/arrow_up.png
-cadc74036384cda59ee91d99bdcfdd69  ./src.zoneconf/img/at.gif
-b91b6739c8107e29680568ef8ff952f9  ./src.zoneconf/img/au.gif
-8e91812abcd372b3a32e7c16c15dd8ed  ./src.zoneconf/img/aw.gif
-64c82a7cafccd37a526f7745b915b8aa  ./src.zoneconf/img/az.gif
-1c8a23d4d9ed0f8decf5eea261e631b5  ./src.zoneconf/img/ba.gif
-eeef19c9c9c854a03119fe234f9b3908  ./src.zoneconf/img/Banner_SYN3_Control_Center.png
-ae7aadd035a40e5026a777e2ecdbd5f5  ./src.zoneconf/img/bb.gif
-5349673c83420f65faac21f9ee14a7d2  ./src.zoneconf/img/bd.gif
-e2697c0d2f33f4c8ca85dac762734cfc  ./src.zoneconf/img/be.gif
-d10e907a9fb8487940f6c5d350dde6ae  ./src.zoneconf/img/bf.gif
-d1df9aec9f2a06d5082453fde4944d3b  ./src.zoneconf/img/bg2.gif
-f6e51fba28e2744b678ffd752d75f945  ./src.zoneconf/img/bg.gif
-61ddbd4a4853bd645d7555cccfbb03f6  ./src.zoneconf/img/bg-left.gif
-b8aeb3f5a24a277ea6c826cd4113e2ee  ./src.zoneconf/img/bh.gif
-fe5f4500cf4baef1d65a424e8d5689bc  ./src.zoneconf/img/bi.gif
-97af4afce5fd166559201493f6848c47  ./src.zoneconf/img/bj.gif
-d2ea6da18b3df59a359cc9bb7e5983c8  ./src.zoneconf/img/B.jpg
-06045f155dd3b1d22cd28b86e57de479  ./src.zoneconf/img/bm.gif
-43948655b170b8e063f023620d97c76b  ./src.zoneconf/img/bn.gif
-9c4ef78c1b8051c0038227e04705c871  ./src.zoneconf/img/bo.gif
-51b60402cd35c1b71fc6a3db49954aed  ./src.zoneconf/img/bottom.gif
-5bf98783850a28198b3f65042b05c607  ./src.zoneconf/img/box_bottom_left.gif
-baaccc0eb8b56debfd492db8ac48481a  ./src.zoneconf/img/box_bottom_right.gif
-f44770a00b2b9edc299baee6159000f0  ./src.zoneconf/img/box_left.gif
-4ed499bb71132178320f0f8b2bea042c  ./src.zoneconf/img/box_right.gif
-23c78932478b9b95ff09e0f7ccf8625e  ./src.zoneconf/img/box_top_left.gif
-089274c82d6a7404cefebf5756f5e432  ./src.zoneconf/img/box_top_right.gif
-667c1c786e5365ea1ff2c51baed8e6a7  ./src.zoneconf/img/br.gif
-1bc0a1b6cf00a50bb9bf3588d84b321c  ./src.zoneconf/img/bs.gif
-995226c86da889b77ee9fa9c60bee399  ./src.zoneconf/img/bt.gif
-d4232256a8374cff569021c5351301be  ./src.zoneconf/img/bw.gif
-23f79b7553f5cdcc90f3bce1f7fe1d0c  ./src.zoneconf/img/by.gif
-2ab46e28a4d3084d7620e0aaecf4c235  ./src.zoneconf/img/bz.gif
-c1c24f48ac653bf3f07423fd12ecd11f  ./src.zoneconf/img/ca.gif
-e9b0924101c8bc05e29d8047935396b5  ./src.zoneconf/img/CAUTION_ACK.gif
-0405f0a416d51c9776805e3415a24f59  ./src.zoneconf/img/CAUTION.gif
-ed683da29bb3b3666ad1cb63cf77ab0f  ./src.zoneconf/img/cd.gif
-fdd15d7a37c8e885b731d6f7c8c67dc6  ./src.zoneconf/img/cf.gif
-62a3129d39d66d648580fbeef1fce60f  ./src.zoneconf/img/cg.gif
-a9aa4db50f1d232d494610110455e98d  ./src.zoneconf/img/ch.gif
-0f8d3618f8a62d914f0f792a83c2c687  ./src.zoneconf/img/ci.gif
-edafceaaf10f5f387523fd27915628e7  ./src.zoneconf/img/ck.gif
-aa212397f66fa15a384ad741102c21bf  ./src.zoneconf/img/cl.gif
-e3ebcf3a59d3f7384320695666032f4f  ./src.zoneconf/img/close.png
-1bb0670559a2676fd42dfdef3a7b1b7f  ./src.zoneconf/img/cm.gif
-12a79273092a0a93adbfe9b685634e5f  ./src.zoneconf/img/cn.gif
-966dc7ed9306794734a2e61438f89744  ./src.zoneconf/img/co.gif
-af62f01fc5d99c9e074a67200cdc5640  ./src.zoneconf/img/comment.gif
-909ab6b0c330a3886eabc3e10991d61b  ./src.zoneconf/img/comment.png
-8be3e1a9c99edee46684b217417157ff  ./src.zoneconf/img/content_bg.gif
-16641d228b27464d6166ab88dc0d6bd1  ./src.zoneconf/img/content.gif
-c5fa3319590501d12afd4e16b4ed81b0  ./src.zoneconf/img/cr.gif
-12f638c2207ceee9759132393ef8d7eb  ./src.zoneconf/img/critical.png
-a40b55eeca54fe5605f06d194b179d3a  ./src.zoneconf/img/cu.gif
-d26c9fc27103d723586ba616057460dd  ./src.zoneconf/img/cv.gif
-d8dd4cfcd2570984219c9826d417ee9a  ./src.zoneconf/img/cy.gif
-3c706c7f9d3bb30ae2df290c8a9be3e7  ./src.zoneconf/img/cz.gif
-3fa02814bd1898178db6384b9c5f93e7  ./src.zoneconf/img/datux.gif
-cc008c02c9f0903c8577ab59d1866248  ./src.zoneconf/img/datux-logo.gif
-92431cf4e39d4faf62f4bb8aa20008fc  ./src.zoneconf/img/datux-logo.png
-5de988efed668223a02a7aba948b6746  ./src.zoneconf/img/DEBUG.gif
-9f1affec327898fc64a172e8fe0c2d55  ./src.zoneconf/img/DEBUG_OFF.gif
-1f31389417402bf187e3276579adcfc1  ./src.zoneconf/img/de.gif
-31ff55a37a821e4b554a2fdf977f9f71  ./src.zoneconf/img/delay.gif
-951a73b837e4300dd2df98ce081b15db  ./src.zoneconf/img/del.gif
-777e706a67a8303fb12b62c7b44c3e43  ./src.zoneconf/img/del.png
-05cf9cc838ae8a22c692358b66804867  ./src.zoneconf/img/disabled.gif
-a8a7eebfd157d859c2fed7cdf3bccd70  ./src.zoneconf/img/dj.gif
-8337faebf55a6e5b297aff95517147a9  ./src.zoneconf/img/dk.gif
-6381af92afc5742af02e2d08961e7a7e  ./src.zoneconf/img/dm.gif
-26ee91a13c0e7fef3a3e843014df0066  ./src.zoneconf/img/do.gif
-4cc71e1622e0c59c41c5db975f5fbf30  ./src.zoneconf/img/downtime.gif
-0cc8e8f5e167b3a19d8a1a51b9737d43  ./src.zoneconf/img/dz.gif
-3f352c56f3ac623b90f3ece6c5c004dc  ./src.zoneconf/img/ec.gif
-5dd15f1df22b7f834e4dff441ed81526  ./src.zoneconf/img/edit.gif
-d200ffb13eab1272939a7b5d92d9cafa  ./src.zoneconf/img/ee.gif
-9600de10fc4779b7873d463e4a5188e9  ./src.zoneconf/img/eg.gif
-d77c995d640aec5858c9350e55b9f6dc  ./src.zoneconf/img/E.jpg
-d08952d917f87941078b4183d95e9136  ./src.zoneconf/img/enabled.gif
-a6a08df3b567f4109063dad77d637a87  ./src.zoneconf/img/enabled.png
-93cb87bcf85c3b2756f6b296494cbc37  ./src.zoneconf/img/en.gif
-238dde43e7077fade86597999e6046c2  ./src.zoneconf/img/er.gif
-55b98cc24ff7e46fdec11145b506efbc  ./src.zoneconf/img/ERROR.gif
-4fc4c91dbb8012db776af9b476c4e1cd  ./src.zoneconf/img/es.gif
-737dc12da78a0b27b999544a41b8c954  ./src.zoneconf/img/et.gif
-ea4d737193a6a0cb0ce129cc5096a103  ./src.zoneconf/img/eu.gif
-0aae04dbd30720f6bd155ce7840910e3  ./src.zoneconf/img/fi.gif
-cd9aac3c03e91d3f07f4603fe0cfcc74  ./src.zoneconf/img/filter.gif
-a825cdf6cdc75877a2748201e0d14874  ./src.zoneconf/img/fj.gif
-9006a34a1f9efa4cde7a9e13606e30df  ./src.zoneconf/img/fk.gif
-2609d7aaa59561551ec3cb404c8ef34d  ./src.zoneconf/img/fm.gif
-adc678b55e16ee1c8e4363e1fd764086  ./src.zoneconf/img/fo.gif
-7f66797472eb9360e0bd22bfcfb9de1f  ./src.zoneconf/img/fr.gif
-96de40e3362ec03980171a6b347755e4  ./src.zoneconf/img/ga.gif
-93cb87bcf85c3b2756f6b296494cbc37  ./src.zoneconf/img/gb.gif
-7cff1a529492101e0977d052aa15aea1  ./src.zoneconf/img/gd.gif
-ac87f86413d9e214be3de0d3820cf1a7  ./src.zoneconf/img/ge.gif
-09c1e5da4de52f8a9ff32653008839ad  ./src.zoneconf/img/gh.gif
-26f676e5676155c1aa1278e3c0e2ede6  ./src.zoneconf/img/gi.gif
-220ba9d5444b958512cf8c14e6f3664d  ./src.zoneconf/img/gl.gif
-1393dbdefc787fe50fe60569f5d6ac31  ./src.zoneconf/img/gm.gif
-35ecc290f184b35f0c79963f4832ad97  ./src.zoneconf/img/gn.gif
-d12f295c5396a57c3ca27de5e46b1f94  ./src.zoneconf/img/gp.gif
-dfb989e1d0af8280628eb3334ffd2206  ./src.zoneconf/img/gq.gif
-dcaa39caadee13e8ce8740f9982896d7  ./src.zoneconf/img/greenblink.gif
-b44213e957c46cb331b92aa805a2f45a  ./src.zoneconf/img/Green Down disabled.gif
-838e383b408f925ca789e05b465e5fec  ./src.zoneconf/img/Green Down disabled.png
-56f407a2a4ab651a05af47f68007d1cc  ./src.zoneconf/img/Green Down.gif
-aacfb42ee668e600271b0aabffff6b41  ./src.zoneconf/img/Green Down.png
-514bcdbb0dba28456fc651606e2b035b  ./src.zoneconf/img/Green Up disabled.gif
-dd89db9c962d627af5c08b0d596437f5  ./src.zoneconf/img/Green Up disabled.png
-e04649f553b709ebf78bca306ca6d838  ./src.zoneconf/img/Green Up.gif
-c801ac5291376524791bb9747a2cbe7d  ./src.zoneconf/img/Green Up.png
-cee23846c8603623882ed5134406806c  ./src.zoneconf/img/gr.gif
-9b5e92154496a88f1ca10648454977af  ./src.zoneconf/img/gt.gif
-d8ee6ee605a30ddadafb179000f1e62b  ./src.zoneconf/img/gu.gif
-ed8aca55e8b0b7f3717024ae84e5cc05  ./src.zoneconf/img/gw.gif
-e0745abf42d852da0588adeab822c002  ./src.zoneconf/img/gy.gif
-7ac7b952c6827286c9f62932627472b6  ./src.zoneconf/img/hbar_green_off.gif
-c8cc8f76fd77b4f36bcb197e6382a8b1  ./src.zoneconf/img/hbar_green_on.gif
-475da5a7071230ba9155ca3539539d33  ./src.zoneconf/img/hbar_off.gif
-1d8b91d43d6cb8b02af632662a9f3c07  ./src.zoneconf/img/hbar_on.gif
-c4718d9beaa82f64cc418015e3630318  ./src.zoneconf/img/hbar_red_off.gif
-2ddd2d35e8e2f89f48ca3671624952d9  ./src.zoneconf/img/hbar_red_on.gif
-640c27684777774d8aadaf40689f512b  ./src.zoneconf/img/hbar_yellow_off.gif
-1d8b91d43d6cb8b02af632662a9f3c07  ./src.zoneconf/img/hbar_yellow_on.gif
-07e2055b3730b047d052b2272d6bfee8  ./src.zoneconf/img/help.gif
-249e9f962144bfaec9061eb21730351f  ./src.zoneconf/img/Help_icon_SYN3.png
-6398a7f50b0a4458d6dd5a74e8e6c431  ./src.zoneconf/img/help.png
-80e829be1d9f9926e4e060361942588f  ./src.zoneconf/img/H.jpg
-83301f5dfebf29cd5aca49a6272240c8  ./src.zoneconf/img/hk.gif
-4245a3847c7b77ddea3a69280362dbe6  ./src.zoneconf/img/hn.gif
-39cac2f2e2e6a9f41f89026442287682  ./src.zoneconf/img/hr.gif
-99b88b35b9310162500f187da64b579e  ./src.zoneconf/img/ht.gif
-3212a65eba5018fdee554234c45fb5ff  ./src.zoneconf/img/hu.gif
-a3fe271b1dec3d96fd3cebce6591c840  ./src.zoneconf/img/id.gif
-d0101b97df3644ac8ef40780ca5cdf8b  ./src.zoneconf/img/ie.gif
-d2ea6da18b3df59a359cc9bb7e5983c8  ./src.zoneconf/img/I.jpg
-ce092caa1539ae185ae407fbc543cd5c  ./src.zoneconf/img/il.gif
-a1dcf6d772acaaca3e4314f42b0c5228  ./src.zoneconf/img/INFO.gif
-3f042c528c4bf957777be35f6b18c691  ./src.zoneconf/img/in.gif
-43a114c7298e15308378fe959f94f3ed  ./src.zoneconf/img/iq.gif
-2a8da57126b658e256ce5b93c6949b83  ./src.zoneconf/img/ir.gif
-142622e0042666bac6eebeaf8c8e53ec  ./src.zoneconf/img/is.gif
-72b0c360b078e4b7d58840c12ec89525  ./src.zoneconf/img/it.gif
-b71f782c24a3caf90d61119fc2a03ade  ./src.zoneconf/img/jm.gif
-9ee5f4d1e42146b658b84b3ddd99119c  ./src.zoneconf/img/jo.gif
-531e4982260e50c173872d32553b9d91  ./src.zoneconf/img/jp.gif
-27481845c6081487f2b67fc7754f8944  ./src.zoneconf/img/ke.gif
-202b1977ecf77a413b7565ada8e126fa  ./src.zoneconf/img/kg.gif
-10324ab7e6a04171269da2092333d4e6  ./src.zoneconf/img/kh.gif
-3367e0e37cf04ef726ed4f31cbb255b1  ./src.zoneconf/img/ki.gif
-f7db107a6e53701d45f9deed179498d1  ./src.zoneconf/img/K.jpg
-b7aa39350977b40a5ffa435f9d4d023c  ./src.zoneconf/img/km.gif
-d44653d482a7a1fde1403263241c98a5  ./src.zoneconf/img/kn.gif
-83172c1241cad924321c27151533316d  ./src.zoneconf/img/kp.gif
-27b12726647e7e783763ad85fbf407c5  ./src.zoneconf/img/kr.gif
-222247d912967786813560ee5475f3dc  ./src.zoneconf/img/kw.gif
-cc6c838c50ec7d1ec09f4c59537f2c05  ./src.zoneconf/img/ky.gif
-c9a29f216dc2aeb3f73f7b50b77a4b4f  ./src.zoneconf/img/kz.gif
-400e3707da27c27bee12c6fe9fc10eed  ./src.zoneconf/img/la.gif
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_deD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_de.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_enD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_en.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_nlD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_nl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_plD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_pl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_ptD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/img/lang_pt.php
-6b7a372934ffc86493ae4daadaa67501  ./src.zoneconf/img/lb.gif
-4ff65704775e685024c149a9b86787e0  ./src.zoneconf/img/lc.gif
-ac3abd2f3d7c75caa12cb4edbceec3ca  ./src.zoneconf/img/left.gif
-c30620d2143a1efb43f22bb4ff43607a  ./src.zoneconf/img/left_menu_bottom.gif
-7be1edc3b638b816be49cf36da30bdf0  ./src.zoneconf/img/left_menu.gif
-8b1dd3e2246ead373f8ebd63dccbff58  ./src.zoneconf/img/left_menu_logo.gif
-53f957d44882e6f3d7efbc8ea2f310b9  ./src.zoneconf/img/left_menu_top.gif
-ff8da31ffdbd30bfdb6b3b9ebb5a8d23  ./src.zoneconf/img/left_off.gif
-4a1afa37039b453d9b93c0daf3adc4a1  ./src.zoneconf/img/left_on.gif
-5623b54973e5d2a4e48e4fc8dd9556ab  ./src.zoneconf/img/liarrow.gif
-182ab3dc9673dbe1bb4b3a08935ceafd  ./src.zoneconf/img/li.gif
-d9eee6b3fcc3d011b684d422ccfd6e38  ./src.zoneconf/img/lk.gif
-24643bb24f4bcb45021397cf3ed3e7a9  ./src.zoneconf/img/loading.gif
-19f33bc005fcba58ce0114b63653808a  ./src.zoneconf/img/login.gif
-5eb2e984b9722d90d3b0a98d288421d1  ./src.zoneconf/img/logo-200.png
-fca1046796b58f99856d74880e5520e7  ./src.zoneconf/img/logo.jpg
-b27a100d44f0f046698b6e32483a4113  ./src.zoneconf/img/lr.gif
-6373b1694e32e5c6e32e9f958cb8c50a  ./src.zoneconf/img/lt.gif
-c333c2b38ad7dbec56be0ea95460a12c  ./src.zoneconf/img/lu.gif
-514de74dc630c59838c4406dbc6f3815  ./src.zoneconf/img/lv.gif
-ad9d25d33cfa64c074d4afce1944a7a3  ./src.zoneconf/img/ly.gif
-a64b6726eecb6c97cdc7d9e99f97f58b  ./src.zoneconf/img/ma.gif
-b078930a4bc2282c3669e0af905513dd  ./src.zoneconf/img/mc.gif
-d10c62b50e2d991f4229d01613bf64ba  ./src.zoneconf/img/md.gif
-05ba6474c152f4248dc26adc2429210d  ./src.zoneconf/img/menu.gif
-df538e4786e8fc7d0d209dbd028bd47c  ./src.zoneconf/img/menutab_add.gif
-e0d9365e53abf0e9cb82c20c09ffd666  ./src.zoneconf/img/menutab_asterisk.gif
-1f50cfb2bdf9e6b08654f3dba9d39e3e  ./src.zoneconf/img/menutab_bck.gif
-8b083f9cfeec57c3f4f0509c12fd843c  ./src.zoneconf/img/menutab_examples.gif
-a7e05b89ba4959fe3b93582ba751fc37  ./src.zoneconf/img/menutab_file.gif
-5d5a351442389a4bfc7600d69244fcdc  ./src.zoneconf/img/menutab_fw.gif
-c604ea15dd138055e61a0dceed25159a  ./src.zoneconf/img/menutab_inet.gif
-fbeb3b44b66c69c54049a6e82bca043d  ./src.zoneconf/img/menutab_mail.gif
-1cdb188a215f27e6eb0b5141d2bdf29d  ./src.zoneconf/img/menutab_mon.gif
-ff5312c49b3c06005ccb2e7bb215d46b  ./src.zoneconf/img/menutab_net.gif
-af3d52b27e068c40d4547f789b1b7259  ./src.zoneconf/img/menutab_syn3.gif
-ba7b80cbc28da3ca0c0e12b121f40b25  ./src.zoneconf/img/menutab_sys.gif
-8041233089c3cf527817e2a6c363fc88  ./src.zoneconf/img/menutab_tc.png
-5dd64190f2d640aded32782c3e781c0a  ./src.zoneconf/img/menutab_usr.gif
-db1ad0fdac03871069df5daf3ae8b57f  ./src.zoneconf/img/menutab_X.gif
-1fd3270525bef3c2209e0a3bcfcef238  ./src.zoneconf/img/mg.gif
-ee5a117ec0561200ab1648c4005ce593  ./src.zoneconf/img/mk.gif
-6494c60f73bdde9ddaaacdd94c9ece71  ./src.zoneconf/img/ml.gif
-441ab074a834661676c35ac9881d658e  ./src.zoneconf/img/mm.gif
-75afb51335f3a965ff7f1b4435c6828c  ./src.zoneconf/img/mn.gif
-8b4d9ee4b065403e3efa837ab3fc3d79  ./src.zoneconf/img/mo.gif
-b11c62f2a55b4773c242ef32cf43c1ca  ./src.zoneconf/img/mon.gif
-f7536c02354a2aa29ad117a0e317046b  ./src.zoneconf/img/mp.gif
-35258bcf870dd43133492444e35275d5  ./src.zoneconf/img/mq.gif
-65cf7be5696d3c2e202502162733d338  ./src.zoneconf/img/mr.gif
-bad88bd31fffb1691332c7eaf671ead3  ./src.zoneconf/img/mt.gif
-cd91727bbb093a8493d4dcadb1864724  ./src.zoneconf/img/mu.gif
-23121a589723abad955d9543f644bceb  ./src.zoneconf/img/mv.gif
-5170501cda1ca85ae815e78817b8eea4  ./src.zoneconf/img/mw.gif
-d3d43f8b958739b00582aa117b7b0d5f  ./src.zoneconf/img/mx.gif
-809e20fa6ea5fa4f6dfaf629bfe32786  ./src.zoneconf/img/my.gif
-169b88a2d2e2b61074725cafcdb02137  ./src.zoneconf/img/mz.gif
-7879034a66005c6362f2dd6e76006903  ./src.zoneconf/img/na.gif
-1891dd4e9799a25058fe59c2ae6bca6c  ./src.zoneconf/img/nc.gif
-51523edda9a5f6eb2e01f54848a287d3  ./src.zoneconf/img/ne.gif
-61684e3bb6ca9505cbdc6c71d4d3df1b  ./src.zoneconf/img/ng.gif
-6385058f4423f3c921d086f75e7c5e42  ./src.zoneconf/img/ni.gif
-96199acdb50773fe45dfdbc31078ea4c  ./src.zoneconf/img/nl.gif
-d98132d9186daf717fea60b515391dbb  ./src.zoneconf/img/no.gif
-8af3968a7b03ba0f32b032264ba32c21  ./src.zoneconf/img/noproduct.gif
-ce351209101c143434e6bb1013a99643  ./src.zoneconf/img/np.gif
-43990e2c126fd5fa663ebff4aeb7abe9  ./src.zoneconf/img/nr.gif
-3156460b6b5711d6eed7f7d8cc2ab5a7  ./src.zoneconf/img/nz.gif
-f58dfae941a58c24b9717cca7bfea3eb  ./src.zoneconf/img/OK.gif
-82a30a1754878742cc4f2d53a321bb18  ./src.zoneconf/img/om.gif
-65fbd504cdd414585931df969eb3ca1a  ./src.zoneconf/img/online.png
-2cb5e6357313398ff7769acdc246d5a5  ./src.zoneconf/img/pa.gif
-4283bc9e72bbb3e872e7160dfad6305e  ./src.zoneconf/img/pdf.gif
-602319cfe293e7a09853c3f9b4b09571  ./src.zoneconf/img/pdflogo.jpg
-5c359dd05ae0be539b2d428c767269a3  ./src.zoneconf/img/pe.gif
-fbd8fc23d9eba2d1e25bd045bbe460a0  ./src.zoneconf/img/pf.gif
-4c2d5192721652a68f663ace97689977  ./src.zoneconf/img/pg.gif
-cec4d7560e2d08926359d2e877f3a76c  ./src.zoneconf/img/ph.gif
-325472601571f31e1bf00674c368d335  ./src.zoneconf/img/pixel.gif
-f76325ca4212849022179a498f0451a3  ./src.zoneconf/img/P.jpg
-5cb1ff3e37207a760e2ecf45a5bb81d7  ./src.zoneconf/img/pk.gif
-a929046f3f0c7781989a284371a7f43b  ./src.zoneconf/img/pl.gif
-b4c3c92d6f14d845e5bd6ef808992e75  ./src.zoneconf/img/pr.gif
-b27fd5ba96425bbb4fa2430d49d7a6c1  ./src.zoneconf/img/ps.gif
-ae548aa692ef71a331afe943026e111d  ./src.zoneconf/img/pt.gif
-5e6d56d4875274e15326bf36e0e440fa  ./src.zoneconf/img/puzzle.gif
-479edce4532bd36f766bd29a346ee0c2  ./src.zoneconf/img/py.gif
-6ad5b83645bf557fe570894f453f432a  ./src.zoneconf/img/qa.gif
-373098598c1e4f96e6387b8450f12100  ./src.zoneconf/img/redblink.gif
-9ad1d92a382bc69320c3207ad05cc848  ./src.zoneconf/img/restart.gif
-03e1eb95e5d617fddecaad97216d6a8d  ./src.zoneconf/img/right.gif
-325e062f23998b57cb0a5434d1232998  ./src.zoneconf/img/right_off.gif
-ca19ca9aec4160b6d6599c1da0c9030e  ./src.zoneconf/img/right_on.gif
-ac04fb14afaae3bc4449a5401c3517e0  ./src.zoneconf/img/ro.gif
-daa2a635125539998a491f04ce53dc60  ./src.zoneconf/img/ru.gif
-35aea723f296758f5cc066a43cf8f7cc  ./src.zoneconf/img/running.gif
-d9fd3f931b1b2fd74189c13163c0d27f  ./src.zoneconf/img/rw.gif
-bbd932aea9265abf5815b74dd9446de4  ./src.zoneconf/img/sa.gif
-c41690739c4f92af9e065e81690a2356  ./src.zoneconf/img/sb.gif
-f6962601aaefb28010546d18c1eee3b6  ./src.zoneconf/img/sc.gif
-aef2c6903b36e52b667bb0baa52604fc  ./src.zoneconf/img/sd.gif
-63ff75c06900689a5d43ab931bc82662  ./src.zoneconf/img/se.gif
-d89f586fb81c9a9cf9cdf95013f73908  ./src.zoneconf/img/sg.gif
-6e01f80930f920ad47317e0231dab31b  ./src.zoneconf/img/shell.gif
-4f311a4b0a39db339be74a2f354d3799  ./src.zoneconf/img/si.gif
-446ee87471efed6edff86d7e6dbbd4ae  ./src.zoneconf/img/S.jpg
-01d603424483cf66ca867ba0f1c9fec4  ./src.zoneconf/img/sk.gif
-a8a1ca018798069590c0f8cb5796fc65  ./src.zoneconf/img/sl.gif
-0a19805c1c5cd1b00d7aa1d3483f2f52  ./src.zoneconf/img/sm.gif
-76f4d671f6e3bedd3186c37811740cf9  ./src.zoneconf/img/sn.gif
-5d8348e7a2fa1302ff6a4a3fbd2bfea6  ./src.zoneconf/img/so.gif
-824d54e319ea0bc466e99519402eee73  ./src.zoneconf/img/sr.gif
-f4cb7f05e5d0df81c144efbf4f92dcf2  ./src.zoneconf/img/start.gif
-e1694e33cbb51bd6b1704dc2e20e6932  ./src.zoneconf/img/STAT.gif
-5964b615e7c17cacfd81b1512493d763  ./src.zoneconf/img/stat.png
-d2f81eaa1c5d96e3ed55beebaf8575ca  ./src.zoneconf/img/st.gif
-248cc8d034ee218a7e6a67af7f07990e  ./src.zoneconf/img/stop.gif
-872967d9ece2371a35b58d5fb0238ff4  ./src.zoneconf/img/sv.gif
-9da5b2078daabfbd9b31f02389d8ed0c  ./src.zoneconf/img/sy.gif
-5d456951dcf4eb341117c87857a20848  ./src.zoneconf/img/tc.gif
-ad1ff45898cd2ca773bdc10f7cc62f57  ./src.zoneconf/img/td.gif
-6aa920611047a1bc48d722a896ae9466  ./src.zoneconf/img/tg.gif
-b525712cc1014c12071aa555b29d9654  ./src.zoneconf/img/th.gif
-6a4529dcfb66dd9643eddc34694901f9  ./src.zoneconf/img/tip.gif
-3ad173d9b7851da9a105a6f2eba83a26  ./src.zoneconf/img/tj.gif
-e77c85af2832c2be5568a743c86b46fd  ./src.zoneconf/img/tm.gif
-f7d1ccddc14b1b2754f19c5eb2d51a56  ./src.zoneconf/img/tn.gif
-1ee074e0dbbb595647270dbced8a8743  ./src.zoneconf/img/to.gif
-2d955f99532fc215ff4fd450c8f65eec  ./src.zoneconf/img/top.gif
-c9a88e87ef4b242a41c3909c1599cc5a  ./src.zoneconf/img/tr-bg.gif
-23c0420906ac063753138c20bacd3e1a  ./src.zoneconf/img/tr.gif
-87decec956e1fc484b1a8b1716326b25  ./src.zoneconf/img/tt.gif
-67e92c1c2cd1222fd607c9f91435883e  ./src.zoneconf/img/tv.gif
-cf5c19a25cb1dd17f9d47b362d98e0a4  ./src.zoneconf/img/tw.gif
-ef039d9935ecda27125f0fd39212ad44  ./src.zoneconf/img/tz.gif
-1cc325bedc5df0920efedda54a184fdc  ./src.zoneconf/img/ua.gif
-174636bd284c8d7f06638767bb84b6fd  ./src.zoneconf/img/ug.gif
-7763400e5ce322599ebf9746d6db0635  ./src.zoneconf/img/uk.gif
-da822aee1a92e293e231bba79c7fea6e  ./src.zoneconf/img/user_bg.gif
-60505fdddf8dbdfbb2c34fc0484eb14c  ./src.zoneconf/img/user_left.gif
-cdb58adbdb0b831f13a43cd1b06556ab  ./src.zoneconf/img/user_right.gif
-a5a63b0486b82f067e8cfcbf254a989b  ./src.zoneconf/img/us.gif
-275a0eccdca2720e84afa23054b5d371  ./src.zoneconf/img/uy.gif
-7765dea7d06dad99059a9e1802c379ce  ./src.zoneconf/img/uz.gif
-4fccba188125599f6448f8e0b71d0677  ./src.zoneconf/img/va.gif
-088eb392df3410f8fd363cedcb97f3c1  ./src.zoneconf/img/vc.gif
-f1082562cd7ee5776e6e732cc7220889  ./src.zoneconf/img/ve.gif
-5f89b155213d1c29181d06da33a974f8  ./src.zoneconf/img/vg.gif
-b30d88bf20ffc5c75a254ab25b4c562c  ./src.zoneconf/img/vi.gif
-eb6ed57d0ac22ecb8aded85f9f6f56ee  ./src.zoneconf/img/V.jpg
-5bf8dfaf74506f3d89aa4a6fd9c4e211  ./src.zoneconf/img/vn.gif
-5079bd5b261d5102a7f7df00201d20b8  ./src.zoneconf/img/vu.gif
-9f820bf009f41f0b24781aa1b8cb72f7  ./src.zoneconf/img/WARNING.gif
-8b78f084e1ff5e4a4dfbb34ebe444c79  ./src.zoneconf/img/warning.png
-a027ff7cdd02b873d271f8d51ab89ae8  ./src.zoneconf/img/ws.gif
-ee7fb77f702f0182de807f188138a152  ./src.zoneconf/img/ye.gif
-3518a6f434bac3f6c197f272bee8bc88  ./src.zoneconf/img/yellowblink.gif
-6a7e5fbc9e3ac06b720eea3387477771  ./src.zoneconf/img/yu.gif
-37d219e52bce3b94891821896c71699a  ./src.zoneconf/img/za.gif
-738eef19ae48c2d33aec2dad247a2cfb  ./src.zoneconf/img/zm.gif
-b36d783070b8b3eb7b6af6b237b5dbc3  ./src.zoneconf/img/zr.gif
-8d31cf8ee73d6c4e8fdd3c8382d01549  ./src.zoneconf/img/zw.gif
-a55c7e314b8f85e6f652329525a1c758  ./src.zoneconf/index.php
-5cf5f6ccca0fa4c4c8a0428e9240b81a  ./src.zoneconf/js/builder.js
-3caf5091b68f3a6afaf881744509d4c6  ./src.zoneconf/js/controls.js
-f41cfdb65270e6f50eb1cce7cee52902  ./src.zoneconf/js/dragdrop.js
-be6dba6cd4a57fc1dade9b547fc614d9  ./src.zoneconf/js/effects.js
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_deD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_de.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_enD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_en.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_nlD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_nl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_plD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_pl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_ptD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/js/lang_pt.php
-76a7817d74e1ade50d87167b13a443db  ./src.zoneconf/js/prototype.js
-211d955609da0b228a65487384b95722  ./src.zoneconf/js/scriptaculous.js
-a35f869479bb76b2d0de3aaa808ead5e  ./src.zoneconf/js/slider.js
-9ffcc3a22dbfeb9e5665247f376deb76  ./src.zoneconf/js/unittest.js
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_deD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_de.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_enD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_en.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_nlD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_nl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_plD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_pl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_ptD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/kiosk/lang_pt.php
-4217b451d7b0f2baf7f381de76c8f11d  ./src.zoneconf/kiosk/menuman.php
-9a538ef0ef2b48d7da2c18afc3c6dba4  ./src.zoneconf/kiosk/modman.php
-0627ddced78c0f6df9fcb35f84e42093  ./src.zoneconf/kiosk/selectmode.php
-a067ebdf2a2124c1bd33a21fbfa51e0e  ./src.zoneconf/kiosk/wizardman.php
-81768364614b8b9528b56948c233a706  ./src.zoneconf/lang2db.php
-bd42470ea5c5aa735df943b4bfcdd449  ./src.zoneconf/lang_deD.php
-3c168ff488cebb20f54e3f31017bb935  ./src.zoneconf/lang_de.php
-572fd9e5c47fadfe8bb68169c14c633e  ./src.zoneconf/lang_enD.php
-e84f01fe911d07604a3caba3600137ba  ./src.zoneconf/lang_en.php
-99bc9ccebe4c5277adf8098d2f2c2bc0  ./src.zoneconf/lang_nlD.php
-ac54cad3d640422c437efc0e3b3d6ce6  ./src.zoneconf/lang_nl.php
-7a0e1100a0f985844bb94b0a55f03085  ./src.zoneconf/lang_plD.php
-ab406aa714bd25a98b9004677f1878cb  ./src.zoneconf/lang_pl.php
-ece19aaff8eb0f184168f3b975eb208e  ./src.zoneconf/lang_ptD.php
-e84f01fe911d07604a3caba3600137ba  ./src.zoneconf/lang_pt.php
-d32239bcb673463ab874e80d47fae504  ./src.zoneconf/LICENSE
-f6df94ebd49522486b58397b98b5a28a  ./src.zoneconf/linux/kernel.php
-f62efe327c6d48c47556147a093c38ff  ./src.zoneconf/linux/lang_deD.php
-6a2a39ff00b669c6164d5f3a3140957a  ./src.zoneconf/linux/lang_de.php
-20b9c14b5e88b23a78eac33a815e51c4  ./src.zoneconf/linux/lang_enD.php
-e7f2749d325c20dc94ab200d7c2b5435  ./src.zoneconf/linux/lang_en.php
-bfe8451fab683f128d3b2d5645670beb  ./src.zoneconf/linux/lang_nlD.php
-2df7d19e63358bdf7bf2243734134980  ./src.zoneconf/linux/lang_nl.php
-fb825052c0ed798a80aa026b2e44e636  ./src.zoneconf/linux/lang_plD.php
-a635d27295795663005b91460c12b2ad  ./src.zoneconf/linux/lang_pl.php
-a03c38371f1c5ae407828fddd4334f33  ./src.zoneconf/linux/lang_ptD.php
-e7f2749d325c20dc94ab200d7c2b5435  ./src.zoneconf/linux/lang_pt.php
-0d95ba411b87f6cd272b2c835fae7639  ./src.zoneconf/linux/menuman.php
-0d59af617fb64479172b18896a208c44  ./src.zoneconf/linux/selectkernel.php
-c823b79bec456b2052139ac9cd91bada  ./src.zoneconf/login/lang_deD.php
-b697096dba7b0a3642d36f14ab695b0e  ./src.zoneconf/login/lang_de.php
-a9c5f1f8730af7c53b378b6e7ef75443  ./src.zoneconf/login/lang_enD.php
-de79d329544b90a68655256c95edc469  ./src.zoneconf/login/lang_en.php
-e8e1f20c1b403d86514495e8b166c201  ./src.zoneconf/login/lang_nlD.php
-a9159d5a4dc8a4fae4b8faebcf1c44db  ./src.zoneconf/login/lang_nl.php
-64c8c39d862923da0078ba4a6333a7e5  ./src.zoneconf/login/lang_plD.php
-d2f3509b084d81bf63cb88c8a49b7273  ./src.zoneconf/login/lang_pl.php
-cf67c28040e2393a3a829a0dba137ced  ./src.zoneconf/login/lang_ptD.php
-de79d329544b90a68655256c95edc469  ./src.zoneconf/login/lang_pt.php
-14d580686f354172f0f62263f518c6ef  ./src.zoneconf/login/login.php
-dc08f4e4db7cf0da48a273bed1762809  ./src.zoneconf/log/lang_deD.php
-36f27fb0d24cf567b5eb15ddffc2d9e2  ./src.zoneconf/log/lang_de.php
-3bc56d3aee7b939f6f8cb5429fcd7b7a  ./src.zoneconf/log/lang_enD.php
-e78eb4d2576e341dc06a648104a491f5  ./src.zoneconf/log/lang_en.php
-190c6869df4f2615cd7fc20296493120  ./src.zoneconf/log/lang_nlD.php
-5c2b3aed377fc885dea58971e19777b9  ./src.zoneconf/log/lang_nl.php
-797cb1ace81551375f0c49cd4759d966  ./src.zoneconf/log/lang_plD.php
-3b0af67cb8fc645a009a0f958fc86401  ./src.zoneconf/log/lang_pl.php
-216d287bab50b07949f476fd0daf8703  ./src.zoneconf/log/lang_ptD.php
-e78eb4d2576e341dc06a648104a491f5  ./src.zoneconf/log/lang_pt.php
-4c23372714bf9ac1e57203fdf02280c4  ./src.zoneconf/log/menuman.php
-d656919aea65300512e0d498a6af4a8e  ./src.zoneconf/log.php
-739b1adadd7efc84c517d3cb7b30b873  ./src.zoneconf/log/simpellinux.php
-7252ec8b2f1607090ab701ad06cbbfee  ./src.zoneconf/log/syslog.php
-61c458fc270bc5c8a072da3a38ca3e0c  ./src.zoneconf/mail/addadress.php
-a479189f0993eaadb91c015414f503bb  ./src.zoneconf/mail/addvirtdomain.php
-1046b84b859fadb9a26fe6c38252a302  ./src.zoneconf/mail/cyradm.pl
-56c570c845a2561315a4247eb43d2d74  ./src.zoneconf/mail/cyrus.php
-fd09ff97e418f5c3b49731734197c9f8  ./src.zoneconf/mail/Cyrus.php.clas
-2d7a33feaf774084c809f9934a545ed1  ./src.zoneconf/mail/delvirtdomain.php
-1ce53cd1c97ecb16ef1d7bccae1d424a  ./src.zoneconf/mail/dspam.php
-df497c065eb4308fcb48d2a6a0eb2b79  ./src.zoneconf/mail/editadress.php
-54ab40a04fc57cae0f3d313c5bca7f02  ./src.zoneconf/mail/editdomain.php
-9d66a89f2aea19e8f25bb79d2e41da74  ./src.zoneconf/mail/editquota.php
-0fa2ec19f10314df4031a32bbe590b37  ./src.zoneconf/mail/include/Net/Cyrus.php
-64e95e90c2d4dd4eb12900d7c365eb3e  ./src.zoneconf/mail/include/Net/IMAP.php
-cf5f873a574081abd2183ba70be378fb  ./src.zoneconf/mail/include/Net/IMAPProtocol.php
-4b0ebd7d239174851357e258eb1b8804  ./src.zoneconf/mail/lang_deD.php
-24c24d7d4830dd2d3f03358b6af1afd8  ./src.zoneconf/mail/lang_de.php
-1a38e1960c1ef9aca413ba3b2b4ca288  ./src.zoneconf/mail/lang_enD.php
-618eb76842c6af4cfe38cad34214b6ec  ./src.zoneconf/mail/lang_en.php
-f154de47ce0d55378274b6d4fff7b023  ./src.zoneconf/mail/lang_nlD.php
-9bdf68795e181ac4057a3ed03200e956  ./src.zoneconf/mail/lang_nl.php
-5ce783d4ea6875d21d810c94a26f2e66  ./src.zoneconf/mail/lang_plD.php
-9a540bc4d17747cbd7ed89cacf80297c  ./src.zoneconf/mail/lang_pl.php
-7d8de42ca34b8bc0b9e4e7cdf269cdce  ./src.zoneconf/mail/lang_ptD.php
-618eb76842c6af4cfe38cad34214b6ec  ./src.zoneconf/mail/lang_pt.php
-b35b9f518c790327b507aa633e0ccae5  ./src.zoneconf/mail/listadress.php
-1d31fd31e269eb0b8ac0832909cb6375  ./src.zoneconf/mail/listdomain.php
-b42ec967c54c3d845a9fa2d22b5f2c67  ./src.zoneconf/mail/listquotas.php
-07b8cda5bdc6fd2f0a9f65b2d44cb264  ./src.zoneconf/mail/mail.txt
-0de7f31a6a7503bb59c19cbf813b8ae3  ./src.zoneconf/mail/menuman.php
-7deb75ce29b9acdbb4fb34c5ba9b5384  ./src.zoneconf/mail/Net_Cyrus-0.3.1.tgz
-7ab7800d5ae043dacbb5b9d5b4e1f9ef  ./src.zoneconf/mail/qmail.php
-e9d77e8ff3efb368936ab7c530d61749  ./src.zoneconf/mailqueue/lang_deD.php
-e7407dbf0083480fb27c4edf8a0a7944  ./src.zoneconf/mailqueue/lang_de.php
-523bcf3f88965e1ee68db016dd99b3b2  ./src.zoneconf/mailqueue/lang_enD.php
-20224a2feddd5cff317709ec02ad8ee9  ./src.zoneconf/mailqueue/lang_en.php
-13160ae664a2f17c1252965d8ad6ec18  ./src.zoneconf/mailqueue/lang_nlD.php
-4d016fa27ebdf58cb5c92fd85f8be4e2  ./src.zoneconf/mailqueue/lang_nl.php
-b831b420dda376c17aa18131b89b615b  ./src.zoneconf/mailqueue/lang_plD.php
-8f29cd170a31bf3aaaceef6a59aac9d3  ./src.zoneconf/mailqueue/lang_pl.php
-433a2dcdd19046c66cf2c6c9cd7c34f0  ./src.zoneconf/mailqueue/lang_ptD.php
-20224a2feddd5cff317709ec02ad8ee9  ./src.zoneconf/mailqueue/lang_pt.php
-3adbc7850b61d503f542512dce592169  ./src.zoneconf/mailqueue/listmailqueue.php
-687e946e94dfb7d3c04e54b6cdd81b5e  ./src.zoneconf/mailqueue/menuman.php
-b805a6f493f3f6a6be79b712c0dadcb8  ./src.zoneconf/mailqueue/qmHandle
-57bc58bd86d859cf5ae0f970072ed702  ./src.zoneconf/mailqueue/resendmailqueue.php
-f187ef7a1d998d67819ca90ffaa77443  ./src.zoneconf/mail/settings.php
-04940c309db50e2768ff90b9dd4a2a9c  ./src.zoneconf/mail/spamfilter.php
-4486caadd91f2277aa3c71abc006d0f2  ./src.zoneconf/mail/svcman.php
-af66bb352a81e5b809abdecbe2243666  ./src.zoneconf/mail/userman.php
-9add59b93a07a7c829bfbce603f42d82  ./src.zoneconf/mail/wizardman.php
-167f1c431e5ae3e14a4fe95ebdd840a5  ./src.zoneconf/main.css
-b1867d32f51404588799e716a00f0fac  ./src.zoneconf/man/jan
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_deD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_de.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_enD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_en.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_nlD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_nl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_plD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_pl.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_ptD.php
-7eebbe05267eae86470a99ff607cf420  ./src.zoneconf/man/lang_pt.php
-fcdace0910068e867aa5d028090b2beb  ./src.zoneconf/menu/lang_deD.php
-48dd563bdf00fda5a9f4b42af68b48b9  ./src.zoneconf/menu/lang_de.php
-a1abd72a4b960c6f8efa880ed50e891e  ./src.zoneconf/menu/lang_enD.php
-97a82d7d1643ea99e5759ff6c64c3874  ./src.zoneconf/menu/lang_en.php
-db0faf83231fac087a25856f2bbc37aa  ./src.zoneconf/menu/lang_nlD.php
-be2951686438e2f1957a04e7e53e29e9  ./src.zoneconf/menu/lang_nl.php
-3fe7c60a4497d3ce323d65c67181a269  ./src.zoneconf/menu/lang_plD.php
-fbd375b213c64fb179f5fd2b11d38043  ./src.zoneconf/menu/lang_pl.php
-5276012185c95dc85e202a963ad5f509  ./src.zoneconf/menu/lang_ptD.php
-97a82d7d1643ea99e5759ff6c64c3874  ./src.zoneconf/menu/lang_pt.php
-c83940aa41093e65e6d3044a1141c87f  ./src.zoneconf/menu/menudata.php
-8b9f51d446264697a5a0696c45bff821  ./src.zoneconf/menu/menu.php
-1ca909af3b84707fe9d9e3ecebf22432  ./src.zoneconf/monitoring/alertsettings.php
-f6e9d15bb3136f6106bedf88fa2585c7  ./src.zoneconf/monitoring/cli.php
-49a050f30edd11005bed578a6c385c29  ./src.zoneconf/monitoring/lang_deD.php
-0b187474d063c8654fb46299a3b87670  ./src.zoneconf/monitoring/lang_de.php
-0f3b64ea0b2ef5a6c7f6461989b70367  ./src.zoneconf/monitoring/lang_enD.php
-5c4fce53839d1a2bf2d2af1e20413cf8  ./src.zoneconf/monitoring/lang_en.php
-e9aac546dc2ea8901c9efc4924b5c4b3  ./src.zoneconf/monitoring/lang_nlD.php
-a8a17b34a35d7006152d17e968d04728  ./src.zoneconf/monitoring/lang_nl.php
-37825dd2a5928fa24c724b115ffe493c  ./src.zoneconf/monitoring/lang_plD.php
-5e22c132adeea8d7b061207fb0982dd9  ./src.zoneconf/monitoring/lang_pl.php
-76901601e36bdd014147904d478974ed  ./src.zoneconf/monitoring/lang_ptD.php
-5c4fce53839d1a2bf2d2af1e20413cf8  ./src.zoneconf/monitoring/lang_pt.php
-0cad4eb9db9d7340e16658f5f775898c  ./src.zoneconf/monitoring/listalerts.php
-a8ce6d0e5af2f95103fd20a8266ae147  ./src.zoneconf/monitoring/menuman.php
-bacecad6ef88d107163d836cd8b1411a  ./src.zoneconf/monitoring/state.php
-5d0df7ad31ffefe7bf77e9106469ca3b  ./src.zoneconf/msg/lang_deD.php
-2a647a6326e5374c5e40caabb7d776ea  ./src.zoneconf/msg/lang_de.php
-3cb9f18fb4534a9632fa424f98ea300c  ./src.zoneconf/msg/lang_enD.php
-fef5878f33028b7c9501b123cab7678e  ./src.zoneconf/msg/lang_en.php
-da4491e300f8f1ba081bd3138eaf8298  ./src.zoneconf/msg/lang_nlD.php
-08c64e2ba16cf5f4865bfa1b150d0594  ./src.zoneconf/msg/lang_nl.php
-780f2b5fef58b19c714e8cd1a0529746  ./src.zoneconf/msg/lang_plD.php
-560ce3ab6e38f15e09f13988ec6c286f  ./src.zoneconf/msg/lang_pl.php
-d22bee21ae93f1ba77cf2682093f4d6f  ./src.zoneconf/msg/lang_ptD.php
-fef5878f33028b7c9501b123cab7678e  ./src.zoneconf/msg/lang_pt.php
-106c8095a75111ced5dc8d0afe6b678c  ./src.zoneconf/msg/processing.php
-346001f195f69b644ced7732da275131  ./src.zoneconf/msg/ynconfirm.php
-34302413654fe81d0575b4faced5c989  ./src.zoneconf/network/adreslist.php
-5e073604c9098265777643192a15f633  ./src.zoneconf/network/check.php
-a2c7955bd885780c42bed296f5156bb7  ./src.zoneconf/network/dhcpcdview.php
-58fd66ed3ea1aebf652b10e972cac666  ./src.zoneconf/network/dns.php
-02aa422da857cffcf569304e81cec36e  ./src.zoneconf/network/editassignment.php
-51bbf93748f1ee59d787641f2b1fffce  ./src.zoneconf/network/editip.php
-cd63ce495e365f60ccf418b68510ac3e  ./src.zoneconf/network/hostname.php
-4a9acf63c07fb1205bc8d29142046a60  ./src.zoneconf/network/ifconfig.php
-1d7582acb5e4279e5834091f6c35840e  ./src.zoneconf/network/lang_deD.php
-671da537b34f813166fc7201b89a2f95  ./src.zoneconf/network/lang_de.php
-08ca698fe512f9ee311d9069af31779c  ./src.zoneconf/network/lang_enD.php
-7e5cd8328534d9523ce0bee72c2a1570  ./src.zoneconf/network/lang_en.php
-099d664d4ae48dbf1657fa146b68aa6f  ./src.zoneconf/network/lang_nlD.php
-cbadaa731f5f1dca2bfeaff3ebb9b955  ./src.zoneconf/network/lang_nl.php
-0ec05c14090e1852ca53e63e13e82680  ./src.zoneconf/network/lang_plD.php
-57f5aba98517efe911fcbb780872ec61  ./src.zoneconf/network/lang_pl.php
-8d4549677312266ef71e07ca49be8159  ./src.zoneconf/network/lang_ptD.php
-7e5cd8328534d9523ce0bee72c2a1570  ./src.zoneconf/network/lang_pt.php
-0c142c8dee1b871838981f06cf44ce68  ./src.zoneconf/network/listassignment.php
-c33862666a8650bca5c767991b8e39b3  ./src.zoneconf/network/listzones.php
-b3427f1ba8bd3691872794c2c307e16c  ./src.zoneconf/network/menuman.php
-b4323aca12fa049f31e4db73ccddbc35  ./src.zoneconf/network/network.php
-4c09b1847df4bb1d0996abfa796ffa9f  ./src.zoneconf/network/route.php
-8931e88cd74007f49e9ea7e7c72ea2ea  ./src.zoneconf/network/wizardman.php
-cbc0ebbef2bd7c7438d1d1981f3b2a44  ./src.zoneconf/openxchange/lang_deD.php
-ade288846f221729413d05fd27a9f2b4  ./src.zoneconf/openxchange/lang_de.php
-595b424d4ebed80c21fde40184aa7bd8  ./src.zoneconf/openxchange/lang_enD.php
-04ef8cdda727755e10bdf543c8edf5ba  ./src.zoneconf/openxchange/lang_en.php
-7c42357f0d9ac8cf2d09e47ffc17df44  ./src.zoneconf/openxchange/lang_nlD.php
-8e5da765c59968fe00c607ad287ab4c0  ./src.zoneconf/openxchange/lang_nl.php
-c5e44a2a6cccab9b5dbd60c0874e9f6e  ./src.zoneconf/openxchange/lang_plD.php
-d51f1186936b7cbdd3578de020b2f7f0  ./src.zoneconf/openxchange/lang_pl.php
-ab4906e5c765bb20e7c5f4cdf4db15e8  ./src.zoneconf/openxchange/lang_ptD.php
-04ef8cdda727755e10bdf543c8edf5ba  ./src.zoneconf/openxchange/lang_pt.php
-2fdebd45da73613eb60c6b10bdaa1e4d  ./src.zoneconf/openxchange/svcman.php
-dff7cd6661d87189fe0bb585e7f85125  ./src.zoneconf/openxchange/userman.php
-33545e2539bf45872795bce946a543f5  ./src.zoneconf/pptp/editsettings.php
-521be276ff5fd59f64774989dc6579f8  ./src.zoneconf/pptp/lang_deD.php
-8e9c59fd741056123c549df3416241da  ./src.zoneconf/pptp/lang_de.php
-1dbc725205b6d5fc990bb48ece67a283  ./src.zoneconf/pptp/lang_enD.php
-1190696b69e56f167e9eee16c7949832  ./src.zoneconf/pptp/lang_en.php
-0072a59180ba0339c3c7bb5374357bfb  ./src.zoneconf/pptp/lang_nlD.php
-0c9f2fe7e55f060e801534e8229f6245  ./src.zoneconf/pptp/lang_nl.php
-bcbdd97f894d270ad29c6629c07f9a51  ./src.zoneconf/pptp/lang_plD.php
-1190696b69e56f167e9eee16c7949832  ./src.zoneconf/pptp/lang_pl.php
-10d00e00b5cde1c9f7ee9fb32741a62b  ./src.zoneconf/pptp/lang_ptD.php
-1190696b69e56f167e9eee16c7949832  ./src.zoneconf/pptp/lang_pt.php
-b64a3756a35876a4bd9161696d6943b1  ./src.zoneconf/pptp/menuman.php
-ca9dad8494c6dec7627e2f454c596ba5  ./src.zoneconf/pptp/model.php
-184d12fea4c6281438d34edc73a0f004  ./src.zoneconf/pptp/status.php
-4e34e135d2bdd1deeca4ebdb63f18598  ./src.zoneconf/pptp/svcman.php
-696762ff6a2afd35b4aff5eae84ef995  ./src.zoneconf/proc.php
-b99b2bf334783d33a9f6687c27b9891e  ./src.zoneconf/proxy/addfilter.php
-5050137e4ab0f25051687313ceb22f0f  ./src.zoneconf/proxy/addhttpaccess.php
-f387515acdc60dce5727b2d68a8b19ea  ./src.zoneconf/proxy/addrule2filter.php
-a52b76a9b3f4c95fcba297010ec1ed68  ./src.zoneconf/proxy/addtimefilter.php
-dfa17eb1282bebca75ab37c5b91bc4c9  ./src.zoneconf/proxy/editurl.php
-2581c2d694eb0ecca4dff259cee87a29  ./src.zoneconf/proxy/lang_deD.php
-fb1ac9b5b05b9672d5fa8f705789d06f  ./src.zoneconf/proxy/lang_de.php
-9ebddd42818373f5bd631dc7244110e3  ./src.zoneconf/proxy/lang_enD.php
-8c407a9b8d283981ccb487aa2cae2013  ./src.zoneconf/proxy/lang_en.php
-e3a61b5afb5e4ac5622b134ee4d3eb44  ./src.zoneconf/proxy/lang_nlD.php
-8ff95883bafd8174f73229a733b8fbbc  ./src.zoneconf/proxy/lang_nl.php
-4b1f0524361257900260b3cb1d4692c1  ./src.zoneconf/proxy/lang_plD.php
-e8f13baf9c86c3413fcf99bd782b4dc0  ./src.zoneconf/proxy/lang_pl.php
-de2a0927263e602e0a2e48dc7baab388  ./src.zoneconf/proxy/lang_ptD.php
-8c407a9b8d283981ccb487aa2cae2013  ./src.zoneconf/proxy/lang_pt.php
-928d1e1cff4ca90273eda5872d22dd4e  ./src.zoneconf/proxy/listaccess.php
-4f9a5c1810129eba296b1cee89a00d24  ./src.zoneconf/proxy/listfilters.php
-25926a2683a1db884b62e536636400d7  ./src.zoneconf/proxy/listhttpaccess.php
-34ae7f777a9e618bd35063dd8ef12595  ./src.zoneconf/proxy/listrules.php
-714f4ee49ae4bfbe56f54f4361fc4974  ./src.zoneconf/proxy/listtimefilters.php
-3b4b782d6114a796c54ef7a7e07debb9  ./src.zoneconf/proxy/listurls.php
-859d55f99135bab92f9bc85d12573136  ./src.zoneconf/proxylog/lang_deD.php
-3ce954d38f17f8ef050e491261469e52  ./src.zoneconf/proxylog/lang_de.php
-8eccf54cb7bbd3a11313b9bbe1b436e8  ./src.zoneconf/proxylog/lang_enD.php
-8fa8cb3533efa0cfbe3b9ef4fdd89a5c  ./src.zoneconf/proxylog/lang_en.php
-cc7691d7a679f95e78594eb1f5e33c66  ./src.zoneconf/proxylog/lang_nlD.php
-35d88f8b774e85361c09ae20b41db440  ./src.zoneconf/proxylog/lang_nl.php
-221812d2a52755f22230f0ffc2ef32f0  ./src.zoneconf/proxylog/lang_plD.php
-8fa8cb3533efa0cfbe3b9ef4fdd89a5c  ./src.zoneconf/proxylog/lang_pl.php
-1bb732a1734b5db6aef981b591520625  ./src.zoneconf/proxylog/lang_ptD.php
-8fa8cb3533efa0cfbe3b9ef4fdd89a5c  ./src.zoneconf/proxylog/lang_pt.php
-bea6bc01c5c5aa059795b370fd5a5f67  ./src.zoneconf/proxylog/menuman.php
-dcf4fbc4c78024c4f466240227aff4c4  ./src.zoneconf/proxylog/model.php
-7f227d253164875600712b8aef30b3a3  ./src.zoneconf/proxylog/parsedomains.pl
-67bddd48c1c7bd170a63916b66101565  ./src.zoneconf/proxylog/report.php
-5bf8a859e7bb844317ddb50bc4f7fdba  ./src.zoneconf/proxy/logs.php
-b5ca504511365cd8a29dbed470a675cd  ./src.zoneconf/proxylog/view_domain_timeblocks.php
-e21423a7c7e0bda6a732a1cdfc35e341  ./src.zoneconf/proxylog/view_domain_topbytes.php
-f9d0395dbff8f8604b4774f24dd1caed  ./src.zoneconf/proxylog/view_domain_topvisits.php
-efd45789cb287bad0875ed417db75a12  ./src.zoneconf/proxylog/view_user_report.php
-6db61853b452673518ebe34d5bd34cdb  ./src.zoneconf/proxylog/view_user_timeblocks.php
-448641a11bca0536c7e1041941784266  ./src.zoneconf/proxylog/view_user_topbytes.php
-2f00873b1efb1ab9bace17f972dc5667  ./src.zoneconf/proxylog/view_user_topvisits.php
-f0ed75655d3ff3cb6a7ed413ff4bca98  ./src.zoneconf/proxy/menuman.php
-c609250de856c804769e3beaf4b602bb  ./src.zoneconf/proxy/processlogs.php
-33feeb9a05cd99bffec5273249e2b4d9  ./src.zoneconf/proxy/settings.php
-910775850d4e5d68c3efbe5c97f4f860  ./src.zoneconf/proxy/squid.php
-7b27b39e5c1f6b66478f867412f429a9  ./src.zoneconf/proxy/svcman.php
-bb14b1d3619e7a6c42767161ae098f82  ./src.zoneconf/raid/adddisk.php
-9b353fbb34525f08767ddee067e2dcba  ./src.zoneconf/raid/assimilatedisk.sh
-065224eacd71b8cff03ceacdd66b2f45  ./src.zoneconf/raid/lang_deD.php
-388ba523b1f5351fe1f32a4a5a4200f7  ./src.zoneconf/raid/lang_de.php
-13ebbfc33d6228e7d52ed26de34f79a4  ./src.zoneconf/raid/lang_enD.php
-586de908233f2c5ff63e53fbf932dc03  ./src.zoneconf/raid/lang_en.php
-aff3f4a81ac71e5394c623e80ff2aaaa  ./src.zoneconf/raid/lang_nlD.php
-a0fab17a1b29b606fad5108aee28491e  ./src.zoneconf/raid/lang_nl.php
-8c9b15122c84371c284ce7e792a7c961  ./src.zoneconf/raid/lang_plD.php
-80e7733d620998525497f8dfa6031357  ./src.zoneconf/raid/lang_pl.php
-40218469e9c8b17790827b40f07a8ef8  ./src.zoneconf/raid/lang_ptD.php
-586de908233f2c5ff63e53fbf932dc03  ./src.zoneconf/raid/lang_pt.php
-d1704fe6ee985ccd056f27643f48d12d  ./src.zoneconf/raid/listdisks.php
-82d0748d8695c12cd80c6d3f4777cc11  ./src.zoneconf/raid/menuman.php
-8bf98a06ee8b3fd709367231768e27c6  ./src.zoneconf/raid/raid.php
-22cb6a4c7432fdae33345e4cd63cd697  ./src.zoneconf/raid/removedisk.sh
-0f41dbcb878eb267272c291594114b0c  ./src.zoneconf/reg.php
-548464fde716a25efa864da6ddd403ca  ./src.zoneconf/report/editreport.php
-587044ffd4b38ef66b396bf2c9dcbcf4  ./src.zoneconf/report/lang_deD.php
-73e7571e87bf33240dddcfc4b37af671  ./src.zoneconf/report/lang_de.php
-065b59a2f0a68e077072e1533882c578  ./src.zoneconf/report/lang_enD.php
-73e7571e87bf33240dddcfc4b37af671  ./src.zoneconf/report/lang_en.php
-765494d5970c86cb0caa2f172f460ec8  ./src.zoneconf/report/lang_nlD.php
-73e7571e87bf33240dddcfc4b37af671  ./src.zoneconf/report/lang_nl.php
-6e61829d463f4bdd13c84910e31cf176  ./src.zoneconf/report/lang_plD.php
-73e7571e87bf33240dddcfc4b37af671  ./src.zoneconf/report/lang_pl.php
-c4f347e0e2be43661a36b6c9fc7c3b50  ./src.zoneconf/report/lang_ptD.php
-73e7571e87bf33240dddcfc4b37af671  ./src.zoneconf/report/lang_pt.php
-28eda3da48b00d2a32c0b810b43cff15  ./src.zoneconf/report/model.php
-c974fec9bb07dfb43efce875aeb29840  ./src.zoneconf/rpcclient.php
-b4165ecbc3aae264ae9c5793364871ee  ./src.zoneconf/samba/addprintershare.php
-a363b7953c4182a43805c1b01de9db16  ./src.zoneconf/samba/addshare.php
-6729912294f3edbeb668124d2c92df3b  ./src.zoneconf/samba/editprintersharecommon.php
-205d8ebab6cdef08d11dd1c9e400a40f  ./src.zoneconf/samba/editprintershare.php
-32ec28221af63e225e65e711d1d82a08  ./src.zoneconf/samba/editquota.php
-13763114371bfff51ac9b7a91ea0a287  ./src.zoneconf/samba/editsharecommon.php
-1009a192c9288d89e5287460dad0308c  ./src.zoneconf/samba/editshare.php
-bcd348e99b6b43e061f0709b01f87c1a  ./src.zoneconf/samba/groupquotas.php
-bf201ed61313569d89b58e3ee11a501b  ./src.zoneconf/samba/lang_deD.php
-610a6cfb4084fdeac18ac5edf70759d4  ./src.zoneconf/samba/lang_de.php
-b5429743d783e834b4a6012339f545c5  ./src.zoneconf/samba/lang_enD.php
-db7ab5da5b34d824c0a8b61b0c1a9c8f  ./src.zoneconf/samba/lang_en.php
-491a3ca5734db04e974a485e2612faf2  ./src.zoneconf/samba/lang_nlD.php
-f0bc2b85c07702343734eb0132963e3e  ./src.zoneconf/samba/lang_nl.php
-06a09827edaf82c1dbeb01d40b6753a0  ./src.zoneconf/samba/lang_plD.php
-488ba08884cd1aafb4ae1481f70d472b  ./src.zoneconf/samba/lang_pl.php
-1a8a3e6af6367324a10bb6838792025b  ./src.zoneconf/samba/lang_ptD.php
-db7ab5da5b34d824c0a8b61b0c1a9c8f  ./src.zoneconf/samba/lang_pt.php
-201981692fa2a352da91296caf5d5434  ./src.zoneconf/samba/listcomputers.php
-59cc300e16c1e2a049fade6e13a7b3c9  ./src.zoneconf/samba/listprinters.php
-97a7c5f0fbab48b21066802769f3c15b  ./src.zoneconf/samba/listquotas.php
-bc02bdd0121b5886cbe1d58487c9c466  ./src.zoneconf/samba/listshares.php
-df4ab65aff0641aaa86b62920d2dff68  ./src.zoneconf/samba/menuman.php
-461e93fc5c7580d5becdd93cdfc62821  ./src.zoneconf/samba/printerqueues.php
-16109be9886b65c7f9d0a6149eb0fbc3  ./src.zoneconf/samba/printers.php
-0eddc6c39230f86bc5fcbbc38982aa1e  ./src.zoneconf/samba/quota.php
-bd343fd609a6ab9b317d761f121da938  ./src.zoneconf/samba/samba_ldap.php
-0db72eb7078d63406eb979399ac92427  ./src.zoneconf/samba/samba.php
-50ebbd1fe351b296d3b72982513036b6  ./src.zoneconf/samba/sambasettings.php
-ecb5ed6b27044b141fc9f9a31f56fd17  ./src.zoneconf/samba/svcman.php
-d6cf7233fe230456461ad0afcbb313af  ./src.zoneconf/samba/userman.php
-5734222198235b089c06c3443bf84504  ./src.zoneconf/samba/userquotas.php
-ad13679c92da4c4b4f28f70b5d34f88e  ./src.zoneconf/samba/wizardman.php
-52d5cc3e22876e33840523a8f325e9fa  ./src.zoneconf/scc/lang_deD.php
-221d39a42278a1a559780a857b1ee328  ./src.zoneconf/scc/lang_de.php
-f8f6158318fce7f6e2f28bcea360b766  ./src.zoneconf/scc/lang_enD.php
-221d39a42278a1a559780a857b1ee328  ./src.zoneconf/scc/lang_en.php
-f4e0107b2ef0c549d1a76d4e8ff7fd07  ./src.zoneconf/scc/lang_nlD.php
-ac2d50af83e7e006a34e5bfed2609c7d  ./src.zoneconf/scc/lang_nl.php
-fb20c6d2333744e7361094e9601d0d41  ./src.zoneconf/scc/lang_plD.php
-221d39a42278a1a559780a857b1ee328  ./src.zoneconf/scc/lang_pl.php
-8d7f2d6f747374ce91a162c5a2bc48f3  ./src.zoneconf/scc/lang_ptD.php
-221d39a42278a1a559780a857b1ee328  ./src.zoneconf/scc/lang_pt.php
-f38a651a9f21d0db473f66aaa33ec36b  ./src.zoneconf/scc/restart.php
-621b8e01e3a67974626874f2ddb01203  ./src.zoneconf/security.php
-99d575e75eb768e77e0b2082c22cb189  ./src.zoneconf/services/lang_deD.php
-76f6e0fc1c56d77118fb4993478fb6f3  ./src.zoneconf/services/lang_de.php
-a13c89af16490297d680aeb82dedd0df  ./src.zoneconf/services/lang_enD.php
-11914da7e2f7a2d4cad3680b844752de  ./src.zoneconf/services/lang_en.php
-d5e2ae82ff45d3300dfe92c267580303  ./src.zoneconf/services/lang_nlD.php
-ea53ed0431b16fa3059cad92762ae903  ./src.zoneconf/services/lang_nl.php
-960fe2b63cd11d4a044e3f690a58934c  ./src.zoneconf/services/lang_plD.php
-07aa9fb17e1ed3af5aa2549f167e3fbd  ./src.zoneconf/services/lang_pl.php
-1c73ca02e36e2fd6f6f0168f7011a4fe  ./src.zoneconf/services/lang_ptD.php
-11914da7e2f7a2d4cad3680b844752de  ./src.zoneconf/services/lang_pt.php
-f2c0f259defd9b865017af6779c932d9  ./src.zoneconf/services/listservices.php
-e88c421baa50451270d370f5b6a3ddac  ./src.zoneconf/services/menuman.php
-840b923c6832539ffa374ab1b5bfd04c  ./src.zoneconf/services/svcman.php
-3fb6f3f7eea029703cb956069bf7ee2b  ./src.zoneconf/services/svc.php
-cc7c71e5ca6a42047cd1a006437de0f4  ./src.zoneconf/sessionlock.php
-27e9f8953c42935fd49355d38ff01215  ./src.zoneconf/settings/lang_deD.php
-1667ffca522a9b7710d9c0abd8bc6f95  ./src.zoneconf/settings/lang_de.php
-68dfee3dc99601368cb99f3d77ce50a0  ./src.zoneconf/settings/lang_enD.php
-6a6153994b0fad450cc89b93ef32e168  ./src.zoneconf/settings/lang_en.php
-3e03880766730d93605c1d1cc6653165  ./src.zoneconf/settings/lang_nlD.php
-1f08bae5600239da3af886229ac4fbd1  ./src.zoneconf/settings/lang_nl.php
-1bad048b7c1191e91566a6cd40f492b2  ./src.zoneconf/settings/lang.php
-2f45c490c038f5528b7a39a530455116  ./src.zoneconf/settings/lang_plD.php
-c1b899ee536a6d1fc6b68f571d7ea01e  ./src.zoneconf/settings/lang_pl.php
-8a4c7efcb2acc5e295fd2a844188eefe  ./src.zoneconf/settings/lang_ptD.php
-6a6153994b0fad450cc89b93ef32e168  ./src.zoneconf/settings/lang_pt.php
-192e1561bc5a5b5df32e706a310d8796  ./src.zoneconf/settings/ldap_config.php
-eac713931bc54cae0d7e9549434a713a  ./src.zoneconf/settings/ldap.php
-7239b66540c4bd611ff3663109eabe5e  ./src.zoneconf/settings/menuman.php
-f12f433966ff8776c883da1a76ef4757  ./src.zoneconf/settings/passwd.php
-464684ba8d4710c6f0e0a8e434b63992  ./src.zoneconf/settings/settings.php
-732b6e2cbd4462cba15dd06bbd126294  ./src.zoneconf/settings/wizardman.php
-a40eb26151153d06f8375f65c9e73dcd  ./src.zoneconf/socket.php
-9146c15253da836aad52db9ae8beb9ea  ./src.zoneconf/system/installmode.php
-cd68ef05ec000f9f7df2e63f28689986  ./src.zoneconf/system/lang_deD.php
-a44e320fa04c9d28056b5ee1301542f0  ./src.zoneconf/system/lang_de.php
-30a268d443bd27bbd6682c045f79b818  ./src.zoneconf/system/lang_enD.php
-f1449e5521602b93328bf758abaecd54  ./src.zoneconf/system/lang_en.php
-ba4d6ab0400acea00e4d07dfaee3085b  ./src.zoneconf/system/lang_nlD.php
-69db602ee0d2d309e5d3f9d01df20d3d  ./src.zoneconf/system/lang_nl.php
-447c3e6d60f4c4636ef50de0979aed63  ./src.zoneconf/system/lang_plD.php
-3a5334b79b10a6077a4a19815bd737f9  ./src.zoneconf/system/lang_pl.php
-5700f44d82859968b4dd4b69cf3d5173  ./src.zoneconf/system/lang_ptD.php
-f1449e5521602b93328bf758abaecd54  ./src.zoneconf/system/lang_pt.php
-8649e30feb1038028efa88e5b88d948f  ./src.zoneconf/system/menuman.php
-b478c3561f56161662a4be5be2b5399e  ./src.zoneconf/system/power.php
-ff202d31a20df660a8bfe403836b6a0e  ./src.zoneconf/system/shutdown.php
-74d7c0dd6f29a25ffaeca0c678fefde4  ./src.zoneconf/system/smartmon.php
-fa14c73e200540cac6c59433fe6ced39  ./src.zoneconf/system/systemstatus.php
-bedaefa6560a3eaf434fe075f29763c0  ./src.zoneconf/trafficcontrol/edittrafficcontrol.php
-979bdf42d7624eda7c7463e489863b26  ./src.zoneconf/trafficcontrol/getstats.js
-06e8583ea4f009c6cd6be57d3d454d64  ./src.zoneconf/trafficcontrol/getstats.php
-e32b1a5dbbcb89fe32069f1b08506bd0  ./src.zoneconf/trafficcontrol/lang_deD.php
-44153feae89201038f74777080a95d32  ./src.zoneconf/trafficcontrol/lang_de.php
-8f9083fd4c8a5ce6b57b12ea1e4781ab  ./src.zoneconf/trafficcontrol/lang_enD.php
-c78be3db586c1e10ef8e8e22e6de8dd3  ./src.zoneconf/trafficcontrol/lang_en.php
-0087d6ba9e20b85002c4159a8418083c  ./src.zoneconf/trafficcontrol/lang_nlD.php
-79feef663e86affc24539b6beff9af90  ./src.zoneconf/trafficcontrol/lang_nl.php
-2a79d701a5162d8bd79e70925e5412dd  ./src.zoneconf/trafficcontrol/lang_plD.php
-c78be3db586c1e10ef8e8e22e6de8dd3  ./src.zoneconf/trafficcontrol/lang_pl.php
-33e36c4e2d309392212cadc380170bdc  ./src.zoneconf/trafficcontrol/lang_ptD.php
-c78be3db586c1e10ef8e8e22e6de8dd3  ./src.zoneconf/trafficcontrol/lang_pt.php
-642a356cda3f33a25305587704d985d2  ./src.zoneconf/trafficcontrol/listtrafficcontrol.php
-bd3552018c148af941b0811db4eb3cfc  ./src.zoneconf/trafficcontrol/menuman.php
-f6eca05e831102daa8dcf87d5bf2a33d  ./src.zoneconf/trafficcontrol/settings.php
-b1953e2d6d43c8e523c674d2579498c5  ./src.zoneconf/trafficcontrol/trafficcontrol.php
-891ddc9d456ba3fc25fedbe52316d8d4  ./src.zoneconf/traffic/edittc.php
-c8417535586cd231abe520a58c6080eb  ./src.zoneconf/traffic/lang_deD.php
-08f19fdd3ce12a56fbe41d4fa75e5e11  ./src.zoneconf/traffic/lang_de.php
-e2146ac8d6fabb59e9afe891f2658d56  ./src.zoneconf/traffic/lang_enD.php
-765b4d817a98afb0cb0a8624e40a89b0  ./src.zoneconf/traffic/lang_en.php
-ff37023ee18e58e796f76b5d93a72998  ./src.zoneconf/traffic/lang_nlD.php
-1c0310cbda53f950c6511522d05ce750  ./src.zoneconf/traffic/lang_nl.php
-34daccf8d969393c80670b85f1eaade8  ./src.zoneconf/traffic/lang_plD.php
-f4379f4db3a98d02bfd089755937b5e5  ./src.zoneconf/traffic/lang_pl.php
-7b468753866229377ffb2b1751180ec7  ./src.zoneconf/traffic/lang_ptD.php
-765b4d817a98afb0cb0a8624e40a89b0  ./src.zoneconf/traffic/lang_pt.php
-b8b1c1a4059858713516164c86c0b85f  ./src.zoneconf/traffic/menuman.php
-81f618b8ffaaeffd8dbd72722ac1ecd8  ./src.zoneconf/traffic/tc.php
-3986501bbe7e897b5093501f903680ce  ./src.zoneconf/translate.php
-c185f2ed267062021b365ea5a0d6067a  ./src.zoneconf/ul1.png
-5b102320d9b4312ef5c2e82332a32868  ./src.zoneconf/updates/cli.php
-54559aff738f1c254a5cd58b5df27bcd  ./src.zoneconf/updates/lang_deD.php
-a739d3aacb21df85e11d93bede656220  ./src.zoneconf/updates/lang_de.php
-d04f532b9a0e741bc0abcd2a6e089963  ./src.zoneconf/updates/lang_enD.php
-2cb2ca5e3c68cb76f8b03531d78bfe17  ./src.zoneconf/updates/lang_en.php
-503e1cd249534a14131209fea09c1757  ./src.zoneconf/updates/lang_nlD.php
-01f5c0c90c7da5911c6e89567a5b7eac  ./src.zoneconf/updates/lang_nl.php
-468c3e1b4918aa510c42f75e502f3bc9  ./src.zoneconf/updates/lang_plD.php
-738a7901ffd36c619b68fcff367c25d2  ./src.zoneconf/updates/lang_pl.php
-64915f0e0fa9394f42dab110a4dfd5d3  ./src.zoneconf/updates/lang_ptD.php
-2cb2ca5e3c68cb76f8b03531d78bfe17  ./src.zoneconf/updates/lang_pt.php
-730c01d2eb055265cce504e29dffb4d6  ./src.zoneconf/updates/listupdates.php
-5c3cdc87d18926a7a1265ef663d6016b  ./src.zoneconf/updates/menuman.php
-4a63947a7af02309bdae7375f2ed6a84  ./src.zoneconf/updates/model.php
-21e4cf8b07098821ae8494ae0947341b  ./src.zoneconf/updates/mountinstaller.sh
-7fe64670448caf6c42c6ca8971822f1a  ./src.zoneconf/useradmin/editgroup.php
-6b18d5d6b8b4410c1f43f5068227ad89  ./src.zoneconf/useradmin/edituser.php
-780b91c58f9b1272ff6042cf876a923b  ./src.zoneconf/useradmin/grouplist.php
-36d694e6e71cb5af6cb358c569ad3a02  ./src.zoneconf/useradmin/lang_deD.php
-39e7c16e605679cf6c3068e085fed97e  ./src.zoneconf/useradmin/lang_de.php
-40b9748f7bfae9ba548a23fccb6661b6  ./src.zoneconf/useradmin/lang_enD.php
-f7932b76c7f4aed6c8dd7c92d2d67680  ./src.zoneconf/useradmin/lang_en.php
-aeaaa63441de62ab2f57736ca637ae84  ./src.zoneconf/useradmin/lang_nlD.php
-279370c758b1b11f323ad9c556fd6c3e  ./src.zoneconf/useradmin/lang_nl.php
-6aca9cea3098879a5f79abe09f550156  ./src.zoneconf/useradmin/lang_plD.php
-705a5ed3ee2655da2e43879c407c3e26  ./src.zoneconf/useradmin/lang_pl.php
-9a9573b97d840a2a855c958f9a8e773c  ./src.zoneconf/useradmin/lang_ptD.php
-f7932b76c7f4aed6c8dd7c92d2d67680  ./src.zoneconf/useradmin/lang_pt.php
-1e0a6f701ef0c996982b52b1c8e01b42  ./src.zoneconf/useradmin/ldap.php
-616cce3cf8c919939002967bf2cb5181  ./src.zoneconf/useradmin/ldap_tools.php
-b30d1f539ad65344a9f020a550df3b91  ./src.zoneconf/useradmin/menuman.php
-55d2b99cf9c2b7b33f146792d4900274  ./src.zoneconf/useradmin/svcman.php
-99c7810da1933edc186acb7336cfdfca  ./src.zoneconf/useradmin/synclist.php
-1fc1784b29dd0e34f1d10e14e19da0e8  ./src.zoneconf/useradmin/userlist.php
-24a446292905738d80c87d2b71646631  ./src.zoneconf/useradmin/usersync
-7a5c5f6be12db3c4e3f1053bcd538380  ./src.zoneconf/useradmin/usersync.php
-c08c7823d7c9de207a9a1e75621cbd57  ./src.zoneconf/vpn/autoconf_draytek.php
-ad32ca872755da67a35138a0dbfd84cc  ./src.zoneconf/vpn/autoconf.php
-d02ac3ebc12df2792bbd0b8eec8ef841  ./src.zoneconf/vpn/autoconf_syn3.php
-a802efaef2eaf69179bad9e814ac1dd8  ./src.zoneconf/vpn/autoconf_zyxel.php
-96ce9bfe62ce5f5f256eef39dfca7088  ./src.zoneconf/vpn/edittunnel.php
-4321ee1ddec6e6f076dd8d4f7ed1e5de  ./src.zoneconf/vpn/editvpnmon.php
-184a3f96b0cc133cd78bf6ebd41d884d  ./src.zoneconf/vpn/lang_deD.php
-7ae424fa9acd824660028b14a1485f57  ./src.zoneconf/vpn/lang_de.php
-a3a2b7fd25a225e67f19b9786e65afa4  ./src.zoneconf/vpn/lang_enD.php
-7eaca076f85554c43a8375360763fb70  ./src.zoneconf/vpn/lang_en.php
-c63b4951fc52293b01ba1eda47ecb1d4  ./src.zoneconf/vpn/lang_nlD.php
-f2ecee96475d2a6cb534693283f3b600  ./src.zoneconf/vpn/lang_nl.php
-866ce1cf69e6a441ad0a34e6582a330d  ./src.zoneconf/vpn/lang_plD.php
-b9e44a9a5743f4f80ccce35a939d28c3  ./src.zoneconf/vpn/lang_pl.php
-b70b7ef86690f87e3a84ab151cc553c2  ./src.zoneconf/vpn/lang_ptD.php
-7eaca076f85554c43a8375360763fb70  ./src.zoneconf/vpn/lang_pt.php
-68fe52df5c6b55d2c5b3bfb41068ab50  ./src.zoneconf/vpn/listtunnels.php
-e8e328c7c80bdad84edfdca5e551a97e  ./src.zoneconf/vpn/menuman.php
-12f7f990591c7b954d6e2ecd37320f1f  ./src.zoneconf/vpn/openswan.php
-a4d2e5a07f6551f63bfe48d784d4536c  ./src.zoneconf/vpn/testtunnel.php
-c0f4dcc6ed3c9f30ab336a850182fd1e  ./src.zoneconf/vpn/testtunnel.sh
-4948047241c566cc6cdb338cde3fa109  ./src.zoneconf/vpn/tunnelstatus.php
-44f1bb03b68c211e2043ceefd421cd9e  ./src.zoneconf/vpn/ZyXEL.php
-5cf70d23efc677ec6aaefd58f069c6e0  ./src.zoneconf/wizard/lang_deD.php
-a72372048f4a9fb215d3f517b4eeccc0  ./src.zoneconf/wizard/lang_de.php
-323172e503975d63b16bf08fe07ce725  ./src.zoneconf/wizard/lang_enD.php
-371c247f446c342f87a8cc2da7cd073c  ./src.zoneconf/wizard/lang_en.php
-2a1580454cd00d176d36847cb3986b2d  ./src.zoneconf/wizard/lang_nlD.php
-f46d9c7d535d615f195e38c34d041610  ./src.zoneconf/wizard/lang_nl.php
-8419e0098ffcd5550b983c32d74e7a27  ./src.zoneconf/wizard/lang_plD.php
-eed92882f4a00dbe87ab14efeb0b8f8a  ./src.zoneconf/wizard/lang_pl.php
-d565fcec716f05b6a7c0459e0a1572ec  ./src.zoneconf/wizard/lang_ptD.php
-371c247f446c342f87a8cc2da7cd073c  ./src.zoneconf/wizard/lang_pt.php
-25484b2acf7b9b6c55d36d460338a2b2  ./src.zoneconf/wizard/menuman.php
-d041b9616d5f8e91483351a0eb6372b5  ./src.zoneconf/wizard/wizarddone.php
-bf9afb844b7133aa167dbe58b7db7c41  ./src.zoneconf/wizard/wizard.php
-d09c61c7ce23614cdf6ae926302c79b4  ./src.zoneconf/X/lang_deD.php
-aa9a5bdaddb70754250e7ea7ae3d5b56  ./src.zoneconf/X/lang_de.php
-e401c7f4a42e98b33f4451d52fbd7984  ./src.zoneconf/X/lang_enD.php
-aa9a5bdaddb70754250e7ea7ae3d5b56  ./src.zoneconf/X/lang_en.php
-0df846e5362f42d430c4c839979733c3  ./src.zoneconf/X/lang_nlD.php
-aa9a5bdaddb70754250e7ea7ae3d5b56  ./src.zoneconf/X/lang_nl.php
-9ce453763cbc4e90f51bcddb3b920da0  ./src.zoneconf/X/lang_plD.php
-aa9a5bdaddb70754250e7ea7ae3d5b56  ./src.zoneconf/X/lang_pl.php
-1bb049543a86fbc604b1c2b5c91c502e  ./src.zoneconf/X/lang_ptD.php
-aa9a5bdaddb70754250e7ea7ae3d5b56  ./src.zoneconf/X/lang_pt.php
-bd1134535daf7e8b8fe3f6735788872d  ./src.zoneconf/X/menuman.php
-2c1d4e3bb7476aef0678e14448f463bc  ./src.zoneconf/X/model.php
-b3bafd683407d6bb90f9e8a66babd9e8  ./src.zoneconf/X/selectconf.php
-3dcc3c3508f5467e8578bc2c7993e02d  ./src.zoneconf/X/wizardman.php
-380cac25536df20cb3b8e00df95950f3  ./.tags
-cfbf1f13ab80634dd4faa4e352a91ee2  ./.tags1
 5ba83de23cbc647b688be953cb28f6de  ./trafficcontrol/config
 d41d8cd98f00b204e9800998ecf8427e  ./trafficcontrol/errors
@@ -2256,6 +1160,6 @@
 3d8b121024940b3004ca67bacb88b74e  ./updatelang.sh
 e15c0d77cf349ff3f2c55bf1b48ea567  ./upload.sh
-877660fa496fa35a59e682fd75152661  ./webint.pkg
+f8eb0845a6df6d7feb5e53cc437fd971  ./webint.pkg
 05d46c478b4e8c14eafeb686a5b8c064  ./webint.SlackBuild
-adf73c19c52ff3dd9479b000f4cd0fef  ./webint.SlackBuild.log.gz
+83e26534916d5989dd01f6c50a3dfe15  ./webint.SlackBuild.log.gz
 693ffd7c59a1fe2b34276bec14f3ebfb  ./zones.conf
Index: npl/syncupdates
===================================================================
--- npl/syncupdates	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/syncupdates	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-
+rm -rf .tmp 2>/dev/null
 HOST="updates@www.syn-3.nl";
 
@@ -19,5 +19,4 @@
 echo "Searching packages..."
 for PKG in `find . -name "$FILTER"`; do
-	echo $PKG
 
 	#dont upload _dev stuff, we dont use it and it wastes space and time :)
@@ -26,7 +25,6 @@
 	fi
     
-	echo -n "Verifying update $PKG...";
+	#echo -n "Verifying update $PKG...";
 	TGZ=`./pkgname $PKG` || exit 1
-
 
 	MOD=
@@ -37,5 +35,5 @@
 	#dont upload mods by default
 	if [ "$MOD" ] && ! [ "$MODS" ]; then
-		echo "NOT uploading uncommitted version. (use 'MODS=1 $0 .... ' to upload anyway)"
+		echo "NOT uploading uncommitted version. (use 'MODS=1 $0 .... ' to upload anyway): $PKG"
 		continue
 	fi
Index: npl/system/binutils/binutils.SlackBuild
===================================================================
--- npl/system/binutils/binutils.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,220 +1,19 @@
-#!/bin/sh
-
-# Copyright 2005-2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
+#!/bin/bash
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port.
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/d/binutils/
+# Created at Tue Jan 31 22:11:28 CET 2017
 
 
-PKGNAM=binutils
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./binutils.SlackBuild.orig
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-# Uncomment this to include the experimental gold linker:
-GOLD=" --enable-gold=yes --enable-ld=default "
-
-# Set to ld.gold or ld.bfd:
-DEFAULT_LD=ld.bfd
-
-# The --enable-initfini-array option was added in binutils-2.21.51.0.3.
-# This option currently causes a world of hurt trying to compile glibc,
-# and might break static libraries or cause other ill effects.  There
-# is an upstream patch for glibc but it does not avoid all of the known
-# problems (and there may be some unknown ones, too), so we will avoid
-# introducing this feature for now.
-# References:
-# http://sourceware.org/bugzilla/show_bug.cgi?id=12343
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46770
-NO_INITFINI=" --disable-initfini-array "
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  # The config option below is currently needed to compile on x86:
-  WERROR="--enable-werror=no"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  # The config option below is currently needed to compile on x86:
-  WERROR="--enable-werror=no"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-binutils
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf binutils-$VERSION
-tar xvf $CWD/binutils-$VERSION.tar.xz || \
-  tar xvf $CWD/binutils-$VERSION.tar.bz2 || exit 1
-cd binutils-$VERSION
-
-# Export the demangle.h header file:
-zcat $CWD/binutils.export.demangle.h.diff.gz | patch -p1 --verbose || exit 1
-# Don't check to see if "config.h" was included in the installed headers:
-zcat $CWD/binutils.no-config-h-check.diff.gz | patch -p1 --verbose || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-# End of preparations
-if echo "$*" | grep -qw -- --prep ; then
-  exit 0
-fi
-
-# Build for an x86 glibc2-based Linux system:
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --with-docdir=/usr/doc/binutils-$VERSION \
-  --enable-shared \
-  --enable-multilib \
-  --enable-64-bit-bfd \
-  --enable-plugins \
-  --enable-threads \
-  --enable-targets=i386-efi-pe,${TARGET},x86_64-slackware-linux \
-  $GOLD \
-  $NO_INITFINI \
-  $WERROR \
-  --build=$TARGET \
-  || exit 1
-
-make clean || exit 1
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# "make install" skips this, but binutils.spec doesn't.  Sneaky, huh?
-cp -a include/libiberty.h $PKG/usr/include/libiberty.h
-
-# Differentiate between BSD strings and GNU strings
-( cd $PKG/usr/bin ; mv strings strings-GNU )
-( cd $PKG/usr/man/man1 ; mv strings.1 strings-GNU.1 )
-
-# Move ldscripts to /usr/lib${LIBDIRSUFFIX}, and then put symlinks in place
-mv $PKG/usr/${TARGET}/lib/ldscripts $PKG/usr/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/${TARGET}
-  ln -s /usr/lib${LIBDIRSUFFIX}/ldscripts lib/ldscripts
-  for FILE in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip ; do
-    if [ -r "/usr/bin/$FILE" ]; then
-      rm -f bin/$FILE
-      ln -s /usr/bin/$FILE bin/$FILE
-    fi
-  done
-)
-
-# If the requested default linker is present, make it the default:
-# Set the link differently on the system to change the default at runtime.
-if [ -r $PKG/usr/bin/$DEFAULT_LD ]; then
-  ( cd $PKG/usr/bin ; rm -f ld ; ln -sf $DEFAULT_LD ld )
-fi
-      
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Remove some unneeded man pages, and then compress the rest
-rm -f $PKG/usr/man/man1/{dlltool,windres}.1
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-# Compress info pages
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
-mkdir -p $PKG/usr/doc/binutils-$VERSION
-cp \
-  $CWD/release.binutils-* \
-  COPYING* ChangeLog.linux MAI* README* \
-  $PKG/usr/doc/binutils-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-chown -R root:root $PKG/usr/doc/binutils-$VERSION
-
-# Add slack-desc:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/binutils-$VERSION-$ARCH-$BUILD.txz
-
-cat << EOF
-
-#############################
-oprofile links to libbfd so
-be sure to recompile that
-#############################
-
-EOF
 
 ############ make syn3 packages
 cd $CWD
 for PKG in /tmp/package-*; do
-        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/'`
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
 
         #seperate dev-package
Index: npl/system/binutils/binutils.SlackBuild.orig
===================================================================
--- npl/system/binutils/binutils.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/binutils/binutils.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,225 @@
+#!/bin/sh
+
+# Copyright 2005-2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+
+PKGNAM=binutils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i586 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# Uncomment this to include the experimental gold linker:
+GOLD=" --enable-gold=yes --enable-ld=default "
+
+# Set to ld.gold or ld.bfd:
+DEFAULT_LD=ld.bfd
+
+# The --enable-initfini-array option was added in binutils-2.21.51.0.3.
+# This option currently causes a world of hurt trying to compile glibc,
+# and might break static libraries or cause other ill effects.  There
+# is an upstream patch for glibc but it does not avoid all of the known
+# problems (and there may be some unknown ones, too), so we will avoid
+# introducing this feature for now.
+# References:
+# http://sourceware.org/bugzilla/show_bug.cgi?id=12343
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46770
+NO_INITFINI=" --disable-initfini-array "
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  # The config option below is currently needed to compile on x86:
+  WERROR="--enable-werror=no"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  # The config option below is currently needed to compile on x86:
+  WERROR="--enable-werror=no"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-binutils
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf binutils-$VERSION
+tar xvf $CWD/binutils-$VERSION.tar.xz || \
+  tar xvf $CWD/binutils-$VERSION.tar.bz2 || exit 1
+cd binutils-$VERSION
+
+# Various upstream patches:
+zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.20.51.0.10-ppc64-pie.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.23.52.0.1-addr2line-dynsymtab.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose || exit 1
+
+# Export the demangle.h header file:
+zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose || exit 1
+# Don't check to see if "config.h" was included in the installed headers:
+zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose || exit 1
+
+# Set %version to something halfway meaningful:
+sed -i -e 's/%''{release}/slack15/g' bfd/Makefile{.am,.in}
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# End of preparations
+if echo "$*" | grep -qw -- --prep ; then
+  exit 0
+fi
+
+# Build for an x86 glibc2-based Linux system:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --with-docdir=/usr/doc/binutils-$VERSION \
+  --disable-compressed-debug-sections \
+  --enable-shared \
+  --enable-multilib \
+  --enable-64-bit-bfd \
+  --enable-plugins \
+  --enable-threads \
+  --enable-targets=i386-efi-pe,${TARGET} \
+  --enable-install-libiberty \
+  $GOLD \
+  $NO_INITFINI \
+  $WERROR \
+  --build=$TARGET \
+  || exit 1
+
+make clean || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Differentiate between BSD strings and GNU strings
+( cd $PKG/usr/bin ; mv strings strings-GNU )
+( cd $PKG/usr/man/man1 ; mv strings.1 strings-GNU.1 )
+
+# Move ldscripts to /usr/lib${LIBDIRSUFFIX}, and then put symlinks in place
+mv $PKG/usr/${TARGET}/lib/ldscripts $PKG/usr/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/${TARGET}
+  ln -s /usr/lib${LIBDIRSUFFIX}/ldscripts lib/ldscripts
+  for FILE in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip ; do
+    if [ -r "/usr/bin/$FILE" ]; then
+      rm -f bin/$FILE
+      ln -s /usr/bin/$FILE bin/$FILE
+    fi
+  done
+)
+
+# If the requested default linker is present, make it the default:
+# Set the link differently on the system to change the default at runtime.
+if [ -r $PKG/usr/bin/$DEFAULT_LD ]; then
+  ( cd $PKG/usr/bin ; rm -f ld ; ln -sf $DEFAULT_LD ld )
+fi
+      
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Remove some unneeded man pages, and then compress the rest
+rm -f $PKG/usr/man/man1/{dlltool,windres}.1
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+# Compress info pages
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/binutils-$VERSION
+cp \
+  COPYING* MAI* README* \
+  $PKG/usr/doc/binutils-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+chown -R root:root $PKG/usr/doc/binutils-$VERSION
+
+# Add slack-desc:
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/binutils-$VERSION-$ARCH-$BUILD.txz
+
+cat << EOF
+
+#############################
+oprofile links to libbfd so
+be sure to recompile that
+#############################
+
+EOF
Index: npl/system/binutils/binutils.arch
===================================================================
--- npl/system/binutils/binutils.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-x86_64
+i586
Index: npl/system/binutils/binutils.build
===================================================================
--- npl/system/binutils/binutils.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6129
+1
Index: npl/system/binutils/binutils.md5
===================================================================
--- npl/system/binutils/binutils.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,10 +1,18 @@
-0a9e211002c3a2a98c0e58971285bc23  ./binutils-2.24.51.0.3.tar.sign
-49757ef8c29ddf84ddf2a1f8b574f7e0  ./binutils-2.24.51.0.3.tar.xz
-b921b4f29f3b5daf7e5ebe9067c5836a  ./binutils_dev.pkg
-5debe7740b469ad78acd9a614c39fd98  ./binutils.export.demangle.h.diff.gz
-11da9c6411c6066874ed96a67dd3f2f6  ./binutils.no-config-h-check.diff.gz
-34d85f8a29ec8376bdd1a82168878c4a  ./binutils.pkg
-95f4f63f3a519243d345a81bf772550d  ./binutils.SlackBuild
-fbb3677eb20875df6b6d6d44343b05fd  ./binutils.SlackBuild.log.gz
-8d4116b9475f4a3fe60a25b98d23545d  ./release.binutils-2.24.51.0.3
+234b04790532412bd31a7a21e33185fb  ./binutils-2.27.tar.xz
+861b0c3d88cb79cd4149627c65e35fbc  ./binutils_dev.pkg
+3982b87f95c1200cb018e72f75de9e3b  ./binutils.pkg
+7f13e0d96ac92c01b28982be5c4b0b7d  ./binutils.SlackBuild
+894b8309c73cf5d0958aff273e242b1a  ./binutils.SlackBuild.log.gz
+d564b6b948659d0936cd78675fb88386  ./binutils.SlackBuild.orig
+30edc86c02ef680578eef6525ed75104  ./patches/binutils-2.20.51.0.10-copy-osabi.patch.gz
+6c7c3374183a78abe904232a6f3660fa  ./patches/binutils-2.20.51.0.10-ppc64-pie.patch.gz
+ecfda8fd71319b431465a9ab2636b26a  ./patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz
+f4d3198bc0b89b19dfd128a63bea1158  ./patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz
+91ba29de94ce2acb9941b4f9783eeb4e  ./patches/binutils-2.23.52.0.1-addr2line-dynsymtab.patch.gz
+e34a73939779f1302ac0b65bafa3e885  ./patches/binutils-2.24-ldforcele.patch.gz
+f4696d3799487767d8051b645ca1a7bb  ./patches/binutils-2.25.1-cleansweep.patch.gz
+6917b40650fa4757a567b2a03cdbe566  ./patches/binutils-2.25-set-long-long.patch.gz
+0f572aa5829f3d3a1a7fe1672a79bccd  ./patches/binutils-2.25-version.patch.gz
+5debe7740b469ad78acd9a614c39fd98  ./patches/binutils.export.demangle.h.diff.gz
+11da9c6411c6066874ed96a67dd3f2f6  ./patches/binutils.no-config-h-check.diff.gz
 3983d265f1969f866b729416a27d5668  ./slack-desc
Index: npl/system/binutils/binutils.version
===================================================================
--- npl/system/binutils/binutils.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.24.51.0.3
+2.27
Index: npl/system/binutils/binutils_dev.arch
===================================================================
--- npl/system/binutils/binutils_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-x86_64
+i586
Index: npl/system/binutils/binutils_dev.build
===================================================================
--- npl/system/binutils/binutils_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+1
Index: npl/system/binutils/binutils_dev.version
===================================================================
--- npl/system/binutils/binutils_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/binutils/binutils_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.24.51.0.3
+2.27
Index: npl/system/binutils/release.binutils-2.24.51.0.3
===================================================================
--- npl/system/binutils/release.binutils-2.24.51.0.3	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,899 +1,0 @@
-This is the beta release of binutils 2.24.51.0.3 for Linux, which is
-based on binutils 2014 0127 master branch on sourceware.org plus
-various changes. It is purely for Linux.
-
-All relevant patches in patches have been applied to the source tree.
-You can take a look at patches/README to see what have been applied and
-in what order they have been applied.
-
-Starting from the 2.23.52.0.2 release, when creating executables, BFD
-linker will issue an error for undefined weak reference which is
-defined in a shared library from DT_NEEDED.  Previously BFD linker
-will silently include the shared library from DT_NEEDED.
-
-Starting from the 2.21.51.0.3 release, you must remove .ctors/.dtors
-section sentinels when building glibc or other C run-time libraries.
-Otherwise, you will run into:
-
-http://sourceware.org/bugzilla/show_bug.cgi?id=12343
-
-Starting from the 2.21.51.0.2 release, BFD linker has the working LTO
-plugin support. It can be used with GCC 4.5 and above. For GCC 4.5, you
-need to configure GCC with --enable-gold to enable LTO plugin support.
-
-Starting from the 2.21.51.0.2 release, binutils fully supports compressed
-debug sections.  However, compressed debug section isn't turned on by
-default in assembler. I am planning to turn it on for x86 assembler in
-the future release, which may lead to the Linux kernel bug messages like
-
-WARNING: lib/ts_kmp.o (.zdebug_aranges): unexpected non-allocatable section.
-
-But the resulting kernel works fine.
-
-Starting from the 2.20.51.0.4 release, no diffs against the previous
-release will be provided.
-
-You can enable both gold and bfd ld with --enable-gold=both.  Gold will
-be installed as ld.gold and bfd ld will be installed as ld.bfd.  By
-default, ld.bfd will be installed as ld.  You can use the configure
-option, --enable-gold=both/gold to choose gold as the default linker,
-ld.  IA-32 binary and X64_64 binary tar balls are configured with
---enable-gold=both/ld --enable-plugins --enable-threads.
-
-Starting from the 2.18.50.0.4 release, the x86 assembler no longer
-accepts
-
-	fnstsw %eax
-
-fnstsw stores 16bit into %ax and the upper 16bit of %eax is unchanged.
-Please use
-
-	fnstsw %ax
-
-Starting from the 2.17.50.0.4 release, the default output section LMA
-(load memory address) has changed for allocatable sections from being
-equal to VMA (virtual memory address), to keeping the difference between
-LMA and VMA the same as the previous output section in the same region.
-
-For
-
-.data.init_task : { *(.data.init_task) }
-
-LMA of .data.init_task section is equal to its VMA with the old linker.
-With the new linker, it depends on the previous output section. You
-can use
-
-.data.init_task : AT (ADDR(.data.init_task)) { *(.data.init_task) }
-
-to ensure that LMA of .data.init_task section is always equal to its
-VMA. The linker script in the older 2.6 x86-64 kernel depends on the
-old behavior.  You can add AT (ADDR(section)) to force LMA of
-.data.init_task section equal to its VMA. It will work with both old
-and new linkers. The x86-64 kernel linker script in kernel 2.6.13 and
-above is OK.
-
-The new x86_64 assembler no longer accepts
-
-	monitor %eax,%ecx,%edx
-
-You should use
-
-	monitor %rax,%ecx,%edx
-
-or
-	monitor
-
-which works with both old and new x86_64 assemblers. They should
-generate the same opcode.
-
-The new i386/x86_64 assemblers no longer accept instructions for moving
-between a segment register and a 32bit memory location, i.e.,
-
-	movl (%eax),%ds
-	movl %ds,(%eax)
-
-To generate instructions for moving between a segment register and a
-16bit memory location without the 16bit operand size prefix, 0x66,
-
-	mov (%eax),%ds
-	mov %ds,(%eax)
-
-should be used. It will work with both new and old assemblers. The
-assembler starting from 2.16.90.0.1 will also support
-
-	movw (%eax),%ds
-	movw %ds,(%eax)
-
-without the 0x66 prefix. Patches for 2.4 and 2.6 Linux kernels are
-available at
-
-http://www.kernel.org/pub/linux/devel/binutils/linux-2.4-seg-4.patch
-http://www.kernel.org/pub/linux/devel/binutils/linux-2.6-seg-5.patch
-
-The ia64 assembler is now defaulted to tune for Itanium 2 processors.
-To build a kernel for Itanium 1 processors, you will need to add
-
-ifeq ($(CONFIG_ITANIUM),y)
-	CFLAGS += -Wa,-mtune=itanium1
-	AFLAGS += -Wa,-mtune=itanium1
-endif
-
-to arch/ia64/Makefile in your kernel source tree.
-
-Please report any bugs related to binutils 2.24.51.0.3 to
-hjl.tools@gmail.com
-
-and
-
-http://www.sourceware.org/bugzilla/
-
-Changes from binutils 2.24.51.0.2:
-
-1. Update from binutils 2014 0127.
-2. Fix a linker crash with mixed IR/non-IR input objects.
-3. Update readelf/objdump to display versioned symbol names when dumping
-dynamic relocations.  PR 16496.
-4. Update linker to improve orphaned TLS section handling.  PR 16498.
-5. Update linker to check incompatible existing default symbol definition.
-PR 16467.
-6. Update linker to properly handle non-PIC references to __ehdr_start in
-pie and shared object.  PR 16428.
-7. Update bfd to properly generate PT_GNU_RELRO segment for ld and
-objcopy.  PRs 14207/16322/16323.
-8. Update x86 assembler to check for invalid register set in AVX512 gather
-instructions.  PR 16489.
-9. Update empty section handling in linker.
-10. Avoid invalid directory in linker library search.  PR 16456.
-11. Improve x86 disassembler.
-12. Improve gold.
-13. Improve COFF support.
-14. Add nds32 support.
-15. Improve aarch64 support.
-16. Improve arm support.
-17. Improve mips support.
-18. Improve msp430 support.
-19. Improve ppc support.
-20. Improve rl78 support.
-21. Improve z80 support.
-
-Changes from binutils 2.24.51.0.1:
-
-1. Update from binutils 2013 1213.
-2. Fix ld and objcopy to set the SHF_INFO_LINK bit for SHT_REL/SHT_RELA
-sections.  PR 16317.
-3. Fix ld and objcopy to properly generate PT_GNU_RELRO segment. PRs
-14207/16322/16323.
-4. Fix objcopy to copy EI_OSABI field.  PR 16318.
-5. Change ld to set e_type in ELF header to ET_EXEC for -pie
--Ttext-segment=.
-6. Fix a ld bug for --as-needed with symbol versioning.
-7. Add gas/ld/gold support for R_X86_64_PC32_BND and R_X86_64_PLT32_BND
-relocations.
-8. Fix an assembler line listing bug.  PR 16109.
-9. Improve gold.
-10. Improve nacl support.
-11. Improve COFF support.
-12. Improve aarch64 support.
-13. Improve arm support.
-14. Improve hppa support.
-15. Improve mips support.
-16. Improve ppc support.
-
-Changes from binutils 2.23.52.0.2:
-
-1. Update from binutils 2013 1106.
-2. Add Intel AVX-512 new instruction support.
-3. Add Intel MPX new instruction support.
-4. Update ld to support x86-64 large PIC model with TLS GD and LD sequences.
-5. Fix ld to properly handle R_X86_64_DTPOFF64.  PR 15685.
-6. Fix x86 assembler to properly check 64-bit register.
-7. Update x86 assembler not to align text/data/bss sections for ELF.
-8. Fix x86 assembler to properly support cvttps2pi.  PR 13572.
-9. Fix ld to generate warning sections in glibc.  PR 15762.
-10. Avoid corrupted binary generated by objcopy/strip.  PR 16056.
-11. Improve ld hash.  PR 15657.
-12. Fix objdump on /proc/kcore.  PR 15818.
-13. Improve DWARF support.
-14. Improve addr2line.  PR 15994.
-15. Improve readelf.  PR 15745.
-16. Improve gold.
-17. Improve nacl support.
-18. Improve aarch64 support.
-19. Improve arm support.
-20. Improve cris support.
-21. Improve hppa support.
-22. Improve m32c support.
-23. Improve m68k support.
-24. Improve mips support.
-25. Improve msp430 support.
-26. Improve nios2 support.
-27. Improve ppc support.
-28. Improve rl78 support.
-29. Improve rx support.
-30. Improve rs6000 support.
-31. Improve s390 support.
-32. Improve sparc support.
-33. Improve tile support.
-34. Improve vax support.
-
-Changes from binutils 2.23.52.0.1:
-
-1. Update from binutils 2013 0426.
-2. Add x32 support to embedded x86_64 ELF target.
-3. Fix an x86 IFUNC linker regression.  PR 15371.
-4. Fix an LTO linker weak definition bug.  PR 15323.
-5. Remove stale dynamic table entries for symbols optimized out by LTO.
-PR 15270.
-6. Revert the fix for PR 15149.  When creating executables, BFD linker
-won't issue an error for undefined weak reference which is defined in
-7 shared library from DT_NEEDED.
-8. Ignore weak reference which is is defined in a shared library from
-DT_NEEDED.  This may change the behavior of resulting binaries with
-undefined weak reference.  List libraries needed on command-line as work
-around.  PR 12549.
-9. Fix a MIPS ELF linker crash.  PR 15382.
-10. Align LMA per VMA alignment only if needed.  PR 15222.
-11. Fix a BFD decompress memory leak.  PR 15356.
-12. Properly check SIB byte in x86 disassembler.
-13, Fix invalid memory access in readelf.  PR 15191.
-14, Fix invalid memory access in DWARF dumper.  PRs 15206/15202/15201.
-15. Improve gold.
-16. Improve aarch64 support.
-17. Improve arm support.
-18. Improve avr support.
-19. Improve h8300 support.
-20. Improve mips support.
-21. Improve nios2 support.
-22. Improve ppc support.
-23. Improve rl78 support.
-24. Improve sh support.
-25. Improve sparc support.
-26. Improve tic6x support.
-27. Improve v850 support.
-
-Changes from binutils 2.23.51.0.9:
-
-1. Update from binutils 2013 0226.
-2. Add Intel SAMP new instruction support.
-3. Allow dynamic R_386_SIZE32, R_X86_64_SIZE32 and R_X86_64_SIZE64
-relocations agaist TLS symbols.
-4. Fix BFD linker to set STB_GNU_UNIQUE only for definition.  PR 15167.
-5. Fix BFD linker to set STB_GNU_UNIQUE only if symbol is defined in
-regular object.  PR 15107.
-6. Don't add DT_NEEDED for references from the LTO IR input.  PR 15146.
-7. When creating executables, BFD linker will issue an error for undefined
-weak reference which is defined in a shared library from DT_NEEDED.
-PR 15149.
-8. Also trace symbol from the LTO IR input.  PR 15141.
-9. Support stripping LTO IR sections.  PR 15033.
-10. Don't allow a nested archive pointing to itself and don't generate
-bad archive.  PR 15140.
-11. Fix objcopy segfault on non-ELF input.  PR 14873.
-12. Update DWARF dump support.
-13. Improve gold.
-14. Add nios2 support.
-15. Improve mach support.
-16. Improve aarch64 support.
-17. Improve arm support.
-18. Improve avr support.
-19. Improve h8300 support.
-20. Improve meta support.
-21. Improve mips support.
-22. Improve ppc support.
-23. Improve rl78 support.
-24. Improve sparc support.
-25. Improve v850 support.
-
-Changes from binutils 2.23.51.0.8:
-
-1. Update from binutils 2013 0118.
-2. Support R_386_SIZE32, R_X86_64_SIZE32 and R_X86_64_SIZE64
-relocations.
-3. Fix x86 assembler for "xtrn@got -1".  PR 15019.
-4. Don't generate old dtags with --enable-new-dtags.
-5. Add Meta support.
-6. Improve gold.
-7. Improve aarch64 support.
-8. Improve arm support.
-9. Improve cr16 support.
-10. Improve mips support.
-11. Improve ppc support.
-12. Improve v850 support.
-13. Improve xgate support.
-
-Changes from binutils 2.23.51.0.7:
-
-1. Properly adjust h->plt.refcount.  PR 14980.
-
-Changes from binutils 2.23.51.0.6:
-
-1. Update from binutils 2012 1218.
-2. Add missing R_*_IRELATIVE relocations.  PR 14968.
-3. Remove unnecessary R_*_NONE relocations.  PR 14956.
-4. Fix ar/ranlib on 32-bit filesystems.  PR 14933.
-5. Fix a "Not enough room for program headers" linker bug.  PR 14926.
-6. Support self-assignment in a linker script to convert symbols to
-absolute.  PR 14962.
-7. Support --copy-dt-needed-entries when creating DSO.  PR 14915.
-8. Improve linker plugin DSO error handling.  PR 14904.
-9. Issue warning for plugin dummy.  PR 12760.
-10. Add -fuse-ld=bfd|gold support to ld and gold.
-11. Fix gold configure.  PR 14897.
-12. Correct gas dependency.  PR 14899.
-13. Add rdos support.
-14. Improve gold.
-15. Improve nacl support.
-16. Improve aarch64 support.
-17. Improve arm support.
-18. Improve microblaze support.
-19. Improve mips support.
-20. Improve ppc support.
-21. Improve tile support.
-
-Changes from binutils 2.23.51.0.5:
-
-1. Update from binutils 2012 1123.
-2. Fix 64-bit jecxz encoding regression in x86 assembler.  PR 14859.
-3. Revert an accidental linker change.  PR 14862.
-4. Fix x32 TLS LD to LE optimization in gold.  PR 14858.
-5. Add "-z global" option to set DF_1_GLOBAL to ld.
-6. Improve ld plugin error handling.
-7. Port ld lib32 arrangement from Debian.
-8. Properly set the output maxpagesize when rewriting program header.
-PR 14493.
-9. Add additional DF_1_XXX support to readelf.
-10. Improve nacl support with separate code segments.
-11. Improve macos support.
-12. Improve arm support.
-13. Improve microblaze support.
-14. Improve mips support.
-15. Improve ppc support.
-16. Improve sparc support.
-
-Changes from binutils 2.23.51.0.4:
-
-1. Update from binutils 2012 1110.
-2. Support new Linux NOTE sections.
-3. Add -z stacksize=SIZE option to ld to set size of stack segment.
-4. Fix a BFD IOVEC close bug.  PR 14813.
-5. Fix a BFD IOVEC on archive bug.  PR 14567.
-6. Fix archive support for non-ELF targets.  PR 14481.
-7. Improve gold.
-8. Improve COFF support.
-9. Improve arm support.
-10. Improve microblaze support.
-11. Improve mips support.
-12. Improve ppc support.
-13. Improve rx support.
-14. Improve s390 support.
-15. Improve v850 support.
-16. Improve xgate support.
-
-Changes from binutils 2.23.51.0.3:
-
-1. Update from binutils 2012 1026.
-2. Fix an LTO linker bug.  PR 14747.
-3. Add cx16 arch feature to x86 assembler.
-4. Add -march=bdver3 option to x86 assembler.
-5. Properly handle ignored REX prefix with fwait in x86 disassembler.
-6. Fix x32 register names in objdump DWARF output.
-7. Add NT_SIGINFO/NT_FILE support to readelf.
-8. Add linker --ignore-unresolved-symbol option from NetBSD.
-9. Treat .gdb_index section as debug section.  PR 14662.
-10. Add --debug-dump=addr, --debug_dump=cu_index options to readelf and
-objdump.
-11. Add dwp, DWARF packaging utility.
-12. Add compressed debug section support to Windows.  PR 14067. 
-13. Improve gold.
-14. Improve aarch64 support.
-15. Improve arm support.
-16. Improve hppa support.
-17. Improve mips support.
-18. Improve s390 support.
-19. Improve tile support.
-20. Improve v850 support.
-
-Changes from binutils 2.23.51.0.2:
-
-1. Update from binutils 2012 0918.
-2. Properly handle versioned STB_SECONDARY symbols. 
-3. Fix wrong symbol type with common symbol and weak function.  PR 14591.
-4. Ignore discarded sections when converting mov to lea.
-5. Improve gold.
-6. Improve avr support.
-7. Improve aarch64 support.
-8. Improve moxie support.
-9. Improve ppc support.
-10. Improve tile support.
-
-Changes from binutils 2.23.51.0.1:
-
-1. Update from binutils 2012 0908.
-2. Fix STB_SECONDARY support:
-   a. Generate STB_SECONDARY symbols in DSO by default.
-   b. Properly handle STB_SECONDAY symbols when linking with archive.
-   c. Don't allow .weak directive to override .secondary directive.
-3. Optimize i386/x86-64 linker to convert GOT load (MOV) to LEA.
-4. Clarify x86 assembler error messages.  PR 14457.
-5. Improve NOP/prefetch support in x86 disassembler.
-6. Improve Intel syntax support in x86 assembler.
-7. Add -march={btver1, btver2} options to x86 assembler.
-8. Fix binutils build with --enable-shared.  PR 4970.
-9. Also provide __executable_start for PIE.  PR 14525.
-10. Use xmalloc to allocate memory for argument list file.  PR 14526.
-11. Add Intel Itanium Series 9500 support to assembler/diassembler.
-12. Ignore section symbols without a BFD section when outputing symbols
-and check bad section index.  PR 14493.
-13. Improve archive reader.  PR 14475.
-14. Support DW_OP_GNU_const_index reader.
-15. Improve handling of imput files with empty ELF group sections.
-PR 14444.
-16. Fix IFUNC support in s390 linker.
-17. Improve gold.
-18. Add aarch64 support.
-19. Improve arm support.
-20. Improve mips support.
-21. Improve mmix support.
-22. Improve moxie support.
-23. Improve ppc support.
-24. Improve s390 support.
-25. Improve tile support.
-
-Changes from binutils 2.22.52.0.4:
-
-1. Update from binutils 2012 0806.
-2. Add Intel ADX, RDSEED and PRFCHW new instruction support.
-3. Support 'rep bsf', 'rep bsr', and 'rep ret' syntax in x86 assembler.
-4. Mark 256-bit vmovntdqa as AVX2 instruction for x86 assembler.
-5. Improve x86 assembler error handling.
-6. Improve the repeat directive support in assembler.  PR 14201.
-7. Improve x86-64 disassembler on superfluous prefixes.
-8. Fix x86 disassembler crash on bad XOP instructions.  PR 14355.
-9. Support STB_SECONDARY:
-
-https://groups.google.com/forum/?hl=en&fromgroups#!forum/generic-abi
-
-10. Added SORT_NONE to the linker script language to disable section
-sorting and properly handle .init/.fini sections.  PR 14156.
-11. Fix a weak alias linker bug.  PR 14323.
-12. Fix the NULL GNU_RELRO segment linker bug.  PR 14207.
-13. Fix the bad GNU_RELRO segment linker bug.  PR 14215.
-14. Add linker support of __ehdr_start symbol for the ELF file header.
-15. Add IFUNC support to s390 linker.
-16. Fix ar for >4GB member.  PR 14302.
-17. Fix objcopy --compress-debug-sections on empty debug section.  PR
-14319.
-18. Fix readelf/objdup to display null bytes in DWARF debug info.  PR
-14420.
-19. Improve gold.
-20. Improve arm support.
-21. Improve avr support.
-22. Improve cris support.
-23. Improve m68k support.
-24. Improve mips support.
-25. Improve ppc support.
-26. Improve vax support.
-27. Improve xgate support.
-
-Changes from binutils 2.22.52.0.3:
-
-1. Update from binutils 2012 0604.
-2. Check addend overflow for R_X86_64_RELATIVE64.
-3. Fix ar/nm/ranlib with --plugin.
-4. Create .eh_frame_hdr section only if needed.  PR 13909.
-5. Properly create .eh_frame section for PLT.  PR 14105. 
-6. Fix a linker crash. PR 14170.
-7. Fix readelf to properly display addend.
-8. Don't make _DYNAMIC/_GLOBAL_OFFSET_TABLE_/_PROCEDURE_LINKAGE_TABLE_
-symbols absolute for x86 and ppc.
-9. Properly handle shared libraries with zero dynamic symbols.  PRs
-7023/13962.
-10. Update readelf/assembler to support multibyte characters in symbol
-names.
-11. Add --strip-dwo/--extract-dwo options to objcopy/strip.
-12. Add R_X86_64_RELATIVE64 support to gold.
-13. Improve gold.
-14. Improve NACL support.
-15. Improve alpha support.
-16. Improve avr support.
-17. Improve m68k support.
-18. Improve mips support.
-19. Improve ppc support.
-20. Improve vax support.
-
-Changes from binutils 2.22.52.0.2:
-
-1. Update from binutils 2012 0507.
-2. Fix Linux kernel build by reverting the PR 13621 fix.  PR 14052.
-3. Add support for x86_64-*-linux-gnux32 target.
-4. Improve x86 assembler.
-5. Improve DWARF support.
-6. Improve gold.
-7. Improve rx support.
-8. Improve sparc support.
-9. Add xgate support.
-
-Changes from binutils 2.22.52.0.1:
-
-1. Update from binutils 2012 0424.
-2. Support Intel HLE and RTM extension.
-3. Add NACL support.
-4. Fix -Bsymbolic with protected function pointer.  PR 13880.
-5. Fix an IFUNC regression.  PR 13817.
-6. Fix x86 NOP fill regression.  PR 13675.
-7. Fix a linker regression.  PR 13991. 
-8. Fix dangling global hidden symbol in symtab.  PR 13621.
-9. Fix objcopy, strip and ld for --emit-relocs.  PR 13947.
-10. Improve gold.
-11. Improve mach support.
-12. Improve vms support.
-13. Improve windows support.
-14. Improve arm support.
-15. Improve avr support.
-16. Improve mips support.
-17. Improve ppc support.
-18. Improve rx support.
-19. Improve s390 support.
-20. Improve sh support.
-21. Improve sparc support.
-22. Improve tile support.
-
-Changes from binutils 2.22.51.0.1:
-
-1. Update from binutils 2012 0131.
-2. Add x32 support to gold.
-3. Support linker arch-depedent fill.  PR 13616.
-4. Add i386 NACL support to x86 assembler.
-5. Add fake zero displacement for .d8 and .d32 suffixes to x86 assembler.
-6. Add vmfunc support to x86 assembler/disassembler.
-7. Support >2GB archive member.  PR 13534.
-8. Support R_X86_64_PC32 relocation for PIC on x32.  PR 13581.
-9. Fix LTO linker with --start-group and archive.  PR 12758.
-10. Fix linker with --build-id.  PR 12451.
-11. Improve linker dead code dependency removal on DSO.  PR 12772.
-12. Improve demangler.
-13. Fix elf64-x86-64.c build with GCC 4.7.
-14. Avoid linker -z text crash.  PR 13468.
-15. Avoid readelf crash.  PR 13622.
-16. Avoid nm crash on --size-sort --no-sort.  PR 13593.
-17. Fix linker COFF SECREL32 relocation support.  PR 13491.
-18. Improve gold.
-19. Improve mach support.
-20. Improve arm support.
-21. Improve avr support.
-22. Improve hppa support.
-23. Improve m68k support.
-24. Improve mips support.
-25. Improve ppc support.
-26. Improve rl78 support.
-27. Improve rx support.
-
-Changes from binutils 2.21.53.0.2:
-
-1. Update from binutils 2011 1118.
-2. Fix ar --plugin on archive with mixed IR/non-IR objects.  PR 13298.
-3. Preserve the maximum alignment and size for common symbols.  PR 13250.
-4. Fix LTO linker with -as-needed.  PR 13287.
-5. Fix --plugin support on thin archive.  PR 13257.
-6. Fix LTO linker on thin archive.  PR 13183.
-7. Fix --plugin slim object support on archive.  PR 13278.
-8. Support LDPR_PREVAILING_DEF_IRONLY_EXP in linker plugin.  PR 13229.
-9. Don't make make IR symbols dynamic.  PR 13244.
-10. Fix LTO linker with --as-needed.  PR 13201.
-11. Properly handle 2 IR symbols with the same comdat key.  PR 13066.
-12. Keep .debug_types sections with linker garbage collection.  PR 13233.
-13. Fix -ffunction-sections -Wl,--gc-sections failure with symbol
-versioning.  PR 13195.
-14. Improve linker garbage collection support.  PR 13177.
-15. Remove symbols hidden by version scripts with --gc-sections.  PR 12975.
-16. Remove unnecessary GOT relocation created for IFUNC.  PR 13178.
-17. Move IRELATIVE relocations to the end.  PR 13302.
-18. Avoid readelf core dump.  PR 13219.
-19. Check zero address size when dumping DWARF sections.  PR 13196.
-20. Remove the group section if all members are removed.  PR 13180.
-21. Support R_X86_64_64 and R_X86_64_RELATIVE64 relocations for x32.
-PR 13082.
-22. Add Adapteva Epiphany support.
-23. Add Renesas RL78 support.
-24. Improve gold.
-25. Improve mach-o support.
-26. Improve alpha support.
-27. Improve arm support.
-28. Improve hppa support.
-29. Improve mips support.
-30. Improve ppc support.
-31. Improve rx support.
-32. Improve sparc support.
-
-Changes from binutils 2.21.53.0.1:
-
-1. Update from binutils 2011 0804.
-2. Add Intel K1OM support.
-3. Allow R_X86_64_64 relocation for x32 and check x32 relocation overflow.
-PR ld/13048.
-4. Support direct call in x86-64 assembly code.  PR gas/13046.
-5. Add ia32 Google Native Client support. 
-6. Add .debug_macro section support.
-7. Improve gold.
-8. Improve VMS support.
-9. Improve arm support.
-10. Improve hppa support.
-11. Improve mips support.
-12. Improve mmix support.
-13. Improve ppc support.
-
-Changes from binutils 2.21.52.0.2:
-
-1. Update from binutils 2011 0716.
-2. Fix LTO linker bugs.  PRs 12982/12942.
-3. Fix rorx support in x86 assembler/disassembler for AVX Programming
-Reference (June, 2011).
-4. Fix an x86-64 ELFOSABI linker regression.
-5. Update ELFOSABI_GNU support.  PR 12913.
-6. Fix a linker regression with prelink support.  PR 12921.
-7. Add unwind info to x86 PLT section.  PR 12570.
-8. Support x32 core files.
-9. Support native x32 linker.
-10. Fix linker --gc-sections on note sections.  PR 12851.
-11. Avoid linker crash on bad input.  PR 12887.
-12. Add section flags in linker script.
-13. Improve elf linker -z option support.
-14. Fix nm on compressed debug sections.  PR 12983.
-15. Fix an ar bug.  PR 12558.
-16. Fix an ia64 linker regression.  PR 12978.
-17. Improve gold.
-18. Improve VMS support.
-19. Add TILE-Gx/TILEPro support.
-20. Improve alpha support.
-21. Improve avr support.
-22. Improve mips support.
-23. Improve arm support.
-24. Improve ppc support.
-25. Improve sh support.
-26. Improve TIC6X support.
-
-Changes from binutils 2.21.52.0.1:
-
-1. Update from binutils 2011 0610.
-2. Support AVX Programming Reference (June, 2011)
-3. Allow R_X86_64_64 relocations in SEC_DEBUGGING sections when building
-x32 shared libraries.  Used to build kernel x32 vDSO.
-4. Fix linker --gc-sections on note sections.  PR 12851.
-5. Update readelf to handle binaries containing corrupt version
-information.  PR 12855.
-6. Improve gold.
-7. Improve VMS support.
-8. Improve mips support.
-
-Changes from binutils 2.21.51.0.9:
-
-1. Update from binutils 2011 0608.
-2. Fix an x86 linker regression. PRs 12833/12837/12859.
-3. Fix an x86-64 large model TLS linker bug.  PR 12809.
-4. Fix LTO bugs.  PRs 12758/12760.
-5. Add a new linker switch, -plugin-save-temps.
-6. Fix an linker bug for warning on common symbol in archive.
-7. Fix warning support when building shared library.  PR 12761.
-8. Reduce linker memory usage when linking many small object files.
-PR 12682.
-9. Fix a thin archive bug.  PR 12710.
-10. Fix a TLS linker bug.  PR 12763.
-11. Improve gold.
-12. Improve DWARF dump support.
-13. Improve XCOFF support.
-14. Improve arm support.
-15. Improve cris support.
-16. Improve ia64 ILP32 support.
-17. Improve mips support.
-18. Improve ppc support.
-19. Improve rx support.
-20. Improve s390 support.
-21. Improve tic30 support.
-22. Improve tic6x support.
-23. Improve v850 support.
-
-Changes from binutils 2.21.51.0.8:
-
-1. Update from binutils 2011 0507.
-2. Improve LTO bfd linker.  PRs 12365/12696/12672
-3. Fix a linker regression with constructor attribute in C++.  PR 12730.
-4. Warn relocation in readonly section when creating a shared object.
-5. Remove empty output sections.  PR 12718.
-6. Remove DT_TEXTREL with local IFUNC symbols.  PR 12694.
-7. Properly set ELFOSABI_LINUX for STB_GNU_UNIQUE. PR 10549.
-8. Fix objcopy on unusual input.  PR 12632.
-9. Fix an ar regression.  PR 12720.
-10  Avoid linker crash on bad linker input.
-11. Fix a linker script regression.  PR 12726.
-12. Support new GNU DWARF extensions.
-13. Initial support for SystemTap note sections.
-14. Add --dwarf-start and --dwarf-end to readelf and objdump. 
-15. Disable 3dnow and 3dnowa for bdver1 in x86 assembler.
-16. Improve gold.
-17. Improve VMS support.
-18. Improve arm support.
-19. Improve mips support.
-20. Improve ppc support.
-21. Improve s390 support.
-22. Improve tic6x support.
-
-Changes from binutils 2.21.51.0.7:
-
-1. Update from binutils 2011 0408.
-2. Fix x32 TLS linker bug.
-3. Enable .quad directive in x32 assembler.
-4. Fix an assembler regression.  PRs 12569/12589.
-5. Add --size-check= assembler option to issue a warning, instead of an
-error, on bad ELF .size directive.
-6. Fix an ia32 linker bug with TLS/PIE.  PR 12654.
-7. Fix Intel L1OM linker library search path.
-8. Fix a linker buffer overflow on malformed inputs.  PR 12613.
-9. Check corrupted symtab in nm/readelf.  PR 12639.
-10. Avoid objcopy crash on archive with unknown objects.  PR 12632.
-11. Fix "ar -t".  PR 12590.
-12. Fix many memory leaks.
-13. Improve DWARF support.
-14. Improve gold.
-15. Improve VMS support.
-16. Improve Windows support.
-17. Improve alpha support.
-18. Improve arm support.
-19. Improve avr support.
-20. Improve ppc support.
-21. Improve sparc support.
-22. Improve tic6x support.
-
-Changes from binutils 2.21.51.0.6:
-
-1. Update from binutils 2011 0306.
-2. Supprt x32 TLS IE->LE transition.
-3. Change x32 library directory from /lib32 to /libx32.
-4. Improve LTO linker support.  Fix PRs 12439/12314/12248/12430.
-5. Improve linker plugin support.
-6. Fix an ar bug.  PR 12513.
-7. Properly generate nops for ia32. PR 6957.
-8. Improve readelf DT_GNU_HASH support.  PR 12523.
-9. Improve readelf on invalid input.  PR 12467.
-10. Update ELF assembler to issue an error on invalid  .size directive.
-PR 12519,
-11. Properly handle PT_DYNAMIC segment with zero size sections.  PR 12516.
-12.  Add a new linker option, --verbose=2, to report plugin symbol
-status.
-13. Properly handle entry symbols in linker LTO support.  PR 12507.  
-14. Improve gold.
-15. Improve arm support.
-16. Improve bfin support.
-17. Improve mips support.
-18. Improve ppc support.
-
-Changes from binutils 2.21.51.0.5:
-
-1. Update from binutils 2011 0118.
-2. Fix x32 (ILP32) support.  Renamed assembler option to --x32.  It
-can create working static and dynamic x32 executables.
-3. Add BMI and TBM new instruction support.
-4. Fix x86 disassembler to properly display sign-extended byte.
-5. Improve IFUNC linker support.  PRs 12366/12371.
-6. Fix readelf bug on archive. PR 12408.
-7. Fix a assembler when compressing empty debug sections.  PR 12409.
-8. Fix a warning symbol linker bug.  PR 12339.
-9. Fix a duplicated assert message linker bug.  PR 12380.
-10. Fix plugin linker build.  PR 12391.
-11. Fix a plugin linker crash.  PR 12364.
-12. Improve plugin linker.
-13. Improve gold.
-14. Improve arm support.
-15. Improve mips support.
-16. Improve rx support.
-
-Changes from binutils 2.21.51.0.4:
-
-1. Update from binutils 2011 0104.
-2. Add ILP32 support:
-
-http://www.kernel.org/pub/linux/devel/binutils/ilp32/abi.pdf
-
-to Linux/x86-64.
-3. Prevent the Linux x86-64 kernel build failure and remove
-__ld_compatibility support.  PR 12356.
-4. Improve gold.
-5. Improve Windows support.
-6. Improve hppa support.
-7. Improve mips support.
-
-Changes from binutils 2.21.51.0.3:
-
-1. Update from binutils 2010 1217.
-2. Fix the Linux relocatable kernel build.  PR 12327.
-3. Improve mips support.
-
-Changes from binutils 2.21.51.0.2:
-
-1. Update from binutils 2010 1215.
-2. Add BFD linker support for placing input .ctors/.dtors sections in
-output .init_array/.fini_array section.  Add SORT_BY_INIT_PRIORITY.  The
-benefits are
-   a. Avoid output .ctors/.dtors section in executables and shared
-      libraries.
-   b. Allow mixing input .ctors/.dtors sections with input
-   .init_array/.fini_array sectiobs.  GCC PR 46770.
-3. Add BFD linker support for "ld -r" on mixed IR/non-IR objects. Add
-the new ELF section type SHT_GNU_OBJECT_ONLY (0x6ffffff8). See
-
-http://sourceware.org/bugzilla/show_bug.cgi?id=12291
-
-4. Update BFD linker to accept -flto and -flto-partition= for GCC LTO
-option compatibility.
-5. Fix BFD linker to avoid touching uncompressed section content when
-relocating DWARF debug sections for errror reporting.
-6. Mark .gnu.lto_* sections with SHF_EXCLUDE.
-7. Add --target option to ar.
-8. Improve gold.
-9. Improve AIX support.
-10. Improve Windows support.
-11. Improve mips support.
-
-Changes from binutils 2.21.51.0.1:
-
-1. Update from binutils 2010 1206.
-2. Fix BFD and GOLD linker for compressed debug section support.
-3. Fix BFD linker plugin support.  PR ld/12246, ld/12247, ld/12248,
-ld/12277, ld/12288 and ld/12289.
-4. Update BFD linker to group .text.exit, text.startup and .text.hot
-sections.
-5. Fix linker for W_EH_PE_datarel handling.  PR ld/12253.
-6. Fix array access bug in readelf/elfedit.  PR binutils/11742 and
-binutils/12235.
-7. Support dumping GDB .gdb_index section.
-8. Install plugin-api.h.
-9. Improve gold.
-10. Improve Solaris support.
-11. Improve VMS support.
-12. Improve Windows support.
-13. Improve arm support.
-14. Improve bfin support.
-15. Improve mips support.
-16. Improve s390 support.
-17. Improve z80 support.
-
-Changes from binutils 2.20.51.0.12:
-
-1. Update from binutils 2010 1110.
-2. Fix ld plugin support.  PRs lto/46291 and lto/46319.
-3. Fix x86 assembler to properly fold _GLOBAL_OFFSET_TABLE_ in Intel
-syntax.  PR 12186.
-4. Update assembler to ensure that group signature symbols have the name
-of the group.
-5. Avoid unnecessary relaxation in assembler.  PR 12049.
-6. Update linker NOLOAD processing.
-7. Update linker not to include archive members when symbols therein have
-already been defined.  PR 12001.
-8. Change objdump to display compressed section names without 'z'.
-9. Improve gold.
-10. Improve Solaris support.
-11. Improve VMS support.
-12. Improve Windows support.
-13. Improve arm support.
-14. Improve cr16 support.
-15. Improve mips support.
-16. Improve ppc support.
-17. Improve tic6x support.
-
-The file list:
-
-1. binutils-2.24.51.0.3.tar.bz2.  Source code.
-
-The primary sites for the beta Linux binutils are:
-
-1. http://www.kernel.org/pub/linux/devel/binutils/
-
-It is also available as hjl/linux/release/2.24.51.0.3 tag at
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=summary
-
-Thanks.
-
-
-H.J. Lu
-hjl.tools@gmail.com
-01/27/2014
Index: npl/system/coreutils/coreutils-8.26.tar.xz.sig
===================================================================
--- npl/system/coreutils/coreutils-8.26.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils-8.26.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJYPyRpAAoJEN9v2XEwYDfZ0I4P/3oaPYXMPEOKuDDpEcLumn26
+gYIMQc1jIMbBNQe120gQmNPkRr5dTKt5Bap9qYkCj0pI/6VxVIWDo0xrOLYZi7AN
+Xgr0kX2qLDFEH+EHkC1BpsAdpsgwfvLmVWPHS62CNKgVDgGiP1cRJZe8oVmlBCiR
+3ES7pUsBfDn3hbdKNTTmMDtro1rQMOxfHkVCZLAva+JjdzpE+KTvzZzKkVuZZfJ/
+Mi/ZySrXZXFvPBS7GXgop4x8EodyzQMeKO+nvpIUEBY1yLQgCvni5/CBI8w/EViD
+DSjj0zWsCQkEjx6HCohi8sBHUYZ+M3lB4rkFk7aevdioPZUGfLkW31LT/cUJC/VV
+MIQKWzQtZO/WCJuyEbWP2m25c4MtnnhTm5yoi29yT/CoTRlUWkIQpXm4oD1cJXHy
+PpHveu8qM0qRaAtVdXE3pmapIMYUV4g7vxSuCjZRrgiDLhp/K7Lzt5xBhl++kPU2
+U9uc202eah4Towo0pbHsuEJT0vk0GGLq8/17dCa/ss8wV+86ZLxl0kZYy4CNEnIW
+vsCN6CJ5AoAEVrMN1F7ZJYnH4hoJedvIczThnAkNTqYYE3wnN9stOe28Oy/a0/tg
+bt5/Mn0JbmQei890uU8zcEdUjidHqGV4hKk1E2UC4UCyHG/VcHv9gfr8OaD/xPDr
+SoauDCHpBU7J7FT/DX+k
+=vkKy
+-----END PGP SIGNATURE-----
Index: npl/system/coreutils/coreutils.SlackBuild
===================================================================
--- npl/system/coreutils/coreutils.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/a/coreutils/
+# Created at Tue Feb  7 16:45:04 CET 2017
+
+
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./coreutils.SlackBuild.orig
+
+
+############ make syn3 packages
+cd $CWD
+for PKG in /tmp/package-*; do
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
+
+        #seperate dev-package
+        syn3_move_dev $PKG $PKG""_dev
+        syn3_makepkg $PKG""_dev $NAME""_dev $VERSION $ARCH || exit 1
+
+        #make main package
+        syn3_makepkg $PKG $NAME $VERSION $ARCH || exit 1
+done
Index: npl/system/coreutils/coreutils.SlackBuild.orig
===================================================================
--- npl/system/coreutils/coreutils.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,213 @@
+#!/bin/sh
+
+# Copyright 2005-2016  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PKGNAM=coreutils
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "armel" ]; then
+  SLKCFLAGS="-O2 -march=armv4t"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+
+rm -rf $PKGNAM-$VERSION
+if [ -r $CWD/$PKGNAM-$VERSION.tar.gz ]; then
+  tar xf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1
+elif [ -r $CWD/$PKGNAM-$VERSION.tar.bz2 ]; then
+  tar xf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+elif [ -r $CWD/$PKGNAM-$VERSION.tar.xz ]; then
+  tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+elif [ -r $CWD/$PKGNAM-$VERSION.tar.lzma ]; then
+  tar xf $CWD/$PKGNAM-$VERSION.tar.lzma || exit 1
+else
+  exit 1
+fi
+
+cd $PKGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Patch uname to correctly display CPU information:
+zcat $CWD/$PKGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+# Revert change to ls quoting style introduced in coreutils-8.25:
+zcat $CWD/no_ls_quoting.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+# Compilation with glibc version later than 2.3.2 needs the environment
+# variable DEFAULT_POSIX2_VERSION set to 199209.
+# Without that line, the coreutils will start complaining about 'obsolete'
+# command switches, like "tail -20" will be considered obsolete.
+# This behaviour breaks many other packages... the 'obsolete' parameters are
+# too commonly used to disregard them.  Better to stick with the older more
+# widely accepted standards until things begin to demand the new way.
+
+FORCE_UNSAFE_CONFIGURE=1 \
+CFLAGS="$SLKCFLAGS" \
+DEFAULT_POSIX2_VERSION=199209 \
+./configure \
+  --prefix=/usr \
+  --bindir=/bin \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --without-gmp \
+  --enable-install-program=arch \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# We have had the mktemp from debianutils included with Slackware for quite a
+# long time, and certain options are changed here, like changing -u to mean a
+# dry-run rather than to unlink the tempfile when finished.  Since this could
+# break existing scripts, unless someone can tell me a good reason why we
+# should start using a new version of mktemp, we will continue to use the
+# one we've been using.  If the new one starts to become expected, let me know.
+# We'll figure out what the best options are and go from there.
+mv $PKG/bin/mktemp $PKG/bin/mktemp-gnu
+mv $PKG/usr/man/man1/mktemp.1 $PKG/usr/man/man1/mktemp-gnu.1
+
+# This seems wrong, and it stomps on files in the ksh93 package, though I'm
+# not sure the placement of those is correct, either...  The ksh93 package
+# installs them as flat text files, while coreutils installs empty directories
+# Oh well, this is what we've done for years, and nobody's complained...
+rm -rf $PKG/usr/share/locale/*/LC_TIME
+
+# Move "arch" to /bin
+#mv $PKG/usr/bin/arch $PKG/bin
+
+# These are important enough that they should probably all go into /bin at this
+# point...   Having some of them unavailable when /usr isn't mounted is just a
+# source of unending bug reports for various third party applications.
+# Time to end those reports.  :-)
+mkdir -p $PKG/bin $PKG/usr/bin
+( cd $PKG/usr/bin
+  for file in ../../bin/* ; do
+    ln --verbose -sf $file .
+  done
+)
+
+# Add some defaults, although a very slack-like set of default options are built
+# into /bin/ls now anyway:
+mkdir -p $PKG/etc
+zcat $CWD/DIR_COLORS.gz > $PKG/etc/DIR_COLORS.new
+
+# Since dircolors no longer provides any default aliases these scripts
+# will be needed for ls to act as expected:
+mkdir -p $PKG/etc/profile.d
+zcat $CWD/coreutils-dircolors.csh.gz > $PKG/etc/profile.d/coreutils-dircolors.csh
+zcat $CWD/coreutils-dircolors.sh.gz > $PKG/etc/profile.d/coreutils-dircolors.sh
+chmod 755 $PKG/etc/profile.d/*
+
+# Remove things that are provided by other Slackware packages:
+for dupe in hostname kill su uptime ; do
+  rm -f $PKG/bin/${dupe} $PKG/usr/bin/${dupe} \
+    $PKG/usr/sbin/${dupe} $PKG/usr/man/man?/${dupe}.* ;
+done
+
+# Add ginstall links (there's still a lot of stuff that needs this to compile):
+( cd $PKG/bin ; ln -sf install ginstall )
+( cd $PKG/usr/bin ; ln -sf ../../bin/ginstall ginstall )
+( cd $PKG/usr/man/man1 ; ln -sf install.1 ginstall.1 )
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* NEWS README* THANKS THANKS-to-translators TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
Index: npl/system/coreutils/coreutils.arch
===================================================================
--- npl/system/coreutils/coreutils.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/system/coreutils/coreutils.build
===================================================================
--- npl/system/coreutils/coreutils.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/system/coreutils/coreutils.md5
===================================================================
--- npl/system/coreutils/coreutils.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,14 @@
+d5aa2072f662d4118b9f4c63b94601a6  ./coreutils-8.26.tar.xz
+f6ac686f508858d62374d9edb1f8ea88  ./coreutils-8.26.tar.xz.sig
+419b935183bacb0ff3100db65d218473  ./coreutils_dev.pkg
+86dd1cc125f7138297e9a10633bf2d82  ./coreutils-dircolors.csh.gz
+cd092337faf2c8309b48e574db7a5ea5  ./coreutils-dircolors.sh.gz
+2745eb3318d0c8f7e68a311d0847f0db  ./coreutils.pkg
+0db8f0da29429fcd78917ad0b1037ded  ./coreutils.SlackBuild
+19004c7fe88dfb330710b7077c6dd7cb  ./coreutils.SlackBuild.log.gz
+6ad68d8609cd593346cd5b0562485ff1  ./coreutils.SlackBuild.orig
+c152b70ec55f7ab70948043900c27b00  ./coreutils.uname.diff.gz
+a5de102e7876a5d48e865ff8365c4fa8  ./DIR_COLORS.gz
+fabe7ac8614465a69eaa8bea5604bc4f  ./doinst.sh.gz
+dbd225cab4c76b71d9bae2f71c233e32  ./no_ls_quoting.patch.gz
+5127129e23beb0f5101752b91e30e75f  ./slack-desc
Index: npl/system/coreutils/coreutils.version
===================================================================
--- npl/system/coreutils/coreutils.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+8.26
Index: npl/system/coreutils/coreutils_dev.arch
===================================================================
--- npl/system/coreutils/coreutils_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/system/coreutils/coreutils_dev.build
===================================================================
--- npl/system/coreutils/coreutils_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+1
Index: npl/system/coreutils/coreutils_dev.version
===================================================================
--- npl/system/coreutils/coreutils_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/coreutils_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+8.26
Index: npl/system/coreutils/slack-desc
===================================================================
--- npl/system/coreutils/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/coreutils/slack-desc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+coreutils: coreutils (core GNU utilities)
+coreutils:
+coreutils: These are the GNU core utilities, the basic command line programs
+coreutils: such as 'mkdir', 'ls', and 'rm' that are needed for the system to
+coreutils: run.  This package is the union of the GNU fileutils, sh-utils, and
+coreutils: textutils packages.  Most of these programs have significant
+coreutils: advantages over their Unix counterparts, such as greater speed,
+coreutils: additional options, and fewer arbitrary limits.
+coreutils:
+coreutils:
+coreutils:
Index: npl/system/gcc/c89.sh
===================================================================
--- npl/system/gcc/c89.sh	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/c89.sh	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,10 @@
+#!/bin/sh
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
Index: npl/system/gcc/c99.sh
===================================================================
--- npl/system/gcc/c99.sh	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/c99.sh	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,10 @@
+#!/bin/sh
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}
Index: npl/system/gcc/ecj.url
===================================================================
--- npl/system/gcc/ecj.url	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/ecj.url	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+ftp://sourceware.org/pub/java/ecj-4.9.jar
Index: npl/system/gcc/gcc.SlackBuild
===================================================================
--- npl/system/gcc/gcc.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,802 +1,42 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/d/gcc/
+# Created at Tue Jan 31 00:22:45 CET 2017
+
+#NEED:gawk
+#NEED:binutils
+
+#DEP:zlib
 #DEP:gmp
+#DEP:mpfr
 #DEP:mpc
-#DEP:mpfr
+#DEP:gtk2
+#DEP:glib2
+#DEP:pango
+#DEP:cairo
+#DEP:pixman
+#DEP:fontconfig
+#DEP:freetype2
+#DEP:expat
+#DEP:libpng
+#DEP:gdk_pixbuf
+#DEP:xorg_lib
+#DEP:pthread_stubs
+#DEP:atk
+#DEP:harfbuzz
+#DEP:libart_lgpl
+#DEP:libffi
 
-# GCC package build script (written by volkerdi@slackware.com)
-#
-# Copyright 2003, 2004  Slackware Linux, Inc., Concord, California, USA
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+#for testing
+#NEED:tcl
 
-# Modified 2011 by Eric Hameleers <alien at slackware.com> for OpenJDK.
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
 
-# Some notes, Fri May 16 12:31:32 PDT 2003:
-#
-# Why i486 and not i386?  Because the shared C++ libraries in gcc-3.2.x will
-# require 486 opcodes even when a 386 target is used (so we already weren't
-# compatible with the i386 for Slackware 9.0, didn't notice, and nobody
-# complained :-).  gcc-3.3 fixes this issue and allows you to build a 386
-# compiler, but the fix is done in a way that produces binaries that are not
-# compatible with gcc-3.2.x compiled binaries.  To retain compatibility with
-# Slackware 9.0, we'll have to use i486 (or better) as the compiler target
-# for gcc-3.3.
-#
-# It's time to say goodbye to i386 support in Slackware.  I've surveyed 386
-# usage online, and the most common thing I see people say when someone asks
-# about running Linux on a 386 is to "run Slackware", but then they also 
-# usually go on to say "be sure to get an OLD version, like 4.0, before glibc,
-# because it'll be more efficient."  Now, if that's the general advice, then
-# I see no reason to continue 386 support in the latest Slackware (and indeed
-# it's no longer easily possible).
+#export GCCCHECK=1
+source ./gcc.SlackBuild.orig
 
-PKGNAM=gcc
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# How many jobs to run in parallel:
-NUMJOBS=" -j 7 "
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=i386
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=i386
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=i386
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=i386
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=s390
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  LIB_ARCH=amd64
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=armv7hl
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=$ARCH
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-CWD=$(pwd)
-# Temporary build location.  This should *NOT* be a directory
-# path a non-root user could create later...
-TMP=${TMP:-"/gcc-$(mcookie)"}
-
-# This is the main DESTDIR target:
-PKG1=$TMP/package-gcc
-# These are the directories to build other packages in:
-PKG2=$TMP/package-gcc-g++
-PKG3=$TMP/package-gcc-gfortran
-PKG4=$TMP/package-gcc-gnat
-PKG5=$TMP/package-gcc-java
-PKG6=$TMP/package-gcc-objc
-PKG7=$TMP/package-gcc-g++-gch
-PKG8=$TMP/package-gcc-go
-
-# Clear the build locations:
-if [ -d $TMP ]; then
-  rm -rf $TMP
-fi
-mkdir -p $PKG{1,2,3,4,5,6,7,8}/usr/doc/gcc-$VERSION
-
-# Insert package descriptions:
-mkdir -p $PKG{1,2,3,4,5,6,7,8}/install
-cat $CWD/slack-desc.gcc > $PKG1/install/slack-desc
-cat $CWD/slack-desc.gcc-g++ > $PKG2/install/slack-desc
-cat $CWD/slack-desc.gcc-gfortran > $PKG3/install/slack-desc
-cat $CWD/slack-desc.gcc-gnat > $PKG4/install/slack-desc
-cat $CWD/slack-desc.gcc-java > $PKG5/install/slack-desc
-cat $CWD/slack-desc.gcc-objc > $PKG6/install/slack-desc
-# cat $CWD/slack-desc.gcc-g++-gch > $PKG7/install/slack-desc
-cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc
-
-cd $TMP
-tar xvf $CWD/gcc-$VERSION.tar.?z*
-
-#( cd gcc-$VERSION
-#  If we had any patches, we would apply them here, but we're .diff free now.
-#) || exit 1
-
-# Copy ecj.jar into the TLD of the source. Needed for java compiler.
-# This can be retrieved from ftp://sourceware.org/pub/java
-cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar
-
-# Use an antlr runtime to compile javadoc.
-# The runtime can be obtained from:
-#https://oss.sonatype.org/content/repositories/releases/org/antlr/antlr-runtime/
-ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
-
-# install docs
-( cd gcc-$VERSION
-  # Smite the fixincludes:
-  zcat $CWD/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-  # Fix perms/owners
-  chown -R root:root .
-  find . -perm 777 -exec chmod 755 {} \;
-  find . -perm 775 -exec chmod 755 {} \;
-  find . -perm 754 -exec chmod 755 {} \;
-  find . -perm 664 -exec chmod 644 {} \;
-  mkdir -p $PKG1/usr/doc/gcc-$VERSION
-  cp -a \
-    COPYING* ChangeLog* FAQ INSTALL \
-    LAST_UPDATED MAINTAINERS NEWS \
-    README* *.html \
-  $PKG1/usr/doc/gcc-$VERSION
-
-  # We will keep part of these, but they are really big...
-  if [ -r ChangeLog ]; then
-    DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION)
-    cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-    touch -r ChangeLog $DOCSDIR/ChangeLog
-  fi
-  if [ -r NEWS ]; then
-    DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION)
-    cat NEWS | head -n 1000 > $DOCSDIR/NEWS
-    touch -r NEWS $DOCSDIR/NEWS
-  fi
-
-  mkdir -p $PKG1/usr/doc/gcc-${VERSION}/gcc
-  ( cd gcc
-    cp -a \
-      ABOUT* COPYING* DATESTAMP DEV-PHASE LANG* ONEWS README* SERVICE \
-    $PKG1/usr/doc/gcc-$VERSION/gcc
-         
-    mkdir -p $PKG3/usr/doc/gcc-${VERSION}/gcc/fortran
-    ( cd fortran
-      if [ -r ChangeLog ]; then
-        cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-$VERSION/gcc/fortran/ChangeLog
-        touch -r ChangeLog $PKG3/usr/doc/gcc-$VERSION/gcc/fortran/ChangeLog
-      fi
-    )
-
-    mkdir -p $PKG4/usr/doc/gcc-${VERSION}/gcc/ada
-    ( cd ada
-      cp -a \
-        ChangeLog.tree-ssa \
-      $PKG4/usr/doc/gcc-$VERSION/gcc/ada
-      if [ -r ChangeLog ]; then
-        cat ChangeLog | head -n 1000 > $PKG4/usr/doc/gcc-$VERSION/gcc/ada/ChangeLog
-        touch -r ChangeLog $PKG4/usr/doc/gcc-$VERSION/gcc/ada/ChangeLog
-      fi
-    )
-
-    mkdir -p $PKG5/usr/doc/gcc-${VERSION}/gcc/java
-    ( cd java
-      cp -a \
-        ChangeLog.tree-ssa \
-      $PKG5/usr/doc/gcc-${VERSION}/gcc/java
-      if [ -r ChangeLog ]; then
-        cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
-        touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
-      fi
-    )
-  
-    mkdir -p $PKG6/usr/doc/gcc-${VERSION}/gcc/objc
-    ( cd objc
-      cp -a \
-        README* \
-      $PKG6/usr/doc/gcc-${VERSION}/gcc/objc
-      if [ -r ChangeLog ]; then
-        cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog
-        touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog
-      fi
-    )
-
-    mkdir -p $PKG8/usr/doc/gcc-${VERSION}/gcc/go
-    ( cd go
-      if [ -r ChangeLog ]; then
-        cat ChangeLog | head -n 1000 > $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
-        touch -r ChangeLog $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
-      fi
-      cp -a \
-        README* THREADS* \
-        gofrontend/{LICENSE,PATENTS,README} \
-      $PKG8/usr/doc/gcc-${VERSION}/gcc/go
-    )
-
-  ) || exit 1
-
-  mkdir -p $PKG3/usr/doc/gcc-${VERSION}/libgfortran
-  ( cd libgfortran
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-${VERSION}/libgfortran/ChangeLog
-      touch -r ChangeLog $PKG3/usr/doc/gcc-${VERSION}/libgfortran/ChangeLog
-    fi
-  )
-
-  mkdir -p $PKG4/usr/doc/gcc-${VERSION}/libada
-  ( cd libada
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG4/usr/doc/gcc-${VERSION}/libada/ChangeLog
-      touch -r ChangeLog $PKG4/usr/doc/gcc-${VERSION}/libada/ChangeLog
-    fi
-  )
-
-  mkdir -p $PKG5/usr/doc/gcc-${VERSION}/libffi
-  ( cd libffi
-    cp -a \
-      ChangeLog.libgcj ChangeLog.v1 \
-      LICENSE* README* \
-    $PKG5/usr/doc/gcc-${VERSION}/libffi
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/libffi/ChangeLog
-      touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/libffi/ChangeLog
-    fi
-  )
-
-  mkdir -p $PKG5/usr/doc/gcc-${VERSION}/libjava
-  ( cd libjava
-    cp -a \
-      COPYING* HACKING LIBGCJ_LICENSE \
-      NEWS README* THANKS \
-    $PKG5/usr/doc/gcc-${VERSION}/libjava
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/libjava/ChangeLog
-      touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/libjava/ChangeLog
-    fi
-  )
-
-  mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libmudflap
-  ( cd libmudflap
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
-      touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
-    fi
-  )
-
-  mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libgomp
-  ( cd libgomp
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
-      touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
-    fi
-  )
-  
-  mkdir -p $PKG6/usr/doc/gcc-${VERSION}/libobjc
-  ( cd libobjc
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/libobjc/ChangeLog
-      touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/libobjc/ChangeLog
-    fi
-    cp -a \
-      README* THREADS* \
-    $PKG6/usr/doc/gcc-${VERSION}/libobjc
-  )
-    
-  mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3
-  ( cd libstdc++-v3
-    cp -a \
-      README* \
-      doc/html/faq.html \
-    $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3
-    if [ -r ChangeLog ]; then
-      cat ChangeLog | head -n 1000 > $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
-      touch -r ChangeLog $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
-    fi
-  )
-
-)
-
-# Add fastjar to the gcc-java package:
-( cd $TMP
-  FASTJARVER=$(echo $CWD/fastjar-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-  echo
-  echo "Building fastjar-$FASTJARVER first"
-  echo
-  rm -rf fastjar-$FASTJARVER
-  tar xvf $CWD/fastjar-$FASTJARVER.tar.xz || exit 1
-  cd fastjar-$FASTJARVER || exit 1
-  chown -R root:root .
-  find . \
-    \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-    -exec chmod 755 {} \; -o \
-    \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-    -exec chmod 644 {} \;
-  for patch in $CWD/fastjar-patches/*.gz ; do
-    zcat $patch | patch -p1 --verbose || exit 1
-  done
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-     --prefix=/usr \
-     --libdir=/usr/lib$LIBDIRSUFFIX \
-     --mandir=/usr/man \
-     --infodir=/usr/info \
-     --build=$TARGET
-  make $NUMJOBS || exit 1
-  make install DESTDIR=$PKG5 || exit 1
-  mkdir -p $PKG5/usr/doc/fastjar-$FASTJARVER
-  cp -a \
-    AUTHORS CHANGES COPYING* INSTALL NEWS README* TODO \
-    $PKG5/usr/doc/fastjar-$FASTJARVER
-  # If there's a ChangeLog, installing at least part of the recent history
-  # is useful, but don't let it get totally out of control:
-  if [ -r ChangeLog ]; then
-    DOCSDIR=$(echo $PKG5/usr/doc/fastjar-$FASTJARVER)
-    cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-    touch -r ChangeLog $DOCSDIR/ChangeLog
-  fi
-  find $PKG5 | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-    | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  # Compress and if needed symlink the man pages:
-  if [ -d $PKG5/usr/man ]; then
-    ( cd $PKG5/usr/man
-      for manpagedir in $(find . -type d -name "man*") ; do
-        ( cd $manpagedir
-          for eachpage in $( find . -type l -maxdepth 1) ; do
-            ln -s $( readlink $eachpage ).gz $eachpage.gz
-            rm $eachpage
-          done
-          gzip -9 *.?
-        )
-      done
-    )
-  fi
-  # Compress info files, if any:
-  if [ -d $PKG5/usr/info ]; then
-    ( cd $PKG5/usr/info
-      rm -f dir
-      gzip -9 *
-    )
-  fi
-  echo
-) || exit 1
-
-# build gcc
-( mkdir gcc.build.lnx;
-  cd gcc.build.lnx;
-
-  # If enough people need "treelang" support for it may be considered.
-  #  --enable-languages=ada,c,c++,fortran,java,objc,treelang
-  # I think it's incorrect to include this option (as it'll end up set
-  # to i486 on x86 platforms), and we want to tune the binary structure
-  # for i686, as that's where almost all of the optimization speedups
-  # are to be found.
-  # Correct me if my take on this is wrong.
-  #  --with-cpu=$ARCH 
- 
-  if [ "$ARCH" != "x86_64" ]; then
-    GCC_ARCHOPTS="--with-arch=$ARCH"
-  else
-    GCC_ARCHOPTS="--disable-multilib"
-  fi
- 
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ../gcc-$VERSION/configure --prefix=/usr \
-     --libdir=/usr/lib$LIBDIRSUFFIX \
-     --mandir=/usr/man \
-     --infodir=/usr/info \
-     --enable-shared \
-     --enable-bootstrap \
-     --enable-languages=c,c++,fortran,go,java,lto,objc \
-     --enable-threads=posix \
-     --enable-checking=release \
-     --enable-objc-gc \
-     --with-system-zlib \
-     --with-python-dir=/lib$LIBDIRSUFFIX/python2.7/site-packages \
-     --disable-libunwind-exceptions \
-     --enable-__cxa_atexit \
-     --enable-libssp \
-     --enable-lto \
-     --with-gnu-ld \
-     --verbose \
-     --enable-java-home \
-     --with-java-home=/usr/lib$LIBDIRSUFFIX/jvm/jre \
-     --with-jvm-root-dir=/usr/lib$LIBDIRSUFFIX/jvm \
-     --with-jvm-jar-dir=/usr/lib$LIBDIRSUFFIX/jvm/jvm-exports \
-     --with-arch-directory=$LIB_ARCH \
-     --with-antlr-jar=$ANTLJAR \
-     --enable-java-awt=gtk \
-     --disable-gtktest \
-     $GCC_ARCHOPTS \
-     --target=${TARGET} \
-     --build=${TARGET} \
-     --host=${TARGET} || exit 1
-
-  # Start the build:
-
-  # Include all debugging info (for now):
-  make $NUMJOBS bootstrap;
-
-  ( cd gcc
-    make $NUMJOBS gnatlib GNATLIBCFLAGS="$SLKCFLAGS"
-    # This wants a shared -ladd2line?
-    #make gnatlib-shared
-    
-    CFLAGS="$SLKCFLAGS" \
-    CXXFLAGS="$SLKCFLAGS" \
-    make $NUMJOBS gnattools
-  )
-  make info
-
-  # Set GCCCHECK=something to run the tests
-  if [ ! -z $GCCCHECK ]; then
-    make $NUMJOBS check
-  fi
-
-  make install DESTDIR=$PKG1
-
-# KLUDGE ALERT
-# These *gdb.py files are causing ldconfig to complain, so they are going
-# to be REMOVED for now...  at some point, they might be moved somewhere
-# else, in which case things should Just Work(tm).  Keep an eye on it.
-rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/*gdb.py
-
-# Be sure the "specs" file is installed.
-if [ ! -r $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs ]; then
-  cat stage1-gcc/specs > $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
-fi
-
-# Make our 64bit gcc look for 32bit gcc binaries in ./32 subdirectory:
-if [ "$ARCH" = "x86_64" ]; then
-  sed -i 's#;.\(:../lib !m64 m32;\)$#;32\1#' \
-    $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
-fi
-
-#  make ada.install-common DESTDIR=$PKG1
-#  make install-gnatlib DESTDIR=$PKG1
-make -i install-info DESTDIR=$PKG1
-
-chmod 755 $PKG1/usr/lib${LIBDIRSUFFIX}/libgcc_s.so.1
-
-# The (huge) static GNU java libraries are not packaged.  In nearly all
-# cases one or more dependencies will not be available as static anyway.
-rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj.a
-rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
-
-# Fix stuff up:
-( cd $PKG1/usr/info ; rm dir ; gzip -9 * )
-( cd $PKG1
-  # *not* ${LIBDIRSUFFIX}
-  mkdir -p lib
-  cd lib
-  ln -sf /usr/bin/cpp .
-)
-
-( cd $PKG1/usr/bin
-  mv g++ g++-gcc-$VERSION
-  mv gcc gcc-$VERSION
-  mv ${TARGET}-gfortran gfortran-gcc-$VERSION
-  ln -sf g++-gcc-$VERSION g++
-  ln -sf gcc-$VERSION gcc
-  ln -sf g++ c++
-  ln -sf gcc cc
-  ln -sf gcc-$VERSION ${TARGET}-gcc
-  ln -sf gcc-$VERSION ${TARGET}-gcc-$VERSION
-  ln -sf gcc-ar ${TARGET}-gcc-ar
-  ln -sf gcc-nm ${TARGET}-gcc-nm
-  ln -sf gcc-ranlib ${TARGET}-gcc-ranlib
-  ln -sf gcj ${TARGET}-gcj
-  ln -sf gcjh ${TARGET}-gcjh
-  ln -sf g++-gcc-$VERSION ${TARGET}-c++
-  ln -sf g++-gcc-$VERSION ${TARGET}-g++
-  ln -sf gfortran-gcc-$VERSION gfortran
-  ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran
-  ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran-$VERSION
-  ln -sf gfortran-gcc-$VERSION ${TARGET}-g95
-  ln -sf gfortran g95
-  ln -sf gfortran f95
-  ln -sf gfortran-gcc-$VERSION ${TARGET}-g77
-  ln -sf gfortran g77
-  ln -sf gfortran f77
-)
-
-( cd $PKG1/usr/man
-  gzip -9 */*
-  cd man1
-  ln -sf g++.1.gz c++.1.gz
-  ln -sf gcc.1.gz cc.1.gz
-)  
-
-## build the txz package
-#(
-#  cd $PKG1;
-#  makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz
-#)
-# keep a log
-) 2>&1 | tee $TMP/gcc.build.log
-
-# OK, time to split the big package where needed:
-
-# gcc-g++:
-( cd $PKG2
-  mkdir -p usr/bin
-  mv $PKG1/usr/bin/*++* usr/bin
-  mkdir -p usr/include
-  mv $PKG1/usr/include/c++ usr/include
-  mkdir -p usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/*++* usr/lib${LIBDIRSUFFIX}
-  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1plus usr/libexec/gcc/$TARGET/$VERSION/cc1plus
-  mkdir -p usr/man/man1
-  mv $PKG1/usr/man/man1/*++* usr/man/man1
-)
-
-# gcc-gfortran:
-( cd $PKG3
-  mkdir -p usr/bin
-  mv $PKG1/usr/bin/*gfortran* usr/bin
-  mv $PKG1/usr/bin/*95* usr/bin
-  mv $PKG1/usr/bin/*77* usr/bin
-  # Doesn't this seem like a logical idea?
-  ( cd usr/bin ; ln -sf gfortran-gcc-${VERSION} fortran )
-  mkdir -p usr/info
-  mv $PKG1/usr/info/gfortran* usr/info
-  mkdir -p usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgfortran* usr/lib${LIBDIRSUFFIX}
-  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/finclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/libgfortran* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
-  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/f951 usr/libexec/gcc/$TARGET/$VERSION/f951
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/libgfortran* usr/libexec/gcc/$TARGET/$VERSION
-  mkdir -p usr/man/man1
-  mv $PKG1/usr/man/man1/gfortran* usr/man/man1
-)
-
-# gcc-gnat:
-# First, relocate usr/bin/gnative2ascii to the gcc-java package so it
-# isn't matched and accidentally put in gcc-gnat:
-mkdir -p $PKG5/usr/bin
-mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
-# Now make the gcc-gnat package tree:
-( cd $PKG4
-  mkdir -p usr/bin
-  mv $PKG1/usr/bin/gnat* usr/bin
-  mv $PKG1/usr/bin/gpr* usr/bin
-  mkdir -p usr/info
-  mv $PKG1/usr/info/gnat* usr/info
-  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/gnat1 usr/libexec/gcc/$TARGET/$VERSION
-  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adainclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adalib usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
-)
-
-# gcc-java:
-( cd $PKG5
-  mkdir -p usr/bin
-  mv $PKG1/usr/bin/aot-compile usr/bin
-  mv $PKG1/usr/bin/addr2name.awk usr/bin
-  # mv $PKG1/usr/bin/fastjar usr/bin
-  mv $PKG1/usr/bin/gappletviewer usr/bin
-  mv $PKG1/usr/bin/gc-analyze usr/bin
-  mv $PKG1/usr/bin/*gcj* usr/bin
-  mv $PKG1/usr/bin/gij usr/bin
-  mv $PKG1/usr/bin/gjar usr/bin
-  mv $PKG1/usr/bin/gjarsigner usr/bin
-  mv $PKG1/usr/bin/gjdoc usr/bin
-  mv $PKG1/usr/bin/gkeytool usr/bin
-  mv $PKG1/usr/bin/grepjar usr/bin
-  mv $PKG1/usr/bin/grmid usr/bin
-  mv $PKG1/usr/bin/grmic usr/bin
-  mv $PKG1/usr/bin/grmiregistry usr/bin
-  mv $PKG1/usr/bin/gserialver usr/bin
-  mv $PKG1/usr/bin/gtnameserv usr/bin
-  mv $PKG1/usr/bin/gjavah usr/bin
-  mv $PKG1/usr/bin/gorbd usr/bin
-  mv $PKG1/usr/bin/jar usr/bin
-  mv $PKG1/usr/bin/jcf-dump usr/bin
-  mv $PKG1/usr/bin/jv-* usr/bin
-  mv $PKG1/usr/bin/rmi* usr/bin
-  mkdir -p usr/include/c++/$VERSION
-  # Move some Java only C++ headers from the C++ package:
-  mv $PKG2/usr/include/c++/$VERSION/{gcj,gnu,java,javax,org,sun} usr/include/c++/$VERSION
-  mv $PKG1/usr/include/ffi.h usr/include
-  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jawt.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/ffi.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/ffitarget.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jawt_md.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jni.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jni_md.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jvmpi.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/libffi usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  # aot-compile Python plugins:
-  if [ ! -d $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 ]; then
-    echo "NO $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 !"
-    exit 1
-  fi
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 usr/lib${LIBDIRSUFFIX}
-  mkdir -p usr/info
-  mv $PKG1/usr/info/gcj.* usr/info
-  # mv $PKG1/usr/info/fastjar.* usr/info
-  mkdir -p usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libffi* usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/logging.properties usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcj* usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj* usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgij* usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/lib-org* usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/security usr/lib${LIBDIRSUFFIX}
-  mkdir -p usr/lib${LIBDIRSUFFIX}/pkgconfig
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgcj*.pc usr/lib${LIBDIRSUFFIX}/pkgconfig
-  rmdir $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig 2> /dev/null
-  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/jc1 usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/ecj1 usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/jvgenmain usr/libexec/gcc/$TARGET/$VERSION
-  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/gcj usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mkdir -p usr/man/man1
-  mv $PKG1/usr/man/man1/aot-compile.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gappletviewer.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gc-analyze.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gcj.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gcjh.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gcj-dbtool.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gij.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gjar.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gjarsigner.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gjavah.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gjdoc.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gjnih.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gkeytool.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gnative2ascii.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gorbd.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/grmic.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/grmid.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/grmiregistry.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gserialver.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/gtnameserv.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/jcf-dump.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/jv-convert.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/jv-scan.1.gz usr/man/man1
-  mv $PKG1/usr/man/man1/rebuild-gcj-db.1.gz usr/man/man1
-  mkdir -p usr/man/man3
-  mv $PKG1/usr/man/man3/ffi* usr/man/man3
-  mkdir -p usr/share
-  mv $PKG1/usr/share/java usr/share
-  # The ecj wrapper script:
-  cat $CWD/ecj.sh | sed -e "s,@JAVADIR@,/usr/share/java," > usr/bin/ecj
-  chmod 755 usr/bin/ecj
-  # The JAVA_HOME compatibility links.
-  # Caution: non-multilib arch-independent stuff! No lib64 here.
-  mkdir -p usr/lib$LIBDIRSUFFIX
-  mv $PKG1/usr/lib$LIBDIRSUFFIX/jvm* usr/lib$LIBDIRSUFFIX
-  # And add the missing javac symlink:
-  ln -s ../../../bin/ecj usr/lib$LIBDIRSUFFIX/jvm/bin/javac
-  # Don't package libffi stuff anymore.  GCC will link the internal version
-  # statically, and we'll need a newer one elsewhere.
-  find . -name "ffi*.h" | xargs rm
-  find . -name "libffi*" | xargs rm
-  rm -f usr/man/man3/ffi*
-  rm -f usr/info/libffi*
-)
-
-# gcc-objc:
-( cd $PKG6
-  mkdir -p usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libobjc* usr/lib${LIBDIRSUFFIX}
-  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1obj usr/libexec/gcc/$TARGET/$VERSION
-  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/objc usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
-)
-
-## NOTE: Thought about this, because the precompiled headers are so large.
-## Probably easier to keep everything together, though.
-## gcc-g++-gch (precompiled c++ headers)
-#( cd $PKG7
-#  mkdir -p usr/include/c++/$VERSION/$TARGET/bits
-#  mv $PKG2/usr/include/c++/$VERSION/$TARGET/bits/stdc++.h.gch usr/include/c++/$VERSION/$TARGET/bits
-#)
-
-# gcc-go:
-( cd $PKG8
-  mkdir -p usr/bin
-  mv $PKG1/usr/bin/*gccgo* usr/bin
-  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
-  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/go1 usr/libexec/gcc/$TARGET/$VERSION/go1
-  mkdir -p usr/info
-  mv $PKG1/usr/info/gccgo.info.gz usr/info
-  mkdir -p usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/go usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so*,libgobegin.a} usr/lib${LIBDIRSUFFIX} || exit 1
-  # Ordinarily Slackware doesn't package static libraries, but in this case
-  # it is useful for deploying compiled binaries on machines that do not yet
-  # have libgo.so.0.0.0.
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.a usr/lib${LIBDIRSUFFIX}
-  mkdir -p usr/man/man1
-  mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1
-) || exit 1
-
-# Filter all .la files (thanks much to Mark Post for the sed script):
-( cd $TMP
-  for file in $(find . -type f -name "*.la") ; do
-    cat $file | sed -e 's%-L/gcc-[[:graph:]]* % %g' > $TMP/tmp-la-file
-    cat $TMP/tmp-la-file > $file
-  done
-  rm $TMP/tmp-la-file
-)
-
-## Strip bloated binaries and libraries:
-for dir in $PKG{1,2,3,4,5,6,8}; do
-  ( cd $dir
-    find . -name "lib*so*" -exec strip --strip-unneeded "{}" \;
-    find . -name "lib*a" -exec strip -g "{}" \;
-    strip --strip-unneeded usr/bin/* 2> /dev/null
-    find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-    find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  )
-done
-
-( cd $PKG1
-  makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz )
-( cd $PKG2
-  makepkg -l y -c n $TMP/gcc-g++-$VERSION-$ARCH-$BUILD.txz )
-( cd $PKG3
-  makepkg -l y -c n $TMP/gcc-gfortran-$VERSION-$ARCH-$BUILD.txz )
-( cd $PKG4
-  makepkg -l y -c n $TMP/gcc-gnat-$VERSION-$ARCH-$BUILD.txz )
-( cd $PKG5
-  makepkg -l y -c n $TMP/gcc-java-$VERSION-$ARCH-$BUILD.txz )
-( cd $PKG6
-  makepkg -l y -c n $TMP/gcc-objc-$VERSION-$ARCH-$BUILD.txz )
-#( cd $PKG7
-#  makepkg -l y -c n $TMP/gcc-g++-gch-$VERSION-$ARCH-$BUILD.txz )
-( cd $PKG8
-  makepkg -l y -c n $TMP/gcc-go-$VERSION-$ARCH-$BUILD.txz )
-
-echo
-echo "Slackware GCC package build complete!"
-echo
-
-
-############ syn3 patches
-
-#backwards compatibility 
-#NO: not allowed, just recompile the stuff..
-#P=`echo  /gcc-*""/package-gcc-g++/usr/lib/`
-#ln -s libstdc++.so $P/libstdc++.so.5 || exit 1
 
 ############ make syn3 packages
Index: npl/system/gcc/gcc.SlackBuild.orig
===================================================================
--- npl/system/gcc/gcc.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/gcc.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,802 @@
+#!/bin/sh
+# GCC package build script (written by volkerdi@slackware.com)
+#
+# Copyright 2003, 2004  Slackware Linux, Inc., Concord, California, USA
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# Modified 2011 by Eric Hameleers <alien at slackware.com> for OpenJDK.
+
+# Some notes, Fri May 16 12:31:32 PDT 2003:
+#
+# Why i486 and not i386?  Because the shared C++ libraries in gcc-3.2.x will
+# require 486 opcodes even when a 386 target is used (so we already weren't
+# compatible with the i386 for Slackware 9.0, didn't notice, and nobody
+# complained :-).  gcc-3.3 fixes this issue and allows you to build a 386
+# compiler, but the fix is done in a way that produces binaries that are not
+# compatible with gcc-3.2.x compiled binaries.  To retain compatibility with
+# Slackware 9.0, we'll have to use i486 (or better) as the compiler target
+# for gcc-3.3.
+#
+# It's time to say goodbye to i386 support in Slackware.  I've surveyed 386
+# usage online, and the most common thing I see people say when someone asks
+# about running Linux on a 386 is to "run Slackware", but then they also 
+# usually go on to say "be sure to get an OLD version, like 4.0, before glibc,
+# because it'll be more efficient."  Now, if that's the general advice, then
+# I see no reason to continue 386 support in the latest Slackware (and indeed
+# it's no longer easily possible).
+
+# Some more notes, Mon Aug  3 19:49:51 UTC 2015:
+#
+# Changing to -march=i586 for 32-bit x86 as several things (Mesa being one of
+# them) no longer work if constrained to -march=i486.  We're not going to use
+# -march=i686 since the only additional opcode is CMOV, which is actually less
+# efficient on modern CPUs running in 32-bit mode than the alternate i586
+# instructions.  No need to throw i586 CPUs under the bus (yet).
+
+PKGNAM=gcc
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# How many jobs to run in parallel:
+NUMJOBS=" -j 7 "
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=s390
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  LIB_ARCH=amd64
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=armv7hl
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=$ARCH
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+# Temporary build location.  This should *NOT* be a directory
+# path a non-root user could create later...
+TMP=${TMP:-"/gcc-$(mcookie)"}
+
+# This is the main DESTDIR target:
+PKG1=$TMP/package-gcc
+# These are the directories to build other packages in:
+PKG2=$TMP/package-gcc-g++
+PKG3=$TMP/package-gcc-gfortran
+PKG4=$TMP/package-gcc-gnat
+PKG5=$TMP/package-gcc-java
+PKG6=$TMP/package-gcc-objc
+PKG7=$TMP/package-gcc-g++-gch
+PKG8=$TMP/package-gcc-go
+
+# Clear the build locations:
+if [ -d $TMP ]; then
+  rm -rf $TMP
+fi
+mkdir -p $PKG{1,2,3,4,5,6,7,8}/usr/doc/gcc-$VERSION
+
+# Insert package descriptions:
+mkdir -p $PKG{1,2,3,4,5,6,7,8}/install
+cat $CWD/slack-desc.gcc > $PKG1/install/slack-desc
+cat $CWD/slack-desc.gcc-g++ > $PKG2/install/slack-desc
+cat $CWD/slack-desc.gcc-gfortran > $PKG3/install/slack-desc
+cat $CWD/slack-desc.gcc-gnat > $PKG4/install/slack-desc
+cat $CWD/slack-desc.gcc-java > $PKG5/install/slack-desc
+cat $CWD/slack-desc.gcc-objc > $PKG6/install/slack-desc
+# cat $CWD/slack-desc.gcc-g++-gch > $PKG7/install/slack-desc
+cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc
+
+cd $TMP
+tar xvf $CWD/gcc-$VERSION.tar.?z*
+
+( cd gcc-$VERSION/gcc
+  zcat $CWD/gcc.66782.diff.gz | patch -p0 --verbose || exit 1
+) || exit 1
+
+# Copy ecj.jar into the TLD of the source. Needed for java compiler.
+# This can be retrieved from ftp://sourceware.org/pub/java
+cp $CWD/ecj-4.9.jar gcc-$VERSION/ecj.jar
+
+# Use an antlr runtime to compile javadoc.
+# The runtime can be obtained from:
+#https://oss.sonatype.org/content/repositories/releases/org/antlr/antlr-runtime/
+ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
+
+# install docs
+( cd gcc-$VERSION
+  # Smite the fixincludes:
+  zcat $CWD/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+  # Fix perms/owners
+  chown -R root:root .
+  find . -perm 777 -exec chmod 755 {} \;
+  find . -perm 775 -exec chmod 755 {} \;
+  find . -perm 754 -exec chmod 755 {} \;
+  find . -perm 664 -exec chmod 644 {} \;
+  mkdir -p $PKG1/usr/doc/gcc-$VERSION
+  cp -a \
+    COPYING* ChangeLog* INSTALL \
+    LAST_UPDATED MAINTAINERS NEWS \
+    README*  \
+  $PKG1/usr/doc/gcc-$VERSION
+
+  # We will keep part of these, but they are really big...
+  if [ -r ChangeLog ]; then
+    DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION)
+    cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+    touch -r ChangeLog $DOCSDIR/ChangeLog
+  fi
+  if [ -r NEWS ]; then
+    DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION)
+    cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+    touch -r NEWS $DOCSDIR/NEWS
+  fi
+
+  mkdir -p $PKG1/usr/doc/gcc-${VERSION}/gcc
+  ( cd gcc
+    cp -a \
+      ABOUT* COPYING* DATESTAMP DEV-PHASE LANG* ONEWS README* SERVICE \
+    $PKG1/usr/doc/gcc-$VERSION/gcc
+         
+    mkdir -p $PKG3/usr/doc/gcc-${VERSION}/gcc/fortran
+    ( cd fortran
+      if [ -r ChangeLog ]; then
+        cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-$VERSION/gcc/fortran/ChangeLog
+        touch -r ChangeLog $PKG3/usr/doc/gcc-$VERSION/gcc/fortran/ChangeLog
+      fi
+    )
+
+    mkdir -p $PKG4/usr/doc/gcc-${VERSION}/gcc/ada
+    ( cd ada
+      cp -a \
+        ChangeLog.tree-ssa \
+      $PKG4/usr/doc/gcc-$VERSION/gcc/ada
+      if [ -r ChangeLog ]; then
+        cat ChangeLog | head -n 1000 > $PKG4/usr/doc/gcc-$VERSION/gcc/ada/ChangeLog
+        touch -r ChangeLog $PKG4/usr/doc/gcc-$VERSION/gcc/ada/ChangeLog
+      fi
+    )
+
+    mkdir -p $PKG5/usr/doc/gcc-${VERSION}/gcc/java
+    ( cd java
+      cp -a \
+        ChangeLog.tree-ssa \
+      $PKG5/usr/doc/gcc-${VERSION}/gcc/java
+      if [ -r ChangeLog ]; then
+        cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
+        touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
+      fi
+    )
+  
+    mkdir -p $PKG6/usr/doc/gcc-${VERSION}/gcc/objc
+    ( cd objc
+      cp -a \
+        README* \
+      $PKG6/usr/doc/gcc-${VERSION}/gcc/objc
+      if [ -r ChangeLog ]; then
+        cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog
+        touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog
+      fi
+    )
+
+    mkdir -p $PKG8/usr/doc/gcc-${VERSION}/gcc/go
+    ( cd go
+      if [ -r ChangeLog ]; then
+        cat ChangeLog | head -n 1000 > $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
+        touch -r ChangeLog $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
+      fi
+      cp -a \
+        README*  \
+        gofrontend/{LICENSE,PATENTS,README} \
+      $PKG8/usr/doc/gcc-${VERSION}/gcc/go
+    )
+
+  ) || exit 1
+
+  mkdir -p $PKG3/usr/doc/gcc-${VERSION}/libgfortran
+  ( cd libgfortran
+    if [ -r ChangeLog ]; then
+      cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-${VERSION}/libgfortran/ChangeLog
+      touch -r ChangeLog $PKG3/usr/doc/gcc-${VERSION}/libgfortran/ChangeLog
+    fi
+  )
+
+  mkdir -p $PKG4/usr/doc/gcc-${VERSION}/libada
+  ( cd libada
+    if [ -r ChangeLog ]; then
+      cat ChangeLog | head -n 1000 > $PKG4/usr/doc/gcc-${VERSION}/libada/ChangeLog
+      touch -r ChangeLog $PKG4/usr/doc/gcc-${VERSION}/libada/ChangeLog
+    fi
+  )
+
+  mkdir -p $PKG5/usr/doc/gcc-${VERSION}/libffi
+  ( cd libffi
+    cp -a \
+      ChangeLog.libgcj ChangeLog.v1 \
+      LICENSE* README* \
+    $PKG5/usr/doc/gcc-${VERSION}/libffi
+    if [ -r ChangeLog ]; then
+      cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/libffi/ChangeLog
+      touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/libffi/ChangeLog
+    fi
+  )
+
+  mkdir -p $PKG5/usr/doc/gcc-${VERSION}/libjava
+  ( cd libjava
+    cp -a \
+      COPYING* HACKING LIBGCJ_LICENSE \
+      NEWS README* THANKS \
+    $PKG5/usr/doc/gcc-${VERSION}/libjava
+    if [ -r ChangeLog ]; then
+      cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/libjava/ChangeLog
+      touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/libjava/ChangeLog
+    fi
+  )
+
+
+  mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libgomp
+  ( cd libgomp
+    if [ -r ChangeLog ]; then
+      cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
+      touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
+    fi
+  )
+  
+  mkdir -p $PKG6/usr/doc/gcc-${VERSION}/libobjc
+  ( cd libobjc
+    if [ -r ChangeLog ]; then
+      cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/libobjc/ChangeLog
+      touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/libobjc/ChangeLog
+    fi
+    cp -a \
+      README* THREADS* \
+    $PKG6/usr/doc/gcc-${VERSION}/libobjc
+  )
+    
+  mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3
+  ( cd libstdc++-v3
+    cp -a \
+      README* \
+      doc/html/faq.html \
+    $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3
+    if [ -r ChangeLog ]; then
+      cat ChangeLog | head -n 1000 > $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
+      touch -r ChangeLog $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
+    fi
+  )
+
+)
+
+# Add fastjar to the gcc-java package:
+( cd $TMP
+  FASTJARVER=$(echo $CWD/fastjar-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+  echo
+  echo "Building fastjar-$FASTJARVER first"
+  echo
+  rm -rf fastjar-$FASTJARVER
+  tar xvf $CWD/fastjar-$FASTJARVER.tar.xz || exit 1
+  cd fastjar-$FASTJARVER || exit 1
+  chown -R root:root .
+  find . \
+    \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+    -exec chmod 755 {} \; -o \
+    \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+    -exec chmod 644 {} \;
+  for patch in $CWD/fastjar-patches/*.gz ; do
+    zcat $patch | patch -p1 --verbose || exit 1
+  done
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+     --prefix=/usr \
+     --libdir=/usr/lib$LIBDIRSUFFIX \
+     --mandir=/usr/man \
+     --infodir=/usr/info \
+     --build=$TARGET
+  make $NUMJOBS || exit 1
+  make install DESTDIR=$PKG5 || exit 1
+  mkdir -p $PKG5/usr/doc/fastjar-$FASTJARVER
+  cp -a \
+    AUTHORS CHANGES COPYING* INSTALL NEWS README* TODO \
+    $PKG5/usr/doc/fastjar-$FASTJARVER
+  # If there's a ChangeLog, installing at least part of the recent history
+  # is useful, but don't let it get totally out of control:
+  if [ -r ChangeLog ]; then
+    DOCSDIR=$(echo $PKG5/usr/doc/fastjar-$FASTJARVER)
+    cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+    touch -r ChangeLog $DOCSDIR/ChangeLog
+  fi
+  find $PKG5 | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+    | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  # Compress and if needed symlink the man pages:
+  if [ -d $PKG5/usr/man ]; then
+    ( cd $PKG5/usr/man
+      for manpagedir in $(find . -type d -name "man*") ; do
+        ( cd $manpagedir
+          for eachpage in $( find . -type l -maxdepth 1) ; do
+            ln -s $( readlink $eachpage ).gz $eachpage.gz
+            rm $eachpage
+          done
+          gzip -9 *.?
+        )
+      done
+    )
+  fi
+  # Compress info files, if any:
+  if [ -d $PKG5/usr/info ]; then
+    ( cd $PKG5/usr/info
+      rm -f dir
+      gzip -9 *
+    )
+  fi
+  echo
+) || exit 1
+
+# build gcc
+( mkdir gcc.build.lnx;
+  cd gcc.build.lnx;
+
+  # If enough people need "treelang" support for it may be considered.
+  #  --enable-languages=ada,c,c++,fortran,java,objc,treelang
+  # I think it's incorrect to include this option (as it'll end up set
+  # to i586 on x86 platforms), and we want to tune the binary structure
+  # for i686, as that's where almost all of the optimization speedups
+  # are to be found.
+  # Correct me if my take on this is wrong.
+  #  --with-cpu=$ARCH 
+ 
+  if [ "$ARCH" != "x86_64" ]; then
+    GCC_ARCHOPTS="--with-arch=$ARCH"
+  else
+    GCC_ARCHOPTS="--disable-multilib"
+  fi
+ 
+  # NOTE:  For Slackware 15.0, look into removing --with-default-libstdcxx-abi=gcc4-compatible,
+  # which will then require rebuilding all C++ libraries.  That is, if there's any benefit.
+
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ../gcc-$VERSION/configure --prefix=/usr \
+     --libdir=/usr/lib$LIBDIRSUFFIX \
+     --mandir=/usr/man \
+     --infodir=/usr/info \
+     --enable-shared \
+     --enable-bootstrap \
+     --enable-languages=c,c++,fortran,go,java,lto,objc \
+     --enable-threads=posix \
+     --enable-checking=release \
+     --enable-objc-gc \
+     --with-system-zlib \
+     --with-python-dir=/lib$LIBDIRSUFFIX/python2.7/site-packages \
+     --enable-libstdcxx-dual-abi \
+     --with-default-libstdcxx-abi=gcc4-compatible \
+     --disable-libunwind-exceptions \
+     --enable-__cxa_atexit \
+     --enable-libssp \
+     --enable-lto \
+     --disable-install-libiberty \
+     --with-gnu-ld \
+     --verbose \
+     --enable-java-home \
+     --with-java-home=/usr/lib$LIBDIRSUFFIX/jvm/jre \
+     --with-jvm-root-dir=/usr/lib$LIBDIRSUFFIX/jvm \
+     --with-jvm-jar-dir=/usr/lib$LIBDIRSUFFIX/jvm/jvm-exports \
+     --with-arch-directory=$LIB_ARCH \
+     --with-antlr-jar=$ANTLJAR \
+     --enable-java-awt=gtk \
+     --disable-gtktest \
+     $GCC_ARCHOPTS \
+     --target=${TARGET} \
+     --build=${TARGET} \
+     --host=${TARGET} || exit 1
+
+  # Start the build:
+
+  # Include all debugging info (for now):
+  make $NUMJOBS bootstrap >/dev/null
+
+#  ( cd gcc
+#    make $NUMJOBS gnatlib GNATLIBCFLAGS="$SLKCFLAGS"
+    # This wants a shared -ladd2line?
+    #make gnatlib-shared
+    
+#    CFLAGS="$SLKCFLAGS" \
+#    CXXFLAGS="$SLKCFLAGS" \
+#    make $NUMJOBS gnattools
+#  )
+  make info
+
+  # Set GCCCHECK=something to run the tests
+  if [ ! -z $GCCCHECK ]; then
+    make $NUMJOBS check
+  fi
+
+  make install DESTDIR=$PKG1
+
+# KLUDGE ALERT
+# These *gdb.py files are causing ldconfig to complain, so they are going
+# to be REMOVED for now...  at some point, they might be moved somewhere
+# else, in which case things should Just Work(tm).  Keep an eye on it.
+rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/*gdb.py
+
+# Be sure the "specs" file is installed.
+if [ ! -r $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs ]; then
+  cat stage1-gcc/specs > $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
+fi
+
+# Make our 64bit gcc look for 32bit gcc binaries in ./32 subdirectory:
+if [ "$ARCH" = "x86_64" ]; then
+  sed -i 's#;.\(:../lib !m64 m32;\)$#;32\1#' \
+    $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
+fi
+
+#  make ada.install-common DESTDIR=$PKG1
+#  make install-gnatlib DESTDIR=$PKG1
+make -i install-info DESTDIR=$PKG1
+
+chmod 755 $PKG1/usr/lib${LIBDIRSUFFIX}/libgcc_s.so.1
+
+# The (huge) static GNU java libraries are not packaged.  In nearly all
+# cases one or more dependencies will not be available as static anyway.
+rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj.a
+rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
+
+# Fix stuff up:
+( cd $PKG1/usr/info ; rm dir ; gzip -9 * )
+( cd $PKG1
+  # *not* ${LIBDIRSUFFIX}
+  mkdir -p lib
+  cd lib
+  ln -sf /usr/bin/cpp .
+)
+
+( cd $PKG1/usr/bin
+  mv g++ g++-gcc-$VERSION
+  mv gcc gcc-$VERSION
+  mv ${TARGET}-gfortran gfortran-gcc-$VERSION
+  ln -sf g++-gcc-$VERSION g++
+  ln -sf gcc-$VERSION gcc
+  ln -sf g++ c++
+  ln -sf gcc cc
+  ln -sf gcc-$VERSION ${TARGET}-gcc
+  ln -sf gcc-$VERSION ${TARGET}-gcc-$VERSION
+  ln -sf gcc-ar ${TARGET}-gcc-ar
+  ln -sf gcc-nm ${TARGET}-gcc-nm
+  ln -sf gcc-ranlib ${TARGET}-gcc-ranlib
+  ln -sf gcj ${TARGET}-gcj
+  ln -sf gcjh ${TARGET}-gcjh
+  ln -sf g++-gcc-$VERSION ${TARGET}-c++
+  ln -sf g++-gcc-$VERSION ${TARGET}-g++
+  ln -sf gfortran-gcc-$VERSION gfortran
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-gfortran-$VERSION
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-g95
+  ln -sf gfortran g95
+  ln -sf gfortran f95
+  ln -sf gfortran-gcc-$VERSION ${TARGET}-g77
+  ln -sf gfortran g77
+  ln -sf gfortran f77
+  cat $CWD/c89.sh > c89
+  cat $CWD/c99.sh > c99
+  chmod 755 c89 c99
+)
+
+( cd $PKG1/usr/man
+  gzip -9 */*
+  cd man1
+  ln -sf g++.1.gz c++.1.gz
+  ln -sf gcc.1.gz cc.1.gz
+)  
+
+## build the txz package
+#(
+#  cd $PKG1;
+#  makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz
+#)
+# keep a log
+) 2>&1 | tee $TMP/gcc.build.log
+
+# OK, time to split the big package where needed:
+
+# gcc-g++:
+( cd $PKG2
+  mkdir -p usr/bin
+  mv $PKG1/usr/bin/*++* usr/bin
+  mkdir -p usr/include
+  mv $PKG1/usr/include/c++ usr/include
+  mkdir -p usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/*++* usr/lib${LIBDIRSUFFIX}
+  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1plus usr/libexec/gcc/$TARGET/$VERSION/cc1plus
+  mkdir -p usr/man/man1
+  mv $PKG1/usr/man/man1/*++* usr/man/man1
+)
+
+# gcc-gfortran:
+( cd $PKG3
+  mkdir -p usr/bin
+  mv $PKG1/usr/bin/*gfortran* usr/bin
+  mv $PKG1/usr/bin/*95* usr/bin
+  mv $PKG1/usr/bin/*77* usr/bin
+  # Doesn't this seem like a logical idea?
+  ( cd usr/bin ; ln -sf gfortran-gcc-${VERSION} fortran )
+  mkdir -p usr/info
+  mv $PKG1/usr/info/gfortran* usr/info
+  mkdir -p usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgfortran* usr/lib${LIBDIRSUFFIX}
+  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/finclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/libgfortran* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/f951 usr/libexec/gcc/$TARGET/$VERSION/f951
+  #mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/libgfortran* usr/libexec/gcc/$TARGET/$VERSION
+  mkdir -p usr/man/man1
+  mv $PKG1/usr/man/man1/gfortran* usr/man/man1
+)
+
+# gcc-gnat:
+# First, relocate usr/bin/gnative2ascii to the gcc-java package so it
+# isn't matched and accidentally put in gcc-gnat:
+#mkdir -p $PKG5/usr/bin
+#mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
+# Now make the gcc-gnat package tree:
+#( cd $PKG4
+#  mkdir -p usr/bin
+#  mv $PKG1/usr/bin/gnat* usr/bin
+#  mv $PKG1/usr/bin/gpr* usr/bin
+#  mkdir -p usr/info
+#  mv $PKG1/usr/info/gnat* usr/info
+#  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
+#  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/gnat1 usr/libexec/gcc/$TARGET/$VERSION
+#  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+#  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adainclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+#  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adalib usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+#)
+
+# gcc-java:
+( cd $PKG5
+  mkdir -p usr/bin
+  mv $PKG1/usr/bin/aot-compile usr/bin
+  #mv $PKG1/usr/bin/addr2name.awk usr/bin
+  # mv $PKG1/usr/bin/fastjar usr/bin
+  mv $PKG1/usr/bin/gappletviewer usr/bin
+  mv $PKG1/usr/bin/gc-analyze usr/bin
+  mv $PKG1/usr/bin/*gcj* usr/bin
+  mv $PKG1/usr/bin/gij usr/bin
+  mv $PKG1/usr/bin/gjar usr/bin
+  mv $PKG1/usr/bin/gjarsigner usr/bin
+  mv $PKG1/usr/bin/gjdoc usr/bin
+  mv $PKG1/usr/bin/gkeytool usr/bin
+  #mv $PKG1/usr/bin/grepjar usr/bin
+  mv $PKG1/usr/bin/grmid usr/bin
+  mv $PKG1/usr/bin/grmic usr/bin
+  mv $PKG1/usr/bin/grmiregistry usr/bin
+  mv $PKG1/usr/bin/gserialver usr/bin
+  mv $PKG1/usr/bin/gtnameserv usr/bin
+  mv $PKG1/usr/bin/gjavah usr/bin
+  mv $PKG1/usr/bin/gorbd usr/bin
+  #mv $PKG1/usr/bin/jar usr/bin
+  mv $PKG1/usr/bin/jcf-dump usr/bin
+  mv $PKG1/usr/bin/jv-* usr/bin
+  #mv $PKG1/usr/bin/rmi* usr/bin
+  mkdir -p usr/include/c++/$VERSION
+  # Move some Java only C++ headers from the C++ package:
+  mv $PKG2/usr/include/c++/$VERSION/{gcj,gnu,java,javax,org,sun} usr/include/c++/$VERSION
+  #mv $PKG1/usr/include/ffi.h usr/include
+  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jawt.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  #mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/ffi.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  #mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/ffitarget.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jawt_md.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jni.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jni_md.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jvmpi.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  #mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/libffi usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  # aot-compile Python plugins:
+  if [ ! -d $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 ]; then
+    echo "NO $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 !"
+    exit 1
+  fi
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 usr/lib${LIBDIRSUFFIX}
+  mkdir -p usr/info
+  mv $PKG1/usr/info/gcj.* usr/info
+  # mv $PKG1/usr/info/fastjar.* usr/info
+  mkdir -p usr/lib${LIBDIRSUFFIX}
+  #mv $PKG1/usr/lib${LIBDIRSUFFIX}/libffi* usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/logging.properties usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcj* usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj* usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgij* usr/lib${LIBDIRSUFFIX}
+#  mv $PKG1/usr/lib${LIBDIRSUFFIX}/lib-org* usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/security usr/lib${LIBDIRSUFFIX}
+  mkdir -p usr/lib${LIBDIRSUFFIX}/pkgconfig
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgcj*.pc usr/lib${LIBDIRSUFFIX}/pkgconfig
+  rmdir $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig 2> /dev/null
+  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/jc1 usr/libexec/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/ecj1 usr/libexec/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/jvgenmain usr/libexec/gcc/$TARGET/$VERSION
+  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/gcj usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mkdir -p usr/man/man1
+  mv $PKG1/usr/man/man1/aot-compile.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gappletviewer.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gc-analyze.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gcj.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gcjh.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gcj-dbtool.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gij.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gjar.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gjarsigner.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gjavah.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gjdoc.1.gz usr/man/man1
+  #mv $PKG1/usr/man/man1/gjnih.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gkeytool.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gnative2ascii.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gorbd.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/grmic.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/grmid.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/grmiregistry.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gserialver.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gtnameserv.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/jcf-dump.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/jv-convert.1.gz usr/man/man1
+  #mv $PKG1/usr/man/man1/jv-scan.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/rebuild-gcj-db.1.gz usr/man/man1
+  mkdir -p usr/man/man3
+  #mv $PKG1/usr/man/man3/ffi* usr/man/man3
+  mkdir -p usr/share
+  mv $PKG1/usr/share/java usr/share
+  # The ecj wrapper script:
+  cat $CWD/ecj.sh | sed -e "s,@JAVADIR@,/usr/share/java," > usr/bin/ecj
+  chmod 755 usr/bin/ecj
+  # The JAVA_HOME compatibility links.
+  # Caution: non-multilib arch-independent stuff! No lib64 here.
+  mkdir -p usr/lib$LIBDIRSUFFIX
+  mv $PKG1/usr/lib$LIBDIRSUFFIX/jvm* usr/lib$LIBDIRSUFFIX
+  # And add the missing javac symlink:
+  ln -s ../../../bin/ecj usr/lib$LIBDIRSUFFIX/jvm/bin/javac
+  # Don't package libffi stuff anymore.  GCC will link the internal version
+  # statically, and we'll need a newer one elsewhere.
+  #find . -name "ffi*.h" | xargs rm
+  #find . -name "libffi*" | xargs rm
+  #rm -f usr/man/man3/ffi*
+  #rm -f usr/info/libffi*
+)
+
+# gcc-objc:
+( cd $PKG6
+  mkdir -p usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libobjc* usr/lib${LIBDIRSUFFIX}
+  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1obj usr/libexec/gcc/$TARGET/$VERSION
+  mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/objc usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+)
+
+## NOTE: Thought about this, because the precompiled headers are so large.
+## Probably easier to keep everything together, though.
+## gcc-g++-gch (precompiled c++ headers)
+#( cd $PKG7
+#  mkdir -p usr/include/c++/$VERSION/$TARGET/bits
+#  mv $PKG2/usr/include/c++/$VERSION/$TARGET/bits/stdc++.h.gch usr/include/c++/$VERSION/$TARGET/bits
+#)
+
+# gcc-go:
+( cd $PKG8
+  mkdir -p usr/bin
+  mv $PKG1/usr/bin/*gccgo* usr/bin
+  mv $PKG1/usr/bin/go{,fmt} usr/bin
+  mkdir -p usr/libexec/gcc/$TARGET/$VERSION
+  mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/{cgo,go1} usr/libexec/gcc/$TARGET/$VERSION
+  mkdir -p usr/info
+  mv $PKG1/usr/info/gccgo.info.gz usr/info
+  mkdir -p usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/go usr/lib${LIBDIRSUFFIX}
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so*,libgobegin.a,libgolibbegin.a,libnetgo.a} usr/lib${LIBDIRSUFFIX} || exit 1
+  # Ordinarily Slackware doesn't package static libraries, but in this case
+  # it is useful for deploying compiled binaries on machines that do not yet
+  # have libgo.so.0.0.0.
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.a usr/lib${LIBDIRSUFFIX}
+  mkdir -p usr/man/man1
+  mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/go.1.gz usr/man/man1
+  mv $PKG1/usr/man/man1/gofmt.1.gz usr/man/man1
+) || exit 1
+
+# Filter all .la files (thanks much to Mark Post for the sed script):
+( cd $TMP
+  for file in $(find . -type f -name "*.la") ; do
+    cat $file | sed -e 's%-L/gcc-[[:graph:]]* % %g' > $TMP/tmp-la-file
+    cat $TMP/tmp-la-file > $file
+  done
+  rm $TMP/tmp-la-file
+)
+
+## Strip bloated binaries and libraries:
+for dir in $PKG{1,2,3,4,5,6,8}; do
+  ( cd $dir
+    find . -name "lib*so*" -exec strip --strip-unneeded "{}" \; || true
+    find . -name "lib*a" -exec strip -g "{}" \; || true
+    strip --strip-unneeded usr/bin/* 2> /dev/null || true
+    find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+    find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  )
+done
+
+( cd $PKG1
+  makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz )
+( cd $PKG2
+  makepkg -l y -c n $TMP/gcc-g++-$VERSION-$ARCH-$BUILD.txz )
+( cd $PKG3
+  makepkg -l y -c n $TMP/gcc-gfortran-$VERSION-$ARCH-$BUILD.txz )
+#( cd $PKG4
+#  makepkg -l y -c n $TMP/gcc-gnat-$VERSION-$ARCH-$BUILD.txz )
+( cd $PKG5
+  makepkg -l y -c n $TMP/gcc-java-$VERSION-$ARCH-$BUILD.txz )
+( cd $PKG6
+  makepkg -l y -c n $TMP/gcc-objc-$VERSION-$ARCH-$BUILD.txz )
+#( cd $PKG7
+#  makepkg -l y -c n $TMP/gcc-g++-gch-$VERSION-$ARCH-$BUILD.txz )
+( cd $PKG8
+  makepkg -l y -c n $TMP/gcc-go-$VERSION-$ARCH-$BUILD.txz )
+
+echo
+echo "Slackware GCC package build complete!"
+echo
+
Index: npl/system/gcc/gcc.arch
===================================================================
--- npl/system/gcc/gcc.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc.build
===================================================================
--- npl/system/gcc/gcc.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+6205
Index: npl/system/gcc/gcc.depver
===================================================================
--- npl/system/gcc/gcc.depver	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,3 +1,20 @@
+zlib	0
 gmp	0
+mpfr	0
 mpc	0
-mpfr	0
+gtk2	2
+glib2	2
+pango	4
+cairo	4
+pixman	1
+fontconfig	2
+freetype2	1
+expat	020100
+libpng	1
+gdk_pixbuf	0
+xorg_lib	1
+pthread_stubs	0
+atk	2
+harfbuzz	0
+libart_lgpl	0
+libffi	0
Index: npl/system/gcc/gcc.md5
===================================================================
--- npl/system/gcc/gcc.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,6 +1,9 @@
 0e0318be407e51fdf7ba6777eabfdf73  ./antlr-runtime-3.4.jar
+3d333df77302ed89e06a4a8539943b7d  ./c89.sh
+da96f545b863e57c6ab2598c1ea9a740  ./c99.sh
 8430857d8ac011e229f6a10099ef8d50  ./create_gcj_jvm.sh
-d7cd6a27c8801e66cbaa964a039ecfdb  ./ecj-4.5.jar
+7339f199ba11c941890031fd9981d7be  ./ecj-4.9.jar
 032d18379479cdfa4fb0211ee63e07ee  ./ecj.sh
+856268004203d1cc51768395dd959877  ./ecj.url
 62eff959f57f878067aad665ed8213a6  ./fastjar-0.97.tar.xz
 fa67bbcfa26c04fba0b06edbaab36ff8  ./fastjar-patches/1000-fastjar-0.97-segfault.patch.gz
@@ -9,26 +12,30 @@
 82101089b3bbe7fa1dcd3542de1750b8  ./fastjar-patches/1003-fastjar-CVE-2010-0831.patch.gz
 7db0bbd8111353d3dfd69ffab5bcc79e  ./fastjar-patches/1004-fastjar-man.patch.gz
-2ce0bc44964a7a5896164581d03bdc45  ./gcc-4.8.4.tar.xz
-d45ef7ca077355136730051c3c161294  ./gcc_dev.pkg
-56e069f39be8ed39008d189c46fe8568  ./gcc_g++_dev.pkg
-3565c5fe2c45590133ef94b0fd50c73a  ./gcc_gfortran_dev.pkg
-38c8f0534be10e955d85ab6751cf3237  ./gcc_gfortran.pkg
-0cd71aff74741ddd2776b924d9aa19a5  ./gcc_g++_gch.pkg
-496bd3bbaf0c30f405bcffb1a07e78d4  ./gcc_gnat.pkg
-456d415ed22665d649cce9573a493ffc  ./gcc_go_dev.pkg
-97b614d0cc916262c1b2a47a106d844c  ./gcc_go.pkg
-55909b93618ef836f18fd943486dfcb1  ./gcc_g++.pkg
-c4fc7a6607830aaecf1d65f1c2d47050  ./gcc_java_dev.pkg
-e4af50c8a7f978508723beebdcb888d3  ./gcc_java.pkg
+85eb6796cfe20c06ecf99105ec4b28c8  ./gcc-5.4.0.tar.xz
+b6f2bbb679113a23d937f2d8be4ccc66  ./gcc.66782.diff.gz
+10405a6e18aca3fc8ad0f4b227f9b03a  ./gcc_dev.pkg
+95aa6c3a17bef5a0adc8a1ab14581b44  ./gcc_g++_dev.pkg
+0d4e31986aa70a707ee54c3e1b0d94b9  ./gcc_gfortran_dev.pkg
+82c7effcaa224c1a0392b4fae7198b13  ./gcc_gfortran.pkg
+b37c463a511d8ad7a147b9497122c02f  ./gcc_g++_gch_dev.pkg
+28c1bf800ca04672f310ccd5241ef5db  ./gcc_g++_gch.pkg
+e4430b546c02ddf75d6aaa0f51cf4f7b  ./gcc_gnat_dev.pkg
+5207506aaff1783acef3d85382ef8799  ./gcc_gnat.pkg
+a9f7e7f8e6940fa6be81267e857b44da  ./gcc_go_dev.pkg
+4094d8c0d9f9528ff94bf99a129bbbaf  ./gcc_go.pkg
+5d15062fbfd843c38c474bd1ab7a55e0  ./gcc_g++.pkg
+904a453ec68b6d26d8e2a04fd73b0144  ./gcc_java_dev.pkg
+99546fdf5259742e48a8de11b29dbd04  ./gcc_java.pkg
 04b803eabffa4cd25e4107aab5990898  ./gcc-no_fixincludes.diff.gz
-7576d766ebffd9dcc386380701d9646f  ./gcc_objc_dev.pkg
-c17cfdb41fa257550f46df1cd23484a5  ./gcc_objc.pkg
-95d69342a9689f3bbc5cc10c2a4d0bba  ./gcc.pkg
-cf0eb430a0b91cca81bb9d3ca68aaf2f  ./gcc.SlackBuild
-75201004dd198f74894d95ccb4eec0b5  ./gcc.SlackBuild.log.gz
-c6adca845a2b19a3eadaa30c332febfd  ./slack-desc.gcc
+eb9c9a1319aadc461cba70a614c49a51  ./gcc_objc_dev.pkg
+f4db95bbaef0860ac36eb9f01536eaed  ./gcc_objc.pkg
+d7fedf1eb56654a2be7ba7791b4300f9  ./gcc.pkg
+041508af7cba9b00e34c15c956de37b2  ./gcc.SlackBuild
+b5a98f9aa5fcd509f50be561cf11757c  ./gcc.SlackBuild.log.gz
+e99e3a86d319d2e55cd05e0d6979111c  ./gcc.SlackBuild.orig
+19ee8dd760ade9286bc687a3ea4170d6  ./slack-desc.gcc
 3354fda9713c3f18f3725ea7eb2c7b1b  ./slack-desc.gcc-g++
 d7d6a2dce931c5b59e43b90c1169d93a  ./slack-desc.gcc-gfortran
-a124d80662594b2dbc28ec4cabcecdbb  ./slack-desc.gcc-gnat
+8f2dd19bee5b49b1301c3847e58b9ac4  ./slack-desc.gcc-gnat
 a8385636f762f42d32a95a64abb9b84b  ./slack-desc.gcc-go
 1ab65690a2534493c39d01bc811e2302  ./slack-desc.gcc-java
Index: npl/system/gcc/gcc.version
===================================================================
--- npl/system/gcc/gcc.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_dev.arch
===================================================================
--- npl/system/gcc/gcc_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_dev.build
===================================================================
--- npl/system/gcc/gcc_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+6205
Index: npl/system/gcc/gcc_dev.version
===================================================================
--- npl/system/gcc/gcc_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_g++.arch
===================================================================
--- npl/system/gcc/gcc_g++.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_g++.build
===================================================================
--- npl/system/gcc/gcc_g++.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+6205
Index: npl/system/gcc/gcc_g++.version
===================================================================
--- npl/system/gcc/gcc_g++.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_g++_dev.arch
===================================================================
--- npl/system/gcc/gcc_g++_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_g++_dev.build
===================================================================
--- npl/system/gcc/gcc_g++_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+6205
Index: npl/system/gcc/gcc_g++_dev.version
===================================================================
--- npl/system/gcc/gcc_g++_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_g++_gch.arch
===================================================================
--- npl/system/gcc/gcc_g++_gch.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++_gch.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_g++_gch.build
===================================================================
--- npl/system/gcc/gcc_g++_gch.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++_gch.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6228
+2
Index: npl/system/gcc/gcc_g++_gch.version
===================================================================
--- npl/system/gcc/gcc_g++_gch.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_g++_gch.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_g++_gch_dev.arch
===================================================================
--- npl/system/gcc/gcc_g++_gch_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/gcc_g++_gch_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/system/gcc/gcc_g++_gch_dev.build
===================================================================
--- npl/system/gcc/gcc_g++_gch_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/gcc_g++_gch_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+2
Index: npl/system/gcc/gcc_g++_gch_dev.version
===================================================================
--- npl/system/gcc/gcc_g++_gch_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/gcc_g++_gch_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+5.4.0
Index: npl/system/gcc/gcc_gfortran.arch
===================================================================
--- npl/system/gcc/gcc_gfortran.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gfortran.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_gfortran.build
===================================================================
--- npl/system/gcc/gcc_gfortran.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gfortran.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_gfortran.version
===================================================================
--- npl/system/gcc/gcc_gfortran.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gfortran.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_gfortran_dev.arch
===================================================================
--- npl/system/gcc/gcc_gfortran_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gfortran_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_gfortran_dev.build
===================================================================
--- npl/system/gcc/gcc_gfortran_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gfortran_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_gfortran_dev.version
===================================================================
--- npl/system/gcc/gcc_gfortran_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gfortran_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_gnat.arch
===================================================================
--- npl/system/gcc/gcc_gnat.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gnat.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_gnat.build
===================================================================
--- npl/system/gcc/gcc_gnat.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gnat.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_gnat.version
===================================================================
--- npl/system/gcc/gcc_gnat.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_gnat.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_gnat_dev.arch
===================================================================
--- npl/system/gcc/gcc_gnat_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/gcc_gnat_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+i586
Index: npl/system/gcc/gcc_gnat_dev.build
===================================================================
--- npl/system/gcc/gcc_gnat_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/gcc_gnat_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+2
Index: npl/system/gcc/gcc_gnat_dev.version
===================================================================
--- npl/system/gcc/gcc_gnat_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gcc/gcc_gnat_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+5.4.0
Index: npl/system/gcc/gcc_go.arch
===================================================================
--- npl/system/gcc/gcc_go.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_go.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_go.build
===================================================================
--- npl/system/gcc/gcc_go.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_go.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_go.version
===================================================================
--- npl/system/gcc/gcc_go.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_go.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_go_dev.arch
===================================================================
--- npl/system/gcc/gcc_go_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_go_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_go_dev.build
===================================================================
--- npl/system/gcc/gcc_go_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_go_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_go_dev.version
===================================================================
--- npl/system/gcc/gcc_go_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_go_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_java.arch
===================================================================
--- npl/system/gcc/gcc_java.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_java.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_java.build
===================================================================
--- npl/system/gcc/gcc_java.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_java.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_java.version
===================================================================
--- npl/system/gcc/gcc_java.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_java.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_java_dev.arch
===================================================================
--- npl/system/gcc/gcc_java_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_java_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_java_dev.build
===================================================================
--- npl/system/gcc/gcc_java_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_java_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_java_dev.version
===================================================================
--- npl/system/gcc/gcc_java_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_java_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_objc.arch
===================================================================
--- npl/system/gcc/gcc_objc.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_objc.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_objc.build
===================================================================
--- npl/system/gcc/gcc_objc.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_objc.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+6205
Index: npl/system/gcc/gcc_objc.version
===================================================================
--- npl/system/gcc/gcc_objc.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_objc.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/gcc_objc_dev.arch
===================================================================
--- npl/system/gcc/gcc_objc_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_objc_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gcc/gcc_objc_dev.build
===================================================================
--- npl/system/gcc/gcc_objc_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_objc_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6203
+2
Index: npl/system/gcc/gcc_objc_dev.version
===================================================================
--- npl/system/gcc/gcc_objc_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/gcc_objc_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-4.8.4
+5.4.0
Index: npl/system/gcc/slack-desc.gcc
===================================================================
--- npl/system/gcc/slack-desc.gcc	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/slack-desc.gcc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -12,6 +12,6 @@
 gcc:
 gcc: This package contains those parts of the compiler collection needed to
-gcc: compile C code.  Other packages add C++, Fortran, Go, Objective-C, and
-gcc: Java support to the compiler core.
+gcc: compile C code.  Other packages add Ada, C++, Fortran, Go,
+gcc: Objective-C, and Java support to the compiler core.
 gcc:
 gcc:
Index: npl/system/gcc/slack-desc.gcc-gnat
===================================================================
--- npl/system/gcc/slack-desc.gcc-gnat	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gcc/slack-desc.gcc-gnat	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -9,11 +9,11 @@
 gcc-gnat: gcc-gnat (Ada support for GCC)
 gcc-gnat:
-gcc-gnat: Ada 95 support for the GNU Compiler Collection.
+gcc-gnat: Ada support for the GNU Compiler Collection.
 gcc-gnat:
 gcc-gnat: This package contains those parts of the compiler collection needed to
-gcc-gnat: compile Ada 95 code.  Ada95 is the object oriented successor to the
-gcc-gnat: Ada83 language.  The base gcc package is also required.
+gcc-gnat: compile Ada code.  GNAT implements Ada 95, Ada 2005 and Ada 2012, and
+gcc-gnat: it may also be invoked in Ada 83 compatibility mode.  By default, GNAT
+gcc-gnat: assumes Ada 2012.  The base gcc package is also required.
 gcc-gnat:
 gcc-gnat:
 gcc-gnat:
-gcc-gnat:
Index: npl/system/glibc/doinst.sh-glibc
===================================================================
--- npl/system/glibc/doinst.sh-glibc	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/doinst.sh-glibc	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -70,23 +70,4 @@
 rm -rf lib/incoming
 # Done installing NPTL glibc libraries.
-
-# Timezone stuff:
-if [ -L etc/localtime -a ! -r etc/localtime-copied-from ]; then
-  mv etc/localtime etc/localtime-copied-from
-  chroot . /bin/cp etc/localtime-copied-from etc/localtime
-fi
-# Add the default timezone in /etc, if none exists:
-if [ ! -r etc/localtime ]; then
-  ( cd etc ; rm -rf localtime localtime-copied-from )
-  ( cd etc ; ln -sf /usr/share/zoneinfo/Factory localtime-copied-from )
-  chroot . /bin/cp etc/localtime-copied-from etc/localtime
-fi
-# Add the default link in /usr/share/zoneinfo, if none exists:
-if [ ! -L usr/share/zoneinfo/localtime ]; then
-  ( cd usr/share/zoneinfo ; rm -rf localtime )
-  ( cd usr/share/zoneinfo ; ln -sf /etc/localtime localtime )
-fi
-( cd usr/share/zoneinfo ; rm -rf timeconfig )
-( cd usr/share/zoneinfo ; ln -sf /usr/sbin/timeconfig timeconfig )
 
 # Handle config files:
@@ -165,6 +146,7 @@
 ( cd usr/lib ; rm -rf libnss_files.so )
 ( cd usr/lib ; ln -sf ../../lib/libnss_files.so.2 libnss_files.so )
-( cd usr/lib ; rm -rf libm.so )
-( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so )
+# This is now a linker script:
+#( cd usr/lib ; rm -rf libm.so )
+#( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so )
 ( cd usr/lib ; rm -rf libutil.so )
 ( cd usr/lib ; ln -sf ../../lib/libutil.so.1 libutil.so )
Index: npl/system/glibc/doinst.sh-glibc-zoneinfo
===================================================================
--- npl/system/glibc/doinst.sh-glibc-zoneinfo	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,15 +1,0 @@
-# Fix existing old style /etc/localtime symlink:
-if [ -L etc/localtime -a ! -r etc/localtime-copied-from ]; then
-  mv etc/localtime etc/localtime-copied-from
-fi
-# Add the default timezone in /etc, if none exists:
-if [ ! -r etc/localtime ]; then
-  ( cd etc ; rm -rf localtime localtime-copied-from )
-  ( cd etc ; ln -sf /usr/share/zoneinfo/Factory localtime-copied-from )
-fi
-# Make sure /etc/localtime is updated:
-chroot . /bin/cp etc/localtime-copied-from etc/localtime
-# Add the default link in /usr/share/zoneinfo:
-( cd usr/share/zoneinfo ; rm -rf timeconfig )
-( cd usr/share/zoneinfo ; ln -sf /usr/sbin/timeconfig timeconfig )
-### Make the rest of the symbolic links in the zoneinfo database:
Index: npl/system/glibc/glibc-2.21.tar.xz.sig
===================================================================
--- npl/system/glibc/glibc-2.21.tar.xz.sig	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,11 +1,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJU1NlUAAoJECXvCkNsKkr/ZScH/0VEm3ilt/q9xV6whTW+JJ/y
-dnIUqzhsh9qIhgpO2XS7L+o80LNPagO4Yivozi6tzLyEd9+XhsSszpS1uqC5Rolp
-1K2rIX9Of2Tnp7KbnpXkXzQ/ABOaIBZVEtNQIuhNL+uwasqDBxuakX85z/2Ybfjm
-Jf4WYHcd6/hGfkUmHiSk01zxPv/isLfMDE063Lb0roiWSqXeyHPzPvz117ok9pU+
-K3Tf03TrbBZZjuFTAioM5bQcHca1YcFMht7ZbOVARLNf9Z7g6VkP8abDf5uJW8Rx
-Eaor4C1YqryVEnZ+ACtc3tplQf2eJ+l579VQcX+pa4N1J5bYIx4lO6SzoPcXOcQ=
-=hTdl
------END PGP SIGNATURE-----
Index: npl/system/glibc/glibc-2.24.tar.xz.sig
===================================================================
--- npl/system/glibc/glibc-2.24.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/glibc/glibc-2.24.tar.xz.sig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJXo1gPAAoJEBZ5K06iU0D4XQcP/3979bgeQZFIzdhhW9qDGf8y
+3Zkij6WyytpSM0xm80bZCTD/4fkVYkiDOhgzfghrI0T3BQWitrQIUS4q94VtbeRk
+i0QbPdYZ6xmnS56OcyxK+hdqr8XpGxRwfCZH+hCEbXjGblYiViXY54VSL2oWj6q9
+Lolyi7LoZZg3nM7Hf7/yEqa38eKq0N6654MXaVZi9wz31YHweJHsI1rdUkYEpWxp
+YIc6eCmhZpyj09Vk7s4qriNqBXmBLZbAcqOAL7hzc1H4aRVGLWdR6JQAClOQtQ6b
+SrW4/MO4re5coz1EYWJLpzkDOnH/pkhA0gPeM7PDm+3t2DJa/6k01Jljxjswfujf
+EflmRw/FRG08/QADaBrtmu8s79/07xJUjf/qLhg0YIJL2aBqaVNkxSZhE+aOIOXD
+FrqX+fVhG4FX2YlQ5twDSU+7Uc370Gh7b8QIEOVvd5Tllg52i200aMB2wlVO+Rl5
+oKN21dhbMzzQvJM9IxrBcWoymEE3kQXid+IBZxShg6JOEv9ZKpHKJGRtueJ1EM3R
+V44rfJ5hVYn+U872lEgf2jf0w1A0aSMCVAX8N/8BO9NAZ9waM6IBgc3v1ng6uWdn
+o4CdOHK6WP+GrbJ8Rbva8co16UHd9Ae1Vcwe5tDU7TxfFFkJ0RPVzVgTdl65+arX
+VU1J1Kp1fBvbgwEacwxC
+=yUZV
+-----END PGP SIGNATURE-----
Index: npl/system/glibc/glibc.SlackBuild
===================================================================
--- npl/system/glibc/glibc.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,505 +1,19 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/l/glibc/
+# Created at Mon Jan 30 20:32:16 CET 2017
 
-# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-## build glibc-$VERSION for Slackware
-
-VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-1}
-
-## Included in glibc now:
-## glibc-libidn version
-#LIBIDNVER=2.10.1
-
-# I was considering disabling NSCD, but MoZes talked me out of it.  :)
-#DISABLE_NSCD=" --disable-nscd "
-
-# $ARCH may be preset, otherwise i486 compatibility with i686 binary
-# structuring is the Slackware default, since this is what gcc-3.2+
-# requires for binary compatibility with previous releases.
-#ARCH=i486
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# I'll break this out as an option for fun  :-)
-case $ARCH  in
-  i386)
-    OPTIMIZ="-O3 -march=i386 -mcpu=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  i486)
-    OPTIMIZ="-O3 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  i586)
-    OPTIMIZ="-O3 -march=i586"
-    LIBDIRSUFFIX=""
-    ;;
-  i686)
-    OPTIMIZ="-O3 -march=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  athlon)
-    OPTIMIZ="-O3 -march=athlon"
-    LIBDIRSUFFIX=""
-    ;;
-  s390)
-    OPTIMIZ="-O3"
-    LIBDIRSUFFIX=""
-    ;;
-  x86_64)
-    OPTIMIZ="-O3 -fPIC"
-    LIBDIRSUFFIX="64"
-    ;;
-  *)
-    OPTIMIZ="-O3"
-    LIBDIRSUFFIX=""
-    ;;
-esac
-
-case $ARCH in
-  x86_64)
-    TARGET=${TARGET:-x86_64}
-    ;;
-  i486)
-    # This should be i486 for all 32-bit x86 arch:
-    TARGET=${TARGET:-i486}
-    ;;
-esac
-
-# Hand off the $ARCH variable to $SLACKWARE_ARCH to avoid confusing glibc:
-SLACKWARE_ARCH=$ARCH
-unset ARCH
-
-CVSVER=${VERSION}${CHECKOUT}
-
-# NOTE!!!  glibc needs to be built against the sanitized kernel headers,
-# which will be installed under /usr/include by the kernel-headers package.
-# Be sure the correct version of the headers package is installed BEFORE
-# building glibc!
-
-CWD=$(pwd)
-# Temporary build location.  This should not be a directory
-# path a non-root user could create later...
-TMP=${TMP:-/glibc-tmp-$(mcookie)}
-mkdir -p $TMP
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-# This function fixes a doinst.sh file for x86_64.
-# With thanks to Fred Emmott.
-fix_doinst() {
-  if [ "x$LIBDIRSUFFIX" = "x" ]; then
-    return;
-  fi;
-  # Fix "( cd usr/lib ;" occurrences
-  sed -i "s#lib ;#lib${LIBDIRSUFFIX} ;#" install/doinst.sh
-  # Fix "lib/" occurrences
-  sed -i "s#lib/#lib${LIBDIRSUFFIX}/#g" install/doinst.sh
-  # Fix "( cd lib" occurrences
-  sed -i "s#( cd lib\$#( cd lib${LIBDIRSUFFIX}#" install/doinst.sh
-
-  if [ "$SLACKWARE_ARCH" = "x86_64" ]; then
-    sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh
-  fi
-}
-
-# This is a patch function to put all glibc patches in the build script
-# up near the top.
-apply_patches() {
-  # Use old-style locale directories rather than a single (and strangely
-  # formatted) /usr/lib/locale/locale-archive file:
-  zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1
-  # The is_IS locale is causing a strange error about the "echn" command
-  # not existing.  This patch reverts is_IS to the version shipped in
-  # glibc-2.5:
-  zcat $CWD/is_IS.diff.gz | patch -p1 --verbose || exit 1
-  # Fix NIS netgroups:
-  zcat $CWD/glibc.nis-netgroups.diff.gz | patch -p1 --verbose || exit 1
-  # Support ru_RU.CP1251 locale:
-  zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
-  # Fix resolver problem with glibc-2.9:
-  zcat $CWD/glibc-2.10-dns-no-gethostbyname4.diff.gz | patch -p0 --verbose || exit 1
-  # This reverts a patch that was made to glibc to fix "namespace leakage",
-  # which seems to cause some build failures (e.g. with conntrack):
-  zcat $CWD/glibc.revert.to.fix.build.breakages.diff.gz | patch -p1 -l --verbose || exit 1
-  # Make it harder for people to trick ldd into running code:
-  zcat $CWD/glibc.ldd.trace.through.dynamic.linker.diff.gz | patch -p1 --verbose || exit 1
-  # Make glibc compile with binutils using --enable-initfini-array.
-  # At this time, we do not recommend this due to probable ABI breakage.
-  # The also patch needs work before it would apply.
-  # ***NOT READY***
-  #zcat $CWD/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch.gz | patch -p1 --verbose || exit 1
-  #
-  # 2014-05:  We'll try building with the stock asm...
-  ## Avoid the Intel optimized asm routines for now because they break
-  ## the flash player.  We'll phase this in when it's safer to do so.
-  #zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1
-}
-
-# This is going to be the initial $DESTDIR:
-export PKG=$TMP/package-glibc-incoming-tree
-PGLIBC=$TMP/package-glibc
-PSOLIBS=$TMP/package-glibc-solibs
-PZONE=$TMP/package-glibc-zoneinfo
-PI18N=$TMP/package-glibc-i18n
-PPROFILE=$TMP/package-glibc-profile
-PDEBUG=$TMP/package-glibc-debug
-
-# Empty these locations first:
-for dir in $PKG $PGLIBC $PSOLIBS $PZONE $PI18N $PPROFILE $PDEBUG ; do
-  if [ -d $dir ]; then
-    rm -rf $dir
-  fi
-  mkdir -p $dir
-done
-if [ -d $TMP/glibc-$VERSION ]; then
-  rm -rf $TMP/glibc-$VERSION
-fi
-
-# Create an incoming directory structure for glibc to be built into:
-mkdir -p $PKG/lib${LIBDIRSUFFIX}
-mkdir -p $PKG/sbin
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-mkdir -p $PKG/usr/sbin
-mkdir -p $PKG/usr/include
-mkdir -p $PKG/usr/doc
-mkdir -p $PKG/usr/man
-mkdir -p $PKG/usr/share
-mkdir -p $PKG/var/db/nscd
-mkdir -p $PKG/var/run/nscd
-
-# Begin extract/compile:
-cd $TMP
-rm -rf glibc-$CVSVER
-tar xvf $CWD/glibc-$CVSVER.tar.xz \
-  || tar xvf $CWD/glibc-$CVSVER.tar.bz2 \
-  || tar xvf $CWD/glibc-$CVSVER.tar.gz
-cd glibc-$CVSVER
-
-#tar xvf $CWD/glibc-libidn-$LIBIDNVER.tar.?z*
-#mv glibc-libidn-$LIBIDNVER libidn
-
-chown -R root:root .
-find . -perm 666 -exec chmod 644 {} \;
-find . -perm 664 -exec chmod 644 {} \;
-find . -perm 600 -exec chmod 644 {} \;
-find . -perm 444 -exec chmod 644 {} \;
-find . -perm 400 -exec chmod 644 {} \;
-find . -perm 440 -exec chmod 644 {} \;
-find . -perm 777 -exec chmod 755 {} \;
-find . -perm 775 -exec chmod 755 {} \;
-find . -perm 511 -exec chmod 755 {} \;
-find . -perm 711 -exec chmod 755 {} \;
-find . -perm 555 -exec chmod 755 {} \;
-
-# Clean up leftover CVS directories:
-find . -type d -name CVS -exec rm -r {} \; 2> /dev/null
-
-# Apply patches; exit if any fail.
-apply_patches
-if [ ! $? = 0 ]; then
-  exit 1
-fi
-
-# Make build directory:
-mkdir build-glibc-$VERSION
-cd build-glibc-$VERSION || exit 1
-
-echo "BUILDING DAS NPTL GLIBC"
-CFLAGS="-g $OPTIMIZ" \
-../configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-kernel=2.6.32 \
-  --with-headers=/usr/include \
-  --enable-add-ons \
-  --enable-obsolete-rpc \
-  --enable-profile \
-  $DISABLE_NSCD \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --with-tls \
-  --with-__thread \
-  --without-cvs \
-  $TARGET-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make install install_root=$PKG || exit 1
-make localedata/install-locales install_root=$PKG || exit 1
-
-# The prevailing standard seems to be putting unstripped libraries in
-# /usr/lib/debug/ and stripping the debugging symbols from all the other
-# libraries.
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/debug
-cp -a $PKG/lib${LIBDIRSUFFIX}/l*.so* $PKG/usr/lib${LIBDIRSUFFIX}/debug
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/*.a $PKG/usr/lib${LIBDIRSUFFIX}/debug
-# Don't need debug+profile:
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/debug ; rm -f *_p.* )
-# NOTE:  Is there really a reason for the glibc-debug package?
-# If you're debugging glibc, you can also compile it, right?
-
-## COMMENTED OUT:  There's no reason for profile libs to include -g information.
-## Put back unstripped profiling libraries:
-#mv $PKG/usr/lib${LIBDIRSUFFIX}/debug/*_p.a $PKG/usr/lib${LIBDIRSUFFIX}
-# It might be best to put the unstripped and profiling libraries in glibc-debug and glibc-profile.
-
-# I don't think "strip -g" causes the pthread problems.  It's --strip-unneeded that does.
-strip -g $PKG/lib${LIBDIRSUFFIX}/l*.so*
-strip -g $PKG/usr/lib${LIBDIRSUFFIX}/l*.so*
-strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a
-
-# Build and install the zoneinfo database:
-cd $TMP
-rm -rf tzcodedata-build
-mkdir tzcodedata-build
-cd tzcodedata-build
-tar xzf $CWD/tzdata?????.tar.gz
-tar xzf $CWD/tzcode?????.tar.gz
-sed -i "s,/usr/local,$(pwd),g" Makefile
-sed -i "s,/etc/zoneinfo,/zoneinfo,g" Makefile
-make
-make install
-mkdir -p $PKG/usr/share/zoneinfo/{posix,right}
-cd etc
-cp -a zoneinfo/* $PKG/usr/share/zoneinfo
-cp -a zoneinfo-posix/* $PKG/usr/share/zoneinfo/posix
-cp -a zoneinfo-leaps/* $PKG/usr/share/zoneinfo/right
-# Remove $PKG/usr/share/zoneinfo/localtime -- the install script will
-# create it as a link to /etc/localtime.
-rm -f $PKG/usr/share/zoneinfo/localtime
-
-# Back to the sources dir to add some files/docs:
-cd $TMP/glibc-$CVSVER
-
-# We'll automatically install the config file for the Name Server Cache Daemon.
-# Perhaps this should also have some commented-out startup code in rc.inet2...
-mkdir -p $PKG/etc
-cat nscd/nscd.conf > $PKG/etc/nscd.conf.new
-
-# Install some scripts to help select a timezone:
-( cd $CWD/timezone-scripts
-  # Try to rebuild this:
-  sh output-updated-timeconfig.sh $PKG/usr/share/zoneinfo > timeconfig 2> /dev/null
-)
-mkdir -p $PKG/var/log/setup
-cp -a $CWD/timezone-scripts/setup.timeconfig $PKG/var/log/setup
-chown root:root $PKG/var/log/setup/setup.timeconfig
-chmod 755 $PKG/var/log/setup/setup.timeconfig
-mkdir -p $PKG/usr/sbin
-cp -a $CWD/timezone-scripts/timeconfig $PKG/usr/sbin
-chown root:root $PKG/usr/sbin/timeconfig
-chmod 755 $PKG/usr/sbin/timeconfig
-
-## Install docs:
-( mkdir -p $PKG/usr/doc/glibc-$VERSION
-  cp -a \
-    BUGS CONFORMANCE COPYING COPYING.LIB FAQ INSTALL LICENSES NAMESPACE \
-    NEWS NOTES PROJECTS README README.libm \
-    $PKG/usr/doc/glibc-$VERSION
-)
-
-# Don't forget to add the /usr/share/zoneinfo/localtime -> /etc/localtime symlink! :)
-if [ ! -r $PKG/usr/share/zoneinfo/localtime ]; then
-  ( cd $PKG/usr/share/zoneinfo ; ln -sf /etc/localtime . )
-fi
-
-# OK, there are some very old Linux standards that say that any binaries in a /bin or
-# /sbin directory (and the directories themselves) should be group bin rather than
-# group root, unless a specific group is really needed for some reason.
-#
-# I can't find any mention of this in more recent standards docs, and always thought
-# that it was pretty cosmetic anyway (hey, if there's a reason -- fill me in!), so
-# it's possible that this ownership change won't be followed in the near future
-# (it's a PITA, and causes many bug reports when the perms change is occasionally
-# forgotten).
-#
-# But, it's hard to get me to break old habits, so we'll continue the tradition here:
-#
-# No, no we won't.  You know how we love to break traditions.
-
-# Strip most binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
-)
-
-# Fix info dir:
-rm $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
-# This is junk
-rm $PKG/etc/ld.so.cache
-( cd $PKG
-  find . -name "*.orig" -exec rm {} \;
-)
-
-##################################
-# OK, time to make some packages #
-##################################
-
-# glibc-zoneinfo.  We will start with an easy one to avoid breaking a sweat.  ;-)
-cd $CWD
-ZONE_VERSIONS="$(echo tzdata* | cut -f1 -d . | cut -b7-11)"
-echo $ZONE_VERSIONS
-cd $PZONE
-# Install some scripts to help select a timezone:
-mkdir -p $PZONE/var/log/setup
-cp -a $CWD/timezone-scripts/setup.timeconfig $PZONE/var/log/setup
-chown root:root $PZONE/var/log/setup/setup.timeconfig
-chmod 755 $PZONE/var/log/setup/setup.timeconfig
-mkdir -p $PZONE/usr/sbin
-cp -a $CWD/timezone-scripts/timeconfig $PZONE/usr/sbin
-chown root:root $PZONE/usr/sbin/timeconfig
-chmod 755 $PZONE/usr/sbin/timeconfig
-mkdir $PZONE/install
-cat $CWD/doinst.sh-glibc-zoneinfo > $PZONE/install/doinst.sh
-cat $CWD/slack-desc.glibc-zoneinfo > $PZONE/install/slack-desc
-mkdir -p $PZONE/usr/share
-cd $PZONE/usr/share
-cp -a --verbose $PKG/usr/share/zoneinfo .
-cd $PZONE
-mkdir -p $PZONE/etc
-# This is already hard-coded into doinst.sh (like it'll be there anyway ;-):
-rm -f etc/localtime
-# Wrap it up:
-makepkg -l y -c n $TMP/glibc-zoneinfo-$ZONE_VERSIONS-noarch-$BUILD.txz
-
-# glibc-profile:
-cd $PPROFILE
-mkdir -p usr/lib${LIBDIRSUFFIX}
-# Might as well just grab these with 'mv' to simplify things later:
-mv $PKG/usr/lib${LIBDIRSUFFIX}/lib*_p.a usr/lib${LIBDIRSUFFIX}
-# Profile libs should be stripped.  Use the debug libs to debug...
-( cd usr/lib${LIBDIRSUFFIX} ; strip -g *.a )
-mkdir install
-cp -a $CWD/slack-desc.glibc-profile install/slack-desc
-makepkg -l y -c n $TMP/glibc-profile-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
-
-# THIS IS NO LONGER PACKAGED (or is it?  might be better to let it be made, and then ship it or not...)
-# glibc-debug:
-cd $PDEBUG
-mkdir -p usr/lib${LIBDIRSUFFIX}
-# Might as well just grab these with 'mv' to simplify things later:
-mv $PKG/usr/lib${LIBDIRSUFFIX}/debug usr/lib${LIBDIRSUFFIX}
-mkdir install
-cp -a $CWD/slack-desc.glibc-debug install/slack-desc
-makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
-## INSTEAD, NUKE THESE LIBS
-#rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug
-
-# glibc-i18n:
-cd $PI18N
-mkdir -p usr/lib${LIBDIRSUFFIX}
-rm -rf usr/lib${LIBDIRSUFFIX}/locale
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/locale usr/lib${LIBDIRSUFFIX}
-mkdir -p usr/share
-cp -a $PKG/usr/share/i18n usr/share
-cp -a $PKG/usr/share/locale usr/share
-mkdir install
-cp -a $CWD/slack-desc.glibc-i18n install/slack-desc
-makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
-
-# glibc-solibs:
-cd $PSOLIBS
-mkdir -p etc/profile.d
-cp -a $CWD/profile.d/* etc/profile.d
-chown -R root:root etc
-chmod 755 etc/profile.d/*
-mkdir -p lib${LIBDIRSUFFIX}
-cp -a $PKG/lib${LIBDIRSUFFIX}/* lib${LIBDIRSUFFIX}
-( cd lib${LIBDIRSUFFIX}
-  mkdir incoming
-  mv *so* incoming
-  mv incoming/libSegFault.so .
-)
-mkdir -p usr
-cp -a $PKG/usr/bin usr
-mv usr/bin/ldd .
-rm usr/bin/*
-mv ldd usr/bin
-mkdir -p usr/lib${LIBDIRSUFFIX}
-# The gconv directory has a lot of stuff, but including it here will save some problems.
-# Seems standard elsewhere.
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/gconv usr/lib${LIBDIRSUFFIX}
-# Another manpage abandoned by GNU...
-#mkdir -p usr/man/man1
-#cp -a $PKG/usr/man/man1/ldd.1.gz usr/man/man1
-mkdir -p usr/libexec
-cp -a $PKG/usr/libexec/pt_chown usr/libexec
-# Same usr.bin deal:
-cp -a $PKG/sbin .
-mv sbin/ldconfig .
-rm sbin/*
-mv ldconfig sbin
-mkdir install
-cp -a $CWD/slack-desc.glibc-solibs install/slack-desc
-cp -a $CWD/doinst.sh-glibc-solibs install/doinst.sh
-fix_doinst
-sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
-# Ditch links:
-find . -type l -exec rm {} \;
-# Build the package:
-makepkg -l y -c n $TMP/glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
-
-# And finally, the complete "all-in-one" glibc package is created
-# from whatever was leftover:
-cd $PGLIBC
-mv $PKG/* .
-mkdir -p etc/profile.d
-cp -a $CWD/profile.d/* etc/profile.d
-chown -R root:root etc
-chmod 755 etc/profile.d/*
-# Ditch links (these are in doinst.sh-glibc):
-find . -type l -exec rm {} \;
-mkdir install
-cp -a $CWD/slack-desc.glibc install/slack-desc
-cp -a $CWD/doinst.sh-glibc install/doinst.sh
-fix_doinst
-sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
-( cd lib${LIBDIRSUFFIX}
-  mkdir incoming
-  mv *so* incoming
-  mv incoming/libSegFault.so .
-)
-# Build the package:
-/sbin/makepkg -l y -c n $TMP/glibc-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
-
-# Done!
-echo
-echo "glibc packages built in $TMP!"
-
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./glibc.SlackBuild.orig
+ARCH=$SLACKWARE_ARCH
 
 ############ make syn3 packages
 cd $CWD
-ARCH=i486
 for PKG in /glibc-tmp-*/package-*; do
-        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/'`
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
 
         #seperate dev-package
Index: npl/system/glibc/glibc.SlackBuild.orig
===================================================================
--- npl/system/glibc/glibc.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/glibc/glibc.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,428 @@
+#!/bin/sh
+
+# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## build glibc-$VERSION for Slackware
+
+VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+CHECKOUT=${CHECKOUT:-""}
+BUILD=${BUILD:-2}
+
+# I was considering disabling NSCD, but MoZes talked me out of it.  :)
+#DISABLE_NSCD=" --disable-nscd "
+
+# $ARCH may be preset, otherwise i586 compatibility with i686 binary
+# structuring is the Slackware default.
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# I'll break this out as an option for fun  :-)
+case $ARCH  in
+  i386)
+    OPTIMIZ="-O3 -march=i386 -mcpu=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  i486)
+    OPTIMIZ="-O3 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  i586)
+    OPTIMIZ="-O3 -march=i586 -mtune=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  i686)
+    OPTIMIZ="-O3 -march=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  athlon)
+    OPTIMIZ="-O3 -march=athlon"
+    LIBDIRSUFFIX=""
+    ;;
+  s390)
+    OPTIMIZ="-O3"
+    LIBDIRSUFFIX=""
+    ;;
+  x86_64)
+    OPTIMIZ="-O3 -fPIC"
+    LIBDIRSUFFIX="64"
+    ;;
+  *)
+    OPTIMIZ="-O3"
+    LIBDIRSUFFIX=""
+    ;;
+esac
+
+case $ARCH in
+  x86_64)
+    TARGET=${TARGET:-x86_64}
+    ;;
+  i586)
+    # This should be i586 for all 32-bit x86 arch:
+    TARGET=${TARGET:-i586}
+    ;;
+esac
+
+# Hand off the $ARCH variable to $SLACKWARE_ARCH to avoid confusing glibc:
+SLACKWARE_ARCH=$ARCH
+unset ARCH
+
+CVSVER=${VERSION}${CHECKOUT}
+
+# NOTE!!!  glibc needs to be built against the sanitized kernel headers,
+# which will be installed under /usr/include by the kernel-headers package.
+# Be sure the correct version of the headers package is installed BEFORE
+# building glibc!
+
+CWD=$(pwd)
+# Temporary build location.  This should not be a directory
+# path a non-root user could create later...
+TMP=${TMP:-/glibc-tmp-$(mcookie)}
+mkdir -p $TMP
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# This function fixes a doinst.sh file for x86_64.
+# With thanks to Fred Emmott.
+fix_doinst() {
+  if [ "x$LIBDIRSUFFIX" = "x" ]; then
+    return;
+  fi;
+  # Fix "( cd usr/lib ;" occurrences
+  sed -i "s#lib ;#lib${LIBDIRSUFFIX} ;#" install/doinst.sh
+  # Fix "lib/" occurrences
+  sed -i "s#lib/#lib${LIBDIRSUFFIX}/#g" install/doinst.sh
+  # Fix "( cd lib" occurrences
+  sed -i "s#( cd lib\$#( cd lib${LIBDIRSUFFIX}#" install/doinst.sh
+
+  if [ "$SLACKWARE_ARCH" = "x86_64" ]; then
+    sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh
+  fi
+}
+
+# This is a patch function to put all glibc patches in the build script
+# up near the top.
+apply_patches() {
+  # Use old-style locale directories rather than a single (and strangely
+  # formatted) /usr/lib/locale/locale-archive file:
+  zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1
+  # The is_IS locale is causing a strange error about the "echn" command
+  # not existing.  This patch reverts is_IS to the version shipped in
+  # glibc-2.5:
+  zcat $CWD/is_IS.diff.gz | patch -p1 --verbose || exit 1
+  # Support ru_RU.CP1251 locale:
+  zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
+  # This reverts a patch that was made to glibc to fix "namespace leakage",
+  # which seems to cause some build failures (e.g. with conntrack):
+  zcat $CWD/glibc.revert.to.fix.build.breakages.diff.gz | patch -p1 -l --verbose || exit 1
+  # Make it harder for people to trick ldd into running code:
+  zcat $CWD/glibc.ldd.trace.through.dynamic.linker.diff.gz | patch -p1 --verbose || exit 1
+  # Add a C.UTF-8 locale:
+  zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1
+}
+
+# This is going to be the initial $DESTDIR:
+export PKG=$TMP/package-glibc-incoming-tree
+PGLIBC=$TMP/package-glibc
+PSOLIBS=$TMP/package-glibc-solibs
+PI18N=$TMP/package-glibc-i18n
+PPROFILE=$TMP/package-glibc-profile
+PDEBUG=$TMP/package-glibc-debug
+
+# Empty these locations first:
+for dir in $PKG $PGLIBC $PSOLIBS $PZONE $PI18N $PPROFILE $PDEBUG ; do
+  if [ -d $dir ]; then
+    rm -rf $dir
+  fi
+  mkdir -p $dir
+done
+if [ -d $TMP/glibc-$VERSION ]; then
+  rm -rf $TMP/glibc-$VERSION
+fi
+
+# Create an incoming directory structure for glibc to be built into:
+mkdir -p $PKG/lib${LIBDIRSUFFIX}
+mkdir -p $PKG/sbin
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+mkdir -p $PKG/usr/sbin
+mkdir -p $PKG/usr/include
+mkdir -p $PKG/usr/doc
+mkdir -p $PKG/usr/man
+mkdir -p $PKG/usr/share
+mkdir -p $PKG/var/db/nscd
+mkdir -p $PKG/var/run/nscd
+
+# Begin extract/compile:
+cd $TMP
+rm -rf glibc-$CVSVER
+tar xvf $CWD/glibc-$CVSVER.tar.xz \
+  || tar xvf $CWD/glibc-$CVSVER.tar.bz2 \
+  || tar xvf $CWD/glibc-$CVSVER.tar.gz
+cd glibc-$CVSVER
+
+chown -R root:root .
+find . -perm 666 -exec chmod 644 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+find . -perm 600 -exec chmod 644 {} \;
+find . -perm 444 -exec chmod 644 {} \;
+find . -perm 400 -exec chmod 644 {} \;
+find . -perm 440 -exec chmod 644 {} \;
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 775 -exec chmod 755 {} \;
+find . -perm 511 -exec chmod 755 {} \;
+find . -perm 711 -exec chmod 755 {} \;
+find . -perm 555 -exec chmod 755 {} \;
+
+# Clean up leftover CVS directories:
+find . -type d -name CVS -exec rm -r {} \; 2> /dev/null
+
+# Apply patches; exit if any fail.
+apply_patches
+if [ ! $? = 0 ]; then
+  exit 1
+fi
+
+# Make build directory:
+mkdir build-glibc-$VERSION
+cd build-glibc-$VERSION || exit 1
+
+echo "BUILDING DAS NPTL GLIBC"
+CFLAGS="-g $OPTIMIZ" \
+../configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --enable-kernel=2.6.32 \
+  --with-headers=/usr/include \
+  --enable-add-ons \
+  --enable-obsolete-rpc \
+  --enable-profile \
+  $DISABLE_NSCD \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --with-tls \
+  --with-__thread \
+  --without-cvs \
+  $TARGET-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install install_root=$PKG || exit 1
+make localedata/install-locales install_root=$PKG || exit 1
+
+# The prevailing standard seems to be putting unstripped libraries in
+# /usr/lib/debug/ and stripping the debugging symbols from all the other
+# libraries.
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/debug
+cp -a $PKG/lib${LIBDIRSUFFIX}/l*.so* $PKG/usr/lib${LIBDIRSUFFIX}/debug
+cp -a $PKG/usr/lib${LIBDIRSUFFIX}/*.a $PKG/usr/lib${LIBDIRSUFFIX}/debug
+# Don't need debug+profile:
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/debug ; rm -f *_p.* )
+# NOTE:  Is there really a reason for the glibc-debug package?
+# If you're debugging glibc, you can also compile it, right?
+
+## COMMENTED OUT:  There's no reason for profile libs to include -g information.
+## Put back unstripped profiling libraries:
+#mv $PKG/usr/lib${LIBDIRSUFFIX}/debug/*_p.a $PKG/usr/lib${LIBDIRSUFFIX}
+# It might be best to put the unstripped and profiling libraries in glibc-debug and glibc-profile.
+
+# I don't think "strip -g" causes the pthread problems.  It's --strip-unneeded that does.
+strip -g $PKG/lib${LIBDIRSUFFIX}/l*.so*
+strip -g $PKG/usr/lib${LIBDIRSUFFIX}/l*.so* || true
+strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a || true
+
+# Remove the rquota.x and rquota.h include files, as they are provided by
+# the quota package:
+rm -f $PKG/usr/include/rpcsvc/rquota.{h,x}
+
+# Back to the sources dir to add some files/docs:
+cd $TMP/glibc-$CVSVER
+
+# We'll automatically install the config file for the Name Server Cache Daemon.
+# Perhaps this should also have some commented-out startup code in rc.inet2...
+mkdir -p $PKG/etc
+cat nscd/nscd.conf > $PKG/etc/nscd.conf.new
+
+# Install docs:
+( mkdir -p $PKG/usr/doc/glibc-$VERSION
+  cp -a \
+    BUGS CONFORMANCE COPYING* INSTALL LICENSES NAMESPACE \
+    NEWS PROJECTS README* \
+    $PKG/usr/doc/glibc-$VERSION
+)
+
+# Trim the NEWS file to omit ancient history:
+if [ -r NEWS ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/glibc-$VERSION)
+  cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+  touch -r NEWS $DOCSDIR/NEWS
+fi
+
+# OK, there are some very old Linux standards that say that any binaries in a /bin or
+# /sbin directory (and the directories themselves) should be group bin rather than
+# group root, unless a specific group is really needed for some reason.
+#
+# I can't find any mention of this in more recent standards docs, and always thought
+# that it was pretty cosmetic anyway (hey, if there's a reason -- fill me in!), so
+# it's possible that this ownership change won't be followed in the near future
+# (it's a PITA, and causes many bug reports when the perms change is occasionally
+# forgotten).
+#
+# But, it's hard to get me to break old habits, so we'll continue the tradition here:
+#
+# No, no we won't.  You know how we love to break traditions.
+
+# Strip most binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
+)
+
+# Fix info dir:
+rm $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+# This is junk
+rm $PKG/etc/ld.so.cache
+( cd $PKG
+  find . -name "*.orig" -exec rm {} \;
+)
+
+##################################
+# OK, time to make some packages #
+##################################
+
+# glibc-profile:
+cd $PPROFILE
+mkdir -p usr/lib${LIBDIRSUFFIX}
+# Might as well just grab these with 'mv' to simplify things later:
+mv $PKG/usr/lib${LIBDIRSUFFIX}/lib*_p.a usr/lib${LIBDIRSUFFIX}
+# Profile libs should be stripped.  Use the debug libs to debug...
+( cd usr/lib${LIBDIRSUFFIX} ; strip -g *.a )
+mkdir install
+cp -a $CWD/slack-desc.glibc-profile install/slack-desc
+makepkg -l y -c n $TMP/glibc-profile-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
+
+# THIS IS NO LONGER PACKAGED (or is it?  might be better to let it be made, and then ship it or not...)
+# glibc-debug:
+cd $PDEBUG
+mkdir -p usr/lib${LIBDIRSUFFIX}
+# Might as well just grab these with 'mv' to simplify things later:
+mv $PKG/usr/lib${LIBDIRSUFFIX}/debug usr/lib${LIBDIRSUFFIX}
+mkdir install
+cp -a $CWD/slack-desc.glibc-debug install/slack-desc
+makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
+## INSTEAD, NUKE THESE LIBS
+#rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug
+
+# glibc-i18n:
+cd $PI18N
+mkdir -p usr/lib${LIBDIRSUFFIX}/locale
+mv $PKG/usr/lib${LIBDIRSUFFIX}/locale/* usr/lib${LIBDIRSUFFIX}/locale
+mkdir -p usr/share/{i18n,locale}
+mv $PKG/usr/share/i18n/* usr/share/i18n
+mv $PKG/usr/share/locale/* usr/share/locale
+# Leave copies of the C, POSIX, and en_US locales in the main glibc package:
+cp -a usr/lib${LIBDIRSUFFIX}/locale/{C,en_US}* $PKG/usr/lib${LIBDIRSUFFIX}/locale
+mkdir -p $PKG/usr/share/i18n/locales
+cp -a usr/share/i18n/locales/{C,POSIX,en_US} $PKG/usr/share/i18n/locales
+mkdir install
+cp -a $CWD/slack-desc.glibc-i18n install/slack-desc
+makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
+
+# glibc-solibs:
+cd $PSOLIBS
+mkdir -p etc/profile.d
+cp -a $CWD/profile.d/* etc/profile.d
+chown -R root:root etc
+chmod 755 etc/profile.d/*
+mkdir -p lib${LIBDIRSUFFIX}
+cp -a $PKG/lib${LIBDIRSUFFIX}/* lib${LIBDIRSUFFIX}
+( cd lib${LIBDIRSUFFIX}
+  mkdir incoming
+  mv *so* incoming
+  mv incoming/libSegFault.so .
+)
+mkdir -p usr
+cp -a $PKG/usr/bin usr
+mv usr/bin/ldd .
+rm usr/bin/*
+mv ldd usr/bin
+mkdir -p usr/lib${LIBDIRSUFFIX}
+# The gconv directory has a lot of stuff, but including it here will save some problems.
+# Seems standard elsewhere.
+cp -a $PKG/usr/lib${LIBDIRSUFFIX}/gconv usr/lib${LIBDIRSUFFIX}
+# Another manpage abandoned by GNU...
+#mkdir -p usr/man/man1
+#cp -a $PKG/usr/man/man1/ldd.1.gz usr/man/man1
+mkdir -p usr/libexec
+#cp -a $PKG/usr/libexec/pt_chown usr/libexec
+# Same usr.bin deal:
+cp -a $PKG/sbin .
+mv sbin/ldconfig .
+rm sbin/*
+mv ldconfig sbin
+mkdir install
+cp -a $CWD/slack-desc.glibc-solibs install/slack-desc
+cp -a $CWD/doinst.sh-glibc-solibs install/doinst.sh
+fix_doinst
+sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
+# Ditch links:
+find . -type l -exec rm {} \;
+# Build the package:
+makepkg -l y -c n $TMP/glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
+
+# And finally, the complete "all-in-one" glibc package is created
+# from whatever was leftover:
+cd $PGLIBC
+mv $PKG/* .
+mkdir -p etc/profile.d
+cp -a $CWD/profile.d/* etc/profile.d
+chown -R root:root etc
+chmod 755 etc/profile.d/*
+# Ditch links (these are in doinst.sh-glibc):
+find . -type l -exec rm {} \;
+# libm.so is *not* a linker script on all $ARCH.
+# If it's missing now, replace the symlink:
+if [ ! -r usr/lib${LIBDIRSUFFIX}/libm.so ]; then
+  ( cd usr/lib${LIBDIRSUFFIX} ; ln -sf ../../lib${LIBDIRSUFFIX}/libm.so.6 libm.so )
+fi
+mkdir install
+cp -a $CWD/slack-desc.glibc install/slack-desc
+cp -a $CWD/doinst.sh-glibc install/doinst.sh
+fix_doinst
+sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
+( cd lib${LIBDIRSUFFIX}
+  mkdir incoming
+  mv *so* incoming
+  mv incoming/libSegFault.so .
+)
+# Build the package:
+/sbin/makepkg -l y -c n $TMP/glibc-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
+
+# Done!
+echo
+echo "glibc packages built in $TMP!"
+
Index: npl/system/glibc/glibc.arch
===================================================================
--- npl/system/glibc/glibc.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc.build
===================================================================
--- npl/system/glibc/glibc.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6129
+2
Index: npl/system/glibc/glibc.md5
===================================================================
--- npl/system/glibc/glibc.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,28 +1,24 @@
-7a2ae009b85138f9a5df651069235e99  ./doinst.sh-glibc
+25b42f0b9b67d203faba1ce937ce9e51  ./doinst.sh-glibc
 97faf35319a5350d91849e479f7af251  ./doinst.sh-glibc-solibs
-06c8f88c5ee48a5c33629c889d8d7296  ./doinst.sh-glibc-zoneinfo
-84d7b49686f601cf23a3ca57983ef917  ./glibc-2.10-dns-no-gethostbyname4.diff.gz
-9cb398828e8f84f57d1f7d5588cf40cd  ./glibc-2.21.tar.xz
-af11fd5722b0f0c74123cef295d706be  ./glibc-2.21.tar.xz.sig
+97dc5517f92016f3d70d83e3162ad318  ./glibc-2.24.tar.xz
+009786da429aeeafa48ac72ad95f0279  ./glibc-2.24.tar.xz.sig
+9840bf42b6be90cd1f8d59298284fa51  ./glibc-c-utf8-locale.patch.gz
 cac267daa2d0d3e538560a0f634cdb98  ./glibc-cvs-checkout.sh
-947cc27e7198cb1fee0388fdf0955218  ./glibc_debug_dev.pkg
-07bc55e57946a3a2e7beb5660f3a1851  ./glibc_debug.pkg
-3627a2dccd190d4c53fa53e0a913ac0f  ./glibc_dev.pkg
-026b4227ea87319c43f85e3314563077  ./glibc.disable.broken.optimized.memcpy.diff.gz
-cd81c33d14bc38a5e703698f6fdb4ebe  ./glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch.gz
-76b103d8b22ae5ce532cf369863ea5d7  ./glibc_i18n.pkg
+b2a37fc7745eeeb3987b44891bd25213  ./glibc_debug_dev.pkg
+44aad8f7f6d8861e52c8ebcbf8372b41  ./glibc_debug.pkg
+2394525632742abc082b90042a9cd831  ./glibc_dev.pkg
+14a949869a6f11c02650681aa9dab743  ./glibc_i18n.pkg
 e8fd726fee851d9430187ac369fe3e65  ./glibc.ldd.trace.through.dynamic.linker.diff.gz
 a2584786738ed1ec206d8ef3dc225ea6  ./glibc.locale.no-archive.diff.gz
 fa4bba7ae44c261c80882390bb2ae0e6  ./glibc.make-3.82.diff.gz
-08810c7a104d99481741b6e1c5c2f988  ./glibc.nis-netgroups.diff.gz
-f9fb64ff6450d3ebd7f1a6d0eb7116eb  ./glibc.pkg
-cdf881900f54d4ba859e12f3188ca26f  ./glibc_profile_dev.pkg
-1f29e892fea265f1e46ee588c249c8a4  ./glibc_profile.pkg
+0c54f24d2df8f486c798bfe11e746029  ./glibc.pkg
+c9e602dcaa3fc0faa0d231fe4280727e  ./glibc_profile_dev.pkg
+b48f872da299d4efb4fb30dc291659b5  ./glibc_profile.pkg
 da9ef35b71a61d44f38dc498b2a64ece  ./glibc.revert.to.fix.build.breakages.diff.gz
 7e17803c959c536303fb190a6f81004e  ./glibc.ru_RU.CP1251.diff.gz
-03a67564233f1c8233b86f5240495561  ./glibc.SlackBuild
-1ec044dc77deec097538615a40bdd104  ./glibc.SlackBuild.log.gz
-e0e22e0d8dd10581ebf7a85ce7d240bc  ./glibc_solibs.pkg
-4bc293ab7ac07ef85e42a846e1181a28  ./glibc_zoneinfo.pkg
+428ad3c1773d8ec32b35134363fc42cc  ./glibc.SlackBuild
+5448ec45b553634887b3927dfc6de53d  ./glibc.SlackBuild.log.gz
+5cf82ae0906e00ac9e8cf19b94ad8757  ./glibc.SlackBuild.orig
+28db276f45aecbc8f39b2c67a128130d  ./glibc_solibs.pkg
 a640795867f336de7d4816c7492da7dd  ./is_IS.diff.gz
 480b7e742ab79249d15cf9cfa1b504c0  ./profile.d/glibc.csh.new
@@ -30,19 +26,6 @@
 9f3102b959f471c78ed7834ce8b188cc  ./slack-desc.glibc
 a60f21040daa15acc281c42216ffda06  ./slack-desc.glibc-debug
-6d1809d00a13d73e3e2d15a758ee8921  ./slack-desc.glibc-i18n
+b1a671730a15ef040cc98cb247308bcd  ./slack-desc.glibc-i18n
 463764206af6515bc0189cbb6f210d31  ./slack-desc.glibc-profile
 b78700bac0ed11208e496d4e384caded  ./slack-desc.glibc-solibs
 3a1a19c0b3c13532f774925222dd034a  ./slack-desc.glibc-solibs-linuxthreads
-58f48bf43645e4b1377ae1787f0802ec  ./slack-desc.glibc-zoneinfo
-baa9500f8017c4729f0200540a6c1196  ./slack-desc.glibc-zoneinfo.olson
-5631d03028aa1e6a87951cee20068134  ./timezone-scripts/output-updated-timeconfig.sh
-2a9d31d2b0d83c3dde6175a95e2f86d1  ./timezone-scripts/parts/00
-1f0a2742428e0bda2aae079069166091  ./timezone-scripts/parts/01
-3178a201d111e6d4c01c09db2c13647b  ./timezone-scripts/parts/02
-f1f97cc241f6811707529053931970ba  ./timezone-scripts/parts/03
-d1568dbfd45fd14e1900af19631770d6  ./timezone-scripts/parts/04
-9ab935960daf52abb4e9a87887ba9739  ./timezone-scripts/parts/README
-e88425b289842c3904c0955edd0c5df3  ./timezone-scripts/setup.timeconfig
-baa18525d2fdd924dbd5810e8b84562b  ./timezone-scripts/timeconfig
-8f375ede46ae137fbac047ac431bda37  ./tzcode2015a.tar.gz
-4ed11c894a74a5ea64201b1c6dbb8831  ./tzdata2015a.tar.gz
Index: npl/system/glibc/glibc.version
===================================================================
--- npl/system/glibc/glibc.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_debug.arch
===================================================================
--- npl/system/glibc/glibc_debug.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_debug.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc_debug.build
===================================================================
--- npl/system/glibc/glibc_debug.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_debug.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6129
+2
Index: npl/system/glibc/glibc_debug.version
===================================================================
--- npl/system/glibc/glibc_debug.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_debug.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_debug_dev.arch
===================================================================
--- npl/system/glibc/glibc_debug_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_debug_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc_debug_dev.build
===================================================================
--- npl/system/glibc/glibc_debug_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_debug_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+2
Index: npl/system/glibc/glibc_debug_dev.version
===================================================================
--- npl/system/glibc/glibc_debug_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_debug_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_dev.arch
===================================================================
--- npl/system/glibc/glibc_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc_dev.build
===================================================================
--- npl/system/glibc/glibc_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+2
Index: npl/system/glibc/glibc_dev.version
===================================================================
--- npl/system/glibc/glibc_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_i18n.arch
===================================================================
--- npl/system/glibc/glibc_i18n.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_i18n.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc_i18n.build
===================================================================
--- npl/system/glibc/glibc_i18n.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_i18n.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6129
+2
Index: npl/system/glibc/glibc_i18n.version
===================================================================
--- npl/system/glibc/glibc_i18n.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_i18n.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_profile.arch
===================================================================
--- npl/system/glibc/glibc_profile.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_profile.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc_profile.build
===================================================================
--- npl/system/glibc/glibc_profile.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_profile.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6129
+2
Index: npl/system/glibc/glibc_profile.version
===================================================================
--- npl/system/glibc/glibc_profile.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_profile.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_profile_dev.arch
===================================================================
--- npl/system/glibc/glibc_profile_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_profile_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc_profile_dev.build
===================================================================
--- npl/system/glibc/glibc_profile_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_profile_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+2
Index: npl/system/glibc/glibc_profile_dev.version
===================================================================
--- npl/system/glibc/glibc_profile_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_profile_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_solibs.arch
===================================================================
--- npl/system/glibc/glibc_solibs.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_solibs.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/glibc/glibc_solibs.build
===================================================================
--- npl/system/glibc/glibc_solibs.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_solibs.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6129
+2
Index: npl/system/glibc/glibc_solibs.version
===================================================================
--- npl/system/glibc/glibc_solibs.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/glibc_solibs.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-2.21
+2.24
Index: npl/system/glibc/glibc_zoneinfo.arch
===================================================================
--- npl/system/glibc/glibc_zoneinfo.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-i486
Index: npl/system/glibc/glibc_zoneinfo.build
===================================================================
--- npl/system/glibc/glibc_zoneinfo.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-6129
Index: npl/system/glibc/glibc_zoneinfo.version
===================================================================
--- npl/system/glibc/glibc_zoneinfo.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-2.21
Index: npl/system/glibc/slack-desc.glibc-i18n
===================================================================
--- npl/system/glibc/slack-desc.glibc-i18n	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/glibc/slack-desc.glibc-i18n	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -9,7 +9,7 @@
 glibc-i18n: glibc-i18n (locale files from glibc)
 glibc-i18n:
-glibc-i18n: These files go in /usr/lib/locale and /usr/share/i18n/ to provide
-glibc-i18n: internationalization support.  You'll need this package unless you
-glibc-i18n: will be using US English only.
+glibc-i18n: These files go in /usr/lib/locale, /usr/share/i18n/, and
+glibc-i18n: /usr/share/locale/ to provide internationalization support.
+glibc-i18n: You'll need this package unless you will be using US English only.
 glibc-i18n:
 glibc-i18n:
Index: npl/system/glibc/slack-desc.glibc-zoneinfo
===================================================================
--- npl/system/glibc/slack-desc.glibc-zoneinfo	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,19 +1,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-glibc-zoneinfo: glibc-zoneinfo (timezone database)
-glibc-zoneinfo:
-glibc-zoneinfo: This package allows you to configure your time zone.
-glibc-zoneinfo:
-glibc-zoneinfo: This timezone database comes from the tzdata and tzcode packages by
-glibc-zoneinfo: Arthur David Olson et.al.  The latest version and more information
-glibc-zoneinfo: may be found at:  http://www.iana.org/time-zones
-glibc-zoneinfo:
-glibc-zoneinfo: Use the timeconfig utility to set your local time zone.
-glibc-zoneinfo:
-glibc-zoneinfo:
Index: npl/system/glibc/slack-desc.glibc-zoneinfo.olson
===================================================================
--- npl/system/glibc/slack-desc.glibc-zoneinfo.olson	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,19 +1,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-glibc-zoneinfo: glibc-zoneinfo (timezone database)
-glibc-zoneinfo:
-glibc-zoneinfo: This package allows you to configure your time zone.
-glibc-zoneinfo:
-glibc-zoneinfo: This timezone database comes from the tzdata and tzcode packages by
-glibc-zoneinfo: Arthur David Olson et.al.  The latest version and more information
-glibc-zoneinfo: may be found at ftp://elsie.nci.nih.gov/pub/
-glibc-zoneinfo:
-glibc-zoneinfo: Use the timeconfig utility to set your local time zone.
-glibc-zoneinfo:
-glibc-zoneinfo:
Index: npl/system/glibc/timezone-scripts/output-updated-timeconfig.sh
===================================================================
--- npl/system/glibc/timezone-scripts/output-updated-timeconfig.sh	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,53 +1,0 @@
-#!/bin/sh
-# Copyright 2000, 2001, 2006, 2007, 2008, 2012  Patrick J. Volkerding, Sebeka, MN, USA.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-if [ ! "$(basename "$1")" = "zoneinfo" -o ! -d "$1" ]; then
-  echo "  Usage:  output-updated-timeconfig.sh <zoneinfo directory>"
-  exit 1
-fi
-
-CWD=$(pwd)
-cat $CWD/parts/00
-# Sorry, I'd rather not be US-centric but some people here have a hard
-# time finding things.  ;-)
-( cd $1
-  find . -type f | xargs file | grep "timezone data" | cut -f 1 -d : | cut -f 2- -d / | sort | grep "^US/" | while read zone ; do
-    echo "\"${zone}\" \" \" \\"
-  done
-)
-( cd $1
-  find . -type f | xargs file | grep "timezone data" | cut -f 1 -d : | cut -f 2- -d / | sort | grep -v "^US/" | while read zone ; do
-    echo "\"${zone}\" \" \" \\"
-  done
-)
-cat $CWD/parts/02
-( cd $1
-  find . -type f | xargs file | grep "timezone data" | cut -f 1 -d : | cut -f 2- -d / | sort | grep "^US/" | while read zone ; do
-    echo "${zone}"
-  done
-)
-( cd $1
-  find . -type f | xargs file | grep "timezone data" | cut -f 1 -d : | cut -f 2- -d / | sort | grep -v "^US/" | while read zone ; do
-    echo "${zone}"
-  done
-)
-cat $CWD/parts/04
Index: npl/system/glibc/timezone-scripts/parts/00
===================================================================
--- npl/system/glibc/timezone-scripts/parts/00	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,131 +1,0 @@
-#!/bin/sh
-#
-# timeconfig         Slackware Linux timezone configuration utility.
-#
-# Author:            Patrick Volkerding <volkerdi@slackware.com>
-# Modified by:  David Cantrell <david@slackware.com>, 06-Oct-2000
-#
-# ChangeLog:
-# 2014-10-22:   Updated timezones from tzdata2014i. <pjv>
-# 2012-12-12:   Updated timezones from tzdata2012j. <pjv>
-# 2008-03-10:   Updated timezones from tzdata2008a. <pjv>
-# 2007-12-21:   Updated timezones from tzdata2007j. <pjv>
-# 2006-12-03:   Updated timezones from tzdata2006p. <pjv>
-# 2006-09-14:   Updated timezones from tzdata2006k. <pjv>
-# 2006-08-22:   Updated timezones from tzdata2006j.
-# 2006-08-13:   Updated timezones from tzdata2006g.
-# 2006-03-13:   Updated timezones from tzdata2006c.
-# 19-Feb-2001   Add new timezones from glibc-2.2.2.
-# 06-Oct-2000   Fixed a problem with selecting UTC time.  It was writing
-#               the hardwareclock file to the root disk and not your dest
-#               partition.  Changed the HWCLOCK_CONF variable to be
-#               $T_PX/etc/hardwareclock to fix this.  Thanks to David L.
-#               Dickman <softbear@optonline.net> for finding this and
-#               submitting a patch.
-#
-# 15-Mar-2000   Added the writeconf function to write out the
-#               /etc/hardwareclock file which tells what the hardware clock
-#               is set to (UTC or localtime).
-#
-# 03-Mar-2000   Reorganized script.  Made one timezone set block, added
-#               stage that asks the user if the hardware clock is set to
-#               UTC.
-
-# setup our temp locations and variables
-TMP=/var/log/setup/tmp
-if [ -r $TMP/SeTT_PX ]; then
-   T_PX="`cat $TMP/SeTT_PX`"
-elif [ ! "$!" = "" ]; then
-   T_PX=$1
-else
-   T_PX=/
-fi
-
-# the hardware clock configuration file
-HWCLOCK_CONF=$T_PX/etc/hardwareclock
-
-# setzone( $TIMEZONE )
-#
-# This function accepts a time zone as the only parameter and sets it as
-# the default system time zone.
-setzone()
-{
-   TZ=$1
-
-   cd $T_PX/etc
-   if [ -r $T_PX/usr/share/zoneinfo/$TZ -o \
-        -r /var/log/mount/usr/share/zoneinfo/$TZ -o \
-        -L $T_PX/usr/share/zoneinfo/$TZ -o \
-        -L /var/log/mount/usr/share/zoneinfo/$TZ ]; then
-      ln -sf /usr/share/zoneinfo/$TZ localtime-copied-from
-      rm -f localtime
-      cd ..
-      chroot . cp etc/localtime-copied-from etc/localtime
-   fi
-}
-
-# writeconf( $CLOCK_SET_TO )
-#
-# Writes out $HWCLOCK_CONF that tells rc.S how the hardware clock
-# value is stored.
-writeconf()
-{
-   echo "# /etc/hardwareclock" > $HWCLOCK_CONF
-   echo "#" >> $HWCLOCK_CONF
-   echo "# Tells how the hardware clock time is stored." >> $HWCLOCK_CONF
-   echo "# You should run timeconfig to edit this file." >> $HWCLOCK_CONF
-   echo >> $HWCLOCK_CONF
-   echo $1 >> $HWCLOCK_CONF
-}
-
-# ask the user if the hardware clock is set for UTC/GMT
-if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
-   ###
-   ### use color menus here
-   ###
-   dialog --title "HARDWARE CLOCK SET TO UTC?" --menu "Is the hardware clock set \
-to Coordinated Universal Time (UTC/GMT)?  If it is, select YES here.  If the \
-hardware clock is set to the current local time (this is how most PCs are set \
-up), then say NO here.  If you are not sure what this is, you should answer NO \
-here." 13 60 2 \
-   "NO" "Hardware clock is set to local time" \
-   "YES" "Hardware clock is set to UTC" \
-   2> $TMP/utc
-   if [ $? = 1 -o $? = 255 ]; then
-     rm -f $TMP/utc
-     exit
-   fi
-   if [ "`cat $TMP/utc`" = "YES" ]; then
-     # yes, the hardware clock is UTC
-     writeconf "UTC"
-   else # must be NO
-     writeconf "localtime"
-   fi
-   rm -f $TMP/utc
-else
-   ###
-   ### use text prompts
-   ###
-   echo "Is the hardware clock set to Coordinated Universal Time (UTC/GMT)?"
-   echo "If it is, select 'y' here.  If the hardware clock is set to the"
-   echo "current local time (this is how most PCs are set up), then say 'n'"
-   echo "here.  If you are not sure what this is, you should answer 'n' here."
-   echo
-   echo -n "Is your hardware clock set to UTC ([y]es, [n]o)? "
-   read HEJAZ
-
-   if [ "$HEJAZ" = "y" -o "$HEJAZ" = "Y" -o "$HEJAZ" = "YES" -o "$HEJAZ" = "yes" ]; then
-      # yes, the hardware clock is UTC
-      writeconf "UTC"
-   else
-      # default to localtime
-      writeconf "localtime"
-   fi
-fi
-
-# Now set the correct timezone link:
-if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
-   ###
-   ### use color menus here
-   ###
-   dialog --title "TIMEZONE CONFIGURATION" --menu "Please select one of the following timezones for your machine:" 21 50 13 \
Index: npl/system/glibc/timezone-scripts/parts/01
===================================================================
--- npl/system/glibc/timezone-scripts/parts/01	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1658 +1,0 @@
-"US/Alaska" " " \
-"US/Aleutian" " " \
-"US/Arizona" " " \
-"US/Central" " " \
-"US/East-Indiana" " " \
-"US/Eastern" " " \
-"US/Hawaii" " " \
-"US/Indiana-Starke" " " \
-"US/Michigan" " " \
-"US/Mountain" " " \
-"US/Pacific" " " \
-"US/Pacific-New" " " \
-"US/Samoa" " " \
-"Africa/Abidjan" " " \
-"Africa/Accra" " " \
-"Africa/Addis_Ababa" " " \
-"Africa/Algiers" " " \
-"Africa/Asmera" " " \
-"Africa/Bamako" " " \
-"Africa/Bangui" " " \
-"Africa/Banjul" " " \
-"Africa/Bissau" " " \
-"Africa/Blantyre" " " \
-"Africa/Brazzaville" " " \
-"Africa/Bujumbura" " " \
-"Africa/Cairo" " " \
-"Africa/Casablanca" " " \
-"Africa/Ceuta" " " \
-"Africa/Conakry" " " \
-"Africa/Dakar" " " \
-"Africa/Dar_es_Salaam" " " \
-"Africa/Djibouti" " " \
-"Africa/Douala" " " \
-"Africa/El_Aaiun" " " \
-"Africa/Freetown" " " \
-"Africa/Gaborone" " " \
-"Africa/Harare" " " \
-"Africa/Johannesburg" " " \
-"Africa/Kampala" " " \
-"Africa/Khartoum" " " \
-"Africa/Kigali" " " \
-"Africa/Kinshasa" " " \
-"Africa/Lagos" " " \
-"Africa/Libreville" " " \
-"Africa/Lome" " " \
-"Africa/Luanda" " " \
-"Africa/Lubumbashi" " " \
-"Africa/Lusaka" " " \
-"Africa/Malabo" " " \
-"Africa/Maputo" " " \
-"Africa/Maseru" " " \
-"Africa/Mbabane" " " \
-"Africa/Mogadishu" " " \
-"Africa/Monrovia" " " \
-"Africa/Nairobi" " " \
-"Africa/Ndjamena" " " \
-"Africa/Niamey" " " \
-"Africa/Nouakchott" " " \
-"Africa/Ouagadougou" " " \
-"Africa/Porto-Novo" " " \
-"Africa/Sao_Tome" " " \
-"Africa/Timbuktu" " " \
-"Africa/Tripoli" " " \
-"Africa/Tunis" " " \
-"Africa/Windhoek" " " \
-"America/Adak" " " \
-"America/Anchorage" " " \
-"America/Anguilla" " " \
-"America/Antigua" " " \
-"America/Araguaina" " " \
-"America/Argentina/Buenos_Aires" " " \
-"America/Argentina/Catamarca" " " \
-"America/Argentina/ComodRivadavia" " " \
-"America/Argentina/Cordoba" " " \
-"America/Argentina/Jujuy" " " \
-"America/Argentina/La_Rioja" " " \
-"America/Argentina/Mendoza" " " \
-"America/Argentina/Rio_Gallegos" " " \
-"America/Argentina/San_Juan" " " \
-"America/Argentina/Tucuman" " " \
-"America/Argentina/Ushuaia" " " \
-"America/Aruba" " " \
-"America/Asuncion" " " \
-"America/Atikokan" " " \
-"America/Atka" " " \
-"America/Bahia" " " \
-"America/Barbados" " " \
-"America/Belem" " " \
-"America/Belize" " " \
-"America/Blanc-Sablon" " " \
-"America/Boa_Vista" " " \
-"America/Bogota" " " \
-"America/Boise" " " \
-"America/Buenos_Aires" " " \
-"America/Cambridge_Bay" " " \
-"America/Campo_Grande" " " \
-"America/Cancun" " " \
-"America/Caracas" " " \
-"America/Catamarca" " " \
-"America/Cayenne" " " \
-"America/Cayman" " " \
-"America/Chicago" " " \
-"America/Chihuahua" " " \
-"America/Coral_Harbour" " " \
-"America/Cordoba" " " \
-"America/Costa_Rica" " " \
-"America/Cuiaba" " " \
-"America/Curacao" " " \
-"America/Danmarkshavn" " " \
-"America/Dawson" " " \
-"America/Dawson_Creek" " " \
-"America/Denver" " " \
-"America/Detroit" " " \
-"America/Dominica" " " \
-"America/Edmonton" " " \
-"America/Eirunepe" " " \
-"America/El_Salvador" " " \
-"America/Ensenada" " " \
-"America/Fort_Wayne" " " \
-"America/Fortaleza" " " \
-"America/Glace_Bay" " " \
-"America/Godthab" " " \
-"America/Goose_Bay" " " \
-"America/Grand_Turk" " " \
-"America/Grenada" " " \
-"America/Guadeloupe" " " \
-"America/Guatemala" " " \
-"America/Guayaquil" " " \
-"America/Guyana" " " \
-"America/Halifax" " " \
-"America/Havana" " " \
-"America/Hermosillo" " " \
-"America/Indiana/Indianapolis" " " \
-"America/Indiana/Knox" " " \
-"America/Indiana/Marengo" " " \
-"America/Indiana/Petersburg" " " \
-"America/Indiana/Tell_City" " " \
-"America/Indiana/Vevay" " " \
-"America/Indiana/Vincennes" " " \
-"America/Indianapolis" " " \
-"America/Inuvik" " " \
-"America/Iqaluit" " " \
-"America/Jamaica" " " \
-"America/Jujuy" " " \
-"America/Juneau" " " \
-"America/Kentucky/Louisville" " " \
-"America/Kentucky/Monticello" " " \
-"America/Knox_IN" " " \
-"America/La_Paz" " " \
-"America/Lima" " " \
-"America/Los_Angeles" " " \
-"America/Louisville" " " \
-"America/Maceio" " " \
-"America/Managua" " " \
-"America/Manaus" " " \
-"America/Martinique" " " \
-"America/Mazatlan" " " \
-"America/Mendoza" " " \
-"America/Menominee" " " \
-"America/Merida" " " \
-"America/Mexico_City" " " \
-"America/Miquelon" " " \
-"America/Moncton" " " \
-"America/Monterrey" " " \
-"America/Montevideo" " " \
-"America/Montreal" " " \
-"America/Montserrat" " " \
-"America/Nassau" " " \
-"America/New_York" " " \
-"America/Nipigon" " " \
-"America/Nome" " " \
-"America/Noronha" " " \
-"America/North_Dakota/Center" " " \
-"America/North_Dakota/New_Salem" " " \
-"America/Panama" " " \
-"America/Pangnirtung" " " \
-"America/Paramaribo" " " \
-"America/Phoenix" " " \
-"America/Port-au-Prince" " " \
-"America/Port_of_Spain" " " \
-"America/Porto_Acre" " " \
-"America/Porto_Velho" " " \
-"America/Puerto_Rico" " " \
-"America/Rainy_River" " " \
-"America/Rankin_Inlet" " " \
-"America/Recife" " " \
-"America/Regina" " " \
-"America/Rio_Branco" " " \
-"America/Rosario" " " \
-"America/Santiago" " " \
-"America/Santo_Domingo" " " \
-"America/Sao_Paulo" " " \
-"America/Scoresbysund" " " \
-"America/Shiprock" " " \
-"America/St_Johns" " " \
-"America/St_Kitts" " " \
-"America/St_Lucia" " " \
-"America/St_Thomas" " " \
-"America/St_Vincent" " " \
-"America/Swift_Current" " " \
-"America/Tegucigalpa" " " \
-"America/Thule" " " \
-"America/Thunder_Bay" " " \
-"America/Tijuana" " " \
-"America/Toronto" " " \
-"America/Tortola" " " \
-"America/Vancouver" " " \
-"America/Virgin" " " \
-"America/Whitehorse" " " \
-"America/Winnipeg" " " \
-"America/Yakutat" " " \
-"America/Yellowknife" " " \
-"Antarctica/Casey" " " \
-"Antarctica/Davis" " " \
-"Antarctica/DumontDUrville" " " \
-"Antarctica/Mawson" " " \
-"Antarctica/McMurdo" " " \
-"Antarctica/Palmer" " " \
-"Antarctica/Rothera" " " \
-"Antarctica/South_Pole" " " \
-"Antarctica/Syowa" " " \
-"Antarctica/Troll" " " \
-"Antarctica/Vostok" " " \
-"Arctic/Longyearbyen" " " \
-"Asia/Aden" " " \
-"Asia/Almaty" " " \
-"Asia/Amman" " " \
-"Asia/Anadyr" " " \
-"Asia/Aqtau" " " \
-"Asia/Aqtobe" " " \
-"Asia/Ashgabat" " " \
-"Asia/Ashkhabad" " " \
-"Asia/Baghdad" " " \
-"Asia/Bahrain" " " \
-"Asia/Baku" " " \
-"Asia/Bangkok" " " \
-"Asia/Beirut" " " \
-"Asia/Bishkek" " " \
-"Asia/Brunei" " " \
-"Asia/Calcutta" " " \
-"Asia/Chita" " " \
-"Asia/Choibalsan" " " \
-"Asia/Chongqing" " " \
-"Asia/Chungking" " " \
-"Asia/Colombo" " " \
-"Asia/Dacca" " " \
-"Asia/Damascus" " " \
-"Asia/Dhaka" " " \
-"Asia/Dili" " " \
-"Asia/Dubai" " " \
-"Asia/Dushanbe" " " \
-"Asia/Gaza" " " \
-"Asia/Harbin" " " \
-"Asia/Hong_Kong" " " \
-"Asia/Hovd" " " \
-"Asia/Irkutsk" " " \
-"Asia/Istanbul" " " \
-"Asia/Jakarta" " " \
-"Asia/Jayapura" " " \
-"Asia/Jerusalem" " " \
-"Asia/Kabul" " " \
-"Asia/Kamchatka" " " \
-"Asia/Karachi" " " \
-"Asia/Kashgar" " " \
-"Asia/Katmandu" " " \
-"Asia/Khandyga" " " \
-"Asia/Khandyga" " " \
-"Asia/Krasnoyarsk" " " \
-"Asia/Kuala_Lumpur" " " \
-"Asia/Kuching" " " \
-"Asia/Kuwait" " " \
-"Asia/Macao" " " \
-"Asia/Macau" " " \
-"Asia/Magadan" " " \
-"Asia/Makassar" " " \
-"Asia/Manila" " " \
-"Asia/Muscat" " " \
-"Asia/Nicosia" " " \
-"Asia/Novosibirsk" " " \
-"Asia/Omsk" " " \
-"Asia/Oral" " " \
-"Asia/Phnom_Penh" " " \
-"Asia/Pontianak" " " \
-"Asia/Pyongyang" " " \
-"Asia/Qatar" " " \
-"Asia/Qyzylorda" " " \
-"Asia/Rangoon" " " \
-"Asia/Riyadh" " " \
-"Asia/Saigon" " " \
-"Asia/Sakhalin" " " \
-"Asia/Samarkand" " " \
-"Asia/Seoul" " " \
-"Asia/Shanghai" " " \
-"Asia/Singapore" " " \
-"Asia/Srednekolymsk" " " \
-"Asia/Taipei" " " \
-"Asia/Tashkent" " " \
-"Asia/Tbilisi" " " \
-"Asia/Tehran" " " \
-"Asia/Tel_Aviv" " " \
-"Asia/Thimbu" " " \
-"Asia/Thimphu" " " \
-"Asia/Tokyo" " " \
-"Asia/Ujung_Pandang" " " \
-"Asia/Ulaanbaatar" " " \
-"Asia/Ulan_Bator" " " \
-"Asia/Urumqi" " " \
-"Asia/Ust-Nera" " " \
-"Asia/Vientiane" " " \
-"Asia/Vladivostok" " " \
-"Asia/Yakutsk" " " \
-"Asia/Yekaterinburg" " " \
-"Asia/Yerevan" " " \
-"Atlantic/Azores" " " \
-"Atlantic/Bermuda" " " \
-"Atlantic/Canary" " " \
-"Atlantic/Cape_Verde" " " \
-"Atlantic/Faeroe" " " \
-"Atlantic/Jan_Mayen" " " \
-"Atlantic/Madeira" " " \
-"Atlantic/Reykjavik" " " \
-"Atlantic/South_Georgia" " " \
-"Atlantic/St_Helena" " " \
-"Atlantic/Stanley" " " \
-"Australia/ACT" " " \
-"Australia/Adelaide" " " \
-"Australia/Brisbane" " " \
-"Australia/Broken_Hill" " " \
-"Australia/Canberra" " " \
-"Australia/Currie" " " \
-"Australia/Darwin" " " \
-"Australia/Hobart" " " \
-"Australia/LHI" " " \
-"Australia/Lindeman" " " \
-"Australia/Lord_Howe" " " \
-"Australia/Melbourne" " " \
-"Australia/NSW" " " \
-"Australia/North" " " \
-"Australia/Perth" " " \
-"Australia/Queensland" " " \
-"Australia/South" " " \
-"Australia/Sydney" " " \
-"Australia/Tasmania" " " \
-"Australia/Victoria" " " \
-"Australia/West" " " \
-"Australia/Yancowinna" " " \
-"Brazil/Acre" " " \
-"Brazil/DeNoronha" " " \
-"Brazil/East" " " \
-"Brazil/West" " " \
-"CET" " " \
-"CST6CDT" " " \
-"Canada/Atlantic" " " \
-"Canada/Central" " " \
-"Canada/East-Saskatchewan" " " \
-"Canada/Eastern" " " \
-"Canada/Mountain" " " \
-"Canada/Newfoundland" " " \
-"Canada/Pacific" " " \
-"Canada/Saskatchewan" " " \
-"Canada/Yukon" " " \
-"Chile/Continental" " " \
-"Chile/EasterIsland" " " \
-"Cuba" " " \
-"EET" " " \
-"EST" " " \
-"EST5EDT" " " \
-"Egypt" " " \
-"Eire" " " \
-"Etc/GMT" " " \
-"Etc/GMT+0" " " \
-"Etc/GMT+1" " " \
-"Etc/GMT+10" " " \
-"Etc/GMT+11" " " \
-"Etc/GMT+12" " " \
-"Etc/GMT+2" " " \
-"Etc/GMT+3" " " \
-"Etc/GMT+4" " " \
-"Etc/GMT+5" " " \
-"Etc/GMT+6" " " \
-"Etc/GMT+7" " " \
-"Etc/GMT+8" " " \
-"Etc/GMT+9" " " \
-"Etc/GMT-0" " " \
-"Etc/GMT-1" " " \
-"Etc/GMT-10" " " \
-"Etc/GMT-11" " " \
-"Etc/GMT-12" " " \
-"Etc/GMT-13" " " \
-"Etc/GMT-14" " " \
-"Etc/GMT-2" " " \
-"Etc/GMT-3" " " \
-"Etc/GMT-4" " " \
-"Etc/GMT-5" " " \
-"Etc/GMT-6" " " \
-"Etc/GMT-7" " " \
-"Etc/GMT-8" " " \
-"Etc/GMT-9" " " \
-"Etc/GMT0" " " \
-"Etc/Greenwich" " " \
-"Etc/UCT" " " \
-"Etc/UTC" " " \
-"Etc/Universal" " " \
-"Etc/Zulu" " " \
-"Europe/Amsterdam" " " \
-"Europe/Andorra" " " \
-"Europe/Athens" " " \
-"Europe/Belfast" " " \
-"Europe/Belgrade" " " \
-"Europe/Berlin" " " \
-"Europe/Bratislava" " " \
-"Europe/Brussels" " " \
-"Europe/Bucharest" " " \
-"Europe/Budapest" " " \
-"Europe/Busingen" " " \
-"Europe/Chisinau" " " \
-"Europe/Copenhagen" " " \
-"Europe/Dublin" " " \
-"Europe/Gibraltar" " " \
-"Europe/Guernsey" " " \
-"Europe/Helsinki" " " \
-"Europe/Isle_of_Man" " " \
-"Europe/Istanbul" " " \
-"Europe/Jersey" " " \
-"Europe/Kaliningrad" " " \
-"Europe/Kiev" " " \
-"Europe/Lisbon" " " \
-"Europe/Ljubljana" " " \
-"Europe/London" " " \
-"Europe/Luxembourg" " " \
-"Europe/Madrid" " " \
-"Europe/Malta" " " \
-"Europe/Mariehamn" " " \
-"Europe/Minsk" " " \
-"Europe/Monaco" " " \
-"Europe/Moscow" " " \
-"Europe/Nicosia" " " \
-"Europe/Oslo" " " \
-"Europe/Paris" " " \
-"Europe/Podgorica" " " \
-"Europe/Prague" " " \
-"Europe/Riga" " " \
-"Europe/Rome" " " \
-"Europe/Samara" " " \
-"Europe/San_Marino" " " \
-"Europe/Sarajevo" " " \
-"Europe/Simferopol" " " \
-"Europe/Skopje" " " \
-"Europe/Sofia" " " \
-"Europe/Stockholm" " " \
-"Europe/Tallinn" " " \
-"Europe/Tirane" " " \
-"Europe/Tiraspol" " " \
-"Europe/Uzhgorod" " " \
-"Europe/Vaduz" " " \
-"Europe/Vatican" " " \
-"Europe/Vienna" " " \
-"Europe/Vilnius" " " \
-"Europe/Volgograd" " " \
-"Europe/Warsaw" " " \
-"Europe/Zagreb" " " \
-"Europe/Zaporozhye" " " \
-"Europe/Zurich" " " \
-"Factory" " " \
-"GB" " " \
-"GB-Eire" " " \
-"GMT" " " \
-"GMT+0" " " \
-"GMT-0" " " \
-"GMT0" " " \
-"Greenwich" " " \
-"HST" " " \
-"Hongkong" " " \
-"Iceland" " " \
-"Indian/Antananarivo" " " \
-"Indian/Chagos" " " \
-"Indian/Christmas" " " \
-"Indian/Cocos" " " \
-"Indian/Comoro" " " \
-"Indian/Kerguelen" " " \
-"Indian/Mahe" " " \
-"Indian/Maldives" " " \
-"Indian/Mauritius" " " \
-"Indian/Mayotte" " " \
-"Indian/Reunion" " " \
-"Iran" " " \
-"Israel" " " \
-"Jamaica" " " \
-"Japan" " " \
-"Kwajalein" " " \
-"Libya" " " \
-"MET" " " \
-"MST" " " \
-"MST7MDT" " " \
-"Mexico/BajaNorte" " " \
-"Mexico/BajaSur" " " \
-"Mexico/General" " " \
-"NZ" " " \
-"NZ-CHAT" " " \
-"Navajo" " " \
-"PRC" " " \
-"PST8PDT" " " \
-"Pacific/Apia" " " \
-"Pacific/Auckland" " " \
-"Pacific/Bougainville" " " \
-"Pacific/Chatham" " " \
-"Pacific/Easter" " " \
-"Pacific/Efate" " " \
-"Pacific/Enderbury" " " \
-"Pacific/Fakaofo" " " \
-"Pacific/Fiji" " " \
-"Pacific/Funafuti" " " \
-"Pacific/Galapagos" " " \
-"Pacific/Gambier" " " \
-"Pacific/Guadalcanal" " " \
-"Pacific/Guam" " " \
-"Pacific/Honolulu" " " \
-"Pacific/Johnston" " " \
-"Pacific/Kiritimati" " " \
-"Pacific/Kosrae" " " \
-"Pacific/Kwajalein" " " \
-"Pacific/Majuro" " " \
-"Pacific/Marquesas" " " \
-"Pacific/Midway" " " \
-"Pacific/Nauru" " " \
-"Pacific/Niue" " " \
-"Pacific/Norfolk" " " \
-"Pacific/Noumea" " " \
-"Pacific/Pago_Pago" " " \
-"Pacific/Palau" " " \
-"Pacific/Pitcairn" " " \
-"Pacific/Ponape" " " \
-"Pacific/Port_Moresby" " " \
-"Pacific/Rarotonga" " " \
-"Pacific/Saipan" " " \
-"Pacific/Samoa" " " \
-"Pacific/Tahiti" " " \
-"Pacific/Tarawa" " " \
-"Pacific/Tongatapu" " " \
-"Pacific/Truk" " " \
-"Pacific/Wake" " " \
-"Pacific/Wallis" " " \
-"Pacific/Yap" " " \
-"Poland" " " \
-"Portugal" " " \
-"ROC" " " \
-"ROK" " " \
-"Singapore" " " \
-"Turkey" " " \
-"UCT" " " \
-"UTC" " " \
-"Universal" " " \
-"W-SU" " " \
-"WET" " " \
-"Zulu" " " \
-"posix/Africa/Abidjan" " " \
-"posix/Africa/Accra" " " \
-"posix/Africa/Addis_Ababa" " " \
-"posix/Africa/Algiers" " " \
-"posix/Africa/Asmera" " " \
-"posix/Africa/Bamako" " " \
-"posix/Africa/Bangui" " " \
-"posix/Africa/Banjul" " " \
-"posix/Africa/Bissau" " " \
-"posix/Africa/Blantyre" " " \
-"posix/Africa/Brazzaville" " " \
-"posix/Africa/Bujumbura" " " \
-"posix/Africa/Cairo" " " \
-"posix/Africa/Casablanca" " " \
-"posix/Africa/Ceuta" " " \
-"posix/Africa/Conakry" " " \
-"posix/Africa/Dakar" " " \
-"posix/Africa/Dar_es_Salaam" " " \
-"posix/Africa/Djibouti" " " \
-"posix/Africa/Douala" " " \
-"posix/Africa/El_Aaiun" " " \
-"posix/Africa/Freetown" " " \
-"posix/Africa/Gaborone" " " \
-"posix/Africa/Harare" " " \
-"posix/Africa/Johannesburg" " " \
-"posix/Africa/Kampala" " " \
-"posix/Africa/Khartoum" " " \
-"posix/Africa/Kigali" " " \
-"posix/Africa/Kinshasa" " " \
-"posix/Africa/Lagos" " " \
-"posix/Africa/Libreville" " " \
-"posix/Africa/Lome" " " \
-"posix/Africa/Luanda" " " \
-"posix/Africa/Lubumbashi" " " \
-"posix/Africa/Lusaka" " " \
-"posix/Africa/Malabo" " " \
-"posix/Africa/Maputo" " " \
-"posix/Africa/Maseru" " " \
-"posix/Africa/Mbabane" " " \
-"posix/Africa/Mogadishu" " " \
-"posix/Africa/Monrovia" " " \
-"posix/Africa/Nairobi" " " \
-"posix/Africa/Ndjamena" " " \
-"posix/Africa/Niamey" " " \
-"posix/Africa/Nouakchott" " " \
-"posix/Africa/Ouagadougou" " " \
-"posix/Africa/Porto-Novo" " " \
-"posix/Africa/Sao_Tome" " " \
-"posix/Africa/Timbuktu" " " \
-"posix/Africa/Tripoli" " " \
-"posix/Africa/Tunis" " " \
-"posix/Africa/Windhoek" " " \
-"posix/America/Adak" " " \
-"posix/America/Anchorage" " " \
-"posix/America/Anguilla" " " \
-"posix/America/Antigua" " " \
-"posix/America/Araguaina" " " \
-"posix/America/Argentina/Buenos_Aires" " " \
-"posix/America/Argentina/Catamarca" " " \
-"posix/America/Argentina/ComodRivadavia" " " \
-"posix/America/Argentina/Cordoba" " " \
-"posix/America/Argentina/Jujuy" " " \
-"posix/America/Argentina/La_Rioja" " " \
-"posix/America/Argentina/Mendoza" " " \
-"posix/America/Argentina/Rio_Gallegos" " " \
-"posix/America/Argentina/San_Juan" " " \
-"posix/America/Argentina/Tucuman" " " \
-"posix/America/Argentina/Ushuaia" " " \
-"posix/America/Aruba" " " \
-"posix/America/Asuncion" " " \
-"posix/America/Atikokan" " " \
-"posix/America/Atka" " " \
-"posix/America/Bahia" " " \
-"posix/America/Barbados" " " \
-"posix/America/Belem" " " \
-"posix/America/Belize" " " \
-"posix/America/Blanc-Sablon" " " \
-"posix/America/Boa_Vista" " " \
-"posix/America/Bogota" " " \
-"posix/America/Boise" " " \
-"posix/America/Buenos_Aires" " " \
-"posix/America/Cambridge_Bay" " " \
-"posix/America/Campo_Grande" " " \
-"posix/America/Cancun" " " \
-"posix/America/Caracas" " " \
-"posix/America/Catamarca" " " \
-"posix/America/Cayenne" " " \
-"posix/America/Cayman" " " \
-"posix/America/Chicago" " " \
-"posix/America/Chihuahua" " " \
-"posix/America/Coral_Harbour" " " \
-"posix/America/Cordoba" " " \
-"posix/America/Costa_Rica" " " \
-"posix/America/Cuiaba" " " \
-"posix/America/Curacao" " " \
-"posix/America/Danmarkshavn" " " \
-"posix/America/Dawson" " " \
-"posix/America/Dawson_Creek" " " \
-"posix/America/Denver" " " \
-"posix/America/Detroit" " " \
-"posix/America/Dominica" " " \
-"posix/America/Edmonton" " " \
-"posix/America/Eirunepe" " " \
-"posix/America/El_Salvador" " " \
-"posix/America/Ensenada" " " \
-"posix/America/Fort_Wayne" " " \
-"posix/America/Fortaleza" " " \
-"posix/America/Glace_Bay" " " \
-"posix/America/Godthab" " " \
-"posix/America/Goose_Bay" " " \
-"posix/America/Grand_Turk" " " \
-"posix/America/Grenada" " " \
-"posix/America/Guadeloupe" " " \
-"posix/America/Guatemala" " " \
-"posix/America/Guayaquil" " " \
-"posix/America/Guyana" " " \
-"posix/America/Halifax" " " \
-"posix/America/Havana" " " \
-"posix/America/Hermosillo" " " \
-"posix/America/Indiana/Indianapolis" " " \
-"posix/America/Indiana/Knox" " " \
-"posix/America/Indiana/Marengo" " " \
-"posix/America/Indiana/Petersburg" " " \
-"posix/America/Indiana/Tell_City" " " \
-"posix/America/Indiana/Vevay" " " \
-"posix/America/Indiana/Vincennes" " " \
-"posix/America/Indianapolis" " " \
-"posix/America/Inuvik" " " \
-"posix/America/Iqaluit" " " \
-"posix/America/Jamaica" " " \
-"posix/America/Jujuy" " " \
-"posix/America/Juneau" " " \
-"posix/America/Kentucky/Louisville" " " \
-"posix/America/Kentucky/Monticello" " " \
-"posix/America/Knox_IN" " " \
-"posix/America/La_Paz" " " \
-"posix/America/Lima" " " \
-"posix/America/Los_Angeles" " " \
-"posix/America/Louisville" " " \
-"posix/America/Maceio" " " \
-"posix/America/Managua" " " \
-"posix/America/Manaus" " " \
-"posix/America/Martinique" " " \
-"posix/America/Mazatlan" " " \
-"posix/America/Mendoza" " " \
-"posix/America/Menominee" " " \
-"posix/America/Merida" " " \
-"posix/America/Mexico_City" " " \
-"posix/America/Miquelon" " " \
-"posix/America/Moncton" " " \
-"posix/America/Monterrey" " " \
-"posix/America/Montevideo" " " \
-"posix/America/Montreal" " " \
-"posix/America/Montserrat" " " \
-"posix/America/Nassau" " " \
-"posix/America/New_York" " " \
-"posix/America/Nipigon" " " \
-"posix/America/Nome" " " \
-"posix/America/Noronha" " " \
-"posix/America/North_Dakota/Center" " " \
-"posix/America/North_Dakota/New_Salem" " " \
-"posix/America/Panama" " " \
-"posix/America/Pangnirtung" " " \
-"posix/America/Paramaribo" " " \
-"posix/America/Phoenix" " " \
-"posix/America/Port-au-Prince" " " \
-"posix/America/Port_of_Spain" " " \
-"posix/America/Porto_Acre" " " \
-"posix/America/Porto_Velho" " " \
-"posix/America/Puerto_Rico" " " \
-"posix/America/Rainy_River" " " \
-"posix/America/Rankin_Inlet" " " \
-"posix/America/Recife" " " \
-"posix/America/Regina" " " \
-"posix/America/Rio_Branco" " " \
-"posix/America/Rosario" " " \
-"posix/America/Santiago" " " \
-"posix/America/Santo_Domingo" " " \
-"posix/America/Sao_Paulo" " " \
-"posix/America/Scoresbysund" " " \
-"posix/America/Shiprock" " " \
-"posix/America/St_Johns" " " \
-"posix/America/St_Kitts" " " \
-"posix/America/St_Lucia" " " \
-"posix/America/St_Thomas" " " \
-"posix/America/St_Vincent" " " \
-"posix/America/Swift_Current" " " \
-"posix/America/Tegucigalpa" " " \
-"posix/America/Thule" " " \
-"posix/America/Thunder_Bay" " " \
-"posix/America/Tijuana" " " \
-"posix/America/Toronto" " " \
-"posix/America/Tortola" " " \
-"posix/America/Vancouver" " " \
-"posix/America/Virgin" " " \
-"posix/America/Whitehorse" " " \
-"posix/America/Winnipeg" " " \
-"posix/America/Yakutat" " " \
-"posix/America/Yellowknife" " " \
-"posix/Antarctica/Casey" " " \
-"posix/Antarctica/Davis" " " \
-"posix/Antarctica/DumontDUrville" " " \
-"posix/Antarctica/Mawson" " " \
-"posix/Antarctica/McMurdo" " " \
-"posix/Antarctica/Palmer" " " \
-"posix/Antarctica/Rothera" " " \
-"posix/Antarctica/South_Pole" " " \
-"posix/Antarctica/Syowa" " " \
-"posix/Antarctica/Troll" " " \
-"posix/Antarctica/Vostok" " " \
-"posix/Arctic/Longyearbyen" " " \
-"posix/Asia/Aden" " " \
-"posix/Asia/Almaty" " " \
-"posix/Asia/Amman" " " \
-"posix/Asia/Anadyr" " " \
-"posix/Asia/Aqtau" " " \
-"posix/Asia/Aqtobe" " " \
-"posix/Asia/Ashgabat" " " \
-"posix/Asia/Ashkhabad" " " \
-"posix/Asia/Baghdad" " " \
-"posix/Asia/Bahrain" " " \
-"posix/Asia/Baku" " " \
-"posix/Asia/Bangkok" " " \
-"posix/Asia/Beirut" " " \
-"posix/Asia/Bishkek" " " \
-"posix/Asia/Brunei" " " \
-"posix/Asia/Calcutta" " " \
-"posix/Asia/Chita" " " \
-"posix/Asia/Choibalsan" " " \
-"posix/Asia/Chongqing" " " \
-"posix/Asia/Chungking" " " \
-"posix/Asia/Colombo" " " \
-"posix/Asia/Dacca" " " \
-"posix/Asia/Damascus" " " \
-"posix/Asia/Dhaka" " " \
-"posix/Asia/Dili" " " \
-"posix/Asia/Dubai" " " \
-"posix/Asia/Dushanbe" " " \
-"posix/Asia/Gaza" " " \
-"posix/Asia/Harbin" " " \
-"posix/Asia/Hong_Kong" " " \
-"posix/Asia/Hovd" " " \
-"posix/Asia/Irkutsk" " " \
-"posix/Asia/Istanbul" " " \
-"posix/Asia/Jakarta" " " \
-"posix/Asia/Jayapura" " " \
-"posix/Asia/Jerusalem" " " \
-"posix/Asia/Kabul" " " \
-"posix/Asia/Kamchatka" " " \
-"posix/Asia/Karachi" " " \
-"posix/Asia/Kashgar" " " \
-"posix/Asia/Katmandu" " " \
-"posix/Asia/Krasnoyarsk" " " \
-"posix/Asia/Kuala_Lumpur" " " \
-"posix/Asia/Kuching" " " \
-"posix/Asia/Kuwait" " " \
-"posix/Asia/Macao" " " \
-"posix/Asia/Macau" " " \
-"posix/Asia/Magadan" " " \
-"posix/Asia/Makassar" " " \
-"posix/Asia/Manila" " " \
-"posix/Asia/Muscat" " " \
-"posix/Asia/Nicosia" " " \
-"posix/Asia/Novosibirsk" " " \
-"posix/Asia/Omsk" " " \
-"posix/Asia/Oral" " " \
-"posix/Asia/Phnom_Penh" " " \
-"posix/Asia/Pontianak" " " \
-"posix/Asia/Pyongyang" " " \
-"posix/Asia/Qatar" " " \
-"posix/Asia/Qyzylorda" " " \
-"posix/Asia/Rangoon" " " \
-"posix/Asia/Riyadh" " " \
-"posix/Asia/Saigon" " " \
-"posix/Asia/Sakhalin" " " \
-"posix/Asia/Samarkand" " " \
-"posix/Asia/Seoul" " " \
-"posix/Asia/Shanghai" " " \
-"posix/Asia/Singapore" " " \
-"posix/Asia/Srednekolymsk" " " \
-"posix/Asia/Taipei" " " \
-"posix/Asia/Tashkent" " " \
-"posix/Asia/Tbilisi" " " \
-"posix/Asia/Tehran" " " \
-"posix/Asia/Tel_Aviv" " " \
-"posix/Asia/Thimbu" " " \
-"posix/Asia/Thimphu" " " \
-"posix/Asia/Tokyo" " " \
-"posix/Asia/Ujung_Pandang" " " \
-"posix/Asia/Ulaanbaatar" " " \
-"posix/Asia/Ulan_Bator" " " \
-"posix/Asia/Urumqi" " " \
-"posix/Asia/Vientiane" " " \
-"posix/Asia/Vladivostok" " " \
-"posix/Asia/Yakutsk" " " \
-"posix/Asia/Yekaterinburg" " " \
-"posix/Asia/Yerevan" " " \
-"posix/Atlantic/Azores" " " \
-"posix/Atlantic/Bermuda" " " \
-"posix/Atlantic/Canary" " " \
-"posix/Atlantic/Cape_Verde" " " \
-"posix/Atlantic/Faeroe" " " \
-"posix/Atlantic/Jan_Mayen" " " \
-"posix/Atlantic/Madeira" " " \
-"posix/Atlantic/Reykjavik" " " \
-"posix/Atlantic/South_Georgia" " " \
-"posix/Atlantic/St_Helena" " " \
-"posix/Atlantic/Stanley" " " \
-"posix/Australia/ACT" " " \
-"posix/Australia/Adelaide" " " \
-"posix/Australia/Brisbane" " " \
-"posix/Australia/Broken_Hill" " " \
-"posix/Australia/Canberra" " " \
-"posix/Australia/Currie" " " \
-"posix/Australia/Darwin" " " \
-"posix/Australia/Hobart" " " \
-"posix/Australia/LHI" " " \
-"posix/Australia/Lindeman" " " \
-"posix/Australia/Lord_Howe" " " \
-"posix/Australia/Melbourne" " " \
-"posix/Australia/NSW" " " \
-"posix/Australia/North" " " \
-"posix/Australia/Perth" " " \
-"posix/Australia/Queensland" " " \
-"posix/Australia/South" " " \
-"posix/Australia/Sydney" " " \
-"posix/Australia/Tasmania" " " \
-"posix/Australia/Victoria" " " \
-"posix/Australia/West" " " \
-"posix/Australia/Yancowinna" " " \
-"posix/Brazil/Acre" " " \
-"posix/Brazil/DeNoronha" " " \
-"posix/Brazil/East" " " \
-"posix/Brazil/West" " " \
-"posix/CET" " " \
-"posix/CST6CDT" " " \
-"posix/Canada/Atlantic" " " \
-"posix/Canada/Central" " " \
-"posix/Canada/East-Saskatchewan" " " \
-"posix/Canada/Eastern" " " \
-"posix/Canada/Mountain" " " \
-"posix/Canada/Newfoundland" " " \
-"posix/Canada/Pacific" " " \
-"posix/Canada/Saskatchewan" " " \
-"posix/Canada/Yukon" " " \
-"posix/Chile/Continental" " " \
-"posix/Chile/EasterIsland" " " \
-"posix/Cuba" " " \
-"posix/EET" " " \
-"posix/EST" " " \
-"posix/EST5EDT" " " \
-"posix/Egypt" " " \
-"posix/Eire" " " \
-"posix/Etc/GMT" " " \
-"posix/Etc/GMT+0" " " \
-"posix/Etc/GMT+1" " " \
-"posix/Etc/GMT+10" " " \
-"posix/Etc/GMT+11" " " \
-"posix/Etc/GMT+12" " " \
-"posix/Etc/GMT+2" " " \
-"posix/Etc/GMT+3" " " \
-"posix/Etc/GMT+4" " " \
-"posix/Etc/GMT+5" " " \
-"posix/Etc/GMT+6" " " \
-"posix/Etc/GMT+7" " " \
-"posix/Etc/GMT+8" " " \
-"posix/Etc/GMT+9" " " \
-"posix/Etc/GMT-0" " " \
-"posix/Etc/GMT-1" " " \
-"posix/Etc/GMT-10" " " \
-"posix/Etc/GMT-11" " " \
-"posix/Etc/GMT-12" " " \
-"posix/Etc/GMT-13" " " \
-"posix/Etc/GMT-14" " " \
-"posix/Etc/GMT-2" " " \
-"posix/Etc/GMT-3" " " \
-"posix/Etc/GMT-4" " " \
-"posix/Etc/GMT-5" " " \
-"posix/Etc/GMT-6" " " \
-"posix/Etc/GMT-7" " " \
-"posix/Etc/GMT-8" " " \
-"posix/Etc/GMT-9" " " \
-"posix/Etc/GMT0" " " \
-"posix/Etc/Greenwich" " " \
-"posix/Etc/UCT" " " \
-"posix/Etc/UTC" " " \
-"posix/Etc/Universal" " " \
-"posix/Etc/Zulu" " " \
-"posix/Europe/Amsterdam" " " \
-"posix/Europe/Andorra" " " \
-"posix/Europe/Athens" " " \
-"posix/Europe/Belfast" " " \
-"posix/Europe/Belgrade" " " \
-"posix/Europe/Berlin" " " \
-"posix/Europe/Bratislava" " " \
-"posix/Europe/Brussels" " " \
-"posix/Europe/Bucharest" " " \
-"posix/Europe/Budapest" " " \
-"posix/Europe/Chisinau" " " \
-"posix/Europe/Copenhagen" " " \
-"posix/Europe/Dublin" " " \
-"posix/Europe/Gibraltar" " " \
-"posix/Europe/Guernsey" " " \
-"posix/Europe/Helsinki" " " \
-"posix/Europe/Isle_of_Man" " " \
-"posix/Europe/Istanbul" " " \
-"posix/Europe/Jersey" " " \
-"posix/Europe/Kaliningrad" " " \
-"posix/Europe/Kiev" " " \
-"posix/Europe/Lisbon" " " \
-"posix/Europe/Ljubljana" " " \
-"posix/Europe/London" " " \
-"posix/Europe/Luxembourg" " " \
-"posix/Europe/Madrid" " " \
-"posix/Europe/Malta" " " \
-"posix/Europe/Mariehamn" " " \
-"posix/Europe/Minsk" " " \
-"posix/Europe/Monaco" " " \
-"posix/Europe/Moscow" " " \
-"posix/Europe/Nicosia" " " \
-"posix/Europe/Oslo" " " \
-"posix/Europe/Paris" " " \
-"posix/Europe/Podgorica" " " \
-"posix/Europe/Prague" " " \
-"posix/Europe/Riga" " " \
-"posix/Europe/Rome" " " \
-"posix/Europe/Samara" " " \
-"posix/Europe/San_Marino" " " \
-"posix/Europe/Sarajevo" " " \
-"posix/Europe/Simferopol" " " \
-"posix/Europe/Skopje" " " \
-"posix/Europe/Sofia" " " \
-"posix/Europe/Stockholm" " " \
-"posix/Europe/Tallinn" " " \
-"posix/Europe/Tirane" " " \
-"posix/Europe/Tiraspol" " " \
-"posix/Europe/Uzhgorod" " " \
-"posix/Europe/Vaduz" " " \
-"posix/Europe/Vatican" " " \
-"posix/Europe/Vienna" " " \
-"posix/Europe/Vilnius" " " \
-"posix/Europe/Volgograd" " " \
-"posix/Europe/Warsaw" " " \
-"posix/Europe/Zagreb" " " \
-"posix/Europe/Zaporozhye" " " \
-"posix/Europe/Zurich" " " \
-"posix/Factory" " " \
-"posix/GB" " " \
-"posix/GB-Eire" " " \
-"posix/GMT" " " \
-"posix/GMT+0" " " \
-"posix/GMT-0" " " \
-"posix/GMT0" " " \
-"posix/Greenwich" " " \
-"posix/HST" " " \
-"posix/Hongkong" " " \
-"posix/Iceland" " " \
-"posix/Indian/Antananarivo" " " \
-"posix/Indian/Chagos" " " \
-"posix/Indian/Christmas" " " \
-"posix/Indian/Cocos" " " \
-"posix/Indian/Comoro" " " \
-"posix/Indian/Kerguelen" " " \
-"posix/Indian/Mahe" " " \
-"posix/Indian/Maldives" " " \
-"posix/Indian/Mauritius" " " \
-"posix/Indian/Mayotte" " " \
-"posix/Indian/Reunion" " " \
-"posix/Iran" " " \
-"posix/Israel" " " \
-"posix/Jamaica" " " \
-"posix/Japan" " " \
-"posix/Kwajalein" " " \
-"posix/Libya" " " \
-"posix/MET" " " \
-"posix/MST" " " \
-"posix/MST7MDT" " " \
-"posix/Mexico/BajaNorte" " " \
-"posix/Mexico/BajaSur" " " \
-"posix/Mexico/General" " " \
-"posix/NZ" " " \
-"posix/NZ-CHAT" " " \
-"posix/Navajo" " " \
-"posix/PRC" " " \
-"posix/PST8PDT" " " \
-"posix/Pacific/Apia" " " \
-"posix/Pacific/Auckland" " " \
-"posix/Pacific/Bougainville" " " \
-"posix/Pacific/Chatham" " " \
-"posix/Pacific/Easter" " " \
-"posix/Pacific/Efate" " " \
-"posix/Pacific/Enderbury" " " \
-"posix/Pacific/Fakaofo" " " \
-"posix/Pacific/Fiji" " " \
-"posix/Pacific/Funafuti" " " \
-"posix/Pacific/Galapagos" " " \
-"posix/Pacific/Gambier" " " \
-"posix/Pacific/Guadalcanal" " " \
-"posix/Pacific/Guam" " " \
-"posix/Pacific/Honolulu" " " \
-"posix/Pacific/Johnston" " " \
-"posix/Pacific/Kiritimati" " " \
-"posix/Pacific/Kosrae" " " \
-"posix/Pacific/Kwajalein" " " \
-"posix/Pacific/Majuro" " " \
-"posix/Pacific/Marquesas" " " \
-"posix/Pacific/Midway" " " \
-"posix/Pacific/Nauru" " " \
-"posix/Pacific/Niue" " " \
-"posix/Pacific/Norfolk" " " \
-"posix/Pacific/Noumea" " " \
-"posix/Pacific/Pago_Pago" " " \
-"posix/Pacific/Palau" " " \
-"posix/Pacific/Pitcairn" " " \
-"posix/Pacific/Ponape" " " \
-"posix/Pacific/Port_Moresby" " " \
-"posix/Pacific/Rarotonga" " " \
-"posix/Pacific/Saipan" " " \
-"posix/Pacific/Samoa" " " \
-"posix/Pacific/Tahiti" " " \
-"posix/Pacific/Tarawa" " " \
-"posix/Pacific/Tongatapu" " " \
-"posix/Pacific/Truk" " " \
-"posix/Pacific/Wake" " " \
-"posix/Pacific/Wallis" " " \
-"posix/Pacific/Yap" " " \
-"posix/Poland" " " \
-"posix/Portugal" " " \
-"posix/ROC" " " \
-"posix/ROK" " " \
-"posix/Singapore" " " \
-"posix/Turkey" " " \
-"posix/UCT" " " \
-"posix/US/Alaska" " " \
-"posix/US/Aleutian" " " \
-"posix/US/Arizona" " " \
-"posix/US/Central" " " \
-"posix/US/East-Indiana" " " \
-"posix/US/Eastern" " " \
-"posix/US/Hawaii" " " \
-"posix/US/Indiana-Starke" " " \
-"posix/US/Michigan" " " \
-"posix/US/Mountain" " " \
-"posix/US/Pacific" " " \
-"posix/US/Pacific-New" " " \
-"posix/US/Samoa" " " \
-"posix/UTC" " " \
-"posix/Universal" " " \
-"posix/W-SU" " " \
-"posix/WET" " " \
-"posix/Zulu" " " \
-"posixrules" " " \
-"right/Africa/Abidjan" " " \
-"right/Africa/Accra" " " \
-"right/Africa/Addis_Ababa" " " \
-"right/Africa/Algiers" " " \
-"right/Africa/Asmera" " " \
-"right/Africa/Bamako" " " \
-"right/Africa/Bangui" " " \
-"right/Africa/Banjul" " " \
-"right/Africa/Bissau" " " \
-"right/Africa/Blantyre" " " \
-"right/Africa/Brazzaville" " " \
-"right/Africa/Bujumbura" " " \
-"right/Africa/Cairo" " " \
-"right/Africa/Casablanca" " " \
-"right/Africa/Ceuta" " " \
-"right/Africa/Conakry" " " \
-"right/Africa/Dakar" " " \
-"right/Africa/Dar_es_Salaam" " " \
-"right/Africa/Djibouti" " " \
-"right/Africa/Douala" " " \
-"right/Africa/El_Aaiun" " " \
-"right/Africa/Freetown" " " \
-"right/Africa/Gaborone" " " \
-"right/Africa/Harare" " " \
-"right/Africa/Johannesburg" " " \
-"right/Africa/Kampala" " " \
-"right/Africa/Khartoum" " " \
-"right/Africa/Kigali" " " \
-"right/Africa/Kinshasa" " " \
-"right/Africa/Lagos" " " \
-"right/Africa/Libreville" " " \
-"right/Africa/Lome" " " \
-"right/Africa/Luanda" " " \
-"right/Africa/Lubumbashi" " " \
-"right/Africa/Lusaka" " " \
-"right/Africa/Malabo" " " \
-"right/Africa/Maputo" " " \
-"right/Africa/Maseru" " " \
-"right/Africa/Mbabane" " " \
-"right/Africa/Mogadishu" " " \
-"right/Africa/Monrovia" " " \
-"right/Africa/Nairobi" " " \
-"right/Africa/Ndjamena" " " \
-"right/Africa/Niamey" " " \
-"right/Africa/Nouakchott" " " \
-"right/Africa/Ouagadougou" " " \
-"right/Africa/Porto-Novo" " " \
-"right/Africa/Sao_Tome" " " \
-"right/Africa/Timbuktu" " " \
-"right/Africa/Tripoli" " " \
-"right/Africa/Tunis" " " \
-"right/Africa/Windhoek" " " \
-"right/America/Adak" " " \
-"right/America/Anchorage" " " \
-"right/America/Anguilla" " " \
-"right/America/Antigua" " " \
-"right/America/Araguaina" " " \
-"right/America/Argentina/Buenos_Aires" " " \
-"right/America/Argentina/Catamarca" " " \
-"right/America/Argentina/ComodRivadavia" " " \
-"right/America/Argentina/Cordoba" " " \
-"right/America/Argentina/Jujuy" " " \
-"right/America/Argentina/La_Rioja" " " \
-"right/America/Argentina/Mendoza" " " \
-"right/America/Argentina/Rio_Gallegos" " " \
-"right/America/Argentina/San_Juan" " " \
-"right/America/Argentina/Tucuman" " " \
-"right/America/Argentina/Ushuaia" " " \
-"right/America/Aruba" " " \
-"right/America/Asuncion" " " \
-"right/America/Atikokan" " " \
-"right/America/Atka" " " \
-"right/America/Bahia" " " \
-"right/America/Barbados" " " \
-"right/America/Belem" " " \
-"right/America/Belize" " " \
-"right/America/Blanc-Sablon" " " \
-"right/America/Boa_Vista" " " \
-"right/America/Bogota" " " \
-"right/America/Boise" " " \
-"right/America/Buenos_Aires" " " \
-"right/America/Cambridge_Bay" " " \
-"right/America/Campo_Grande" " " \
-"right/America/Cancun" " " \
-"right/America/Caracas" " " \
-"right/America/Catamarca" " " \
-"right/America/Cayenne" " " \
-"right/America/Cayman" " " \
-"right/America/Chicago" " " \
-"right/America/Chihuahua" " " \
-"right/America/Coral_Harbour" " " \
-"right/America/Cordoba" " " \
-"right/America/Costa_Rica" " " \
-"right/America/Cuiaba" " " \
-"right/America/Curacao" " " \
-"right/America/Danmarkshavn" " " \
-"right/America/Dawson" " " \
-"right/America/Dawson_Creek" " " \
-"right/America/Denver" " " \
-"right/America/Detroit" " " \
-"right/America/Dominica" " " \
-"right/America/Edmonton" " " \
-"right/America/Eirunepe" " " \
-"right/America/El_Salvador" " " \
-"right/America/Ensenada" " " \
-"right/America/Fort_Wayne" " " \
-"right/America/Fortaleza" " " \
-"right/America/Glace_Bay" " " \
-"right/America/Godthab" " " \
-"right/America/Goose_Bay" " " \
-"right/America/Grand_Turk" " " \
-"right/America/Grenada" " " \
-"right/America/Guadeloupe" " " \
-"right/America/Guatemala" " " \
-"right/America/Guayaquil" " " \
-"right/America/Guyana" " " \
-"right/America/Halifax" " " \
-"right/America/Havana" " " \
-"right/America/Hermosillo" " " \
-"right/America/Indiana/Indianapolis" " " \
-"right/America/Indiana/Knox" " " \
-"right/America/Indiana/Marengo" " " \
-"right/America/Indiana/Petersburg" " " \
-"right/America/Indiana/Tell_City" " " \
-"right/America/Indiana/Vevay" " " \
-"right/America/Indiana/Vincennes" " " \
-"right/America/Indianapolis" " " \
-"right/America/Inuvik" " " \
-"right/America/Iqaluit" " " \
-"right/America/Jamaica" " " \
-"right/America/Jujuy" " " \
-"right/America/Juneau" " " \
-"right/America/Kentucky/Louisville" " " \
-"right/America/Kentucky/Monticello" " " \
-"right/America/Knox_IN" " " \
-"right/America/La_Paz" " " \
-"right/America/Lima" " " \
-"right/America/Los_Angeles" " " \
-"right/America/Louisville" " " \
-"right/America/Maceio" " " \
-"right/America/Managua" " " \
-"right/America/Manaus" " " \
-"right/America/Martinique" " " \
-"right/America/Mazatlan" " " \
-"right/America/Mendoza" " " \
-"right/America/Menominee" " " \
-"right/America/Merida" " " \
-"right/America/Mexico_City" " " \
-"right/America/Miquelon" " " \
-"right/America/Moncton" " " \
-"right/America/Monterrey" " " \
-"right/America/Montevideo" " " \
-"right/America/Montreal" " " \
-"right/America/Montserrat" " " \
-"right/America/Nassau" " " \
-"right/America/New_York" " " \
-"right/America/Nipigon" " " \
-"right/America/Nome" " " \
-"right/America/Noronha" " " \
-"right/America/North_Dakota/Center" " " \
-"right/America/North_Dakota/New_Salem" " " \
-"right/America/Panama" " " \
-"right/America/Pangnirtung" " " \
-"right/America/Paramaribo" " " \
-"right/America/Phoenix" " " \
-"right/America/Port-au-Prince" " " \
-"right/America/Port_of_Spain" " " \
-"right/America/Porto_Acre" " " \
-"right/America/Porto_Velho" " " \
-"right/America/Puerto_Rico" " " \
-"right/America/Rainy_River" " " \
-"right/America/Rankin_Inlet" " " \
-"right/America/Recife" " " \
-"right/America/Regina" " " \
-"right/America/Rio_Branco" " " \
-"right/America/Rosario" " " \
-"right/America/Santiago" " " \
-"right/America/Santo_Domingo" " " \
-"right/America/Sao_Paulo" " " \
-"right/America/Scoresbysund" " " \
-"right/America/Shiprock" " " \
-"right/America/St_Johns" " " \
-"right/America/St_Kitts" " " \
-"right/America/St_Lucia" " " \
-"right/America/St_Thomas" " " \
-"right/America/St_Vincent" " " \
-"right/America/Swift_Current" " " \
-"right/America/Tegucigalpa" " " \
-"right/America/Thule" " " \
-"right/America/Thunder_Bay" " " \
-"right/America/Tijuana" " " \
-"right/America/Toronto" " " \
-"right/America/Tortola" " " \
-"right/America/Vancouver" " " \
-"right/America/Virgin" " " \
-"right/America/Whitehorse" " " \
-"right/America/Winnipeg" " " \
-"right/America/Yakutat" " " \
-"right/America/Yellowknife" " " \
-"right/Antarctica/Casey" " " \
-"right/Antarctica/Davis" " " \
-"right/Antarctica/DumontDUrville" " " \
-"right/Antarctica/Mawson" " " \
-"right/Antarctica/McMurdo" " " \
-"right/Antarctica/Palmer" " " \
-"right/Antarctica/Rothera" " " \
-"right/Antarctica/South_Pole" " " \
-"right/Antarctica/Syowa" " " \
-"right/Antarctica/Troll" " " \
-"right/Antarctica/Vostok" " " \
-"right/Arctic/Longyearbyen" " " \
-"right/Asia/Aden" " " \
-"right/Asia/Almaty" " " \
-"right/Asia/Amman" " " \
-"right/Asia/Anadyr" " " \
-"right/Asia/Aqtau" " " \
-"right/Asia/Aqtobe" " " \
-"right/Asia/Ashgabat" " " \
-"right/Asia/Ashkhabad" " " \
-"right/Asia/Baghdad" " " \
-"right/Asia/Bahrain" " " \
-"right/Asia/Baku" " " \
-"right/Asia/Bangkok" " " \
-"right/Asia/Beirut" " " \
-"right/Asia/Bishkek" " " \
-"right/Asia/Brunei" " " \
-"right/Asia/Calcutta" " " \
-"right/Asia/Chita" " " \
-"right/Asia/Choibalsan" " " \
-"right/Asia/Chongqing" " " \
-"right/Asia/Chungking" " " \
-"right/Asia/Colombo" " " \
-"right/Asia/Dacca" " " \
-"right/Asia/Damascus" " " \
-"right/Asia/Dhaka" " " \
-"right/Asia/Dili" " " \
-"right/Asia/Dubai" " " \
-"right/Asia/Dushanbe" " " \
-"right/Asia/Gaza" " " \
-"right/Asia/Harbin" " " \
-"right/Asia/Hong_Kong" " " \
-"right/Asia/Hovd" " " \
-"right/Asia/Irkutsk" " " \
-"right/Asia/Istanbul" " " \
-"right/Asia/Jakarta" " " \
-"right/Asia/Jayapura" " " \
-"right/Asia/Jerusalem" " " \
-"right/Asia/Kabul" " " \
-"right/Asia/Kamchatka" " " \
-"right/Asia/Karachi" " " \
-"right/Asia/Kashgar" " " \
-"right/Asia/Katmandu" " " \
-"right/Asia/Krasnoyarsk" " " \
-"right/Asia/Kuala_Lumpur" " " \
-"right/Asia/Kuching" " " \
-"right/Asia/Kuwait" " " \
-"right/Asia/Macao" " " \
-"right/Asia/Macau" " " \
-"right/Asia/Magadan" " " \
-"right/Asia/Makassar" " " \
-"right/Asia/Manila" " " \
-"right/Asia/Muscat" " " \
-"right/Asia/Nicosia" " " \
-"right/Asia/Novosibirsk" " " \
-"right/Asia/Omsk" " " \
-"right/Asia/Oral" " " \
-"right/Asia/Phnom_Penh" " " \
-"right/Asia/Pontianak" " " \
-"right/Asia/Pyongyang" " " \
-"right/Asia/Qatar" " " \
-"right/Asia/Qyzylorda" " " \
-"right/Asia/Rangoon" " " \
-"right/Asia/Riyadh" " " \
-"right/Asia/Saigon" " " \
-"right/Asia/Sakhalin" " " \
-"right/Asia/Samarkand" " " \
-"right/Asia/Seoul" " " \
-"right/Asia/Shanghai" " " \
-"right/Asia/Singapore" " " \
-"right/Asia/Srednekolymsk" " " \
-"right/Asia/Taipei" " " \
-"right/Asia/Tashkent" " " \
-"right/Asia/Tbilisi" " " \
-"right/Asia/Tehran" " " \
-"right/Asia/Tel_Aviv" " " \
-"right/Asia/Thimbu" " " \
-"right/Asia/Thimphu" " " \
-"right/Asia/Tokyo" " " \
-"right/Asia/Ujung_Pandang" " " \
-"right/Asia/Ulaanbaatar" " " \
-"right/Asia/Ulan_Bator" " " \
-"right/Asia/Urumqi" " " \
-"right/Asia/Vientiane" " " \
-"right/Asia/Vladivostok" " " \
-"right/Asia/Yakutsk" " " \
-"right/Asia/Yekaterinburg" " " \
-"right/Asia/Yerevan" " " \
-"right/Atlantic/Azores" " " \
-"right/Atlantic/Bermuda" " " \
-"right/Atlantic/Canary" " " \
-"right/Atlantic/Cape_Verde" " " \
-"right/Atlantic/Faeroe" " " \
-"right/Atlantic/Jan_Mayen" " " \
-"right/Atlantic/Madeira" " " \
-"right/Atlantic/Reykjavik" " " \
-"right/Atlantic/South_Georgia" " " \
-"right/Atlantic/St_Helena" " " \
-"right/Atlantic/Stanley" " " \
-"right/Australia/ACT" " " \
-"right/Australia/Adelaide" " " \
-"right/Australia/Brisbane" " " \
-"right/Australia/Broken_Hill" " " \
-"right/Australia/Canberra" " " \
-"right/Australia/Currie" " " \
-"right/Australia/Darwin" " " \
-"right/Australia/Hobart" " " \
-"right/Australia/LHI" " " \
-"right/Australia/Lindeman" " " \
-"right/Australia/Lord_Howe" " " \
-"right/Australia/Melbourne" " " \
-"right/Australia/NSW" " " \
-"right/Australia/North" " " \
-"right/Australia/Perth" " " \
-"right/Australia/Queensland" " " \
-"right/Australia/South" " " \
-"right/Australia/Sydney" " " \
-"right/Australia/Tasmania" " " \
-"right/Australia/Victoria" " " \
-"right/Australia/West" " " \
-"right/Australia/Yancowinna" " " \
-"right/Brazil/Acre" " " \
-"right/Brazil/DeNoronha" " " \
-"right/Brazil/East" " " \
-"right/Brazil/West" " " \
-"right/CET" " " \
-"right/CST6CDT" " " \
-"right/Canada/Atlantic" " " \
-"right/Canada/Central" " " \
-"right/Canada/East-Saskatchewan" " " \
-"right/Canada/Eastern" " " \
-"right/Canada/Mountain" " " \
-"right/Canada/Newfoundland" " " \
-"right/Canada/Pacific" " " \
-"right/Canada/Saskatchewan" " " \
-"right/Canada/Yukon" " " \
-"right/Chile/Continental" " " \
-"right/Chile/EasterIsland" " " \
-"right/Cuba" " " \
-"right/EET" " " \
-"right/EST" " " \
-"right/EST5EDT" " " \
-"right/Egypt" " " \
-"right/Eire" " " \
-"right/Etc/GMT" " " \
-"right/Etc/GMT+0" " " \
-"right/Etc/GMT+1" " " \
-"right/Etc/GMT+10" " " \
-"right/Etc/GMT+11" " " \
-"right/Etc/GMT+12" " " \
-"right/Etc/GMT+2" " " \
-"right/Etc/GMT+3" " " \
-"right/Etc/GMT+4" " " \
-"right/Etc/GMT+5" " " \
-"right/Etc/GMT+6" " " \
-"right/Etc/GMT+7" " " \
-"right/Etc/GMT+8" " " \
-"right/Etc/GMT+9" " " \
-"right/Etc/GMT-0" " " \
-"right/Etc/GMT-1" " " \
-"right/Etc/GMT-10" " " \
-"right/Etc/GMT-11" " " \
-"right/Etc/GMT-12" " " \
-"right/Etc/GMT-13" " " \
-"right/Etc/GMT-14" " " \
-"right/Etc/GMT-2" " " \
-"right/Etc/GMT-3" " " \
-"right/Etc/GMT-4" " " \
-"right/Etc/GMT-5" " " \
-"right/Etc/GMT-6" " " \
-"right/Etc/GMT-7" " " \
-"right/Etc/GMT-8" " " \
-"right/Etc/GMT-9" " " \
-"right/Etc/GMT0" " " \
-"right/Etc/Greenwich" " " \
-"right/Etc/UCT" " " \
-"right/Etc/UTC" " " \
-"right/Etc/Universal" " " \
-"right/Etc/Zulu" " " \
-"right/Europe/Amsterdam" " " \
-"right/Europe/Andorra" " " \
-"right/Europe/Athens" " " \
-"right/Europe/Belfast" " " \
-"right/Europe/Belgrade" " " \
-"right/Europe/Berlin" " " \
-"right/Europe/Bratislava" " " \
-"right/Europe/Brussels" " " \
-"right/Europe/Bucharest" " " \
-"right/Europe/Budapest" " " \
-"right/Europe/Chisinau" " " \
-"right/Europe/Copenhagen" " " \
-"right/Europe/Dublin" " " \
-"right/Europe/Gibraltar" " " \
-"right/Europe/Guernsey" " " \
-"right/Europe/Helsinki" " " \
-"right/Europe/Isle_of_Man" " " \
-"right/Europe/Istanbul" " " \
-"right/Europe/Jersey" " " \
-"right/Europe/Kaliningrad" " " \
-"right/Europe/Kiev" " " \
-"right/Europe/Lisbon" " " \
-"right/Europe/Ljubljana" " " \
-"right/Europe/London" " " \
-"right/Europe/Luxembourg" " " \
-"right/Europe/Madrid" " " \
-"right/Europe/Malta" " " \
-"right/Europe/Mariehamn" " " \
-"right/Europe/Minsk" " " \
-"right/Europe/Monaco" " " \
-"right/Europe/Moscow" " " \
-"right/Europe/Nicosia" " " \
-"right/Europe/Oslo" " " \
-"right/Europe/Paris" " " \
-"right/Europe/Podgorica" " " \
-"right/Europe/Prague" " " \
-"right/Europe/Riga" " " \
-"right/Europe/Rome" " " \
-"right/Europe/Samara" " " \
-"right/Europe/San_Marino" " " \
-"right/Europe/Sarajevo" " " \
-"right/Europe/Simferopol" " " \
-"right/Europe/Skopje" " " \
-"right/Europe/Sofia" " " \
-"right/Europe/Stockholm" " " \
-"right/Europe/Tallinn" " " \
-"right/Europe/Tirane" " " \
-"right/Europe/Tiraspol" " " \
-"right/Europe/Uzhgorod" " " \
-"right/Europe/Vaduz" " " \
-"right/Europe/Vatican" " " \
-"right/Europe/Vienna" " " \
-"right/Europe/Vilnius" " " \
-"right/Europe/Volgograd" " " \
-"right/Europe/Warsaw" " " \
-"right/Europe/Zagreb" " " \
-"right/Europe/Zaporozhye" " " \
-"right/Europe/Zurich" " " \
-"right/Factory" " " \
-"right/GB" " " \
-"right/GB-Eire" " " \
-"right/GMT" " " \
-"right/GMT+0" " " \
-"right/GMT-0" " " \
-"right/GMT0" " " \
-"right/Greenwich" " " \
-"right/HST" " " \
-"right/Hongkong" " " \
-"right/Iceland" " " \
-"right/Indian/Antananarivo" " " \
-"right/Indian/Chagos" " " \
-"right/Indian/Christmas" " " \
-"right/Indian/Cocos" " " \
-"right/Indian/Comoro" " " \
-"right/Indian/Kerguelen" " " \
-"right/Indian/Mahe" " " \
-"right/Indian/Maldives" " " \
-"right/Indian/Mauritius" " " \
-"right/Indian/Mayotte" " " \
-"right/Indian/Reunion" " " \
-"right/Iran" " " \
-"right/Israel" " " \
-"right/Jamaica" " " \
-"right/Japan" " " \
-"right/Kwajalein" " " \
-"right/Libya" " " \
-"right/MET" " " \
-"right/MST" " " \
-"right/MST7MDT" " " \
-"right/Mexico/BajaNorte" " " \
-"right/Mexico/BajaSur" " " \
-"right/Mexico/General" " " \
-"right/NZ" " " \
-"right/NZ-CHAT" " " \
-"right/Navajo" " " \
-"right/PRC" " " \
-"right/PST8PDT" " " \
-"right/Pacific/Apia" " " \
-"right/Pacific/Auckland" " " \
-"right/Pacific/Bougainville" " " \
-"right/Pacific/Chatham" " " \
-"right/Pacific/Easter" " " \
-"right/Pacific/Efate" " " \
-"right/Pacific/Enderbury" " " \
-"right/Pacific/Fakaofo" " " \
-"right/Pacific/Fiji" " " \
-"right/Pacific/Funafuti" " " \
-"right/Pacific/Galapagos" " " \
-"right/Pacific/Gambier" " " \
-"right/Pacific/Guadalcanal" " " \
-"right/Pacific/Guam" " " \
-"right/Pacific/Honolulu" " " \
-"right/Pacific/Johnston" " " \
-"right/Pacific/Kiritimati" " " \
-"right/Pacific/Kosrae" " " \
-"right/Pacific/Kwajalein" " " \
-"right/Pacific/Majuro" " " \
-"right/Pacific/Marquesas" " " \
-"right/Pacific/Midway" " " \
-"right/Pacific/Nauru" " " \
-"right/Pacific/Niue" " " \
-"right/Pacific/Norfolk" " " \
-"right/Pacific/Noumea" " " \
-"right/Pacific/Pago_Pago" " " \
-"right/Pacific/Palau" " " \
-"right/Pacific/Pitcairn" " " \
-"right/Pacific/Ponape" " " \
-"right/Pacific/Port_Moresby" " " \
-"right/Pacific/Rarotonga" " " \
-"right/Pacific/Saipan" " " \
-"right/Pacific/Samoa" " " \
-"right/Pacific/Tahiti" " " \
-"right/Pacific/Tarawa" " " \
-"right/Pacific/Tongatapu" " " \
-"right/Pacific/Truk" " " \
-"right/Pacific/Wake" " " \
-"right/Pacific/Wallis" " " \
-"right/Pacific/Yap" " " \
-"right/Poland" " " \
-"right/Portugal" " " \
-"right/ROC" " " \
-"right/ROK" " " \
-"right/Singapore" " " \
-"right/Turkey" " " \
-"right/UCT" " " \
-"right/US/Alaska" " " \
-"right/US/Aleutian" " " \
-"right/US/Arizona" " " \
-"right/US/Central" " " \
-"right/US/East-Indiana" " " \
-"right/US/Eastern" " " \
-"right/US/Hawaii" " " \
-"right/US/Indiana-Starke" " " \
-"right/US/Michigan" " " \
-"right/US/Mountain" " " \
-"right/US/Pacific" " " \
-"right/US/Pacific-New" " " \
-"right/US/Samoa" " " \
-"right/UTC" " " \
-"right/Universal" " " \
-"right/W-SU" " " \
-"right/WET" " " \
-"right/Zulu" " " \
Index: npl/system/glibc/timezone-scripts/parts/02
===================================================================
--- npl/system/glibc/timezone-scripts/parts/02	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,28 +1,0 @@
-   2> $TMP/tz
-
-   if [ $? = 1 -o $? = 255 ]; then
-      rm -f $TMP/tz
-      exit
-   fi
-
-   TIMEZONE="`cat $TMP/tz`"
-   rm -f $TMP/tz
-
-   setzone $TIMEZONE
-   exit
-else
-   ###
-   ### use text prompts
-   ###
-   while [ 0 ]; do
-      echo -n "Would you like to configure your timezone ([y]es, [n]o)? "
-      read TIMECONF;
-      echo
-
-      if [ "$TIMECONF" = "n" ]; then
-         break
-      fi
-
-      cat << EOF
-Select one of these timezones:
-
Index: npl/system/glibc/timezone-scripts/parts/03
===================================================================
--- npl/system/glibc/timezone-scripts/parts/03	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1658 +1,0 @@
-US/Alaska
-US/Aleutian
-US/Arizona
-US/Central
-US/East-Indiana
-US/Eastern
-US/Hawaii
-US/Indiana-Starke
-US/Michigan
-US/Mountain
-US/Pacific
-US/Pacific-New
-US/Samoa
-Africa/Abidjan
-Africa/Accra
-Africa/Addis_Ababa
-Africa/Algiers
-Africa/Asmera
-Africa/Bamako
-Africa/Bangui
-Africa/Banjul
-Africa/Bissau
-Africa/Blantyre
-Africa/Brazzaville
-Africa/Bujumbura
-Africa/Cairo
-Africa/Casablanca
-Africa/Ceuta
-Africa/Conakry
-Africa/Dakar
-Africa/Dar_es_Salaam
-Africa/Djibouti
-Africa/Douala
-Africa/El_Aaiun
-Africa/Freetown
-Africa/Gaborone
-Africa/Harare
-Africa/Johannesburg
-Africa/Kampala
-Africa/Khartoum
-Africa/Kigali
-Africa/Kinshasa
-Africa/Lagos
-Africa/Libreville
-Africa/Lome
-Africa/Luanda
-Africa/Lubumbashi
-Africa/Lusaka
-Africa/Malabo
-Africa/Maputo
-Africa/Maseru
-Africa/Mbabane
-Africa/Mogadishu
-Africa/Monrovia
-Africa/Nairobi
-Africa/Ndjamena
-Africa/Niamey
-Africa/Nouakchott
-Africa/Ouagadougou
-Africa/Porto-Novo
-Africa/Sao_Tome
-Africa/Timbuktu
-Africa/Tripoli
-Africa/Tunis
-Africa/Windhoek
-America/Adak
-America/Anchorage
-America/Anguilla
-America/Antigua
-America/Araguaina
-America/Argentina/Buenos_Aires
-America/Argentina/Catamarca
-America/Argentina/ComodRivadavia
-America/Argentina/Cordoba
-America/Argentina/Jujuy
-America/Argentina/La_Rioja
-America/Argentina/Mendoza
-America/Argentina/Rio_Gallegos
-America/Argentina/San_Juan
-America/Argentina/Tucuman
-America/Argentina/Ushuaia
-America/Aruba
-America/Asuncion
-America/Atikokan
-America/Atka
-America/Bahia
-America/Barbados
-America/Belem
-America/Belize
-America/Blanc-Sablon
-America/Boa_Vista
-America/Bogota
-America/Boise
-America/Buenos_Aires
-America/Cambridge_Bay
-America/Campo_Grande
-America/Cancun
-America/Caracas
-America/Catamarca
-America/Cayenne
-America/Cayman
-America/Chicago
-America/Chihuahua
-America/Coral_Harbour
-America/Cordoba
-America/Costa_Rica
-America/Cuiaba
-America/Curacao
-America/Danmarkshavn
-America/Dawson
-America/Dawson_Creek
-America/Denver
-America/Detroit
-America/Dominica
-America/Edmonton
-America/Eirunepe
-America/El_Salvador
-America/Ensenada
-America/Fort_Wayne
-America/Fortaleza
-America/Glace_Bay
-America/Godthab
-America/Goose_Bay
-America/Grand_Turk
-America/Grenada
-America/Guadeloupe
-America/Guatemala
-America/Guayaquil
-America/Guyana
-America/Halifax
-America/Havana
-America/Hermosillo
-America/Indiana/Indianapolis
-America/Indiana/Knox
-America/Indiana/Marengo
-America/Indiana/Petersburg
-America/Indiana/Tell_City
-America/Indiana/Vevay
-America/Indiana/Vincennes
-America/Indianapolis
-America/Inuvik
-America/Iqaluit
-America/Jamaica
-America/Jujuy
-America/Juneau
-America/Kentucky/Louisville
-America/Kentucky/Monticello
-America/Knox_IN
-America/La_Paz
-America/Lima
-America/Los_Angeles
-America/Louisville
-America/Maceio
-America/Managua
-America/Manaus
-America/Martinique
-America/Mazatlan
-America/Mendoza
-America/Menominee
-America/Merida
-America/Mexico_City
-America/Miquelon
-America/Moncton
-America/Monterrey
-America/Montevideo
-America/Montreal
-America/Montserrat
-America/Nassau
-America/New_York
-America/Nipigon
-America/Nome
-America/Noronha
-America/North_Dakota/Center
-America/North_Dakota/New_Salem
-America/Panama
-America/Pangnirtung
-America/Paramaribo
-America/Phoenix
-America/Port-au-Prince
-America/Port_of_Spain
-America/Porto_Acre
-America/Porto_Velho
-America/Puerto_Rico
-America/Rainy_River
-America/Rankin_Inlet
-America/Recife
-America/Regina
-America/Rio_Branco
-America/Rosario
-America/Santiago
-America/Santo_Domingo
-America/Sao_Paulo
-America/Scoresbysund
-America/Shiprock
-America/St_Johns
-America/St_Kitts
-America/St_Lucia
-America/St_Thomas
-America/St_Vincent
-America/Swift_Current
-America/Tegucigalpa
-America/Thule
-America/Thunder_Bay
-America/Tijuana
-America/Toronto
-America/Tortola
-America/Vancouver
-America/Virgin
-America/Whitehorse
-America/Winnipeg
-America/Yakutat
-America/Yellowknife
-Antarctica/Casey
-Antarctica/Davis
-Antarctica/DumontDUrville
-Antarctica/Mawson
-Antarctica/McMurdo
-Antarctica/Palmer
-Antarctica/Rothera
-Antarctica/South_Pole
-Antarctica/Syowa
-Antarctica/Troll
-Antarctica/Vostok
-Arctic/Longyearbyen
-Asia/Aden
-Asia/Almaty
-Asia/Amman
-Asia/Anadyr
-Asia/Aqtau
-Asia/Aqtobe
-Asia/Ashgabat
-Asia/Ashkhabad
-Asia/Baghdad
-Asia/Bahrain
-Asia/Baku
-Asia/Bangkok
-Asia/Beirut
-Asia/Bishkek
-Asia/Brunei
-Asia/Calcutta
-Asia/Chita
-Asia/Choibalsan
-Asia/Chongqing
-Asia/Chungking
-Asia/Colombo
-Asia/Dacca
-Asia/Damascus
-Asia/Dhaka
-Asia/Dili
-Asia/Dubai
-Asia/Dushanbe
-Asia/Gaza
-Asia/Harbin
-Asia/Hong_Kong
-Asia/Hovd
-Asia/Irkutsk
-Asia/Istanbul
-Asia/Jakarta
-Asia/Jayapura
-Asia/Jerusalem
-Asia/Kabul
-Asia/Kamchatka
-Asia/Karachi
-Asia/Kashgar
-Asia/Katmandu
-Asia/Khandyga
-Asia/Kolkata
-Asia/Krasnoyarsk
-Asia/Kuala_Lumpur
-Asia/Kuching
-Asia/Kuwait
-Asia/Macao
-Asia/Macau
-Asia/Magadan
-Asia/Makassar
-Asia/Manila
-Asia/Muscat
-Asia/Nicosia
-Asia/Novosibirsk
-Asia/Omsk
-Asia/Oral
-Asia/Phnom_Penh
-Asia/Pontianak
-Asia/Pyongyang
-Asia/Qatar
-Asia/Qyzylorda
-Asia/Rangoon
-Asia/Riyadh
-Asia/Saigon
-Asia/Sakhalin
-Asia/Samarkand
-Asia/Seoul
-Asia/Shanghai
-Asia/Singapore
-Asia/Srednekolymsk
-Asia/Taipei
-Asia/Tashkent
-Asia/Tbilisi
-Asia/Tehran
-Asia/Tel_Aviv
-Asia/Thimbu
-Asia/Thimphu
-Asia/Tokyo
-Asia/Ujung_Pandang
-Asia/Ulaanbaatar
-Asia/Ulan_Bator
-Asia/Urumqi
-Asia/Ust-Nera
-Asia/Vientiane
-Asia/Vladivostok
-Asia/Yakutsk
-Asia/Yekaterinburg
-Asia/Yerevan
-Atlantic/Azores
-Atlantic/Bermuda
-Atlantic/Canary
-Atlantic/Cape_Verde
-Atlantic/Faeroe
-Atlantic/Jan_Mayen
-Atlantic/Madeira
-Atlantic/Reykjavik
-Atlantic/South_Georgia
-Atlantic/St_Helena
-Atlantic/Stanley
-Australia/ACT
-Australia/Adelaide
-Australia/Brisbane
-Australia/Broken_Hill
-Australia/Canberra
-Australia/Currie
-Australia/Darwin
-Australia/Hobart
-Australia/LHI
-Australia/Lindeman
-Australia/Lord_Howe
-Australia/Melbourne
-Australia/NSW
-Australia/North
-Australia/Perth
-Australia/Queensland
-Australia/South
-Australia/Sydney
-Australia/Tasmania
-Australia/Victoria
-Australia/West
-Australia/Yancowinna
-Brazil/Acre
-Brazil/DeNoronha
-Brazil/East
-Brazil/West
-CET
-CST6CDT
-Canada/Atlantic
-Canada/Central
-Canada/East-Saskatchewan
-Canada/Eastern
-Canada/Mountain
-Canada/Newfoundland
-Canada/Pacific
-Canada/Saskatchewan
-Canada/Yukon
-Chile/Continental
-Chile/EasterIsland
-Cuba
-EET
-EST
-EST5EDT
-Egypt
-Eire
-Etc/GMT
-Etc/GMT+0
-Etc/GMT+1
-Etc/GMT+10
-Etc/GMT+11
-Etc/GMT+12
-Etc/GMT+2
-Etc/GMT+3
-Etc/GMT+4
-Etc/GMT+5
-Etc/GMT+6
-Etc/GMT+7
-Etc/GMT+8
-Etc/GMT+9
-Etc/GMT-0
-Etc/GMT-1
-Etc/GMT-10
-Etc/GMT-11
-Etc/GMT-12
-Etc/GMT-13
-Etc/GMT-14
-Etc/GMT-2
-Etc/GMT-3
-Etc/GMT-4
-Etc/GMT-5
-Etc/GMT-6
-Etc/GMT-7
-Etc/GMT-8
-Etc/GMT-9
-Etc/GMT0
-Etc/Greenwich
-Etc/UCT
-Etc/UTC
-Etc/Universal
-Etc/Zulu
-Europe/Amsterdam
-Europe/Andorra
-Europe/Athens
-Europe/Belfast
-Europe/Belgrade
-Europe/Berlin
-Europe/Bratislava
-Europe/Brussels
-Europe/Bucharest
-Europe/Budapest
-Europe/Busingen
-Europe/Chisinau
-Europe/Copenhagen
-Europe/Dublin
-Europe/Gibraltar
-Europe/Guernsey
-Europe/Helsinki
-Europe/Isle_of_Man
-Europe/Istanbul
-Europe/Jersey
-Europe/Kaliningrad
-Europe/Kiev
-Europe/Lisbon
-Europe/Ljubljana
-Europe/London
-Europe/Luxembourg
-Europe/Madrid
-Europe/Malta
-Europe/Mariehamn
-Europe/Minsk
-Europe/Monaco
-Europe/Moscow
-Europe/Nicosia
-Europe/Oslo
-Europe/Paris
-Europe/Podgorica
-Europe/Prague
-Europe/Riga
-Europe/Rome
-Europe/Samara
-Europe/San_Marino
-Europe/Sarajevo
-Europe/Simferopol
-Europe/Skopje
-Europe/Sofia
-Europe/Stockholm
-Europe/Tallinn
-Europe/Tirane
-Europe/Tiraspol
-Europe/Uzhgorod
-Europe/Vaduz
-Europe/Vatican
-Europe/Vienna
-Europe/Vilnius
-Europe/Volgograd
-Europe/Warsaw
-Europe/Zagreb
-Europe/Zaporozhye
-Europe/Zurich
-Factory
-GB
-GB-Eire
-GMT
-GMT+0
-GMT-0
-GMT0
-Greenwich
-HST
-Hongkong
-Iceland
-Indian/Antananarivo
-Indian/Chagos
-Indian/Christmas
-Indian/Cocos
-Indian/Comoro
-Indian/Kerguelen
-Indian/Mahe
-Indian/Maldives
-Indian/Mauritius
-Indian/Mayotte
-Indian/Reunion
-Iran
-Israel
-Jamaica
-Japan
-Kwajalein
-Libya
-MET
-MST
-MST7MDT
-Mexico/BajaNorte
-Mexico/BajaSur
-Mexico/General
-NZ
-NZ-CHAT
-Navajo
-PRC
-PST8PDT
-Pacific/Apia
-Pacific/Auckland
-Pacific/Bougainville
-Pacific/Chatham
-Pacific/Easter
-Pacific/Efate
-Pacific/Enderbury
-Pacific/Fakaofo
-Pacific/Fiji
-Pacific/Funafuti
-Pacific/Galapagos
-Pacific/Gambier
-Pacific/Guadalcanal
-Pacific/Guam
-Pacific/Honolulu
-Pacific/Johnston
-Pacific/Kiritimati
-Pacific/Kosrae
-Pacific/Kwajalein
-Pacific/Majuro
-Pacific/Marquesas
-Pacific/Midway
-Pacific/Nauru
-Pacific/Niue
-Pacific/Norfolk
-Pacific/Noumea
-Pacific/Pago_Pago
-Pacific/Palau
-Pacific/Pitcairn
-Pacific/Ponape
-Pacific/Port_Moresby
-Pacific/Rarotonga
-Pacific/Saipan
-Pacific/Samoa
-Pacific/Tahiti
-Pacific/Tarawa
-Pacific/Tongatapu
-Pacific/Truk
-Pacific/Wake
-Pacific/Wallis
-Pacific/Yap
-Poland
-Portugal
-ROC
-ROK
-Singapore
-Turkey
-UCT
-UTC
-Universal
-W-SU
-WET
-Zulu
-posix/Africa/Abidjan
-posix/Africa/Accra
-posix/Africa/Addis_Ababa
-posix/Africa/Algiers
-posix/Africa/Asmera
-posix/Africa/Bamako
-posix/Africa/Bangui
-posix/Africa/Banjul
-posix/Africa/Bissau
-posix/Africa/Blantyre
-posix/Africa/Brazzaville
-posix/Africa/Bujumbura
-posix/Africa/Cairo
-posix/Africa/Casablanca
-posix/Africa/Ceuta
-posix/Africa/Conakry
-posix/Africa/Dakar
-posix/Africa/Dar_es_Salaam
-posix/Africa/Djibouti
-posix/Africa/Douala
-posix/Africa/El_Aaiun
-posix/Africa/Freetown
-posix/Africa/Gaborone
-posix/Africa/Harare
-posix/Africa/Johannesburg
-posix/Africa/Kampala
-posix/Africa/Khartoum
-posix/Africa/Kigali
-posix/Africa/Kinshasa
-posix/Africa/Lagos
-posix/Africa/Libreville
-posix/Africa/Lome
-posix/Africa/Luanda
-posix/Africa/Lubumbashi
-posix/Africa/Lusaka
-posix/Africa/Malabo
-posix/Africa/Maputo
-posix/Africa/Maseru
-posix/Africa/Mbabane
-posix/Africa/Mogadishu
-posix/Africa/Monrovia
-posix/Africa/Nairobi
-posix/Africa/Ndjamena
-posix/Africa/Niamey
-posix/Africa/Nouakchott
-posix/Africa/Ouagadougou
-posix/Africa/Porto-Novo
-posix/Africa/Sao_Tome
-posix/Africa/Timbuktu
-posix/Africa/Tripoli
-posix/Africa/Tunis
-posix/Africa/Windhoek
-posix/America/Adak
-posix/America/Anchorage
-posix/America/Anguilla
-posix/America/Antigua
-posix/America/Araguaina
-posix/America/Argentina/Buenos_Aires
-posix/America/Argentina/Catamarca
-posix/America/Argentina/ComodRivadavia
-posix/America/Argentina/Cordoba
-posix/America/Argentina/Jujuy
-posix/America/Argentina/La_Rioja
-posix/America/Argentina/Mendoza
-posix/America/Argentina/Rio_Gallegos
-posix/America/Argentina/San_Juan
-posix/America/Argentina/Tucuman
-posix/America/Argentina/Ushuaia
-posix/America/Aruba
-posix/America/Asuncion
-posix/America/Atikokan
-posix/America/Atka
-posix/America/Bahia
-posix/America/Barbados
-posix/America/Belem
-posix/America/Belize
-posix/America/Blanc-Sablon
-posix/America/Boa_Vista
-posix/America/Bogota
-posix/America/Boise
-posix/America/Buenos_Aires
-posix/America/Cambridge_Bay
-posix/America/Campo_Grande
-posix/America/Cancun
-posix/America/Caracas
-posix/America/Catamarca
-posix/America/Cayenne
-posix/America/Cayman
-posix/America/Chicago
-posix/America/Chihuahua
-posix/America/Coral_Harbour
-posix/America/Cordoba
-posix/America/Costa_Rica
-posix/America/Cuiaba
-posix/America/Curacao
-posix/America/Danmarkshavn
-posix/America/Dawson
-posix/America/Dawson_Creek
-posix/America/Denver
-posix/America/Detroit
-posix/America/Dominica
-posix/America/Edmonton
-posix/America/Eirunepe
-posix/America/El_Salvador
-posix/America/Ensenada
-posix/America/Fort_Wayne
-posix/America/Fortaleza
-posix/America/Glace_Bay
-posix/America/Godthab
-posix/America/Goose_Bay
-posix/America/Grand_Turk
-posix/America/Grenada
-posix/America/Guadeloupe
-posix/America/Guatemala
-posix/America/Guayaquil
-posix/America/Guyana
-posix/America/Halifax
-posix/America/Havana
-posix/America/Hermosillo
-posix/America/Indiana/Indianapolis
-posix/America/Indiana/Knox
-posix/America/Indiana/Marengo
-posix/America/Indiana/Petersburg
-posix/America/Indiana/Tell_City
-posix/America/Indiana/Vevay
-posix/America/Indiana/Vincennes
-posix/America/Indianapolis
-posix/America/Inuvik
-posix/America/Iqaluit
-posix/America/Jamaica
-posix/America/Jujuy
-posix/America/Juneau
-posix/America/Kentucky/Louisville
-posix/America/Kentucky/Monticello
-posix/America/Knox_IN
-posix/America/La_Paz
-posix/America/Lima
-posix/America/Los_Angeles
-posix/America/Louisville
-posix/America/Maceio
-posix/America/Managua
-posix/America/Manaus
-posix/America/Martinique
-posix/America/Mazatlan
-posix/America/Mendoza
-posix/America/Menominee
-posix/America/Merida
-posix/America/Mexico_City
-posix/America/Miquelon
-posix/America/Moncton
-posix/America/Monterrey
-posix/America/Montevideo
-posix/America/Montreal
-posix/America/Montserrat
-posix/America/Nassau
-posix/America/New_York
-posix/America/Nipigon
-posix/America/Nome
-posix/America/Noronha
-posix/America/North_Dakota/Center
-posix/America/North_Dakota/New_Salem
-posix/America/Panama
-posix/America/Pangnirtung
-posix/America/Paramaribo
-posix/America/Phoenix
-posix/America/Port-au-Prince
-posix/America/Port_of_Spain
-posix/America/Porto_Acre
-posix/America/Porto_Velho
-posix/America/Puerto_Rico
-posix/America/Rainy_River
-posix/America/Rankin_Inlet
-posix/America/Recife
-posix/America/Regina
-posix/America/Rio_Branco
-posix/America/Rosario
-posix/America/Santiago
-posix/America/Santo_Domingo
-posix/America/Sao_Paulo
-posix/America/Scoresbysund
-posix/America/Shiprock
-posix/America/St_Johns
-posix/America/St_Kitts
-posix/America/St_Lucia
-posix/America/St_Thomas
-posix/America/St_Vincent
-posix/America/Swift_Current
-posix/America/Tegucigalpa
-posix/America/Thule
-posix/America/Thunder_Bay
-posix/America/Tijuana
-posix/America/Toronto
-posix/America/Tortola
-posix/America/Vancouver
-posix/America/Virgin
-posix/America/Whitehorse
-posix/America/Winnipeg
-posix/America/Yakutat
-posix/America/Yellowknife
-posix/Antarctica/Casey
-posix/Antarctica/Davis
-posix/Antarctica/DumontDUrville
-posix/Antarctica/Mawson
-posix/Antarctica/McMurdo
-posix/Antarctica/Palmer
-posix/Antarctica/Rothera
-posix/Antarctica/South_Pole
-posix/Antarctica/Syowa
-posix/Antarctica/Troll
-posix/Antarctica/Vostok
-posix/Arctic/Longyearbyen
-posix/Asia/Aden
-posix/Asia/Almaty
-posix/Asia/Amman
-posix/Asia/Anadyr
-posix/Asia/Aqtau
-posix/Asia/Aqtobe
-posix/Asia/Ashgabat
-posix/Asia/Ashkhabad
-posix/Asia/Baghdad
-posix/Asia/Bahrain
-posix/Asia/Baku
-posix/Asia/Bangkok
-posix/Asia/Beirut
-posix/Asia/Bishkek
-posix/Asia/Brunei
-posix/Asia/Calcutta
-posix/Asia/Chita
-posix/Asia/Choibalsan
-posix/Asia/Chongqing
-posix/Asia/Chungking
-posix/Asia/Colombo
-posix/Asia/Dacca
-posix/Asia/Damascus
-posix/Asia/Dhaka
-posix/Asia/Dili
-posix/Asia/Dubai
-posix/Asia/Dushanbe
-posix/Asia/Gaza
-posix/Asia/Harbin
-posix/Asia/Hong_Kong
-posix/Asia/Hovd
-posix/Asia/Irkutsk
-posix/Asia/Istanbul
-posix/Asia/Jakarta
-posix/Asia/Jayapura
-posix/Asia/Jerusalem
-posix/Asia/Kabul
-posix/Asia/Kamchatka
-posix/Asia/Karachi
-posix/Asia/Kashgar
-posix/Asia/Katmandu
-posix/Asia/Krasnoyarsk
-posix/Asia/Kuala_Lumpur
-posix/Asia/Kuching
-posix/Asia/Kuwait
-posix/Asia/Macao
-posix/Asia/Macau
-posix/Asia/Magadan
-posix/Asia/Makassar
-posix/Asia/Manila
-posix/Asia/Muscat
-posix/Asia/Nicosia
-posix/Asia/Novosibirsk
-posix/Asia/Omsk
-posix/Asia/Oral
-posix/Asia/Phnom_Penh
-posix/Asia/Pontianak
-posix/Asia/Pyongyang
-posix/Asia/Qatar
-posix/Asia/Qyzylorda
-posix/Asia/Rangoon
-posix/Asia/Riyadh
-posix/Asia/Saigon
-posix/Asia/Sakhalin
-posix/Asia/Samarkand
-posix/Asia/Seoul
-posix/Asia/Shanghai
-posix/Asia/Singapore
-posix/Asia/Srednekolymsk
-posix/Asia/Taipei
-posix/Asia/Tashkent
-posix/Asia/Tbilisi
-posix/Asia/Tehran
-posix/Asia/Tel_Aviv
-posix/Asia/Thimbu
-posix/Asia/Thimphu
-posix/Asia/Tokyo
-posix/Asia/Ujung_Pandang
-posix/Asia/Ulaanbaatar
-posix/Asia/Ulan_Bator
-posix/Asia/Urumqi
-posix/Asia/Vientiane
-posix/Asia/Vladivostok
-posix/Asia/Yakutsk
-posix/Asia/Yekaterinburg
-posix/Asia/Yerevan
-posix/Atlantic/Azores
-posix/Atlantic/Bermuda
-posix/Atlantic/Canary
-posix/Atlantic/Cape_Verde
-posix/Atlantic/Faeroe
-posix/Atlantic/Jan_Mayen
-posix/Atlantic/Madeira
-posix/Atlantic/Reykjavik
-posix/Atlantic/South_Georgia
-posix/Atlantic/St_Helena
-posix/Atlantic/Stanley
-posix/Australia/ACT
-posix/Australia/Adelaide
-posix/Australia/Brisbane
-posix/Australia/Broken_Hill
-posix/Australia/Canberra
-posix/Australia/Currie
-posix/Australia/Darwin
-posix/Australia/Hobart
-posix/Australia/LHI
-posix/Australia/Lindeman
-posix/Australia/Lord_Howe
-posix/Australia/Melbourne
-posix/Australia/NSW
-posix/Australia/North
-posix/Australia/Perth
-posix/Australia/Queensland
-posix/Australia/South
-posix/Australia/Sydney
-posix/Australia/Tasmania
-posix/Australia/Victoria
-posix/Australia/West
-posix/Australia/Yancowinna
-posix/Brazil/Acre
-posix/Brazil/DeNoronha
-posix/Brazil/East
-posix/Brazil/West
-posix/CET
-posix/CST6CDT
-posix/Canada/Atlantic
-posix/Canada/Central
-posix/Canada/East-Saskatchewan
-posix/Canada/Eastern
-posix/Canada/Mountain
-posix/Canada/Newfoundland
-posix/Canada/Pacific
-posix/Canada/Saskatchewan
-posix/Canada/Yukon
-posix/Chile/Continental
-posix/Chile/EasterIsland
-posix/Cuba
-posix/EET
-posix/EST
-posix/EST5EDT
-posix/Egypt
-posix/Eire
-posix/Etc/GMT
-posix/Etc/GMT+0
-posix/Etc/GMT+1
-posix/Etc/GMT+10
-posix/Etc/GMT+11
-posix/Etc/GMT+12
-posix/Etc/GMT+2
-posix/Etc/GMT+3
-posix/Etc/GMT+4
-posix/Etc/GMT+5
-posix/Etc/GMT+6
-posix/Etc/GMT+7
-posix/Etc/GMT+8
-posix/Etc/GMT+9
-posix/Etc/GMT-0
-posix/Etc/GMT-1
-posix/Etc/GMT-10
-posix/Etc/GMT-11
-posix/Etc/GMT-12
-posix/Etc/GMT-13
-posix/Etc/GMT-14
-posix/Etc/GMT-2
-posix/Etc/GMT-3
-posix/Etc/GMT-4
-posix/Etc/GMT-5
-posix/Etc/GMT-6
-posix/Etc/GMT-7
-posix/Etc/GMT-8
-posix/Etc/GMT-9
-posix/Etc/GMT0
-posix/Etc/Greenwich
-posix/Etc/UCT
-posix/Etc/UTC
-posix/Etc/Universal
-posix/Etc/Zulu
-posix/Europe/Amsterdam
-posix/Europe/Andorra
-posix/Europe/Athens
-posix/Europe/Belfast
-posix/Europe/Belgrade
-posix/Europe/Berlin
-posix/Europe/Bratislava
-posix/Europe/Brussels
-posix/Europe/Bucharest
-posix/Europe/Budapest
-posix/Europe/Chisinau
-posix/Europe/Copenhagen
-posix/Europe/Dublin
-posix/Europe/Gibraltar
-posix/Europe/Guernsey
-posix/Europe/Helsinki
-posix/Europe/Isle_of_Man
-posix/Europe/Istanbul
-posix/Europe/Jersey
-posix/Europe/Kaliningrad
-posix/Europe/Kiev
-posix/Europe/Lisbon
-posix/Europe/Ljubljana
-posix/Europe/London
-posix/Europe/Luxembourg
-posix/Europe/Madrid
-posix/Europe/Malta
-posix/Europe/Mariehamn
-posix/Europe/Minsk
-posix/Europe/Monaco
-posix/Europe/Moscow
-posix/Europe/Nicosia
-posix/Europe/Oslo
-posix/Europe/Paris
-posix/Europe/Podgorica
-posix/Europe/Prague
-posix/Europe/Riga
-posix/Europe/Rome
-posix/Europe/Samara
-posix/Europe/San_Marino
-posix/Europe/Sarajevo
-posix/Europe/Simferopol
-posix/Europe/Skopje
-posix/Europe/Sofia
-posix/Europe/Stockholm
-posix/Europe/Tallinn
-posix/Europe/Tirane
-posix/Europe/Tiraspol
-posix/Europe/Uzhgorod
-posix/Europe/Vaduz
-posix/Europe/Vatican
-posix/Europe/Vienna
-posix/Europe/Vilnius
-posix/Europe/Volgograd
-posix/Europe/Warsaw
-posix/Europe/Zagreb
-posix/Europe/Zaporozhye
-posix/Europe/Zurich
-posix/Factory
-posix/GB
-posix/GB-Eire
-posix/GMT
-posix/GMT+0
-posix/GMT-0
-posix/GMT0
-posix/Greenwich
-posix/HST
-posix/Hongkong
-posix/Iceland
-posix/Indian/Antananarivo
-posix/Indian/Chagos
-posix/Indian/Christmas
-posix/Indian/Cocos
-posix/Indian/Comoro
-posix/Indian/Kerguelen
-posix/Indian/Mahe
-posix/Indian/Maldives
-posix/Indian/Mauritius
-posix/Indian/Mayotte
-posix/Indian/Reunion
-posix/Iran
-posix/Israel
-posix/Jamaica
-posix/Japan
-posix/Kwajalein
-posix/Libya
-posix/MET
-posix/MST
-posix/MST7MDT
-posix/Mexico/BajaNorte
-posix/Mexico/BajaSur
-posix/Mexico/General
-posix/NZ
-posix/NZ-CHAT
-posix/Navajo
-posix/PRC
-posix/PST8PDT
-posix/Pacific/Apia
-posix/Pacific/Auckland
-posix/Pacific/Bougainville
-posix/Pacific/Chatham
-posix/Pacific/Easter
-posix/Pacific/Efate
-posix/Pacific/Enderbury
-posix/Pacific/Fakaofo
-posix/Pacific/Fiji
-posix/Pacific/Funafuti
-posix/Pacific/Galapagos
-posix/Pacific/Gambier
-posix/Pacific/Guadalcanal
-posix/Pacific/Guam
-posix/Pacific/Honolulu
-posix/Pacific/Johnston
-posix/Pacific/Kiritimati
-posix/Pacific/Kosrae
-posix/Pacific/Kwajalein
-posix/Pacific/Majuro
-posix/Pacific/Marquesas
-posix/Pacific/Midway
-posix/Pacific/Nauru
-posix/Pacific/Niue
-posix/Pacific/Norfolk
-posix/Pacific/Noumea
-posix/Pacific/Pago_Pago
-posix/Pacific/Palau
-posix/Pacific/Pitcairn
-posix/Pacific/Ponape
-posix/Pacific/Port_Moresby
-posix/Pacific/Rarotonga
-posix/Pacific/Saipan
-posix/Pacific/Samoa
-posix/Pacific/Tahiti
-posix/Pacific/Tarawa
-posix/Pacific/Tongatapu
-posix/Pacific/Truk
-posix/Pacific/Wake
-posix/Pacific/Wallis
-posix/Pacific/Yap
-posix/Poland
-posix/Portugal
-posix/ROC
-posix/ROK
-posix/Singapore
-posix/Turkey
-posix/UCT
-posix/US/Alaska
-posix/US/Aleutian
-posix/US/Arizona
-posix/US/Central
-posix/US/East-Indiana
-posix/US/Eastern
-posix/US/Hawaii
-posix/US/Indiana-Starke
-posix/US/Michigan
-posix/US/Mountain
-posix/US/Pacific
-posix/US/Pacific-New
-posix/US/Samoa
-posix/UTC
-posix/Universal
-posix/W-SU
-posix/WET
-posix/Zulu
-posixrules
-right/Africa/Abidjan
-right/Africa/Accra
-right/Africa/Addis_Ababa
-right/Africa/Algiers
-right/Africa/Asmera
-right/Africa/Bamako
-right/Africa/Bangui
-right/Africa/Banjul
-right/Africa/Bissau
-right/Africa/Blantyre
-right/Africa/Brazzaville
-right/Africa/Bujumbura
-right/Africa/Cairo
-right/Africa/Casablanca
-right/Africa/Ceuta
-right/Africa/Conakry
-right/Africa/Dakar
-right/Africa/Dar_es_Salaam
-right/Africa/Djibouti
-right/Africa/Douala
-right/Africa/El_Aaiun
-right/Africa/Freetown
-right/Africa/Gaborone
-right/Africa/Harare
-right/Africa/Johannesburg
-right/Africa/Kampala
-right/Africa/Khartoum
-right/Africa/Kigali
-right/Africa/Kinshasa
-right/Africa/Lagos
-right/Africa/Libreville
-right/Africa/Lome
-right/Africa/Luanda
-right/Africa/Lubumbashi
-right/Africa/Lusaka
-right/Africa/Malabo
-right/Africa/Maputo
-right/Africa/Maseru
-right/Africa/Mbabane
-right/Africa/Mogadishu
-right/Africa/Monrovia
-right/Africa/Nairobi
-right/Africa/Ndjamena
-right/Africa/Niamey
-right/Africa/Nouakchott
-right/Africa/Ouagadougou
-right/Africa/Porto-Novo
-right/Africa/Sao_Tome
-right/Africa/Timbuktu
-right/Africa/Tripoli
-right/Africa/Tunis
-right/Africa/Windhoek
-right/America/Adak
-right/America/Anchorage
-right/America/Anguilla
-right/America/Antigua
-right/America/Araguaina
-right/America/Argentina/Buenos_Aires
-right/America/Argentina/Catamarca
-right/America/Argentina/ComodRivadavia
-right/America/Argentina/Cordoba
-right/America/Argentina/Jujuy
-right/America/Argentina/La_Rioja
-right/America/Argentina/Mendoza
-right/America/Argentina/Rio_Gallegos
-right/America/Argentina/San_Juan
-right/America/Argentina/Tucuman
-right/America/Argentina/Ushuaia
-right/America/Aruba
-right/America/Asuncion
-right/America/Atikokan
-right/America/Atka
-right/America/Bahia
-right/America/Barbados
-right/America/Belem
-right/America/Belize
-right/America/Blanc-Sablon
-right/America/Boa_Vista
-right/America/Bogota
-right/America/Boise
-right/America/Buenos_Aires
-right/America/Cambridge_Bay
-right/America/Campo_Grande
-right/America/Cancun
-right/America/Caracas
-right/America/Catamarca
-right/America/Cayenne
-right/America/Cayman
-right/America/Chicago
-right/America/Chihuahua
-right/America/Coral_Harbour
-right/America/Cordoba
-right/America/Costa_Rica
-right/America/Cuiaba
-right/America/Curacao
-right/America/Danmarkshavn
-right/America/Dawson
-right/America/Dawson_Creek
-right/America/Denver
-right/America/Detroit
-right/America/Dominica
-right/America/Edmonton
-right/America/Eirunepe
-right/America/El_Salvador
-right/America/Ensenada
-right/America/Fort_Wayne
-right/America/Fortaleza
-right/America/Glace_Bay
-right/America/Godthab
-right/America/Goose_Bay
-right/America/Grand_Turk
-right/America/Grenada
-right/America/Guadeloupe
-right/America/Guatemala
-right/America/Guayaquil
-right/America/Guyana
-right/America/Halifax
-right/America/Havana
-right/America/Hermosillo
-right/America/Indiana/Indianapolis
-right/America/Indiana/Knox
-right/America/Indiana/Marengo
-right/America/Indiana/Petersburg
-right/America/Indiana/Tell_City
-right/America/Indiana/Vevay
-right/America/Indiana/Vincennes
-right/America/Indianapolis
-right/America/Inuvik
-right/America/Iqaluit
-right/America/Jamaica
-right/America/Jujuy
-right/America/Juneau
-right/America/Kentucky/Louisville
-right/America/Kentucky/Monticello
-right/America/Knox_IN
-right/America/La_Paz
-right/America/Lima
-right/America/Los_Angeles
-right/America/Louisville
-right/America/Maceio
-right/America/Managua
-right/America/Manaus
-right/America/Martinique
-right/America/Mazatlan
-right/America/Mendoza
-right/America/Menominee
-right/America/Merida
-right/America/Mexico_City
-right/America/Miquelon
-right/America/Moncton
-right/America/Monterrey
-right/America/Montevideo
-right/America/Montreal
-right/America/Montserrat
-right/America/Nassau
-right/America/New_York
-right/America/Nipigon
-right/America/Nome
-right/America/Noronha
-right/America/North_Dakota/Center
-right/America/North_Dakota/New_Salem
-right/America/Panama
-right/America/Pangnirtung
-right/America/Paramaribo
-right/America/Phoenix
-right/America/Port-au-Prince
-right/America/Port_of_Spain
-right/America/Porto_Acre
-right/America/Porto_Velho
-right/America/Puerto_Rico
-right/America/Rainy_River
-right/America/Rankin_Inlet
-right/America/Recife
-right/America/Regina
-right/America/Rio_Branco
-right/America/Rosario
-right/America/Santiago
-right/America/Santo_Domingo
-right/America/Sao_Paulo
-right/America/Scoresbysund
-right/America/Shiprock
-right/America/St_Johns
-right/America/St_Kitts
-right/America/St_Lucia
-right/America/St_Thomas
-right/America/St_Vincent
-right/America/Swift_Current
-right/America/Tegucigalpa
-right/America/Thule
-right/America/Thunder_Bay
-right/America/Tijuana
-right/America/Toronto
-right/America/Tortola
-right/America/Vancouver
-right/America/Virgin
-right/America/Whitehorse
-right/America/Winnipeg
-right/America/Yakutat
-right/America/Yellowknife
-right/Antarctica/Casey
-right/Antarctica/Davis
-right/Antarctica/DumontDUrville
-right/Antarctica/Mawson
-right/Antarctica/McMurdo
-right/Antarctica/Palmer
-right/Antarctica/Rothera
-right/Antarctica/South_Pole
-right/Antarctica/Syowa
-right/Antarctica/Troll
-right/Antarctica/Vostok
-right/Arctic/Longyearbyen
-right/Asia/Aden
-right/Asia/Almaty
-right/Asia/Amman
-right/Asia/Anadyr
-right/Asia/Aqtau
-right/Asia/Aqtobe
-right/Asia/Ashgabat
-right/Asia/Ashkhabad
-right/Asia/Baghdad
-right/Asia/Bahrain
-right/Asia/Baku
-right/Asia/Bangkok
-right/Asia/Beirut
-right/Asia/Bishkek
-right/Asia/Brunei
-right/Asia/Calcutta
-right/Asia/Chita
-right/Asia/Choibalsan
-right/Asia/Chongqing
-right/Asia/Chungking
-right/Asia/Colombo
-right/Asia/Dacca
-right/Asia/Damascus
-right/Asia/Dhaka
-right/Asia/Dili
-right/Asia/Dubai
-right/Asia/Dushanbe
-right/Asia/Gaza
-right/Asia/Harbin
-right/Asia/Hong_Kong
-right/Asia/Hovd
-right/Asia/Irkutsk
-right/Asia/Istanbul
-right/Asia/Jakarta
-right/Asia/Jayapura
-right/Asia/Jerusalem
-right/Asia/Kabul
-right/Asia/Kamchatka
-right/Asia/Karachi
-right/Asia/Kashgar
-right/Asia/Katmandu
-right/Asia/Krasnoyarsk
-right/Asia/Kuala_Lumpur
-right/Asia/Kuching
-right/Asia/Kuwait
-right/Asia/Macao
-right/Asia/Macau
-right/Asia/Magadan
-right/Asia/Makassar
-right/Asia/Manila
-right/Asia/Muscat
-right/Asia/Nicosia
-right/Asia/Novosibirsk
-right/Asia/Omsk
-right/Asia/Oral
-right/Asia/Phnom_Penh
-right/Asia/Pontianak
-right/Asia/Pyongyang
-right/Asia/Qatar
-right/Asia/Qyzylorda
-right/Asia/Rangoon
-right/Asia/Riyadh
-right/Asia/Saigon
-right/Asia/Sakhalin
-right/Asia/Samarkand
-right/Asia/Seoul
-right/Asia/Shanghai
-right/Asia/Singapore
-right/Asia/Srednekolymsk
-right/Asia/Taipei
-right/Asia/Tashkent
-right/Asia/Tbilisi
-right/Asia/Tehran
-right/Asia/Tel_Aviv
-right/Asia/Thimbu
-right/Asia/Thimphu
-right/Asia/Tokyo
-right/Asia/Ujung_Pandang
-right/Asia/Ulaanbaatar
-right/Asia/Ulan_Bator
-right/Asia/Urumqi
-right/Asia/Vientiane
-right/Asia/Vladivostok
-right/Asia/Yakutsk
-right/Asia/Yekaterinburg
-right/Asia/Yerevan
-right/Atlantic/Azores
-right/Atlantic/Bermuda
-right/Atlantic/Canary
-right/Atlantic/Cape_Verde
-right/Atlantic/Faeroe
-right/Atlantic/Jan_Mayen
-right/Atlantic/Madeira
-right/Atlantic/Reykjavik
-right/Atlantic/South_Georgia
-right/Atlantic/St_Helena
-right/Atlantic/Stanley
-right/Australia/ACT
-right/Australia/Adelaide
-right/Australia/Brisbane
-right/Australia/Broken_Hill
-right/Australia/Canberra
-right/Australia/Currie
-right/Australia/Darwin
-right/Australia/Hobart
-right/Australia/LHI
-right/Australia/Lindeman
-right/Australia/Lord_Howe
-right/Australia/Melbourne
-right/Australia/NSW
-right/Australia/North
-right/Australia/Perth
-right/Australia/Queensland
-right/Australia/South
-right/Australia/Sydney
-right/Australia/Tasmania
-right/Australia/Victoria
-right/Australia/West
-right/Australia/Yancowinna
-right/Brazil/Acre
-right/Brazil/DeNoronha
-right/Brazil/East
-right/Brazil/West
-right/CET
-right/CST6CDT
-right/Canada/Atlantic
-right/Canada/Central
-right/Canada/East-Saskatchewan
-right/Canada/Eastern
-right/Canada/Mountain
-right/Canada/Newfoundland
-right/Canada/Pacific
-right/Canada/Saskatchewan
-right/Canada/Yukon
-right/Chile/Continental
-right/Chile/EasterIsland
-right/Cuba
-right/EET
-right/EST
-right/EST5EDT
-right/Egypt
-right/Eire
-right/Etc/GMT
-right/Etc/GMT+0
-right/Etc/GMT+1
-right/Etc/GMT+10
-right/Etc/GMT+11
-right/Etc/GMT+12
-right/Etc/GMT+2
-right/Etc/GMT+3
-right/Etc/GMT+4
-right/Etc/GMT+5
-right/Etc/GMT+6
-right/Etc/GMT+7
-right/Etc/GMT+8
-right/Etc/GMT+9
-right/Etc/GMT-0
-right/Etc/GMT-1
-right/Etc/GMT-10
-right/Etc/GMT-11
-right/Etc/GMT-12
-right/Etc/GMT-13
-right/Etc/GMT-14
-right/Etc/GMT-2
-right/Etc/GMT-3
-right/Etc/GMT-4
-right/Etc/GMT-5
-right/Etc/GMT-6
-right/Etc/GMT-7
-right/Etc/GMT-8
-right/Etc/GMT-9
-right/Etc/GMT0
-right/Etc/Greenwich
-right/Etc/UCT
-right/Etc/UTC
-right/Etc/Universal
-right/Etc/Zulu
-right/Europe/Amsterdam
-right/Europe/Andorra
-right/Europe/Athens
-right/Europe/Belfast
-right/Europe/Belgrade
-right/Europe/Berlin
-right/Europe/Bratislava
-right/Europe/Brussels
-right/Europe/Bucharest
-right/Europe/Budapest
-right/Europe/Chisinau
-right/Europe/Copenhagen
-right/Europe/Dublin
-right/Europe/Gibraltar
-right/Europe/Guernsey
-right/Europe/Helsinki
-right/Europe/Isle_of_Man
-right/Europe/Istanbul
-right/Europe/Jersey
-right/Europe/Kaliningrad
-right/Europe/Kiev
-right/Europe/Lisbon
-right/Europe/Ljubljana
-right/Europe/London
-right/Europe/Luxembourg
-right/Europe/Madrid
-right/Europe/Malta
-right/Europe/Mariehamn
-right/Europe/Minsk
-right/Europe/Monaco
-right/Europe/Moscow
-right/Europe/Nicosia
-right/Europe/Oslo
-right/Europe/Paris
-right/Europe/Podgorica
-right/Europe/Prague
-right/Europe/Riga
-right/Europe/Rome
-right/Europe/Samara
-right/Europe/San_Marino
-right/Europe/Sarajevo
-right/Europe/Simferopol
-right/Europe/Skopje
-right/Europe/Sofia
-right/Europe/Stockholm
-right/Europe/Tallinn
-right/Europe/Tirane
-right/Europe/Tiraspol
-right/Europe/Uzhgorod
-right/Europe/Vaduz
-right/Europe/Vatican
-right/Europe/Vienna
-right/Europe/Vilnius
-right/Europe/Volgograd
-right/Europe/Warsaw
-right/Europe/Zagreb
-right/Europe/Zaporozhye
-right/Europe/Zurich
-right/Factory
-right/GB
-right/GB-Eire
-right/GMT
-right/GMT+0
-right/GMT-0
-right/GMT0
-right/Greenwich
-right/HST
-right/Hongkong
-right/Iceland
-right/Indian/Antananarivo
-right/Indian/Chagos
-right/Indian/Christmas
-right/Indian/Cocos
-right/Indian/Comoro
-right/Indian/Kerguelen
-right/Indian/Mahe
-right/Indian/Maldives
-right/Indian/Mauritius
-right/Indian/Mayotte
-right/Indian/Reunion
-right/Iran
-right/Israel
-right/Jamaica
-right/Japan
-right/Kwajalein
-right/Libya
-right/MET
-right/MST
-right/MST7MDT
-right/Mexico/BajaNorte
-right/Mexico/BajaSur
-right/Mexico/General
-right/NZ
-right/NZ-CHAT
-right/Navajo
-right/PRC
-right/PST8PDT
-right/Pacific/Apia
-right/Pacific/Auckland
-right/Pacific/Bougainville
-right/Pacific/Chatham
-right/Pacific/Easter
-right/Pacific/Efate
-right/Pacific/Enderbury
-right/Pacific/Fakaofo
-right/Pacific/Fiji
-right/Pacific/Funafuti
-right/Pacific/Galapagos
-right/Pacific/Gambier
-right/Pacific/Guadalcanal
-right/Pacific/Guam
-right/Pacific/Honolulu
-right/Pacific/Johnston
-right/Pacific/Kiritimati
-right/Pacific/Kosrae
-right/Pacific/Kwajalein
-right/Pacific/Majuro
-right/Pacific/Marquesas
-right/Pacific/Midway
-right/Pacific/Nauru
-right/Pacific/Niue
-right/Pacific/Norfolk
-right/Pacific/Noumea
-right/Pacific/Pago_Pago
-right/Pacific/Palau
-right/Pacific/Pitcairn
-right/Pacific/Ponape
-right/Pacific/Port_Moresby
-right/Pacific/Rarotonga
-right/Pacific/Saipan
-right/Pacific/Samoa
-right/Pacific/Tahiti
-right/Pacific/Tarawa
-right/Pacific/Tongatapu
-right/Pacific/Truk
-right/Pacific/Wake
-right/Pacific/Wallis
-right/Pacific/Yap
-right/Poland
-right/Portugal
-right/ROC
-right/ROK
-right/Singapore
-right/Turkey
-right/UCT
-right/US/Alaska
-right/US/Aleutian
-right/US/Arizona
-right/US/Central
-right/US/East-Indiana
-right/US/Eastern
-right/US/Hawaii
-right/US/Indiana-Starke
-right/US/Michigan
-right/US/Mountain
-right/US/Pacific
-right/US/Pacific-New
-right/US/Samoa
-right/UTC
-right/Universal
-right/W-SU
-right/WET
-right/Zulu
Index: npl/system/glibc/timezone-scripts/parts/04
===================================================================
--- npl/system/glibc/timezone-scripts/parts/04	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,32 +1,0 @@
-
-Type it at the prompt below exactly as it appears above.  (NOTE: If you don't
-see your timezone, use "timeconfig" again after booting for the verbose list)
-
-EOF
-      echo -n "Timezone? "
-      read TIMEZONE;
-      echo
-
-      if [ -r $T_PX/usr/share/zoneinfo/$TIMEZONE -o \
-           -r /var/log/mount/usr/share/zoneinfo/$TIMEZONE -o \
-           -L $T_PX/usr/share/zoneinfo/$TIMEZONE -o \
-           -L /var/log/mount/usr/share/zoneinfo/$TIMEZONE ]; then
-         echo "Creating link from $TIMEZONE to localtime in /etc..."
-         echo
-         setzone $TIMEZONE
-         exit
-      else
-         cat << EOF
-
-Timezone $TIMEZONE could not be found. You may try again if you wish. 
-Make sure you type the name exactly as it appears - this configuration script
-is case sensitive.
-
-Press [enter] to continue.
-
-EOF
-         read JUNK;
-      fi
-   done
-fi
-
Index: npl/system/glibc/timezone-scripts/parts/README
===================================================================
--- npl/system/glibc/timezone-scripts/parts/README	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,2 +1,0 @@
-Files 01 and 03 are samples, showing the format, and are
-not necessarily up to date...
Index: npl/system/glibc/timezone-scripts/setup.timeconfig
===================================================================
--- npl/system/glibc/timezone-scripts/setup.timeconfig	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,3 +1,0 @@
-#!/bin/sh
-#BLURB="Select your timezone"
-sh usr/sbin/timeconfig $*
Index: npl/system/glibc/timezone-scripts/timeconfig
===================================================================
--- npl/system/glibc/timezone-scripts/timeconfig	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,3695 +1,0 @@
-#!/bin/sh
-#
-# timeconfig         Slackware Linux timezone configuration utility.
-#
-# Author:            Patrick Volkerding <volkerdi@slackware.com>
-# Modified by:  David Cantrell <david@slackware.com>, 06-Oct-2000
-#
-# ChangeLog:
-# 2014-10-22:   Updated timezones from tzdata2014i. <pjv>
-# 2012-12-12:   Updated timezones from tzdata2012j. <pjv>
-# 2008-03-10:   Updated timezones from tzdata2008a. <pjv>
-# 2007-12-21:   Updated timezones from tzdata2007j. <pjv>
-# 2006-12-03:   Updated timezones from tzdata2006p. <pjv>
-# 2006-09-14:   Updated timezones from tzdata2006k. <pjv>
-# 2006-08-22:   Updated timezones from tzdata2006j.
-# 2006-08-13:   Updated timezones from tzdata2006g.
-# 2006-03-13:   Updated timezones from tzdata2006c.
-# 19-Feb-2001   Add new timezones from glibc-2.2.2.
-# 06-Oct-2000   Fixed a problem with selecting UTC time.  It was writing
-#               the hardwareclock file to the root disk and not your dest
-#               partition.  Changed the HWCLOCK_CONF variable to be
-#               $T_PX/etc/hardwareclock to fix this.  Thanks to David L.
-#               Dickman <softbear@optonline.net> for finding this and
-#               submitting a patch.
-#
-# 15-Mar-2000   Added the writeconf function to write out the
-#               /etc/hardwareclock file which tells what the hardware clock
-#               is set to (UTC or localtime).
-#
-# 03-Mar-2000   Reorganized script.  Made one timezone set block, added
-#               stage that asks the user if the hardware clock is set to
-#               UTC.
-
-# setup our temp locations and variables
-TMP=/var/log/setup/tmp
-if [ -r $TMP/SeTT_PX ]; then
-   T_PX="`cat $TMP/SeTT_PX`"
-elif [ ! "$!" = "" ]; then
-   T_PX=$1
-else
-   T_PX=/
-fi
-
-# the hardware clock configuration file
-HWCLOCK_CONF=$T_PX/etc/hardwareclock
-
-# setzone( $TIMEZONE )
-#
-# This function accepts a time zone as the only parameter and sets it as
-# the default system time zone.
-setzone()
-{
-   TZ=$1
-
-   cd $T_PX/etc
-   if [ -r $T_PX/usr/share/zoneinfo/$TZ -o \
-        -r /var/log/mount/usr/share/zoneinfo/$TZ -o \
-        -L $T_PX/usr/share/zoneinfo/$TZ -o \
-        -L /var/log/mount/usr/share/zoneinfo/$TZ ]; then
-      ln -sf /usr/share/zoneinfo/$TZ localtime-copied-from
-      rm -f localtime
-      cd ..
-      chroot . cp etc/localtime-copied-from etc/localtime
-   fi
-}
-
-# writeconf( $CLOCK_SET_TO )
-#
-# Writes out $HWCLOCK_CONF that tells rc.S how the hardware clock
-# value is stored.
-writeconf()
-{
-   echo "# /etc/hardwareclock" > $HWCLOCK_CONF
-   echo "#" >> $HWCLOCK_CONF
-   echo "# Tells how the hardware clock time is stored." >> $HWCLOCK_CONF
-   echo "# You should run timeconfig to edit this file." >> $HWCLOCK_CONF
-   echo >> $HWCLOCK_CONF
-   echo $1 >> $HWCLOCK_CONF
-}
-
-# ask the user if the hardware clock is set for UTC/GMT
-if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
-   ###
-   ### use color menus here
-   ###
-   dialog --title "HARDWARE CLOCK SET TO UTC?" --menu "Is the hardware clock set \
-to Coordinated Universal Time (UTC/GMT)?  If it is, select YES here.  If the \
-hardware clock is set to the current local time (this is how most PCs are set \
-up), then say NO here.  If you are not sure what this is, you should answer NO \
-here." 13 60 2 \
-   "NO" "Hardware clock is set to local time" \
-   "YES" "Hardware clock is set to UTC" \
-   2> $TMP/utc
-   if [ $? = 1 -o $? = 255 ]; then
-     rm -f $TMP/utc
-     exit
-   fi
-   if [ "`cat $TMP/utc`" = "YES" ]; then
-     # yes, the hardware clock is UTC
-     writeconf "UTC"
-   else # must be NO
-     writeconf "localtime"
-   fi
-   rm -f $TMP/utc
-else
-   ###
-   ### use text prompts
-   ###
-   echo "Is the hardware clock set to Coordinated Universal Time (UTC/GMT)?"
-   echo "If it is, select 'y' here.  If the hardware clock is set to the"
-   echo "current local time (this is how most PCs are set up), then say 'n'"
-   echo "here.  If you are not sure what this is, you should answer 'n' here."
-   echo
-   echo -n "Is your hardware clock set to UTC ([y]es, [n]o)? "
-   read HEJAZ
-
-   if [ "$HEJAZ" = "y" -o "$HEJAZ" = "Y" -o "$HEJAZ" = "YES" -o "$HEJAZ" = "yes" ]; then
-      # yes, the hardware clock is UTC
-      writeconf "UTC"
-   else
-      # default to localtime
-      writeconf "localtime"
-   fi
-fi
-
-# Now set the correct timezone link:
-if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
-   ###
-   ### use color menus here
-   ###
-   dialog --title "TIMEZONE CONFIGURATION" --menu "Please select one of the following timezones for your machine:" 21 50 13 \
-"US/Alaska" " " \
-"US/Aleutian" " " \
-"US/Arizona" " " \
-"US/Central" " " \
-"US/East-Indiana" " " \
-"US/Eastern" " " \
-"US/Hawaii" " " \
-"US/Indiana-Starke" " " \
-"US/Michigan" " " \
-"US/Mountain" " " \
-"US/Pacific" " " \
-"US/Pacific-New" " " \
-"US/Samoa" " " \
-"Africa/Abidjan" " " \
-"Africa/Accra" " " \
-"Africa/Addis_Ababa" " " \
-"Africa/Algiers" " " \
-"Africa/Asmara" " " \
-"Africa/Asmera" " " \
-"Africa/Bamako" " " \
-"Africa/Bangui" " " \
-"Africa/Banjul" " " \
-"Africa/Bissau" " " \
-"Africa/Blantyre" " " \
-"Africa/Brazzaville" " " \
-"Africa/Bujumbura" " " \
-"Africa/Cairo" " " \
-"Africa/Casablanca" " " \
-"Africa/Ceuta" " " \
-"Africa/Conakry" " " \
-"Africa/Dakar" " " \
-"Africa/Dar_es_Salaam" " " \
-"Africa/Djibouti" " " \
-"Africa/Douala" " " \
-"Africa/El_Aaiun" " " \
-"Africa/Freetown" " " \
-"Africa/Gaborone" " " \
-"Africa/Harare" " " \
-"Africa/Johannesburg" " " \
-"Africa/Juba" " " \
-"Africa/Kampala" " " \
-"Africa/Khartoum" " " \
-"Africa/Kigali" " " \
-"Africa/Kinshasa" " " \
-"Africa/Lagos" " " \
-"Africa/Libreville" " " \
-"Africa/Lome" " " \
-"Africa/Luanda" " " \
-"Africa/Lubumbashi" " " \
-"Africa/Lusaka" " " \
-"Africa/Malabo" " " \
-"Africa/Maputo" " " \
-"Africa/Maseru" " " \
-"Africa/Mbabane" " " \
-"Africa/Mogadishu" " " \
-"Africa/Monrovia" " " \
-"Africa/Nairobi" " " \
-"Africa/Ndjamena" " " \
-"Africa/Niamey" " " \
-"Africa/Nouakchott" " " \
-"Africa/Ouagadougou" " " \
-"Africa/Porto-Novo" " " \
-"Africa/Sao_Tome" " " \
-"Africa/Timbuktu" " " \
-"Africa/Tripoli" " " \
-"Africa/Tunis" " " \
-"Africa/Windhoek" " " \
-"America/Adak" " " \
-"America/Anchorage" " " \
-"America/Anguilla" " " \
-"America/Antigua" " " \
-"America/Araguaina" " " \
-"America/Argentina/Buenos_Aires" " " \
-"America/Argentina/Catamarca" " " \
-"America/Argentina/ComodRivadavia" " " \
-"America/Argentina/Cordoba" " " \
-"America/Argentina/Jujuy" " " \
-"America/Argentina/La_Rioja" " " \
-"America/Argentina/Mendoza" " " \
-"America/Argentina/Rio_Gallegos" " " \
-"America/Argentina/Salta" " " \
-"America/Argentina/San_Juan" " " \
-"America/Argentina/San_Luis" " " \
-"America/Argentina/Tucuman" " " \
-"America/Argentina/Ushuaia" " " \
-"America/Aruba" " " \
-"America/Asuncion" " " \
-"America/Atikokan" " " \
-"America/Atka" " " \
-"America/Bahia" " " \
-"America/Bahia_Banderas" " " \
-"America/Barbados" " " \
-"America/Belem" " " \
-"America/Belize" " " \
-"America/Blanc-Sablon" " " \
-"America/Boa_Vista" " " \
-"America/Bogota" " " \
-"America/Boise" " " \
-"America/Buenos_Aires" " " \
-"America/Cambridge_Bay" " " \
-"America/Campo_Grande" " " \
-"America/Cancun" " " \
-"America/Caracas" " " \
-"America/Catamarca" " " \
-"America/Cayenne" " " \
-"America/Cayman" " " \
-"America/Chicago" " " \
-"America/Chihuahua" " " \
-"America/Coral_Harbour" " " \
-"America/Cordoba" " " \
-"America/Costa_Rica" " " \
-"America/Creston" " " \
-"America/Cuiaba" " " \
-"America/Curacao" " " \
-"America/Danmarkshavn" " " \
-"America/Dawson" " " \
-"America/Dawson_Creek" " " \
-"America/Denver" " " \
-"America/Detroit" " " \
-"America/Dominica" " " \
-"America/Edmonton" " " \
-"America/Eirunepe" " " \
-"America/El_Salvador" " " \
-"America/Ensenada" " " \
-"America/Fort_Wayne" " " \
-"America/Fortaleza" " " \
-"America/Glace_Bay" " " \
-"America/Godthab" " " \
-"America/Goose_Bay" " " \
-"America/Grand_Turk" " " \
-"America/Grenada" " " \
-"America/Guadeloupe" " " \
-"America/Guatemala" " " \
-"America/Guayaquil" " " \
-"America/Guyana" " " \
-"America/Halifax" " " \
-"America/Havana" " " \
-"America/Hermosillo" " " \
-"America/Indiana/Indianapolis" " " \
-"America/Indiana/Knox" " " \
-"America/Indiana/Marengo" " " \
-"America/Indiana/Petersburg" " " \
-"America/Indiana/Tell_City" " " \
-"America/Indiana/Vevay" " " \
-"America/Indiana/Vincennes" " " \
-"America/Indiana/Winamac" " " \
-"America/Indianapolis" " " \
-"America/Inuvik" " " \
-"America/Iqaluit" " " \
-"America/Jamaica" " " \
-"America/Jujuy" " " \
-"America/Juneau" " " \
-"America/Kentucky/Louisville" " " \
-"America/Kentucky/Monticello" " " \
-"America/Knox_IN" " " \
-"America/Kralendijk" " " \
-"America/La_Paz" " " \
-"America/Lima" " " \
-"America/Los_Angeles" " " \
-"America/Louisville" " " \
-"America/Lower_Princes" " " \
-"America/Maceio" " " \
-"America/Managua" " " \
-"America/Manaus" " " \
-"America/Marigot" " " \
-"America/Martinique" " " \
-"America/Matamoros" " " \
-"America/Mazatlan" " " \
-"America/Mendoza" " " \
-"America/Menominee" " " \
-"America/Merida" " " \
-"America/Metlakatla" " " \
-"America/Mexico_City" " " \
-"America/Miquelon" " " \
-"America/Moncton" " " \
-"America/Monterrey" " " \
-"America/Montevideo" " " \
-"America/Montreal" " " \
-"America/Montserrat" " " \
-"America/Nassau" " " \
-"America/New_York" " " \
-"America/Nipigon" " " \
-"America/Nome" " " \
-"America/Noronha" " " \
-"America/North_Dakota/Beulah" " " \
-"America/North_Dakota/Center" " " \
-"America/North_Dakota/New_Salem" " " \
-"America/Ojinaga" " " \
-"America/Panama" " " \
-"America/Pangnirtung" " " \
-"America/Paramaribo" " " \
-"America/Phoenix" " " \
-"America/Port-au-Prince" " " \
-"America/Port_of_Spain" " " \
-"America/Porto_Acre" " " \
-"America/Porto_Velho" " " \
-"America/Puerto_Rico" " " \
-"America/Rainy_River" " " \
-"America/Rankin_Inlet" " " \
-"America/Recife" " " \
-"America/Regina" " " \
-"America/Resolute" " " \
-"America/Rio_Branco" " " \
-"America/Rosario" " " \
-"America/Santa_Isabel" " " \
-"America/Santarem" " " \
-"America/Santiago" " " \
-"America/Santo_Domingo" " " \
-"America/Sao_Paulo" " " \
-"America/Scoresbysund" " " \
-"America/Shiprock" " " \
-"America/Sitka" " " \
-"America/St_Barthelemy" " " \
-"America/St_Johns" " " \
-"America/St_Kitts" " " \
-"America/St_Lucia" " " \
-"America/St_Thomas" " " \
-"America/St_Vincent" " " \
-"America/Swift_Current" " " \
-"America/Tegucigalpa" " " \
-"America/Thule" " " \
-"America/Thunder_Bay" " " \
-"America/Tijuana" " " \
-"America/Toronto" " " \
-"America/Tortola" " " \
-"America/Vancouver" " " \
-"America/Virgin" " " \
-"America/Whitehorse" " " \
-"America/Winnipeg" " " \
-"America/Yakutat" " " \
-"America/Yellowknife" " " \
-"Antarctica/Casey" " " \
-"Antarctica/Davis" " " \
-"Antarctica/DumontDUrville" " " \
-"Antarctica/Macquarie" " " \
-"Antarctica/Mawson" " " \
-"Antarctica/McMurdo" " " \
-"Antarctica/Palmer" " " \
-"Antarctica/Rothera" " " \
-"Antarctica/South_Pole" " " \
-"Antarctica/Syowa" " " \
-"Antarctica/Troll" " " \
-"Antarctica/Vostok" " " \
-"Arctic/Longyearbyen" " " \
-"Asia/Aden" " " \
-"Asia/Almaty" " " \
-"Asia/Amman" " " \
-"Asia/Anadyr" " " \
-"Asia/Aqtau" " " \
-"Asia/Aqtobe" " " \
-"Asia/Ashgabat" " " \
-"Asia/Ashkhabad" " " \
-"Asia/Baghdad" " " \
-"Asia/Bahrain" " " \
-"Asia/Baku" " " \
-"Asia/Bangkok" " " \
-"Asia/Beirut" " " \
-"Asia/Bishkek" " " \
-"Asia/Brunei" " " \
-"Asia/Calcutta" " " \
-"Asia/Chita" " " \
-"Asia/Choibalsan" " " \
-"Asia/Chongqing" " " \
-"Asia/Chungking" " " \
-"Asia/Colombo" " " \
-"Asia/Dacca" " " \
-"Asia/Damascus" " " \
-"Asia/Dhaka" " " \
-"Asia/Dili" " " \
-"Asia/Dubai" " " \
-"Asia/Dushanbe" " " \
-"Asia/Gaza" " " \
-"Asia/Harbin" " " \
-"Asia/Hebron" " " \
-"Asia/Ho_Chi_Minh" " " \
-"Asia/Hong_Kong" " " \
-"Asia/Hovd" " " \
-"Asia/Irkutsk" " " \
-"Asia/Istanbul" " " \
-"Asia/Jakarta" " " \
-"Asia/Jayapura" " " \
-"Asia/Jerusalem" " " \
-"Asia/Kabul" " " \
-"Asia/Kamchatka" " " \
-"Asia/Karachi" " " \
-"Asia/Kashgar" " " \
-"Asia/Kathmandu" " " \
-"Asia/Katmandu" " " \
-"Asia/Khandyga" " " \
-"Asia/Kolkata" " " \
-"Asia/Krasnoyarsk" " " \
-"Asia/Kuala_Lumpur" " " \
-"Asia/Kuching" " " \
-"Asia/Kuwait" " " \
-"Asia/Macao" " " \
-"Asia/Macau" " " \
-"Asia/Magadan" " " \
-"Asia/Makassar" " " \
-"Asia/Manila" " " \
-"Asia/Muscat" " " \
-"Asia/Nicosia" " " \
-"Asia/Novokuznetsk" " " \
-"Asia/Novosibirsk" " " \
-"Asia/Omsk" " " \
-"Asia/Oral" " " \
-"Asia/Phnom_Penh" " " \
-"Asia/Pontianak" " " \
-"Asia/Pyongyang" " " \
-"Asia/Qatar" " " \
-"Asia/Qyzylorda" " " \
-"Asia/Rangoon" " " \
-"Asia/Riyadh" " " \
-"Asia/Saigon" " " \
-"Asia/Sakhalin" " " \
-"Asia/Samarkand" " " \
-"Asia/Seoul" " " \
-"Asia/Shanghai" " " \
-"Asia/Singapore" " " \
-"Asia/Srednekolymsk" " " \
-"Asia/Taipei" " " \
-"Asia/Tashkent" " " \
-"Asia/Tbilisi" " " \
-"Asia/Tehran" " " \
-"Asia/Tel_Aviv" " " \
-"Asia/Thimbu" " " \
-"Asia/Thimphu" " " \
-"Asia/Tokyo" " " \
-"Asia/Ujung_Pandang" " " \
-"Asia/Ulaanbaatar" " " \
-"Asia/Ulan_Bator" " " \
-"Asia/Urumqi" " " \
-"Asia/Ust-Nera" " " \
-"Asia/Vientiane" " " \
-"Asia/Vladivostok" " " \
-"Asia/Yakutsk" " " \
-"Asia/Yekaterinburg" " " \
-"Asia/Yerevan" " " \
-"Atlantic/Azores" " " \
-"Atlantic/Bermuda" " " \
-"Atlantic/Canary" " " \
-"Atlantic/Cape_Verde" " " \
-"Atlantic/Faeroe" " " \
-"Atlantic/Faroe" " " \
-"Atlantic/Jan_Mayen" " " \
-"Atlantic/Madeira" " " \
-"Atlantic/Reykjavik" " " \
-"Atlantic/South_Georgia" " " \
-"Atlantic/St_Helena" " " \
-"Atlantic/Stanley" " " \
-"Australia/ACT" " " \
-"Australia/Adelaide" " " \
-"Australia/Brisbane" " " \
-"Australia/Broken_Hill" " " \
-"Australia/Canberra" " " \
-"Australia/Currie" " " \
-"Australia/Darwin" " " \
-"Australia/Eucla" " " \
-"Australia/Hobart" " " \
-"Australia/LHI" " " \
-"Australia/Lindeman" " " \
-"Australia/Lord_Howe" " " \
-"Australia/Melbourne" " " \
-"Australia/NSW" " " \
-"Australia/North" " " \
-"Australia/Perth" " " \
-"Australia/Queensland" " " \
-"Australia/South" " " \
-"Australia/Sydney" " " \
-"Australia/Tasmania" " " \
-"Australia/Victoria" " " \
-"Australia/West" " " \
-"Australia/Yancowinna" " " \
-"Brazil/Acre" " " \
-"Brazil/DeNoronha" " " \
-"Brazil/East" " " \
-"Brazil/West" " " \
-"CET" " " \
-"CST6CDT" " " \
-"Canada/Atlantic" " " \
-"Canada/Central" " " \
-"Canada/East-Saskatchewan" " " \
-"Canada/Eastern" " " \
-"Canada/Mountain" " " \
-"Canada/Newfoundland" " " \
-"Canada/Pacific" " " \
-"Canada/Saskatchewan" " " \
-"Canada/Yukon" " " \
-"Chile/Continental" " " \
-"Chile/EasterIsland" " " \
-"Cuba" " " \
-"EET" " " \
-"EST" " " \
-"EST5EDT" " " \
-"Egypt" " " \
-"Eire" " " \
-"Etc/GMT" " " \
-"Etc/GMT+0" " " \
-"Etc/GMT+1" " " \
-"Etc/GMT+10" " " \
-"Etc/GMT+11" " " \
-"Etc/GMT+12" " " \
-"Etc/GMT+2" " " \
-"Etc/GMT+3" " " \
-"Etc/GMT+4" " " \
-"Etc/GMT+5" " " \
-"Etc/GMT+6" " " \
-"Etc/GMT+7" " " \
-"Etc/GMT+8" " " \
-"Etc/GMT+9" " " \
-"Etc/GMT-0" " " \
-"Etc/GMT-1" " " \
-"Etc/GMT-10" " " \
-"Etc/GMT-11" " " \
-"Etc/GMT-12" " " \
-"Etc/GMT-13" " " \
-"Etc/GMT-14" " " \
-"Etc/GMT-2" " " \
-"Etc/GMT-3" " " \
-"Etc/GMT-4" " " \
-"Etc/GMT-5" " " \
-"Etc/GMT-6" " " \
-"Etc/GMT-7" " " \
-"Etc/GMT-8" " " \
-"Etc/GMT-9" " " \
-"Etc/GMT0" " " \
-"Etc/Greenwich" " " \
-"Etc/UCT" " " \
-"Etc/UTC" " " \
-"Etc/Universal" " " \
-"Etc/Zulu" " " \
-"Europe/Amsterdam" " " \
-"Europe/Andorra" " " \
-"Europe/Athens" " " \
-"Europe/Belfast" " " \
-"Europe/Belgrade" " " \
-"Europe/Berlin" " " \
-"Europe/Bratislava" " " \
-"Europe/Brussels" " " \
-"Europe/Bucharest" " " \
-"Europe/Budapest" " " \
-"Europe/Busingen" " " \
-"Europe/Chisinau" " " \
-"Europe/Copenhagen" " " \
-"Europe/Dublin" " " \
-"Europe/Gibraltar" " " \
-"Europe/Guernsey" " " \
-"Europe/Helsinki" " " \
-"Europe/Isle_of_Man" " " \
-"Europe/Istanbul" " " \
-"Europe/Jersey" " " \
-"Europe/Kaliningrad" " " \
-"Europe/Kiev" " " \
-"Europe/Lisbon" " " \
-"Europe/Ljubljana" " " \
-"Europe/London" " " \
-"Europe/Luxembourg" " " \
-"Europe/Madrid" " " \
-"Europe/Malta" " " \
-"Europe/Mariehamn" " " \
-"Europe/Minsk" " " \
-"Europe/Monaco" " " \
-"Europe/Moscow" " " \
-"Europe/Nicosia" " " \
-"Europe/Oslo" " " \
-"Europe/Paris" " " \
-"Europe/Podgorica" " " \
-"Europe/Prague" " " \
-"Europe/Riga" " " \
-"Europe/Rome" " " \
-"Europe/Samara" " " \
-"Europe/San_Marino" " " \
-"Europe/Sarajevo" " " \
-"Europe/Simferopol" " " \
-"Europe/Skopje" " " \
-"Europe/Sofia" " " \
-"Europe/Stockholm" " " \
-"Europe/Tallinn" " " \
-"Europe/Tirane" " " \
-"Europe/Tiraspol" " " \
-"Europe/Uzhgorod" " " \
-"Europe/Vaduz" " " \
-"Europe/Vatican" " " \
-"Europe/Vienna" " " \
-"Europe/Vilnius" " " \
-"Europe/Volgograd" " " \
-"Europe/Warsaw" " " \
-"Europe/Zagreb" " " \
-"Europe/Zaporozhye" " " \
-"Europe/Zurich" " " \
-"Factory" " " \
-"GB" " " \
-"GB-Eire" " " \
-"GMT" " " \
-"GMT+0" " " \
-"GMT-0" " " \
-"GMT0" " " \
-"Greenwich" " " \
-"HST" " " \
-"Hongkong" " " \
-"Iceland" " " \
-"Indian/Antananarivo" " " \
-"Indian/Chagos" " " \
-"Indian/Christmas" " " \
-"Indian/Cocos" " " \
-"Indian/Comoro" " " \
-"Indian/Kerguelen" " " \
-"Indian/Mahe" " " \
-"Indian/Maldives" " " \
-"Indian/Mauritius" " " \
-"Indian/Mayotte" " " \
-"Indian/Reunion" " " \
-"Iran" " " \
-"Israel" " " \
-"Jamaica" " " \
-"Japan" " " \
-"Kwajalein" " " \
-"Libya" " " \
-"MET" " " \
-"MST" " " \
-"MST7MDT" " " \
-"Mexico/BajaNorte" " " \
-"Mexico/BajaSur" " " \
-"Mexico/General" " " \
-"NZ" " " \
-"NZ-CHAT" " " \
-"Navajo" " " \
-"PRC" " " \
-"PST8PDT" " " \
-"Pacific/Apia" " " \
-"Pacific/Auckland" " " \
-"Pacific/Bougainville" " " \
-"Pacific/Chatham" " " \
-"Pacific/Chuuk" " " \
-"Pacific/Easter" " " \
-"Pacific/Efate" " " \
-"Pacific/Enderbury" " " \
-"Pacific/Fakaofo" " " \
-"Pacific/Fiji" " " \
-"Pacific/Funafuti" " " \
-"Pacific/Galapagos" " " \
-"Pacific/Gambier" " " \
-"Pacific/Guadalcanal" " " \
-"Pacific/Guam" " " \
-"Pacific/Honolulu" " " \
-"Pacific/Johnston" " " \
-"Pacific/Kiritimati" " " \
-"Pacific/Kosrae" " " \
-"Pacific/Kwajalein" " " \
-"Pacific/Majuro" " " \
-"Pacific/Marquesas" " " \
-"Pacific/Midway" " " \
-"Pacific/Nauru" " " \
-"Pacific/Niue" " " \
-"Pacific/Norfolk" " " \
-"Pacific/Noumea" " " \
-"Pacific/Pago_Pago" " " \
-"Pacific/Palau" " " \
-"Pacific/Pitcairn" " " \
-"Pacific/Pohnpei" " " \
-"Pacific/Ponape" " " \
-"Pacific/Port_Moresby" " " \
-"Pacific/Rarotonga" " " \
-"Pacific/Saipan" " " \
-"Pacific/Samoa" " " \
-"Pacific/Tahiti" " " \
-"Pacific/Tarawa" " " \
-"Pacific/Tongatapu" " " \
-"Pacific/Truk" " " \
-"Pacific/Wake" " " \
-"Pacific/Wallis" " " \
-"Pacific/Yap" " " \
-"Poland" " " \
-"Portugal" " " \
-"ROC" " " \
-"ROK" " " \
-"Singapore" " " \
-"Turkey" " " \
-"UCT" " " \
-"UTC" " " \
-"Universal" " " \
-"W-SU" " " \
-"WET" " " \
-"Zulu" " " \
-"posix/Africa/Abidjan" " " \
-"posix/Africa/Accra" " " \
-"posix/Africa/Addis_Ababa" " " \
-"posix/Africa/Algiers" " " \
-"posix/Africa/Asmara" " " \
-"posix/Africa/Asmera" " " \
-"posix/Africa/Bamako" " " \
-"posix/Africa/Bangui" " " \
-"posix/Africa/Banjul" " " \
-"posix/Africa/Bissau" " " \
-"posix/Africa/Blantyre" " " \
-"posix/Africa/Brazzaville" " " \
-"posix/Africa/Bujumbura" " " \
-"posix/Africa/Cairo" " " \
-"posix/Africa/Casablanca" " " \
-"posix/Africa/Ceuta" " " \
-"posix/Africa/Conakry" " " \
-"posix/Africa/Dakar" " " \
-"posix/Africa/Dar_es_Salaam" " " \
-"posix/Africa/Djibouti" " " \
-"posix/Africa/Douala" " " \
-"posix/Africa/El_Aaiun" " " \
-"posix/Africa/Freetown" " " \
-"posix/Africa/Gaborone" " " \
-"posix/Africa/Harare" " " \
-"posix/Africa/Johannesburg" " " \
-"posix/Africa/Juba" " " \
-"posix/Africa/Kampala" " " \
-"posix/Africa/Khartoum" " " \
-"posix/Africa/Kigali" " " \
-"posix/Africa/Kinshasa" " " \
-"posix/Africa/Lagos" " " \
-"posix/Africa/Libreville" " " \
-"posix/Africa/Lome" " " \
-"posix/Africa/Luanda" " " \
-"posix/Africa/Lubumbashi" " " \
-"posix/Africa/Lusaka" " " \
-"posix/Africa/Malabo" " " \
-"posix/Africa/Maputo" " " \
-"posix/Africa/Maseru" " " \
-"posix/Africa/Mbabane" " " \
-"posix/Africa/Mogadishu" " " \
-"posix/Africa/Monrovia" " " \
-"posix/Africa/Nairobi" " " \
-"posix/Africa/Ndjamena" " " \
-"posix/Africa/Niamey" " " \
-"posix/Africa/Nouakchott" " " \
-"posix/Africa/Ouagadougou" " " \
-"posix/Africa/Porto-Novo" " " \
-"posix/Africa/Sao_Tome" " " \
-"posix/Africa/Timbuktu" " " \
-"posix/Africa/Tripoli" " " \
-"posix/Africa/Tunis" " " \
-"posix/Africa/Windhoek" " " \
-"posix/America/Adak" " " \
-"posix/America/Anchorage" " " \
-"posix/America/Anguilla" " " \
-"posix/America/Antigua" " " \
-"posix/America/Araguaina" " " \
-"posix/America/Argentina/Buenos_Aires" " " \
-"posix/America/Argentina/Catamarca" " " \
-"posix/America/Argentina/ComodRivadavia" " " \
-"posix/America/Argentina/Cordoba" " " \
-"posix/America/Argentina/Jujuy" " " \
-"posix/America/Argentina/La_Rioja" " " \
-"posix/America/Argentina/Mendoza" " " \
-"posix/America/Argentina/Rio_Gallegos" " " \
-"posix/America/Argentina/Salta" " " \
-"posix/America/Argentina/San_Juan" " " \
-"posix/America/Argentina/San_Luis" " " \
-"posix/America/Argentina/Tucuman" " " \
-"posix/America/Argentina/Ushuaia" " " \
-"posix/America/Aruba" " " \
-"posix/America/Asuncion" " " \
-"posix/America/Atikokan" " " \
-"posix/America/Atka" " " \
-"posix/America/Bahia" " " \
-"posix/America/Bahia_Banderas" " " \
-"posix/America/Barbados" " " \
-"posix/America/Belem" " " \
-"posix/America/Belize" " " \
-"posix/America/Blanc-Sablon" " " \
-"posix/America/Boa_Vista" " " \
-"posix/America/Bogota" " " \
-"posix/America/Boise" " " \
-"posix/America/Buenos_Aires" " " \
-"posix/America/Cambridge_Bay" " " \
-"posix/America/Campo_Grande" " " \
-"posix/America/Cancun" " " \
-"posix/America/Caracas" " " \
-"posix/America/Catamarca" " " \
-"posix/America/Cayenne" " " \
-"posix/America/Cayman" " " \
-"posix/America/Chicago" " " \
-"posix/America/Chihuahua" " " \
-"posix/America/Coral_Harbour" " " \
-"posix/America/Cordoba" " " \
-"posix/America/Costa_Rica" " " \
-"posix/America/Creston" " " \
-"posix/America/Cuiaba" " " \
-"posix/America/Curacao" " " \
-"posix/America/Danmarkshavn" " " \
-"posix/America/Dawson" " " \
-"posix/America/Dawson_Creek" " " \
-"posix/America/Denver" " " \
-"posix/America/Detroit" " " \
-"posix/America/Dominica" " " \
-"posix/America/Edmonton" " " \
-"posix/America/Eirunepe" " " \
-"posix/America/El_Salvador" " " \
-"posix/America/Ensenada" " " \
-"posix/America/Fort_Wayne" " " \
-"posix/America/Fortaleza" " " \
-"posix/America/Glace_Bay" " " \
-"posix/America/Godthab" " " \
-"posix/America/Goose_Bay" " " \
-"posix/America/Grand_Turk" " " \
-"posix/America/Grenada" " " \
-"posix/America/Guadeloupe" " " \
-"posix/America/Guatemala" " " \
-"posix/America/Guayaquil" " " \
-"posix/America/Guyana" " " \
-"posix/America/Halifax" " " \
-"posix/America/Havana" " " \
-"posix/America/Hermosillo" " " \
-"posix/America/Indiana/Indianapolis" " " \
-"posix/America/Indiana/Knox" " " \
-"posix/America/Indiana/Marengo" " " \
-"posix/America/Indiana/Petersburg" " " \
-"posix/America/Indiana/Tell_City" " " \
-"posix/America/Indiana/Vevay" " " \
-"posix/America/Indiana/Vincennes" " " \
-"posix/America/Indiana/Winamac" " " \
-"posix/America/Indianapolis" " " \
-"posix/America/Inuvik" " " \
-"posix/America/Iqaluit" " " \
-"posix/America/Jamaica" " " \
-"posix/America/Jujuy" " " \
-"posix/America/Juneau" " " \
-"posix/America/Kentucky/Louisville" " " \
-"posix/America/Kentucky/Monticello" " " \
-"posix/America/Knox_IN" " " \
-"posix/America/Kralendijk" " " \
-"posix/America/La_Paz" " " \
-"posix/America/Lima" " " \
-"posix/America/Los_Angeles" " " \
-"posix/America/Louisville" " " \
-"posix/America/Lower_Princes" " " \
-"posix/America/Maceio" " " \
-"posix/America/Managua" " " \
-"posix/America/Manaus" " " \
-"posix/America/Marigot" " " \
-"posix/America/Martinique" " " \
-"posix/America/Matamoros" " " \
-"posix/America/Mazatlan" " " \
-"posix/America/Mendoza" " " \
-"posix/America/Menominee" " " \
-"posix/America/Merida" " " \
-"posix/America/Metlakatla" " " \
-"posix/America/Mexico_City" " " \
-"posix/America/Miquelon" " " \
-"posix/America/Moncton" " " \
-"posix/America/Monterrey" " " \
-"posix/America/Montevideo" " " \
-"posix/America/Montreal" " " \
-"posix/America/Montserrat" " " \
-"posix/America/Nassau" " " \
-"posix/America/New_York" " " \
-"posix/America/Nipigon" " " \
-"posix/America/Nome" " " \
-"posix/America/Noronha" " " \
-"posix/America/North_Dakota/Beulah" " " \
-"posix/America/North_Dakota/Center" " " \
-"posix/America/North_Dakota/New_Salem" " " \
-"posix/America/Ojinaga" " " \
-"posix/America/Panama" " " \
-"posix/America/Pangnirtung" " " \
-"posix/America/Paramaribo" " " \
-"posix/America/Phoenix" " " \
-"posix/America/Port-au-Prince" " " \
-"posix/America/Port_of_Spain" " " \
-"posix/America/Porto_Acre" " " \
-"posix/America/Porto_Velho" " " \
-"posix/America/Puerto_Rico" " " \
-"posix/America/Rainy_River" " " \
-"posix/America/Rankin_Inlet" " " \
-"posix/America/Recife" " " \
-"posix/America/Regina" " " \
-"posix/America/Resolute" " " \
-"posix/America/Rio_Branco" " " \
-"posix/America/Rosario" " " \
-"posix/America/Santa_Isabel" " " \
-"posix/America/Santarem" " " \
-"posix/America/Santiago" " " \
-"posix/America/Santo_Domingo" " " \
-"posix/America/Sao_Paulo" " " \
-"posix/America/Scoresbysund" " " \
-"posix/America/Shiprock" " " \
-"posix/America/Sitka" " " \
-"posix/America/St_Barthelemy" " " \
-"posix/America/St_Johns" " " \
-"posix/America/St_Kitts" " " \
-"posix/America/St_Lucia" " " \
-"posix/America/St_Thomas" " " \
-"posix/America/St_Vincent" " " \
-"posix/America/Swift_Current" " " \
-"posix/America/Tegucigalpa" " " \
-"posix/America/Thule" " " \
-"posix/America/Thunder_Bay" " " \
-"posix/America/Tijuana" " " \
-"posix/America/Toronto" " " \
-"posix/America/Tortola" " " \
-"posix/America/Vancouver" " " \
-"posix/America/Virgin" " " \
-"posix/America/Whitehorse" " " \
-"posix/America/Winnipeg" " " \
-"posix/America/Yakutat" " " \
-"posix/America/Yellowknife" " " \
-"posix/Antarctica/Casey" " " \
-"posix/Antarctica/Davis" " " \
-"posix/Antarctica/DumontDUrville" " " \
-"posix/Antarctica/Macquarie" " " \
-"posix/Antarctica/Mawson" " " \
-"posix/Antarctica/McMurdo" " " \
-"posix/Antarctica/Palmer" " " \
-"posix/Antarctica/Rothera" " " \
-"posix/Antarctica/South_Pole" " " \
-"posix/Antarctica/Syowa" " " \
-"posix/Antarctica/Troll" " " \
-"posix/Antarctica/Vostok" " " \
-"posix/Arctic/Longyearbyen" " " \
-"posix/Asia/Aden" " " \
-"posix/Asia/Almaty" " " \
-"posix/Asia/Amman" " " \
-"posix/Asia/Anadyr" " " \
-"posix/Asia/Aqtau" " " \
-"posix/Asia/Aqtobe" " " \
-"posix/Asia/Ashgabat" " " \
-"posix/Asia/Ashkhabad" " " \
-"posix/Asia/Baghdad" " " \
-"posix/Asia/Bahrain" " " \
-"posix/Asia/Baku" " " \
-"posix/Asia/Bangkok" " " \
-"posix/Asia/Beirut" " " \
-"posix/Asia/Bishkek" " " \
-"posix/Asia/Brunei" " " \
-"posix/Asia/Calcutta" " " \
-"posix/Asia/Chita" " " \
-"posix/Asia/Choibalsan" " " \
-"posix/Asia/Chongqing" " " \
-"posix/Asia/Chungking" " " \
-"posix/Asia/Colombo" " " \
-"posix/Asia/Dacca" " " \
-"posix/Asia/Damascus" " " \
-"posix/Asia/Dhaka" " " \
-"posix/Asia/Dili" " " \
-"posix/Asia/Dubai" " " \
-"posix/Asia/Dushanbe" " " \
-"posix/Asia/Gaza" " " \
-"posix/Asia/Harbin" " " \
-"posix/Asia/Hebron" " " \
-"posix/Asia/Ho_Chi_Minh" " " \
-"posix/Asia/Hong_Kong" " " \
-"posix/Asia/Hovd" " " \
-"posix/Asia/Irkutsk" " " \
-"posix/Asia/Istanbul" " " \
-"posix/Asia/Jakarta" " " \
-"posix/Asia/Jayapura" " " \
-"posix/Asia/Jerusalem" " " \
-"posix/Asia/Kabul" " " \
-"posix/Asia/Kamchatka" " " \
-"posix/Asia/Karachi" " " \
-"posix/Asia/Kashgar" " " \
-"posix/Asia/Kathmandu" " " \
-"posix/Asia/Katmandu" " " \
-"posix/Asia/Khandyga" " " \
-"posix/Asia/Kolkata" " " \
-"posix/Asia/Krasnoyarsk" " " \
-"posix/Asia/Kuala_Lumpur" " " \
-"posix/Asia/Kuching" " " \
-"posix/Asia/Kuwait" " " \
-"posix/Asia/Macao" " " \
-"posix/Asia/Macau" " " \
-"posix/Asia/Magadan" " " \
-"posix/Asia/Makassar" " " \
-"posix/Asia/Manila" " " \
-"posix/Asia/Muscat" " " \
-"posix/Asia/Nicosia" " " \
-"posix/Asia/Novokuznetsk" " " \
-"posix/Asia/Novosibirsk" " " \
-"posix/Asia/Omsk" " " \
-"posix/Asia/Oral" " " \
-"posix/Asia/Phnom_Penh" " " \
-"posix/Asia/Pontianak" " " \
-"posix/Asia/Pyongyang" " " \
-"posix/Asia/Qatar" " " \
-"posix/Asia/Qyzylorda" " " \
-"posix/Asia/Rangoon" " " \
-"posix/Asia/Riyadh" " " \
-"posix/Asia/Saigon" " " \
-"posix/Asia/Sakhalin" " " \
-"posix/Asia/Samarkand" " " \
-"posix/Asia/Seoul" " " \
-"posix/Asia/Shanghai" " " \
-"posix/Asia/Singapore" " " \
-"posix/Asia/Srednekolymsk" " " \
-"posix/Asia/Taipei" " " \
-"posix/Asia/Tashkent" " " \
-"posix/Asia/Tbilisi" " " \
-"posix/Asia/Tehran" " " \
-"posix/Asia/Tel_Aviv" " " \
-"posix/Asia/Thimbu" " " \
-"posix/Asia/Thimphu" " " \
-"posix/Asia/Tokyo" " " \
-"posix/Asia/Ujung_Pandang" " " \
-"posix/Asia/Ulaanbaatar" " " \
-"posix/Asia/Ulan_Bator" " " \
-"posix/Asia/Urumqi" " " \
-"posix/Asia/Ust-Nera" " " \
-"posix/Asia/Vientiane" " " \
-"posix/Asia/Vladivostok" " " \
-"posix/Asia/Yakutsk" " " \
-"posix/Asia/Yekaterinburg" " " \
-"posix/Asia/Yerevan" " " \
-"posix/Atlantic/Azores" " " \
-"posix/Atlantic/Bermuda" " " \
-"posix/Atlantic/Canary" " " \
-"posix/Atlantic/Cape_Verde" " " \
-"posix/Atlantic/Faeroe" " " \
-"posix/Atlantic/Faroe" " " \
-"posix/Atlantic/Jan_Mayen" " " \
-"posix/Atlantic/Madeira" " " \
-"posix/Atlantic/Reykjavik" " " \
-"posix/Atlantic/South_Georgia" " " \
-"posix/Atlantic/St_Helena" " " \
-"posix/Atlantic/Stanley" " " \
-"posix/Australia/ACT" " " \
-"posix/Australia/Adelaide" " " \
-"posix/Australia/Brisbane" " " \
-"posix/Australia/Broken_Hill" " " \
-"posix/Australia/Canberra" " " \
-"posix/Australia/Currie" " " \
-"posix/Australia/Darwin" " " \
-"posix/Australia/Eucla" " " \
-"posix/Australia/Hobart" " " \
-"posix/Australia/LHI" " " \
-"posix/Australia/Lindeman" " " \
-"posix/Australia/Lord_Howe" " " \
-"posix/Australia/Melbourne" " " \
-"posix/Australia/NSW" " " \
-"posix/Australia/North" " " \
-"posix/Australia/Perth" " " \
-"posix/Australia/Queensland" " " \
-"posix/Australia/South" " " \
-"posix/Australia/Sydney" " " \
-"posix/Australia/Tasmania" " " \
-"posix/Australia/Victoria" " " \
-"posix/Australia/West" " " \
-"posix/Australia/Yancowinna" " " \
-"posix/Brazil/Acre" " " \
-"posix/Brazil/DeNoronha" " " \
-"posix/Brazil/East" " " \
-"posix/Brazil/West" " " \
-"posix/CET" " " \
-"posix/CST6CDT" " " \
-"posix/Canada/Atlantic" " " \
-"posix/Canada/Central" " " \
-"posix/Canada/East-Saskatchewan" " " \
-"posix/Canada/Eastern" " " \
-"posix/Canada/Mountain" " " \
-"posix/Canada/Newfoundland" " " \
-"posix/Canada/Pacific" " " \
-"posix/Canada/Saskatchewan" " " \
-"posix/Canada/Yukon" " " \
-"posix/Chile/Continental" " " \
-"posix/Chile/EasterIsland" " " \
-"posix/Cuba" " " \
-"posix/EET" " " \
-"posix/EST" " " \
-"posix/EST5EDT" " " \
-"posix/Egypt" " " \
-"posix/Eire" " " \
-"posix/Etc/GMT" " " \
-"posix/Etc/GMT+0" " " \
-"posix/Etc/GMT+1" " " \
-"posix/Etc/GMT+10" " " \
-"posix/Etc/GMT+11" " " \
-"posix/Etc/GMT+12" " " \
-"posix/Etc/GMT+2" " " \
-"posix/Etc/GMT+3" " " \
-"posix/Etc/GMT+4" " " \
-"posix/Etc/GMT+5" " " \
-"posix/Etc/GMT+6" " " \
-"posix/Etc/GMT+7" " " \
-"posix/Etc/GMT+8" " " \
-"posix/Etc/GMT+9" " " \
-"posix/Etc/GMT-0" " " \
-"posix/Etc/GMT-1" " " \
-"posix/Etc/GMT-10" " " \
-"posix/Etc/GMT-11" " " \
-"posix/Etc/GMT-12" " " \
-"posix/Etc/GMT-13" " " \
-"posix/Etc/GMT-14" " " \
-"posix/Etc/GMT-2" " " \
-"posix/Etc/GMT-3" " " \
-"posix/Etc/GMT-4" " " \
-"posix/Etc/GMT-5" " " \
-"posix/Etc/GMT-6" " " \
-"posix/Etc/GMT-7" " " \
-"posix/Etc/GMT-8" " " \
-"posix/Etc/GMT-9" " " \
-"posix/Etc/GMT0" " " \
-"posix/Etc/Greenwich" " " \
-"posix/Etc/UCT" " " \
-"posix/Etc/UTC" " " \
-"posix/Etc/Universal" " " \
-"posix/Etc/Zulu" " " \
-"posix/Europe/Amsterdam" " " \
-"posix/Europe/Andorra" " " \
-"posix/Europe/Athens" " " \
-"posix/Europe/Belfast" " " \
-"posix/Europe/Belgrade" " " \
-"posix/Europe/Berlin" " " \
-"posix/Europe/Bratislava" " " \
-"posix/Europe/Brussels" " " \
-"posix/Europe/Bucharest" " " \
-"posix/Europe/Budapest" " " \
-"posix/Europe/Busingen" " " \
-"posix/Europe/Chisinau" " " \
-"posix/Europe/Copenhagen" " " \
-"posix/Europe/Dublin" " " \
-"posix/Europe/Gibraltar" " " \
-"posix/Europe/Guernsey" " " \
-"posix/Europe/Helsinki" " " \
-"posix/Europe/Isle_of_Man" " " \
-"posix/Europe/Istanbul" " " \
-"posix/Europe/Jersey" " " \
-"posix/Europe/Kaliningrad" " " \
-"posix/Europe/Kiev" " " \
-"posix/Europe/Lisbon" " " \
-"posix/Europe/Ljubljana" " " \
-"posix/Europe/London" " " \
-"posix/Europe/Luxembourg" " " \
-"posix/Europe/Madrid" " " \
-"posix/Europe/Malta" " " \
-"posix/Europe/Mariehamn" " " \
-"posix/Europe/Minsk" " " \
-"posix/Europe/Monaco" " " \
-"posix/Europe/Moscow" " " \
-"posix/Europe/Nicosia" " " \
-"posix/Europe/Oslo" " " \
-"posix/Europe/Paris" " " \
-"posix/Europe/Podgorica" " " \
-"posix/Europe/Prague" " " \
-"posix/Europe/Riga" " " \
-"posix/Europe/Rome" " " \
-"posix/Europe/Samara" " " \
-"posix/Europe/San_Marino" " " \
-"posix/Europe/Sarajevo" " " \
-"posix/Europe/Simferopol" " " \
-"posix/Europe/Skopje" " " \
-"posix/Europe/Sofia" " " \
-"posix/Europe/Stockholm" " " \
-"posix/Europe/Tallinn" " " \
-"posix/Europe/Tirane" " " \
-"posix/Europe/Tiraspol" " " \
-"posix/Europe/Uzhgorod" " " \
-"posix/Europe/Vaduz" " " \
-"posix/Europe/Vatican" " " \
-"posix/Europe/Vienna" " " \
-"posix/Europe/Vilnius" " " \
-"posix/Europe/Volgograd" " " \
-"posix/Europe/Warsaw" " " \
-"posix/Europe/Zagreb" " " \
-"posix/Europe/Zaporozhye" " " \
-"posix/Europe/Zurich" " " \
-"posix/Factory" " " \
-"posix/GB" " " \
-"posix/GB-Eire" " " \
-"posix/GMT" " " \
-"posix/GMT+0" " " \
-"posix/GMT-0" " " \
-"posix/GMT0" " " \
-"posix/Greenwich" " " \
-"posix/HST" " " \
-"posix/Hongkong" " " \
-"posix/Iceland" " " \
-"posix/Indian/Antananarivo" " " \
-"posix/Indian/Chagos" " " \
-"posix/Indian/Christmas" " " \
-"posix/Indian/Cocos" " " \
-"posix/Indian/Comoro" " " \
-"posix/Indian/Kerguelen" " " \
-"posix/Indian/Mahe" " " \
-"posix/Indian/Maldives" " " \
-"posix/Indian/Mauritius" " " \
-"posix/Indian/Mayotte" " " \
-"posix/Indian/Reunion" " " \
-"posix/Iran" " " \
-"posix/Israel" " " \
-"posix/Jamaica" " " \
-"posix/Japan" " " \
-"posix/Kwajalein" " " \
-"posix/Libya" " " \
-"posix/MET" " " \
-"posix/MST" " " \
-"posix/MST7MDT" " " \
-"posix/Mexico/BajaNorte" " " \
-"posix/Mexico/BajaSur" " " \
-"posix/Mexico/General" " " \
-"posix/NZ" " " \
-"posix/NZ-CHAT" " " \
-"posix/Navajo" " " \
-"posix/PRC" " " \
-"posix/PST8PDT" " " \
-"posix/Pacific/Apia" " " \
-"posix/Pacific/Auckland" " " \
-"posix/Pacific/Bougainville" " " \
-"posix/Pacific/Chatham" " " \
-"posix/Pacific/Chuuk" " " \
-"posix/Pacific/Easter" " " \
-"posix/Pacific/Efate" " " \
-"posix/Pacific/Enderbury" " " \
-"posix/Pacific/Fakaofo" " " \
-"posix/Pacific/Fiji" " " \
-"posix/Pacific/Funafuti" " " \
-"posix/Pacific/Galapagos" " " \
-"posix/Pacific/Gambier" " " \
-"posix/Pacific/Guadalcanal" " " \
-"posix/Pacific/Guam" " " \
-"posix/Pacific/Honolulu" " " \
-"posix/Pacific/Johnston" " " \
-"posix/Pacific/Kiritimati" " " \
-"posix/Pacific/Kosrae" " " \
-"posix/Pacific/Kwajalein" " " \
-"posix/Pacific/Majuro" " " \
-"posix/Pacific/Marquesas" " " \
-"posix/Pacific/Midway" " " \
-"posix/Pacific/Nauru" " " \
-"posix/Pacific/Niue" " " \
-"posix/Pacific/Norfolk" " " \
-"posix/Pacific/Noumea" " " \
-"posix/Pacific/Pago_Pago" " " \
-"posix/Pacific/Palau" " " \
-"posix/Pacific/Pitcairn" " " \
-"posix/Pacific/Pohnpei" " " \
-"posix/Pacific/Ponape" " " \
-"posix/Pacific/Port_Moresby" " " \
-"posix/Pacific/Rarotonga" " " \
-"posix/Pacific/Saipan" " " \
-"posix/Pacific/Samoa" " " \
-"posix/Pacific/Tahiti" " " \
-"posix/Pacific/Tarawa" " " \
-"posix/Pacific/Tongatapu" " " \
-"posix/Pacific/Truk" " " \
-"posix/Pacific/Wake" " " \
-"posix/Pacific/Wallis" " " \
-"posix/Pacific/Yap" " " \
-"posix/Poland" " " \
-"posix/Portugal" " " \
-"posix/ROC" " " \
-"posix/ROK" " " \
-"posix/Singapore" " " \
-"posix/Turkey" " " \
-"posix/UCT" " " \
-"posix/US/Alaska" " " \
-"posix/US/Aleutian" " " \
-"posix/US/Arizona" " " \
-"posix/US/Central" " " \
-"posix/US/East-Indiana" " " \
-"posix/US/Eastern" " " \
-"posix/US/Hawaii" " " \
-"posix/US/Indiana-Starke" " " \
-"posix/US/Michigan" " " \
-"posix/US/Mountain" " " \
-"posix/US/Pacific" " " \
-"posix/US/Pacific-New" " " \
-"posix/US/Samoa" " " \
-"posix/UTC" " " \
-"posix/Universal" " " \
-"posix/W-SU" " " \
-"posix/WET" " " \
-"posix/Zulu" " " \
-"posix/localtime" " " \
-"posix/posixrules" " " \
-"posixrules" " " \
-"right/Africa/Abidjan" " " \
-"right/Africa/Accra" " " \
-"right/Africa/Addis_Ababa" " " \
-"right/Africa/Algiers" " " \
-"right/Africa/Asmara" " " \
-"right/Africa/Asmera" " " \
-"right/Africa/Bamako" " " \
-"right/Africa/Bangui" " " \
-"right/Africa/Banjul" " " \
-"right/Africa/Bissau" " " \
-"right/Africa/Blantyre" " " \
-"right/Africa/Brazzaville" " " \
-"right/Africa/Bujumbura" " " \
-"right/Africa/Cairo" " " \
-"right/Africa/Casablanca" " " \
-"right/Africa/Ceuta" " " \
-"right/Africa/Conakry" " " \
-"right/Africa/Dakar" " " \
-"right/Africa/Dar_es_Salaam" " " \
-"right/Africa/Djibouti" " " \
-"right/Africa/Douala" " " \
-"right/Africa/El_Aaiun" " " \
-"right/Africa/Freetown" " " \
-"right/Africa/Gaborone" " " \
-"right/Africa/Harare" " " \
-"right/Africa/Johannesburg" " " \
-"right/Africa/Juba" " " \
-"right/Africa/Kampala" " " \
-"right/Africa/Khartoum" " " \
-"right/Africa/Kigali" " " \
-"right/Africa/Kinshasa" " " \
-"right/Africa/Lagos" " " \
-"right/Africa/Libreville" " " \
-"right/Africa/Lome" " " \
-"right/Africa/Luanda" " " \
-"right/Africa/Lubumbashi" " " \
-"right/Africa/Lusaka" " " \
-"right/Africa/Malabo" " " \
-"right/Africa/Maputo" " " \
-"right/Africa/Maseru" " " \
-"right/Africa/Mbabane" " " \
-"right/Africa/Mogadishu" " " \
-"right/Africa/Monrovia" " " \
-"right/Africa/Nairobi" " " \
-"right/Africa/Ndjamena" " " \
-"right/Africa/Niamey" " " \
-"right/Africa/Nouakchott" " " \
-"right/Africa/Ouagadougou" " " \
-"right/Africa/Porto-Novo" " " \
-"right/Africa/Sao_Tome" " " \
-"right/Africa/Timbuktu" " " \
-"right/Africa/Tripoli" " " \
-"right/Africa/Tunis" " " \
-"right/Africa/Windhoek" " " \
-"right/America/Adak" " " \
-"right/America/Anchorage" " " \
-"right/America/Anguilla" " " \
-"right/America/Antigua" " " \
-"right/America/Araguaina" " " \
-"right/America/Argentina/Buenos_Aires" " " \
-"right/America/Argentina/Catamarca" " " \
-"right/America/Argentina/ComodRivadavia" " " \
-"right/America/Argentina/Cordoba" " " \
-"right/America/Argentina/Jujuy" " " \
-"right/America/Argentina/La_Rioja" " " \
-"right/America/Argentina/Mendoza" " " \
-"right/America/Argentina/Rio_Gallegos" " " \
-"right/America/Argentina/Salta" " " \
-"right/America/Argentina/San_Juan" " " \
-"right/America/Argentina/San_Luis" " " \
-"right/America/Argentina/Tucuman" " " \
-"right/America/Argentina/Ushuaia" " " \
-"right/America/Aruba" " " \
-"right/America/Asuncion" " " \
-"right/America/Atikokan" " " \
-"right/America/Atka" " " \
-"right/America/Bahia" " " \
-"right/America/Bahia_Banderas" " " \
-"right/America/Barbados" " " \
-"right/America/Belem" " " \
-"right/America/Belize" " " \
-"right/America/Blanc-Sablon" " " \
-"right/America/Boa_Vista" " " \
-"right/America/Bogota" " " \
-"right/America/Boise" " " \
-"right/America/Buenos_Aires" " " \
-"right/America/Cambridge_Bay" " " \
-"right/America/Campo_Grande" " " \
-"right/America/Cancun" " " \
-"right/America/Caracas" " " \
-"right/America/Catamarca" " " \
-"right/America/Cayenne" " " \
-"right/America/Cayman" " " \
-"right/America/Chicago" " " \
-"right/America/Chihuahua" " " \
-"right/America/Coral_Harbour" " " \
-"right/America/Cordoba" " " \
-"right/America/Costa_Rica" " " \
-"right/America/Creston" " " \
-"right/America/Cuiaba" " " \
-"right/America/Curacao" " " \
-"right/America/Danmarkshavn" " " \
-"right/America/Dawson" " " \
-"right/America/Dawson_Creek" " " \
-"right/America/Denver" " " \
-"right/America/Detroit" " " \
-"right/America/Dominica" " " \
-"right/America/Edmonton" " " \
-"right/America/Eirunepe" " " \
-"right/America/El_Salvador" " " \
-"right/America/Ensenada" " " \
-"right/America/Fort_Wayne" " " \
-"right/America/Fortaleza" " " \
-"right/America/Glace_Bay" " " \
-"right/America/Godthab" " " \
-"right/America/Goose_Bay" " " \
-"right/America/Grand_Turk" " " \
-"right/America/Grenada" " " \
-"right/America/Guadeloupe" " " \
-"right/America/Guatemala" " " \
-"right/America/Guayaquil" " " \
-"right/America/Guyana" " " \
-"right/America/Halifax" " " \
-"right/America/Havana" " " \
-"right/America/Hermosillo" " " \
-"right/America/Indiana/Indianapolis" " " \
-"right/America/Indiana/Knox" " " \
-"right/America/Indiana/Marengo" " " \
-"right/America/Indiana/Petersburg" " " \
-"right/America/Indiana/Tell_City" " " \
-"right/America/Indiana/Vevay" " " \
-"right/America/Indiana/Vincennes" " " \
-"right/America/Indiana/Winamac" " " \
-"right/America/Indianapolis" " " \
-"right/America/Inuvik" " " \
-"right/America/Iqaluit" " " \
-"right/America/Jamaica" " " \
-"right/America/Jujuy" " " \
-"right/America/Juneau" " " \
-"right/America/Kentucky/Louisville" " " \
-"right/America/Kentucky/Monticello" " " \
-"right/America/Knox_IN" " " \
-"right/America/Kralendijk" " " \
-"right/America/La_Paz" " " \
-"right/America/Lima" " " \
-"right/America/Los_Angeles" " " \
-"right/America/Louisville" " " \
-"right/America/Lower_Princes" " " \
-"right/America/Maceio" " " \
-"right/America/Managua" " " \
-"right/America/Manaus" " " \
-"right/America/Marigot" " " \
-"right/America/Martinique" " " \
-"right/America/Matamoros" " " \
-"right/America/Mazatlan" " " \
-"right/America/Mendoza" " " \
-"right/America/Menominee" " " \
-"right/America/Merida" " " \
-"right/America/Metlakatla" " " \
-"right/America/Mexico_City" " " \
-"right/America/Miquelon" " " \
-"right/America/Moncton" " " \
-"right/America/Monterrey" " " \
-"right/America/Montevideo" " " \
-"right/America/Montreal" " " \
-"right/America/Montserrat" " " \
-"right/America/Nassau" " " \
-"right/America/New_York" " " \
-"right/America/Nipigon" " " \
-"right/America/Nome" " " \
-"right/America/Noronha" " " \
-"right/America/North_Dakota/Beulah" " " \
-"right/America/North_Dakota/Center" " " \
-"right/America/North_Dakota/New_Salem" " " \
-"right/America/Ojinaga" " " \
-"right/America/Panama" " " \
-"right/America/Pangnirtung" " " \
-"right/America/Paramaribo" " " \
-"right/America/Phoenix" " " \
-"right/America/Port-au-Prince" " " \
-"right/America/Port_of_Spain" " " \
-"right/America/Porto_Acre" " " \
-"right/America/Porto_Velho" " " \
-"right/America/Puerto_Rico" " " \
-"right/America/Rainy_River" " " \
-"right/America/Rankin_Inlet" " " \
-"right/America/Recife" " " \
-"right/America/Regina" " " \
-"right/America/Resolute" " " \
-"right/America/Rio_Branco" " " \
-"right/America/Rosario" " " \
-"right/America/Santa_Isabel" " " \
-"right/America/Santarem" " " \
-"right/America/Santiago" " " \
-"right/America/Santo_Domingo" " " \
-"right/America/Sao_Paulo" " " \
-"right/America/Scoresbysund" " " \
-"right/America/Shiprock" " " \
-"right/America/Sitka" " " \
-"right/America/St_Barthelemy" " " \
-"right/America/St_Johns" " " \
-"right/America/St_Kitts" " " \
-"right/America/St_Lucia" " " \
-"right/America/St_Thomas" " " \
-"right/America/St_Vincent" " " \
-"right/America/Swift_Current" " " \
-"right/America/Tegucigalpa" " " \
-"right/America/Thule" " " \
-"right/America/Thunder_Bay" " " \
-"right/America/Tijuana" " " \
-"right/America/Toronto" " " \
-"right/America/Tortola" " " \
-"right/America/Vancouver" " " \
-"right/America/Virgin" " " \
-"right/America/Whitehorse" " " \
-"right/America/Winnipeg" " " \
-"right/America/Yakutat" " " \
-"right/America/Yellowknife" " " \
-"right/Antarctica/Casey" " " \
-"right/Antarctica/Davis" " " \
-"right/Antarctica/DumontDUrville" " " \
-"right/Antarctica/Macquarie" " " \
-"right/Antarctica/Mawson" " " \
-"right/Antarctica/McMurdo" " " \
-"right/Antarctica/Palmer" " " \
-"right/Antarctica/Rothera" " " \
-"right/Antarctica/South_Pole" " " \
-"right/Antarctica/Syowa" " " \
-"right/Antarctica/Troll" " " \
-"right/Antarctica/Vostok" " " \
-"right/Arctic/Longyearbyen" " " \
-"right/Asia/Aden" " " \
-"right/Asia/Almaty" " " \
-"right/Asia/Amman" " " \
-"right/Asia/Anadyr" " " \
-"right/Asia/Aqtau" " " \
-"right/Asia/Aqtobe" " " \
-"right/Asia/Ashgabat" " " \
-"right/Asia/Ashkhabad" " " \
-"right/Asia/Baghdad" " " \
-"right/Asia/Bahrain" " " \
-"right/Asia/Baku" " " \
-"right/Asia/Bangkok" " " \
-"right/Asia/Beirut" " " \
-"right/Asia/Bishkek" " " \
-"right/Asia/Brunei" " " \
-"right/Asia/Calcutta" " " \
-"right/Asia/Chita" " " \
-"right/Asia/Choibalsan" " " \
-"right/Asia/Chongqing" " " \
-"right/Asia/Chungking" " " \
-"right/Asia/Colombo" " " \
-"right/Asia/Dacca" " " \
-"right/Asia/Damascus" " " \
-"right/Asia/Dhaka" " " \
-"right/Asia/Dili" " " \
-"right/Asia/Dubai" " " \
-"right/Asia/Dushanbe" " " \
-"right/Asia/Gaza" " " \
-"right/Asia/Harbin" " " \
-"right/Asia/Hebron" " " \
-"right/Asia/Ho_Chi_Minh" " " \
-"right/Asia/Hong_Kong" " " \
-"right/Asia/Hovd" " " \
-"right/Asia/Irkutsk" " " \
-"right/Asia/Istanbul" " " \
-"right/Asia/Jakarta" " " \
-"right/Asia/Jayapura" " " \
-"right/Asia/Jerusalem" " " \
-"right/Asia/Kabul" " " \
-"right/Asia/Kamchatka" " " \
-"right/Asia/Karachi" " " \
-"right/Asia/Kashgar" " " \
-"right/Asia/Kathmandu" " " \
-"right/Asia/Katmandu" " " \
-"right/Asia/Khandyga" " " \
-"right/Asia/Kolkata" " " \
-"right/Asia/Krasnoyarsk" " " \
-"right/Asia/Kuala_Lumpur" " " \
-"right/Asia/Kuching" " " \
-"right/Asia/Kuwait" " " \
-"right/Asia/Macao" " " \
-"right/Asia/Macau" " " \
-"right/Asia/Magadan" " " \
-"right/Asia/Makassar" " " \
-"right/Asia/Manila" " " \
-"right/Asia/Muscat" " " \
-"right/Asia/Nicosia" " " \
-"right/Asia/Novokuznetsk" " " \
-"right/Asia/Novosibirsk" " " \
-"right/Asia/Omsk" " " \
-"right/Asia/Oral" " " \
-"right/Asia/Phnom_Penh" " " \
-"right/Asia/Pontianak" " " \
-"right/Asia/Pyongyang" " " \
-"right/Asia/Qatar" " " \
-"right/Asia/Qyzylorda" " " \
-"right/Asia/Rangoon" " " \
-"right/Asia/Riyadh" " " \
-"right/Asia/Saigon" " " \
-"right/Asia/Sakhalin" " " \
-"right/Asia/Samarkand" " " \
-"right/Asia/Seoul" " " \
-"right/Asia/Shanghai" " " \
-"right/Asia/Singapore" " " \
-"right/Asia/Srednekolymsk" " " \
-"right/Asia/Taipei" " " \
-"right/Asia/Tashkent" " " \
-"right/Asia/Tbilisi" " " \
-"right/Asia/Tehran" " " \
-"right/Asia/Tel_Aviv" " " \
-"right/Asia/Thimbu" " " \
-"right/Asia/Thimphu" " " \
-"right/Asia/Tokyo" " " \
-"right/Asia/Ujung_Pandang" " " \
-"right/Asia/Ulaanbaatar" " " \
-"right/Asia/Ulan_Bator" " " \
-"right/Asia/Urumqi" " " \
-"right/Asia/Ust-Nera" " " \
-"right/Asia/Vientiane" " " \
-"right/Asia/Vladivostok" " " \
-"right/Asia/Yakutsk" " " \
-"right/Asia/Yekaterinburg" " " \
-"right/Asia/Yerevan" " " \
-"right/Atlantic/Azores" " " \
-"right/Atlantic/Bermuda" " " \
-"right/Atlantic/Canary" " " \
-"right/Atlantic/Cape_Verde" " " \
-"right/Atlantic/Faeroe" " " \
-"right/Atlantic/Faroe" " " \
-"right/Atlantic/Jan_Mayen" " " \
-"right/Atlantic/Madeira" " " \
-"right/Atlantic/Reykjavik" " " \
-"right/Atlantic/South_Georgia" " " \
-"right/Atlantic/St_Helena" " " \
-"right/Atlantic/Stanley" " " \
-"right/Australia/ACT" " " \
-"right/Australia/Adelaide" " " \
-"right/Australia/Brisbane" " " \
-"right/Australia/Broken_Hill" " " \
-"right/Australia/Canberra" " " \
-"right/Australia/Currie" " " \
-"right/Australia/Darwin" " " \
-"right/Australia/Eucla" " " \
-"right/Australia/Hobart" " " \
-"right/Australia/LHI" " " \
-"right/Australia/Lindeman" " " \
-"right/Australia/Lord_Howe" " " \
-"right/Australia/Melbourne" " " \
-"right/Australia/NSW" " " \
-"right/Australia/North" " " \
-"right/Australia/Perth" " " \
-"right/Australia/Queensland" " " \
-"right/Australia/South" " " \
-"right/Australia/Sydney" " " \
-"right/Australia/Tasmania" " " \
-"right/Australia/Victoria" " " \
-"right/Australia/West" " " \
-"right/Australia/Yancowinna" " " \
-"right/Brazil/Acre" " " \
-"right/Brazil/DeNoronha" " " \
-"right/Brazil/East" " " \
-"right/Brazil/West" " " \
-"right/CET" " " \
-"right/CST6CDT" " " \
-"right/Canada/Atlantic" " " \
-"right/Canada/Central" " " \
-"right/Canada/East-Saskatchewan" " " \
-"right/Canada/Eastern" " " \
-"right/Canada/Mountain" " " \
-"right/Canada/Newfoundland" " " \
-"right/Canada/Pacific" " " \
-"right/Canada/Saskatchewan" " " \
-"right/Canada/Yukon" " " \
-"right/Chile/Continental" " " \
-"right/Chile/EasterIsland" " " \
-"right/Cuba" " " \
-"right/EET" " " \
-"right/EST" " " \
-"right/EST5EDT" " " \
-"right/Egypt" " " \
-"right/Eire" " " \
-"right/Etc/GMT" " " \
-"right/Etc/GMT+0" " " \
-"right/Etc/GMT+1" " " \
-"right/Etc/GMT+10" " " \
-"right/Etc/GMT+11" " " \
-"right/Etc/GMT+12" " " \
-"right/Etc/GMT+2" " " \
-"right/Etc/GMT+3" " " \
-"right/Etc/GMT+4" " " \
-"right/Etc/GMT+5" " " \
-"right/Etc/GMT+6" " " \
-"right/Etc/GMT+7" " " \
-"right/Etc/GMT+8" " " \
-"right/Etc/GMT+9" " " \
-"right/Etc/GMT-0" " " \
-"right/Etc/GMT-1" " " \
-"right/Etc/GMT-10" " " \
-"right/Etc/GMT-11" " " \
-"right/Etc/GMT-12" " " \
-"right/Etc/GMT-13" " " \
-"right/Etc/GMT-14" " " \
-"right/Etc/GMT-2" " " \
-"right/Etc/GMT-3" " " \
-"right/Etc/GMT-4" " " \
-"right/Etc/GMT-5" " " \
-"right/Etc/GMT-6" " " \
-"right/Etc/GMT-7" " " \
-"right/Etc/GMT-8" " " \
-"right/Etc/GMT-9" " " \
-"right/Etc/GMT0" " " \
-"right/Etc/Greenwich" " " \
-"right/Etc/UCT" " " \
-"right/Etc/UTC" " " \
-"right/Etc/Universal" " " \
-"right/Etc/Zulu" " " \
-"right/Europe/Amsterdam" " " \
-"right/Europe/Andorra" " " \
-"right/Europe/Athens" " " \
-"right/Europe/Belfast" " " \
-"right/Europe/Belgrade" " " \
-"right/Europe/Berlin" " " \
-"right/Europe/Bratislava" " " \
-"right/Europe/Brussels" " " \
-"right/Europe/Bucharest" " " \
-"right/Europe/Budapest" " " \
-"right/Europe/Busingen" " " \
-"right/Europe/Chisinau" " " \
-"right/Europe/Copenhagen" " " \
-"right/Europe/Dublin" " " \
-"right/Europe/Gibraltar" " " \
-"right/Europe/Guernsey" " " \
-"right/Europe/Helsinki" " " \
-"right/Europe/Isle_of_Man" " " \
-"right/Europe/Istanbul" " " \
-"right/Europe/Jersey" " " \
-"right/Europe/Kaliningrad" " " \
-"right/Europe/Kiev" " " \
-"right/Europe/Lisbon" " " \
-"right/Europe/Ljubljana" " " \
-"right/Europe/London" " " \
-"right/Europe/Luxembourg" " " \
-"right/Europe/Madrid" " " \
-"right/Europe/Malta" " " \
-"right/Europe/Mariehamn" " " \
-"right/Europe/Minsk" " " \
-"right/Europe/Monaco" " " \
-"right/Europe/Moscow" " " \
-"right/Europe/Nicosia" " " \
-"right/Europe/Oslo" " " \
-"right/Europe/Paris" " " \
-"right/Europe/Podgorica" " " \
-"right/Europe/Prague" " " \
-"right/Europe/Riga" " " \
-"right/Europe/Rome" " " \
-"right/Europe/Samara" " " \
-"right/Europe/San_Marino" " " \
-"right/Europe/Sarajevo" " " \
-"right/Europe/Simferopol" " " \
-"right/Europe/Skopje" " " \
-"right/Europe/Sofia" " " \
-"right/Europe/Stockholm" " " \
-"right/Europe/Tallinn" " " \
-"right/Europe/Tirane" " " \
-"right/Europe/Tiraspol" " " \
-"right/Europe/Uzhgorod" " " \
-"right/Europe/Vaduz" " " \
-"right/Europe/Vatican" " " \
-"right/Europe/Vienna" " " \
-"right/Europe/Vilnius" " " \
-"right/Europe/Volgograd" " " \
-"right/Europe/Warsaw" " " \
-"right/Europe/Zagreb" " " \
-"right/Europe/Zaporozhye" " " \
-"right/Europe/Zurich" " " \
-"right/Factory" " " \
-"right/GB" " " \
-"right/GB-Eire" " " \
-"right/GMT" " " \
-"right/GMT+0" " " \
-"right/GMT-0" " " \
-"right/GMT0" " " \
-"right/Greenwich" " " \
-"right/HST" " " \
-"right/Hongkong" " " \
-"right/Iceland" " " \
-"right/Indian/Antananarivo" " " \
-"right/Indian/Chagos" " " \
-"right/Indian/Christmas" " " \
-"right/Indian/Cocos" " " \
-"right/Indian/Comoro" " " \
-"right/Indian/Kerguelen" " " \
-"right/Indian/Mahe" " " \
-"right/Indian/Maldives" " " \
-"right/Indian/Mauritius" " " \
-"right/Indian/Mayotte" " " \
-"right/Indian/Reunion" " " \
-"right/Iran" " " \
-"right/Israel" " " \
-"right/Jamaica" " " \
-"right/Japan" " " \
-"right/Kwajalein" " " \
-"right/Libya" " " \
-"right/MET" " " \
-"right/MST" " " \
-"right/MST7MDT" " " \
-"right/Mexico/BajaNorte" " " \
-"right/Mexico/BajaSur" " " \
-"right/Mexico/General" " " \
-"right/NZ" " " \
-"right/NZ-CHAT" " " \
-"right/Navajo" " " \
-"right/PRC" " " \
-"right/PST8PDT" " " \
-"right/Pacific/Apia" " " \
-"right/Pacific/Auckland" " " \
-"right/Pacific/Bougainville" " " \
-"right/Pacific/Chatham" " " \
-"right/Pacific/Chuuk" " " \
-"right/Pacific/Easter" " " \
-"right/Pacific/Efate" " " \
-"right/Pacific/Enderbury" " " \
-"right/Pacific/Fakaofo" " " \
-"right/Pacific/Fiji" " " \
-"right/Pacific/Funafuti" " " \
-"right/Pacific/Galapagos" " " \
-"right/Pacific/Gambier" " " \
-"right/Pacific/Guadalcanal" " " \
-"right/Pacific/Guam" " " \
-"right/Pacific/Honolulu" " " \
-"right/Pacific/Johnston" " " \
-"right/Pacific/Kiritimati" " " \
-"right/Pacific/Kosrae" " " \
-"right/Pacific/Kwajalein" " " \
-"right/Pacific/Majuro" " " \
-"right/Pacific/Marquesas" " " \
-"right/Pacific/Midway" " " \
-"right/Pacific/Nauru" " " \
-"right/Pacific/Niue" " " \
-"right/Pacific/Norfolk" " " \
-"right/Pacific/Noumea" " " \
-"right/Pacific/Pago_Pago" " " \
-"right/Pacific/Palau" " " \
-"right/Pacific/Pitcairn" " " \
-"right/Pacific/Pohnpei" " " \
-"right/Pacific/Ponape" " " \
-"right/Pacific/Port_Moresby" " " \
-"right/Pacific/Rarotonga" " " \
-"right/Pacific/Saipan" " " \
-"right/Pacific/Samoa" " " \
-"right/Pacific/Tahiti" " " \
-"right/Pacific/Tarawa" " " \
-"right/Pacific/Tongatapu" " " \
-"right/Pacific/Truk" " " \
-"right/Pacific/Wake" " " \
-"right/Pacific/Wallis" " " \
-"right/Pacific/Yap" " " \
-"right/Poland" " " \
-"right/Portugal" " " \
-"right/ROC" " " \
-"right/ROK" " " \
-"right/Singapore" " " \
-"right/Turkey" " " \
-"right/UCT" " " \
-"right/US/Alaska" " " \
-"right/US/Aleutian" " " \
-"right/US/Arizona" " " \
-"right/US/Central" " " \
-"right/US/East-Indiana" " " \
-"right/US/Eastern" " " \
-"right/US/Hawaii" " " \
-"right/US/Indiana-Starke" " " \
-"right/US/Michigan" " " \
-"right/US/Mountain" " " \
-"right/US/Pacific" " " \
-"right/US/Pacific-New" " " \
-"right/US/Samoa" " " \
-"right/UTC" " " \
-"right/Universal" " " \
-"right/W-SU" " " \
-"right/WET" " " \
-"right/Zulu" " " \
-   2> $TMP/tz
-
-   if [ $? = 1 -o $? = 255 ]; then
-      rm -f $TMP/tz
-      exit
-   fi
-
-   TIMEZONE="`cat $TMP/tz`"
-   rm -f $TMP/tz
-
-   setzone $TIMEZONE
-   exit
-else
-   ###
-   ### use text prompts
-   ###
-   while [ 0 ]; do
-      echo -n "Would you like to configure your timezone ([y]es, [n]o)? "
-      read TIMECONF;
-      echo
-
-      if [ "$TIMECONF" = "n" ]; then
-         break
-      fi
-
-      cat << EOF
-Select one of these timezones:
-
-US/Alaska
-US/Aleutian
-US/Arizona
-US/Central
-US/East-Indiana
-US/Eastern
-US/Hawaii
-US/Indiana-Starke
-US/Michigan
-US/Mountain
-US/Pacific
-US/Pacific-New
-US/Samoa
-Africa/Abidjan
-Africa/Accra
-Africa/Addis_Ababa
-Africa/Algiers
-Africa/Asmara
-Africa/Asmera
-Africa/Bamako
-Africa/Bangui
-Africa/Banjul
-Africa/Bissau
-Africa/Blantyre
-Africa/Brazzaville
-Africa/Bujumbura
-Africa/Cairo
-Africa/Casablanca
-Africa/Ceuta
-Africa/Conakry
-Africa/Dakar
-Africa/Dar_es_Salaam
-Africa/Djibouti
-Africa/Douala
-Africa/El_Aaiun
-Africa/Freetown
-Africa/Gaborone
-Africa/Harare
-Africa/Johannesburg
-Africa/Juba
-Africa/Kampala
-Africa/Khartoum
-Africa/Kigali
-Africa/Kinshasa
-Africa/Lagos
-Africa/Libreville
-Africa/Lome
-Africa/Luanda
-Africa/Lubumbashi
-Africa/Lusaka
-Africa/Malabo
-Africa/Maputo
-Africa/Maseru
-Africa/Mbabane
-Africa/Mogadishu
-Africa/Monrovia
-Africa/Nairobi
-Africa/Ndjamena
-Africa/Niamey
-Africa/Nouakchott
-Africa/Ouagadougou
-Africa/Porto-Novo
-Africa/Sao_Tome
-Africa/Timbuktu
-Africa/Tripoli
-Africa/Tunis
-Africa/Windhoek
-America/Adak
-America/Anchorage
-America/Anguilla
-America/Antigua
-America/Araguaina
-America/Argentina/Buenos_Aires
-America/Argentina/Catamarca
-America/Argentina/ComodRivadavia
-America/Argentina/Cordoba
-America/Argentina/Jujuy
-America/Argentina/La_Rioja
-America/Argentina/Mendoza
-America/Argentina/Rio_Gallegos
-America/Argentina/Salta
-America/Argentina/San_Juan
-America/Argentina/San_Luis
-America/Argentina/Tucuman
-America/Argentina/Ushuaia
-America/Aruba
-America/Asuncion
-America/Atikokan
-America/Atka
-America/Bahia
-America/Bahia_Banderas
-America/Barbados
-America/Belem
-America/Belize
-America/Blanc-Sablon
-America/Boa_Vista
-America/Bogota
-America/Boise
-America/Buenos_Aires
-America/Cambridge_Bay
-America/Campo_Grande
-America/Cancun
-America/Caracas
-America/Catamarca
-America/Cayenne
-America/Cayman
-America/Chicago
-America/Chihuahua
-America/Coral_Harbour
-America/Cordoba
-America/Costa_Rica
-America/Creston
-America/Cuiaba
-America/Curacao
-America/Danmarkshavn
-America/Dawson
-America/Dawson_Creek
-America/Denver
-America/Detroit
-America/Dominica
-America/Edmonton
-America/Eirunepe
-America/El_Salvador
-America/Ensenada
-America/Fort_Wayne
-America/Fortaleza
-America/Glace_Bay
-America/Godthab
-America/Goose_Bay
-America/Grand_Turk
-America/Grenada
-America/Guadeloupe
-America/Guatemala
-America/Guayaquil
-America/Guyana
-America/Halifax
-America/Havana
-America/Hermosillo
-America/Indiana/Indianapolis
-America/Indiana/Knox
-America/Indiana/Marengo
-America/Indiana/Petersburg
-America/Indiana/Tell_City
-America/Indiana/Vevay
-America/Indiana/Vincennes
-America/Indiana/Winamac
-America/Indianapolis
-America/Inuvik
-America/Iqaluit
-America/Jamaica
-America/Jujuy
-America/Juneau
-America/Kentucky/Louisville
-America/Kentucky/Monticello
-America/Knox_IN
-America/Kralendijk
-America/La_Paz
-America/Lima
-America/Los_Angeles
-America/Louisville
-America/Lower_Princes
-America/Maceio
-America/Managua
-America/Manaus
-America/Marigot
-America/Martinique
-America/Matamoros
-America/Mazatlan
-America/Mendoza
-America/Menominee
-America/Merida
-America/Metlakatla
-America/Mexico_City
-America/Miquelon
-America/Moncton
-America/Monterrey
-America/Montevideo
-America/Montreal
-America/Montserrat
-America/Nassau
-America/New_York
-America/Nipigon
-America/Nome
-America/Noronha
-America/North_Dakota/Beulah
-America/North_Dakota/Center
-America/North_Dakota/New_Salem
-America/Ojinaga
-America/Panama
-America/Pangnirtung
-America/Paramaribo
-America/Phoenix
-America/Port-au-Prince
-America/Port_of_Spain
-America/Porto_Acre
-America/Porto_Velho
-America/Puerto_Rico
-America/Rainy_River
-America/Rankin_Inlet
-America/Recife
-America/Regina
-America/Resolute
-America/Rio_Branco
-America/Rosario
-America/Santa_Isabel
-America/Santarem
-America/Santiago
-America/Santo_Domingo
-America/Sao_Paulo
-America/Scoresbysund
-America/Shiprock
-America/Sitka
-America/St_Barthelemy
-America/St_Johns
-America/St_Kitts
-America/St_Lucia
-America/St_Thomas
-America/St_Vincent
-America/Swift_Current
-America/Tegucigalpa
-America/Thule
-America/Thunder_Bay
-America/Tijuana
-America/Toronto
-America/Tortola
-America/Vancouver
-America/Virgin
-America/Whitehorse
-America/Winnipeg
-America/Yakutat
-America/Yellowknife
-Antarctica/Casey
-Antarctica/Davis
-Antarctica/DumontDUrville
-Antarctica/Macquarie
-Antarctica/Mawson
-Antarctica/McMurdo
-Antarctica/Palmer
-Antarctica/Rothera
-Antarctica/South_Pole
-Antarctica/Syowa
-Antarctica/Troll
-Antarctica/Vostok
-Arctic/Longyearbyen
-Asia/Aden
-Asia/Almaty
-Asia/Amman
-Asia/Anadyr
-Asia/Aqtau
-Asia/Aqtobe
-Asia/Ashgabat
-Asia/Ashkhabad
-Asia/Baghdad
-Asia/Bahrain
-Asia/Baku
-Asia/Bangkok
-Asia/Beirut
-Asia/Bishkek
-Asia/Brunei
-Asia/Calcutta
-Asia/Chita
-Asia/Choibalsan
-Asia/Chongqing
-Asia/Chungking
-Asia/Colombo
-Asia/Dacca
-Asia/Damascus
-Asia/Dhaka
-Asia/Dili
-Asia/Dubai
-Asia/Dushanbe
-Asia/Gaza
-Asia/Harbin
-Asia/Hebron
-Asia/Ho_Chi_Minh
-Asia/Hong_Kong
-Asia/Hovd
-Asia/Irkutsk
-Asia/Istanbul
-Asia/Jakarta
-Asia/Jayapura
-Asia/Jerusalem
-Asia/Kabul
-Asia/Kamchatka
-Asia/Karachi
-Asia/Kashgar
-Asia/Kathmandu
-Asia/Katmandu
-Asia/Khandyga
-Asia/Kolkata
-Asia/Krasnoyarsk
-Asia/Kuala_Lumpur
-Asia/Kuching
-Asia/Kuwait
-Asia/Macao
-Asia/Macau
-Asia/Magadan
-Asia/Makassar
-Asia/Manila
-Asia/Muscat
-Asia/Nicosia
-Asia/Novokuznetsk
-Asia/Novosibirsk
-Asia/Omsk
-Asia/Oral
-Asia/Phnom_Penh
-Asia/Pontianak
-Asia/Pyongyang
-Asia/Qatar
-Asia/Qyzylorda
-Asia/Rangoon
-Asia/Riyadh
-Asia/Saigon
-Asia/Sakhalin
-Asia/Samarkand
-Asia/Seoul
-Asia/Shanghai
-Asia/Singapore
-Asia/Srednekolymsk
-Asia/Taipei
-Asia/Tashkent
-Asia/Tbilisi
-Asia/Tehran
-Asia/Tel_Aviv
-Asia/Thimbu
-Asia/Thimphu
-Asia/Tokyo
-Asia/Ujung_Pandang
-Asia/Ulaanbaatar
-Asia/Ulan_Bator
-Asia/Urumqi
-Asia/Ust-Nera
-Asia/Vientiane
-Asia/Vladivostok
-Asia/Yakutsk
-Asia/Yekaterinburg
-Asia/Yerevan
-Atlantic/Azores
-Atlantic/Bermuda
-Atlantic/Canary
-Atlantic/Cape_Verde
-Atlantic/Faeroe
-Atlantic/Faroe
-Atlantic/Jan_Mayen
-Atlantic/Madeira
-Atlantic/Reykjavik
-Atlantic/South_Georgia
-Atlantic/St_Helena
-Atlantic/Stanley
-Australia/ACT
-Australia/Adelaide
-Australia/Brisbane
-Australia/Broken_Hill
-Australia/Canberra
-Australia/Currie
-Australia/Darwin
-Australia/Eucla
-Australia/Hobart
-Australia/LHI
-Australia/Lindeman
-Australia/Lord_Howe
-Australia/Melbourne
-Australia/NSW
-Australia/North
-Australia/Perth
-Australia/Queensland
-Australia/South
-Australia/Sydney
-Australia/Tasmania
-Australia/Victoria
-Australia/West
-Australia/Yancowinna
-Brazil/Acre
-Brazil/DeNoronha
-Brazil/East
-Brazil/West
-CET
-CST6CDT
-Canada/Atlantic
-Canada/Central
-Canada/East-Saskatchewan
-Canada/Eastern
-Canada/Mountain
-Canada/Newfoundland
-Canada/Pacific
-Canada/Saskatchewan
-Canada/Yukon
-Chile/Continental
-Chile/EasterIsland
-Cuba
-EET
-EST
-EST5EDT
-Egypt
-Eire
-Etc/GMT
-Etc/GMT+0
-Etc/GMT+1
-Etc/GMT+10
-Etc/GMT+11
-Etc/GMT+12
-Etc/GMT+2
-Etc/GMT+3
-Etc/GMT+4
-Etc/GMT+5
-Etc/GMT+6
-Etc/GMT+7
-Etc/GMT+8
-Etc/GMT+9
-Etc/GMT-0
-Etc/GMT-1
-Etc/GMT-10
-Etc/GMT-11
-Etc/GMT-12
-Etc/GMT-13
-Etc/GMT-14
-Etc/GMT-2
-Etc/GMT-3
-Etc/GMT-4
-Etc/GMT-5
-Etc/GMT-6
-Etc/GMT-7
-Etc/GMT-8
-Etc/GMT-9
-Etc/GMT0
-Etc/Greenwich
-Etc/UCT
-Etc/UTC
-Etc/Universal
-Etc/Zulu
-Europe/Amsterdam
-Europe/Andorra
-Europe/Athens
-Europe/Belfast
-Europe/Belgrade
-Europe/Berlin
-Europe/Bratislava
-Europe/Brussels
-Europe/Bucharest
-Europe/Budapest
-Europe/Busingen
-Europe/Chisinau
-Europe/Copenhagen
-Europe/Dublin
-Europe/Gibraltar
-Europe/Guernsey
-Europe/Helsinki
-Europe/Isle_of_Man
-Europe/Istanbul
-Europe/Jersey
-Europe/Kaliningrad
-Europe/Kiev
-Europe/Lisbon
-Europe/Ljubljana
-Europe/London
-Europe/Luxembourg
-Europe/Madrid
-Europe/Malta
-Europe/Mariehamn
-Europe/Minsk
-Europe/Monaco
-Europe/Moscow
-Europe/Nicosia
-Europe/Oslo
-Europe/Paris
-Europe/Podgorica
-Europe/Prague
-Europe/Riga
-Europe/Rome
-Europe/Samara
-Europe/San_Marino
-Europe/Sarajevo
-Europe/Simferopol
-Europe/Skopje
-Europe/Sofia
-Europe/Stockholm
-Europe/Tallinn
-Europe/Tirane
-Europe/Tiraspol
-Europe/Uzhgorod
-Europe/Vaduz
-Europe/Vatican
-Europe/Vienna
-Europe/Vilnius
-Europe/Volgograd
-Europe/Warsaw
-Europe/Zagreb
-Europe/Zaporozhye
-Europe/Zurich
-Factory
-GB
-GB-Eire
-GMT
-GMT+0
-GMT-0
-GMT0
-Greenwich
-HST
-Hongkong
-Iceland
-Indian/Antananarivo
-Indian/Chagos
-Indian/Christmas
-Indian/Cocos
-Indian/Comoro
-Indian/Kerguelen
-Indian/Mahe
-Indian/Maldives
-Indian/Mauritius
-Indian/Mayotte
-Indian/Reunion
-Iran
-Israel
-Jamaica
-Japan
-Kwajalein
-Libya
-MET
-MST
-MST7MDT
-Mexico/BajaNorte
-Mexico/BajaSur
-Mexico/General
-NZ
-NZ-CHAT
-Navajo
-PRC
-PST8PDT
-Pacific/Apia
-Pacific/Auckland
-Pacific/Bougainville
-Pacific/Chatham
-Pacific/Chuuk
-Pacific/Easter
-Pacific/Efate
-Pacific/Enderbury
-Pacific/Fakaofo
-Pacific/Fiji
-Pacific/Funafuti
-Pacific/Galapagos
-Pacific/Gambier
-Pacific/Guadalcanal
-Pacific/Guam
-Pacific/Honolulu
-Pacific/Johnston
-Pacific/Kiritimati
-Pacific/Kosrae
-Pacific/Kwajalein
-Pacific/Majuro
-Pacific/Marquesas
-Pacific/Midway
-Pacific/Nauru
-Pacific/Niue
-Pacific/Norfolk
-Pacific/Noumea
-Pacific/Pago_Pago
-Pacific/Palau
-Pacific/Pitcairn
-Pacific/Pohnpei
-Pacific/Ponape
-Pacific/Port_Moresby
-Pacific/Rarotonga
-Pacific/Saipan
-Pacific/Samoa
-Pacific/Tahiti
-Pacific/Tarawa
-Pacific/Tongatapu
-Pacific/Truk
-Pacific/Wake
-Pacific/Wallis
-Pacific/Yap
-Poland
-Portugal
-ROC
-ROK
-Singapore
-Turkey
-UCT
-UTC
-Universal
-W-SU
-WET
-Zulu
-posix/Africa/Abidjan
-posix/Africa/Accra
-posix/Africa/Addis_Ababa
-posix/Africa/Algiers
-posix/Africa/Asmara
-posix/Africa/Asmera
-posix/Africa/Bamako
-posix/Africa/Bangui
-posix/Africa/Banjul
-posix/Africa/Bissau
-posix/Africa/Blantyre
-posix/Africa/Brazzaville
-posix/Africa/Bujumbura
-posix/Africa/Cairo
-posix/Africa/Casablanca
-posix/Africa/Ceuta
-posix/Africa/Conakry
-posix/Africa/Dakar
-posix/Africa/Dar_es_Salaam
-posix/Africa/Djibouti
-posix/Africa/Douala
-posix/Africa/El_Aaiun
-posix/Africa/Freetown
-posix/Africa/Gaborone
-posix/Africa/Harare
-posix/Africa/Johannesburg
-posix/Africa/Juba
-posix/Africa/Kampala
-posix/Africa/Khartoum
-posix/Africa/Kigali
-posix/Africa/Kinshasa
-posix/Africa/Lagos
-posix/Africa/Libreville
-posix/Africa/Lome
-posix/Africa/Luanda
-posix/Africa/Lubumbashi
-posix/Africa/Lusaka
-posix/Africa/Malabo
-posix/Africa/Maputo
-posix/Africa/Maseru
-posix/Africa/Mbabane
-posix/Africa/Mogadishu
-posix/Africa/Monrovia
-posix/Africa/Nairobi
-posix/Africa/Ndjamena
-posix/Africa/Niamey
-posix/Africa/Nouakchott
-posix/Africa/Ouagadougou
-posix/Africa/Porto-Novo
-posix/Africa/Sao_Tome
-posix/Africa/Timbuktu
-posix/Africa/Tripoli
-posix/Africa/Tunis
-posix/Africa/Windhoek
-posix/America/Adak
-posix/America/Anchorage
-posix/America/Anguilla
-posix/America/Antigua
-posix/America/Araguaina
-posix/America/Argentina/Buenos_Aires
-posix/America/Argentina/Catamarca
-posix/America/Argentina/ComodRivadavia
-posix/America/Argentina/Cordoba
-posix/America/Argentina/Jujuy
-posix/America/Argentina/La_Rioja
-posix/America/Argentina/Mendoza
-posix/America/Argentina/Rio_Gallegos
-posix/America/Argentina/Salta
-posix/America/Argentina/San_Juan
-posix/America/Argentina/San_Luis
-posix/America/Argentina/Tucuman
-posix/America/Argentina/Ushuaia
-posix/America/Aruba
-posix/America/Asuncion
-posix/America/Atikokan
-posix/America/Atka
-posix/America/Bahia
-posix/America/Bahia_Banderas
-posix/America/Barbados
-posix/America/Belem
-posix/America/Belize
-posix/America/Blanc-Sablon
-posix/America/Boa_Vista
-posix/America/Bogota
-posix/America/Boise
-posix/America/Buenos_Aires
-posix/America/Cambridge_Bay
-posix/America/Campo_Grande
-posix/America/Cancun
-posix/America/Caracas
-posix/America/Catamarca
-posix/America/Cayenne
-posix/America/Cayman
-posix/America/Chicago
-posix/America/Chihuahua
-posix/America/Coral_Harbour
-posix/America/Cordoba
-posix/America/Costa_Rica
-posix/America/Creston
-posix/America/Cuiaba
-posix/America/Curacao
-posix/America/Danmarkshavn
-posix/America/Dawson
-posix/America/Dawson_Creek
-posix/America/Denver
-posix/America/Detroit
-posix/America/Dominica
-posix/America/Edmonton
-posix/America/Eirunepe
-posix/America/El_Salvador
-posix/America/Ensenada
-posix/America/Fort_Wayne
-posix/America/Fortaleza
-posix/America/Glace_Bay
-posix/America/Godthab
-posix/America/Goose_Bay
-posix/America/Grand_Turk
-posix/America/Grenada
-posix/America/Guadeloupe
-posix/America/Guatemala
-posix/America/Guayaquil
-posix/America/Guyana
-posix/America/Halifax
-posix/America/Havana
-posix/America/Hermosillo
-posix/America/Indiana/Indianapolis
-posix/America/Indiana/Knox
-posix/America/Indiana/Marengo
-posix/America/Indiana/Petersburg
-posix/America/Indiana/Tell_City
-posix/America/Indiana/Vevay
-posix/America/Indiana/Vincennes
-posix/America/Indiana/Winamac
-posix/America/Indianapolis
-posix/America/Inuvik
-posix/America/Iqaluit
-posix/America/Jamaica
-posix/America/Jujuy
-posix/America/Juneau
-posix/America/Kentucky/Louisville
-posix/America/Kentucky/Monticello
-posix/America/Knox_IN
-posix/America/Kralendijk
-posix/America/La_Paz
-posix/America/Lima
-posix/America/Los_Angeles
-posix/America/Louisville
-posix/America/Lower_Princes
-posix/America/Maceio
-posix/America/Managua
-posix/America/Manaus
-posix/America/Marigot
-posix/America/Martinique
-posix/America/Matamoros
-posix/America/Mazatlan
-posix/America/Mendoza
-posix/America/Menominee
-posix/America/Merida
-posix/America/Metlakatla
-posix/America/Mexico_City
-posix/America/Miquelon
-posix/America/Moncton
-posix/America/Monterrey
-posix/America/Montevideo
-posix/America/Montreal
-posix/America/Montserrat
-posix/America/Nassau
-posix/America/New_York
-posix/America/Nipigon
-posix/America/Nome
-posix/America/Noronha
-posix/America/North_Dakota/Beulah
-posix/America/North_Dakota/Center
-posix/America/North_Dakota/New_Salem
-posix/America/Ojinaga
-posix/America/Panama
-posix/America/Pangnirtung
-posix/America/Paramaribo
-posix/America/Phoenix
-posix/America/Port-au-Prince
-posix/America/Port_of_Spain
-posix/America/Porto_Acre
-posix/America/Porto_Velho
-posix/America/Puerto_Rico
-posix/America/Rainy_River
-posix/America/Rankin_Inlet
-posix/America/Recife
-posix/America/Regina
-posix/America/Resolute
-posix/America/Rio_Branco
-posix/America/Rosario
-posix/America/Santa_Isabel
-posix/America/Santarem
-posix/America/Santiago
-posix/America/Santo_Domingo
-posix/America/Sao_Paulo
-posix/America/Scoresbysund
-posix/America/Shiprock
-posix/America/Sitka
-posix/America/St_Barthelemy
-posix/America/St_Johns
-posix/America/St_Kitts
-posix/America/St_Lucia
-posix/America/St_Thomas
-posix/America/St_Vincent
-posix/America/Swift_Current
-posix/America/Tegucigalpa
-posix/America/Thule
-posix/America/Thunder_Bay
-posix/America/Tijuana
-posix/America/Toronto
-posix/America/Tortola
-posix/America/Vancouver
-posix/America/Virgin
-posix/America/Whitehorse
-posix/America/Winnipeg
-posix/America/Yakutat
-posix/America/Yellowknife
-posix/Antarctica/Casey
-posix/Antarctica/Davis
-posix/Antarctica/DumontDUrville
-posix/Antarctica/Macquarie
-posix/Antarctica/Mawson
-posix/Antarctica/McMurdo
-posix/Antarctica/Palmer
-posix/Antarctica/Rothera
-posix/Antarctica/South_Pole
-posix/Antarctica/Syowa
-posix/Antarctica/Troll
-posix/Antarctica/Vostok
-posix/Arctic/Longyearbyen
-posix/Asia/Aden
-posix/Asia/Almaty
-posix/Asia/Amman
-posix/Asia/Anadyr
-posix/Asia/Aqtau
-posix/Asia/Aqtobe
-posix/Asia/Ashgabat
-posix/Asia/Ashkhabad
-posix/Asia/Baghdad
-posix/Asia/Bahrain
-posix/Asia/Baku
-posix/Asia/Bangkok
-posix/Asia/Beirut
-posix/Asia/Bishkek
-posix/Asia/Brunei
-posix/Asia/Calcutta
-posix/Asia/Chita
-posix/Asia/Choibalsan
-posix/Asia/Chongqing
-posix/Asia/Chungking
-posix/Asia/Colombo
-posix/Asia/Dacca
-posix/Asia/Damascus
-posix/Asia/Dhaka
-posix/Asia/Dili
-posix/Asia/Dubai
-posix/Asia/Dushanbe
-posix/Asia/Gaza
-posix/Asia/Harbin
-posix/Asia/Hebron
-posix/Asia/Ho_Chi_Minh
-posix/Asia/Hong_Kong
-posix/Asia/Hovd
-posix/Asia/Irkutsk
-posix/Asia/Istanbul
-posix/Asia/Jakarta
-posix/Asia/Jayapura
-posix/Asia/Jerusalem
-posix/Asia/Kabul
-posix/Asia/Kamchatka
-posix/Asia/Karachi
-posix/Asia/Kashgar
-posix/Asia/Kathmandu
-posix/Asia/Katmandu
-posix/Asia/Khandyga
-posix/Asia/Kolkata
-posix/Asia/Krasnoyarsk
-posix/Asia/Kuala_Lumpur
-posix/Asia/Kuching
-posix/Asia/Kuwait
-posix/Asia/Macao
-posix/Asia/Macau
-posix/Asia/Magadan
-posix/Asia/Makassar
-posix/Asia/Manila
-posix/Asia/Muscat
-posix/Asia/Nicosia
-posix/Asia/Novokuznetsk
-posix/Asia/Novosibirsk
-posix/Asia/Omsk
-posix/Asia/Oral
-posix/Asia/Phnom_Penh
-posix/Asia/Pontianak
-posix/Asia/Pyongyang
-posix/Asia/Qatar
-posix/Asia/Qyzylorda
-posix/Asia/Rangoon
-posix/Asia/Riyadh
-posix/Asia/Saigon
-posix/Asia/Sakhalin
-posix/Asia/Samarkand
-posix/Asia/Seoul
-posix/Asia/Shanghai
-posix/Asia/Singapore
-posix/Asia/Srednekolymsk
-posix/Asia/Taipei
-posix/Asia/Tashkent
-posix/Asia/Tbilisi
-posix/Asia/Tehran
-posix/Asia/Tel_Aviv
-posix/Asia/Thimbu
-posix/Asia/Thimphu
-posix/Asia/Tokyo
-posix/Asia/Ujung_Pandang
-posix/Asia/Ulaanbaatar
-posix/Asia/Ulan_Bator
-posix/Asia/Urumqi
-posix/Asia/Ust-Nera
-posix/Asia/Vientiane
-posix/Asia/Vladivostok
-posix/Asia/Yakutsk
-posix/Asia/Yekaterinburg
-posix/Asia/Yerevan
-posix/Atlantic/Azores
-posix/Atlantic/Bermuda
-posix/Atlantic/Canary
-posix/Atlantic/Cape_Verde
-posix/Atlantic/Faeroe
-posix/Atlantic/Faroe
-posix/Atlantic/Jan_Mayen
-posix/Atlantic/Madeira
-posix/Atlantic/Reykjavik
-posix/Atlantic/South_Georgia
-posix/Atlantic/St_Helena
-posix/Atlantic/Stanley
-posix/Australia/ACT
-posix/Australia/Adelaide
-posix/Australia/Brisbane
-posix/Australia/Broken_Hill
-posix/Australia/Canberra
-posix/Australia/Currie
-posix/Australia/Darwin
-posix/Australia/Eucla
-posix/Australia/Hobart
-posix/Australia/LHI
-posix/Australia/Lindeman
-posix/Australia/Lord_Howe
-posix/Australia/Melbourne
-posix/Australia/NSW
-posix/Australia/North
-posix/Australia/Perth
-posix/Australia/Queensland
-posix/Australia/South
-posix/Australia/Sydney
-posix/Australia/Tasmania
-posix/Australia/Victoria
-posix/Australia/West
-posix/Australia/Yancowinna
-posix/Brazil/Acre
-posix/Brazil/DeNoronha
-posix/Brazil/East
-posix/Brazil/West
-posix/CET
-posix/CST6CDT
-posix/Canada/Atlantic
-posix/Canada/Central
-posix/Canada/East-Saskatchewan
-posix/Canada/Eastern
-posix/Canada/Mountain
-posix/Canada/Newfoundland
-posix/Canada/Pacific
-posix/Canada/Saskatchewan
-posix/Canada/Yukon
-posix/Chile/Continental
-posix/Chile/EasterIsland
-posix/Cuba
-posix/EET
-posix/EST
-posix/EST5EDT
-posix/Egypt
-posix/Eire
-posix/Etc/GMT
-posix/Etc/GMT+0
-posix/Etc/GMT+1
-posix/Etc/GMT+10
-posix/Etc/GMT+11
-posix/Etc/GMT+12
-posix/Etc/GMT+2
-posix/Etc/GMT+3
-posix/Etc/GMT+4
-posix/Etc/GMT+5
-posix/Etc/GMT+6
-posix/Etc/GMT+7
-posix/Etc/GMT+8
-posix/Etc/GMT+9
-posix/Etc/GMT-0
-posix/Etc/GMT-1
-posix/Etc/GMT-10
-posix/Etc/GMT-11
-posix/Etc/GMT-12
-posix/Etc/GMT-13
-posix/Etc/GMT-14
-posix/Etc/GMT-2
-posix/Etc/GMT-3
-posix/Etc/GMT-4
-posix/Etc/GMT-5
-posix/Etc/GMT-6
-posix/Etc/GMT-7
-posix/Etc/GMT-8
-posix/Etc/GMT-9
-posix/Etc/GMT0
-posix/Etc/Greenwich
-posix/Etc/UCT
-posix/Etc/UTC
-posix/Etc/Universal
-posix/Etc/Zulu
-posix/Europe/Amsterdam
-posix/Europe/Andorra
-posix/Europe/Athens
-posix/Europe/Belfast
-posix/Europe/Belgrade
-posix/Europe/Berlin
-posix/Europe/Bratislava
-posix/Europe/Brussels
-posix/Europe/Bucharest
-posix/Europe/Budapest
-posix/Europe/Busingen
-posix/Europe/Chisinau
-posix/Europe/Copenhagen
-posix/Europe/Dublin
-posix/Europe/Gibraltar
-posix/Europe/Guernsey
-posix/Europe/Helsinki
-posix/Europe/Isle_of_Man
-posix/Europe/Istanbul
-posix/Europe/Jersey
-posix/Europe/Kaliningrad
-posix/Europe/Kiev
-posix/Europe/Lisbon
-posix/Europe/Ljubljana
-posix/Europe/London
-posix/Europe/Luxembourg
-posix/Europe/Madrid
-posix/Europe/Malta
-posix/Europe/Mariehamn
-posix/Europe/Minsk
-posix/Europe/Monaco
-posix/Europe/Moscow
-posix/Europe/Nicosia
-posix/Europe/Oslo
-posix/Europe/Paris
-posix/Europe/Podgorica
-posix/Europe/Prague
-posix/Europe/Riga
-posix/Europe/Rome
-posix/Europe/Samara
-posix/Europe/San_Marino
-posix/Europe/Sarajevo
-posix/Europe/Simferopol
-posix/Europe/Skopje
-posix/Europe/Sofia
-posix/Europe/Stockholm
-posix/Europe/Tallinn
-posix/Europe/Tirane
-posix/Europe/Tiraspol
-posix/Europe/Uzhgorod
-posix/Europe/Vaduz
-posix/Europe/Vatican
-posix/Europe/Vienna
-posix/Europe/Vilnius
-posix/Europe/Volgograd
-posix/Europe/Warsaw
-posix/Europe/Zagreb
-posix/Europe/Zaporozhye
-posix/Europe/Zurich
-posix/Factory
-posix/GB
-posix/GB-Eire
-posix/GMT
-posix/GMT+0
-posix/GMT-0
-posix/GMT0
-posix/Greenwich
-posix/HST
-posix/Hongkong
-posix/Iceland
-posix/Indian/Antananarivo
-posix/Indian/Chagos
-posix/Indian/Christmas
-posix/Indian/Cocos
-posix/Indian/Comoro
-posix/Indian/Kerguelen
-posix/Indian/Mahe
-posix/Indian/Maldives
-posix/Indian/Mauritius
-posix/Indian/Mayotte
-posix/Indian/Reunion
-posix/Iran
-posix/Israel
-posix/Jamaica
-posix/Japan
-posix/Kwajalein
-posix/Libya
-posix/MET
-posix/MST
-posix/MST7MDT
-posix/Mexico/BajaNorte
-posix/Mexico/BajaSur
-posix/Mexico/General
-posix/NZ
-posix/NZ-CHAT
-posix/Navajo
-posix/PRC
-posix/PST8PDT
-posix/Pacific/Apia
-posix/Pacific/Auckland
-posix/Pacific/Bougainville
-posix/Pacific/Chatham
-posix/Pacific/Chuuk
-posix/Pacific/Easter
-posix/Pacific/Efate
-posix/Pacific/Enderbury
-posix/Pacific/Fakaofo
-posix/Pacific/Fiji
-posix/Pacific/Funafuti
-posix/Pacific/Galapagos
-posix/Pacific/Gambier
-posix/Pacific/Guadalcanal
-posix/Pacific/Guam
-posix/Pacific/Honolulu
-posix/Pacific/Johnston
-posix/Pacific/Kiritimati
-posix/Pacific/Kosrae
-posix/Pacific/Kwajalein
-posix/Pacific/Majuro
-posix/Pacific/Marquesas
-posix/Pacific/Midway
-posix/Pacific/Nauru
-posix/Pacific/Niue
-posix/Pacific/Norfolk
-posix/Pacific/Noumea
-posix/Pacific/Pago_Pago
-posix/Pacific/Palau
-posix/Pacific/Pitcairn
-posix/Pacific/Pohnpei
-posix/Pacific/Ponape
-posix/Pacific/Port_Moresby
-posix/Pacific/Rarotonga
-posix/Pacific/Saipan
-posix/Pacific/Samoa
-posix/Pacific/Tahiti
-posix/Pacific/Tarawa
-posix/Pacific/Tongatapu
-posix/Pacific/Truk
-posix/Pacific/Wake
-posix/Pacific/Wallis
-posix/Pacific/Yap
-posix/Poland
-posix/Portugal
-posix/ROC
-posix/ROK
-posix/Singapore
-posix/Turkey
-posix/UCT
-posix/US/Alaska
-posix/US/Aleutian
-posix/US/Arizona
-posix/US/Central
-posix/US/East-Indiana
-posix/US/Eastern
-posix/US/Hawaii
-posix/US/Indiana-Starke
-posix/US/Michigan
-posix/US/Mountain
-posix/US/Pacific
-posix/US/Pacific-New
-posix/US/Samoa
-posix/UTC
-posix/Universal
-posix/W-SU
-posix/WET
-posix/Zulu
-posix/localtime
-posix/posixrules
-posixrules
-right/Africa/Abidjan
-right/Africa/Accra
-right/Africa/Addis_Ababa
-right/Africa/Algiers
-right/Africa/Asmara
-right/Africa/Asmera
-right/Africa/Bamako
-right/Africa/Bangui
-right/Africa/Banjul
-right/Africa/Bissau
-right/Africa/Blantyre
-right/Africa/Brazzaville
-right/Africa/Bujumbura
-right/Africa/Cairo
-right/Africa/Casablanca
-right/Africa/Ceuta
-right/Africa/Conakry
-right/Africa/Dakar
-right/Africa/Dar_es_Salaam
-right/Africa/Djibouti
-right/Africa/Douala
-right/Africa/El_Aaiun
-right/Africa/Freetown
-right/Africa/Gaborone
-right/Africa/Harare
-right/Africa/Johannesburg
-right/Africa/Juba
-right/Africa/Kampala
-right/Africa/Khartoum
-right/Africa/Kigali
-right/Africa/Kinshasa
-right/Africa/Lagos
-right/Africa/Libreville
-right/Africa/Lome
-right/Africa/Luanda
-right/Africa/Lubumbashi
-right/Africa/Lusaka
-right/Africa/Malabo
-right/Africa/Maputo
-right/Africa/Maseru
-right/Africa/Mbabane
-right/Africa/Mogadishu
-right/Africa/Monrovia
-right/Africa/Nairobi
-right/Africa/Ndjamena
-right/Africa/Niamey
-right/Africa/Nouakchott
-right/Africa/Ouagadougou
-right/Africa/Porto-Novo
-right/Africa/Sao_Tome
-right/Africa/Timbuktu
-right/Africa/Tripoli
-right/Africa/Tunis
-right/Africa/Windhoek
-right/America/Adak
-right/America/Anchorage
-right/America/Anguilla
-right/America/Antigua
-right/America/Araguaina
-right/America/Argentina/Buenos_Aires
-right/America/Argentina/Catamarca
-right/America/Argentina/ComodRivadavia
-right/America/Argentina/Cordoba
-right/America/Argentina/Jujuy
-right/America/Argentina/La_Rioja
-right/America/Argentina/Mendoza
-right/America/Argentina/Rio_Gallegos
-right/America/Argentina/Salta
-right/America/Argentina/San_Juan
-right/America/Argentina/San_Luis
-right/America/Argentina/Tucuman
-right/America/Argentina/Ushuaia
-right/America/Aruba
-right/America/Asuncion
-right/America/Atikokan
-right/America/Atka
-right/America/Bahia
-right/America/Bahia_Banderas
-right/America/Barbados
-right/America/Belem
-right/America/Belize
-right/America/Blanc-Sablon
-right/America/Boa_Vista
-right/America/Bogota
-right/America/Boise
-right/America/Buenos_Aires
-right/America/Cambridge_Bay
-right/America/Campo_Grande
-right/America/Cancun
-right/America/Caracas
-right/America/Catamarca
-right/America/Cayenne
-right/America/Cayman
-right/America/Chicago
-right/America/Chihuahua
-right/America/Coral_Harbour
-right/America/Cordoba
-right/America/Costa_Rica
-right/America/Creston
-right/America/Cuiaba
-right/America/Curacao
-right/America/Danmarkshavn
-right/America/Dawson
-right/America/Dawson_Creek
-right/America/Denver
-right/America/Detroit
-right/America/Dominica
-right/America/Edmonton
-right/America/Eirunepe
-right/America/El_Salvador
-right/America/Ensenada
-right/America/Fort_Wayne
-right/America/Fortaleza
-right/America/Glace_Bay
-right/America/Godthab
-right/America/Goose_Bay
-right/America/Grand_Turk
-right/America/Grenada
-right/America/Guadeloupe
-right/America/Guatemala
-right/America/Guayaquil
-right/America/Guyana
-right/America/Halifax
-right/America/Havana
-right/America/Hermosillo
-right/America/Indiana/Indianapolis
-right/America/Indiana/Knox
-right/America/Indiana/Marengo
-right/America/Indiana/Petersburg
-right/America/Indiana/Tell_City
-right/America/Indiana/Vevay
-right/America/Indiana/Vincennes
-right/America/Indiana/Winamac
-right/America/Indianapolis
-right/America/Inuvik
-right/America/Iqaluit
-right/America/Jamaica
-right/America/Jujuy
-right/America/Juneau
-right/America/Kentucky/Louisville
-right/America/Kentucky/Monticello
-right/America/Knox_IN
-right/America/Kralendijk
-right/America/La_Paz
-right/America/Lima
-right/America/Los_Angeles
-right/America/Louisville
-right/America/Lower_Princes
-right/America/Maceio
-right/America/Managua
-right/America/Manaus
-right/America/Marigot
-right/America/Martinique
-right/America/Matamoros
-right/America/Mazatlan
-right/America/Mendoza
-right/America/Menominee
-right/America/Merida
-right/America/Metlakatla
-right/America/Mexico_City
-right/America/Miquelon
-right/America/Moncton
-right/America/Monterrey
-right/America/Montevideo
-right/America/Montreal
-right/America/Montserrat
-right/America/Nassau
-right/America/New_York
-right/America/Nipigon
-right/America/Nome
-right/America/Noronha
-right/America/North_Dakota/Beulah
-right/America/North_Dakota/Center
-right/America/North_Dakota/New_Salem
-right/America/Ojinaga
-right/America/Panama
-right/America/Pangnirtung
-right/America/Paramaribo
-right/America/Phoenix
-right/America/Port-au-Prince
-right/America/Port_of_Spain
-right/America/Porto_Acre
-right/America/Porto_Velho
-right/America/Puerto_Rico
-right/America/Rainy_River
-right/America/Rankin_Inlet
-right/America/Recife
-right/America/Regina
-right/America/Resolute
-right/America/Rio_Branco
-right/America/Rosario
-right/America/Santa_Isabel
-right/America/Santarem
-right/America/Santiago
-right/America/Santo_Domingo
-right/America/Sao_Paulo
-right/America/Scoresbysund
-right/America/Shiprock
-right/America/Sitka
-right/America/St_Barthelemy
-right/America/St_Johns
-right/America/St_Kitts
-right/America/St_Lucia
-right/America/St_Thomas
-right/America/St_Vincent
-right/America/Swift_Current
-right/America/Tegucigalpa
-right/America/Thule
-right/America/Thunder_Bay
-right/America/Tijuana
-right/America/Toronto
-right/America/Tortola
-right/America/Vancouver
-right/America/Virgin
-right/America/Whitehorse
-right/America/Winnipeg
-right/America/Yakutat
-right/America/Yellowknife
-right/Antarctica/Casey
-right/Antarctica/Davis
-right/Antarctica/DumontDUrville
-right/Antarctica/Macquarie
-right/Antarctica/Mawson
-right/Antarctica/McMurdo
-right/Antarctica/Palmer
-right/Antarctica/Rothera
-right/Antarctica/South_Pole
-right/Antarctica/Syowa
-right/Antarctica/Troll
-right/Antarctica/Vostok
-right/Arctic/Longyearbyen
-right/Asia/Aden
-right/Asia/Almaty
-right/Asia/Amman
-right/Asia/Anadyr
-right/Asia/Aqtau
-right/Asia/Aqtobe
-right/Asia/Ashgabat
-right/Asia/Ashkhabad
-right/Asia/Baghdad
-right/Asia/Bahrain
-right/Asia/Baku
-right/Asia/Bangkok
-right/Asia/Beirut
-right/Asia/Bishkek
-right/Asia/Brunei
-right/Asia/Calcutta
-right/Asia/Chita
-right/Asia/Choibalsan
-right/Asia/Chongqing
-right/Asia/Chungking
-right/Asia/Colombo
-right/Asia/Dacca
-right/Asia/Damascus
-right/Asia/Dhaka
-right/Asia/Dili
-right/Asia/Dubai
-right/Asia/Dushanbe
-right/Asia/Gaza
-right/Asia/Harbin
-right/Asia/Hebron
-right/Asia/Ho_Chi_Minh
-right/Asia/Hong_Kong
-right/Asia/Hovd
-right/Asia/Irkutsk
-right/Asia/Istanbul
-right/Asia/Jakarta
-right/Asia/Jayapura
-right/Asia/Jerusalem
-right/Asia/Kabul
-right/Asia/Kamchatka
-right/Asia/Karachi
-right/Asia/Kashgar
-right/Asia/Kathmandu
-right/Asia/Katmandu
-right/Asia/Khandyga
-right/Asia/Kolkata
-right/Asia/Krasnoyarsk
-right/Asia/Kuala_Lumpur
-right/Asia/Kuching
-right/Asia/Kuwait
-right/Asia/Macao
-right/Asia/Macau
-right/Asia/Magadan
-right/Asia/Makassar
-right/Asia/Manila
-right/Asia/Muscat
-right/Asia/Nicosia
-right/Asia/Novokuznetsk
-right/Asia/Novosibirsk
-right/Asia/Omsk
-right/Asia/Oral
-right/Asia/Phnom_Penh
-right/Asia/Pontianak
-right/Asia/Pyongyang
-right/Asia/Qatar
-right/Asia/Qyzylorda
-right/Asia/Rangoon
-right/Asia/Riyadh
-right/Asia/Saigon
-right/Asia/Sakhalin
-right/Asia/Samarkand
-right/Asia/Seoul
-right/Asia/Shanghai
-right/Asia/Singapore
-right/Asia/Srednekolymsk
-right/Asia/Taipei
-right/Asia/Tashkent
-right/Asia/Tbilisi
-right/Asia/Tehran
-right/Asia/Tel_Aviv
-right/Asia/Thimbu
-right/Asia/Thimphu
-right/Asia/Tokyo
-right/Asia/Ujung_Pandang
-right/Asia/Ulaanbaatar
-right/Asia/Ulan_Bator
-right/Asia/Urumqi
-right/Asia/Ust-Nera
-right/Asia/Vientiane
-right/Asia/Vladivostok
-right/Asia/Yakutsk
-right/Asia/Yekaterinburg
-right/Asia/Yerevan
-right/Atlantic/Azores
-right/Atlantic/Bermuda
-right/Atlantic/Canary
-right/Atlantic/Cape_Verde
-right/Atlantic/Faeroe
-right/Atlantic/Faroe
-right/Atlantic/Jan_Mayen
-right/Atlantic/Madeira
-right/Atlantic/Reykjavik
-right/Atlantic/South_Georgia
-right/Atlantic/St_Helena
-right/Atlantic/Stanley
-right/Australia/ACT
-right/Australia/Adelaide
-right/Australia/Brisbane
-right/Australia/Broken_Hill
-right/Australia/Canberra
-right/Australia/Currie
-right/Australia/Darwin
-right/Australia/Eucla
-right/Australia/Hobart
-right/Australia/LHI
-right/Australia/Lindeman
-right/Australia/Lord_Howe
-right/Australia/Melbourne
-right/Australia/NSW
-right/Australia/North
-right/Australia/Perth
-right/Australia/Queensland
-right/Australia/South
-right/Australia/Sydney
-right/Australia/Tasmania
-right/Australia/Victoria
-right/Australia/West
-right/Australia/Yancowinna
-right/Brazil/Acre
-right/Brazil/DeNoronha
-right/Brazil/East
-right/Brazil/West
-right/CET
-right/CST6CDT
-right/Canada/Atlantic
-right/Canada/Central
-right/Canada/East-Saskatchewan
-right/Canada/Eastern
-right/Canada/Mountain
-right/Canada/Newfoundland
-right/Canada/Pacific
-right/Canada/Saskatchewan
-right/Canada/Yukon
-right/Chile/Continental
-right/Chile/EasterIsland
-right/Cuba
-right/EET
-right/EST
-right/EST5EDT
-right/Egypt
-right/Eire
-right/Etc/GMT
-right/Etc/GMT+0
-right/Etc/GMT+1
-right/Etc/GMT+10
-right/Etc/GMT+11
-right/Etc/GMT+12
-right/Etc/GMT+2
-right/Etc/GMT+3
-right/Etc/GMT+4
-right/Etc/GMT+5
-right/Etc/GMT+6
-right/Etc/GMT+7
-right/Etc/GMT+8
-right/Etc/GMT+9
-right/Etc/GMT-0
-right/Etc/GMT-1
-right/Etc/GMT-10
-right/Etc/GMT-11
-right/Etc/GMT-12
-right/Etc/GMT-13
-right/Etc/GMT-14
-right/Etc/GMT-2
-right/Etc/GMT-3
-right/Etc/GMT-4
-right/Etc/GMT-5
-right/Etc/GMT-6
-right/Etc/GMT-7
-right/Etc/GMT-8
-right/Etc/GMT-9
-right/Etc/GMT0
-right/Etc/Greenwich
-right/Etc/UCT
-right/Etc/UTC
-right/Etc/Universal
-right/Etc/Zulu
-right/Europe/Amsterdam
-right/Europe/Andorra
-right/Europe/Athens
-right/Europe/Belfast
-right/Europe/Belgrade
-right/Europe/Berlin
-right/Europe/Bratislava
-right/Europe/Brussels
-right/Europe/Bucharest
-right/Europe/Budapest
-right/Europe/Busingen
-right/Europe/Chisinau
-right/Europe/Copenhagen
-right/Europe/Dublin
-right/Europe/Gibraltar
-right/Europe/Guernsey
-right/Europe/Helsinki
-right/Europe/Isle_of_Man
-right/Europe/Istanbul
-right/Europe/Jersey
-right/Europe/Kaliningrad
-right/Europe/Kiev
-right/Europe/Lisbon
-right/Europe/Ljubljana
-right/Europe/London
-right/Europe/Luxembourg
-right/Europe/Madrid
-right/Europe/Malta
-right/Europe/Mariehamn
-right/Europe/Minsk
-right/Europe/Monaco
-right/Europe/Moscow
-right/Europe/Nicosia
-right/Europe/Oslo
-right/Europe/Paris
-right/Europe/Podgorica
-right/Europe/Prague
-right/Europe/Riga
-right/Europe/Rome
-right/Europe/Samara
-right/Europe/San_Marino
-right/Europe/Sarajevo
-right/Europe/Simferopol
-right/Europe/Skopje
-right/Europe/Sofia
-right/Europe/Stockholm
-right/Europe/Tallinn
-right/Europe/Tirane
-right/Europe/Tiraspol
-right/Europe/Uzhgorod
-right/Europe/Vaduz
-right/Europe/Vatican
-right/Europe/Vienna
-right/Europe/Vilnius
-right/Europe/Volgograd
-right/Europe/Warsaw
-right/Europe/Zagreb
-right/Europe/Zaporozhye
-right/Europe/Zurich
-right/Factory
-right/GB
-right/GB-Eire
-right/GMT
-right/GMT+0
-right/GMT-0
-right/GMT0
-right/Greenwich
-right/HST
-right/Hongkong
-right/Iceland
-right/Indian/Antananarivo
-right/Indian/Chagos
-right/Indian/Christmas
-right/Indian/Cocos
-right/Indian/Comoro
-right/Indian/Kerguelen
-right/Indian/Mahe
-right/Indian/Maldives
-right/Indian/Mauritius
-right/Indian/Mayotte
-right/Indian/Reunion
-right/Iran
-right/Israel
-right/Jamaica
-right/Japan
-right/Kwajalein
-right/Libya
-right/MET
-right/MST
-right/MST7MDT
-right/Mexico/BajaNorte
-right/Mexico/BajaSur
-right/Mexico/General
-right/NZ
-right/NZ-CHAT
-right/Navajo
-right/PRC
-right/PST8PDT
-right/Pacific/Apia
-right/Pacific/Auckland
-right/Pacific/Bougainville
-right/Pacific/Chatham
-right/Pacific/Chuuk
-right/Pacific/Easter
-right/Pacific/Efate
-right/Pacific/Enderbury
-right/Pacific/Fakaofo
-right/Pacific/Fiji
-right/Pacific/Funafuti
-right/Pacific/Galapagos
-right/Pacific/Gambier
-right/Pacific/Guadalcanal
-right/Pacific/Guam
-right/Pacific/Honolulu
-right/Pacific/Johnston
-right/Pacific/Kiritimati
-right/Pacific/Kosrae
-right/Pacific/Kwajalein
-right/Pacific/Majuro
-right/Pacific/Marquesas
-right/Pacific/Midway
-right/Pacific/Nauru
-right/Pacific/Niue
-right/Pacific/Norfolk
-right/Pacific/Noumea
-right/Pacific/Pago_Pago
-right/Pacific/Palau
-right/Pacific/Pitcairn
-right/Pacific/Pohnpei
-right/Pacific/Ponape
-right/Pacific/Port_Moresby
-right/Pacific/Rarotonga
-right/Pacific/Saipan
-right/Pacific/Samoa
-right/Pacific/Tahiti
-right/Pacific/Tarawa
-right/Pacific/Tongatapu
-right/Pacific/Truk
-right/Pacific/Wake
-right/Pacific/Wallis
-right/Pacific/Yap
-right/Poland
-right/Portugal
-right/ROC
-right/ROK
-right/Singapore
-right/Turkey
-right/UCT
-right/US/Alaska
-right/US/Aleutian
-right/US/Arizona
-right/US/Central
-right/US/East-Indiana
-right/US/Eastern
-right/US/Hawaii
-right/US/Indiana-Starke
-right/US/Michigan
-right/US/Mountain
-right/US/Pacific
-right/US/Pacific-New
-right/US/Samoa
-right/UTC
-right/Universal
-right/W-SU
-right/WET
-right/Zulu
-
-Type it at the prompt below exactly as it appears above.  (NOTE: If you don't
-see your timezone, use "timeconfig" again after booting for the verbose list)
-
-EOF
-      echo -n "Timezone? "
-      read TIMEZONE;
-      echo
-
-      if [ -r $T_PX/usr/share/zoneinfo/$TIMEZONE -o \
-           -r /var/log/mount/usr/share/zoneinfo/$TIMEZONE -o \
-           -L $T_PX/usr/share/zoneinfo/$TIMEZONE -o \
-           -L /var/log/mount/usr/share/zoneinfo/$TIMEZONE ]; then
-         echo "Creating link from $TIMEZONE to localtime in /etc..."
-         echo
-         setzone $TIMEZONE
-         exit
-      else
-         cat << EOF
-
-Timezone $TIMEZONE could not be found. You may try again if you wish. 
-Make sure you type the name exactly as it appears - this configuration script
-is case sensitive.
-
-Press [enter] to continue.
-
-EOF
-         read JUNK;
-      fi
-   done
-fi
-
Index: npl/system/gmp/gmp.SlackBuild
===================================================================
--- npl/system/gmp/gmp.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,127 +1,13 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/l/gmp/
+# Created at Mon Jan 30 23:49:35 CET 2017
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-VERSION=${VERSION:-$(echo gmp-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=/$TMP/package-gmp
-rm -rf $PKG
-mkdir -p $TMP $PKG/usr
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-cd $TMP
-rm -rf gmp-$VERSION
-tar xvf $CWD/gmp-$VERSION.tar.xz || exit 1
-cd gmp-$VERSION
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-# End of preparations
-if echo "$*" | grep -qw -- --prep ; then
-  exit 0
-fi
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --infodir=/usr/info \
-  --with-gnu-ld \
-  --enable-cxx \
-  --build=$TARGET
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-rm $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/gmp-$VERSION
-cp -a \
-  AUTHORS COPYING* NEWS README \
-  $PKG/usr/doc/gmp-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd /$TMP/package-gmp
-/sbin/makepkg -l y -c n $TMP/gmp-$VERSION-$ARCH-$BUILD.txz
-
-############ syn3 patches
-
-ln -s libgmp.so.10 /tmp/package-gmp/usr/lib/libgmp.so.3 || exit 1
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./gmp.SlackBuild.orig
 
 
@@ -129,5 +15,5 @@
 cd $CWD
 for PKG in /tmp/package-*; do
-        NAME=`echo $PKG| sed 's/.*-//'`
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
 
         #seperate dev-package
Index: npl/system/gmp/gmp.SlackBuild.orig
===================================================================
--- npl/system/gmp/gmp.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/gmp/gmp.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+VERSION=${VERSION:-$(echo gmp-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i586 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=/$TMP/package-gmp
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+cd $TMP
+rm -rf gmp-$VERSION
+tar xvf $CWD/gmp-$VERSION.tar.xz || exit 1
+cd gmp-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# End of preparations
+if echo "$*" | grep -qw -- --prep ; then
+  exit 0
+fi
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
+  --with-gnu-ld \
+  --enable-cxx \
+  --disable-static \
+  --build=$TARGET || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+rm $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/usr/doc/gmp-$VERSION
+cp -a \
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/gmp-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd /$TMP/package-gmp
+/sbin/makepkg -l y -c n $TMP/gmp-$VERSION-$ARCH-$BUILD.txz
+
Index: npl/system/gmp/gmp.arch
===================================================================
--- npl/system/gmp/gmp.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gmp/gmp.build
===================================================================
--- npl/system/gmp/gmp.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+3
Index: npl/system/gmp/gmp.md5
===================================================================
--- npl/system/gmp/gmp.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,7 +1,8 @@
-e5fe367801ff067b923d1e6a126448aa  ./gmp-5.1.3.tar.xz
-12ff8573e9796edf018ee736052c2da7  ./gmp-5.1.3.tar.xz.sig
-73588836b821e3ab4509c4994635fc88  ./gmp_dev.pkg
-d3929c9b7130591e0d06a50158f94ff0  ./gmp.pkg
-9306b7337fa580178fbcfb4ca59ed3b1  ./gmp.SlackBuild
-e1e82ae9104750e43949401e8c7cb7ac  ./gmp.SlackBuild.log.gz
+e70e183609244a332d80529e7e155a35  ./gmp-6.1.1.tar.xz
+4eadadd7c87688a9c4c246d69dbf1393  ./gmp-6.1.1.tar.xz.sig
+aa3cb1017fcf259292459c35bdffa027  ./gmp_dev.pkg
+2ad8b70219b57b7bb011deb50c455881  ./gmp.pkg
+edb6e9edc7e216e24292bbe47aaaf822  ./gmp.SlackBuild
+16c1610e0fe90bd6588e831675e6c48a  ./gmp.SlackBuild.log.gz
+9d82cd92a8adbf9837c4b1199be649da  ./gmp.SlackBuild.orig
 53f2b77b2f2632bc8166912ee2891aa9  ./slack-desc
Index: npl/system/gmp/gmp.version
===================================================================
--- npl/system/gmp/gmp.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-5.1.3
+6.1.1
Index: npl/system/gmp/gmp_dev.arch
===================================================================
--- npl/system/gmp/gmp_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/gmp/gmp_dev.build
===================================================================
--- npl/system/gmp/gmp_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+3
Index: npl/system/gmp/gmp_dev.version
===================================================================
--- npl/system/gmp/gmp_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/gmp/gmp_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-5.1.3
+6.1.1
Index: npl/system/libmpc/libmpc.SlackBuild
===================================================================
--- npl/system/libmpc/libmpc.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/libmpc/libmpc.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,115 +1,14 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/l/libmpc/
+# Created at Tue Jan 31 00:15:39 CET 2017
+#DEP:mpfr
+#DEP:gmp
 
-#DEP:gmp
-#DEP:mpfr
-
-# Copyright 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# I really do not like to package source under a different name than upstream,
-# but in this case there is a media player frontend that is well-known as
-# mpc already, and it appears that other projects are packaging this mpc as
-# libmpc instead.  It is probably best to follow suit.
-SRCNAM=mpc
-PKGNAM=libmpc
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$SRCNAM
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
-cd $SRCNAM-$VERSION
-chown -R root:root .
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --enable-static=yes \
-  --enable-shared=yes \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Hardly a savings doing this...
-#strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* INSTALL NEWS README* TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-${VERSION}-${ARCH}-${BUILD}.txz
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./libmpc.SlackBuild.orig
 
 
@@ -117,5 +16,5 @@
 cd $CWD
 for PKG in /tmp/package-*; do
-        NAME=`echo $PKG| sed 's/.*-//'`
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
 
         #seperate dev-package
Index: npl/system/libmpc/libmpc.SlackBuild.orig
===================================================================
--- npl/system/libmpc/libmpc.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/libmpc/libmpc.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Copyright 2010, 2011, 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# I really do not like to package source under a different name than upstream,
+# but in this case there is a media player frontend that is well-known as
+# mpc already, and it appears that other projects are packaging this mpc as
+# libmpc instead.  It is probably best to follow suit.
+SRCNAM=mpc
+PKGNAM=libmpc
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$SRCNAM
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION
+chown -R root:root .
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-static=yes \
+  --enable-shared=yes \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Hardly a savings doing this...
+#strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-${VERSION}-${ARCH}-${BUILD}.txz
+
Index: npl/system/libmpc/libmpc.depver
===================================================================
--- npl/system/libmpc/libmpc.depver	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/libmpc/libmpc.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,2 +1,2 @@
+mpfr	0
 gmp	0
-mpfr	0
Index: npl/system/libmpc/libmpc.md5
===================================================================
--- npl/system/libmpc/libmpc.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/libmpc/libmpc.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,6 +1,7 @@
-f6ade98e3f8072dff8681b666bdbef13  ./libmpc.SlackBuild
-403f98c0def39514d988b183d1d17618  ./libmpc.SlackBuild.log.gz
-f25be2b48f36f1b3be00c62a76d7d5cb  ./mpc-0.8.2.tar.xz
-9c38f9706e62e78ca2857060c9464ff0  ./mpc_dev.pkg
-78b980e6daeac6f1a0c737809efb6d57  ./mpc.pkg
+f3a7c89d5261ebf7d2a9af57be58178d  ./libmpc.SlackBuild
+fd5791546cc253f2746778faf1eda437  ./libmpc.SlackBuild.log.gz
+27a3e0eda02994e05de2e7d8881631e3  ./libmpc.SlackBuild.orig
+e28ed77068ef2b88a3aa4ec71e5e2b82  ./mpc-1.0.3.tar.xz
+5577204bc4358c7bdefe9f187f9c5808  ./mpc_dev.pkg
+a39d6ca8f49cae36acd11cc6b117bab1  ./mpc.pkg
 92c54c1101b09c2f940ea786ed570463  ./slack-desc
Index: npl/system/libmpc/mpc.build
===================================================================
--- npl/system/libmpc/mpc.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/libmpc/mpc.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+2
Index: npl/system/libmpc/mpc.version
===================================================================
--- npl/system/libmpc/mpc.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/libmpc/mpc.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-0.8.2
+1.0.3
Index: npl/system/libmpc/mpc_dev.build
===================================================================
--- npl/system/libmpc/mpc_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/libmpc/mpc_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+2
Index: npl/system/libmpc/mpc_dev.version
===================================================================
--- npl/system/libmpc/mpc_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/libmpc/mpc_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-0.8.2
+1.0.3
Index: npl/system/libmpfr/libmpfr.SlackBuild
===================================================================
--- npl/system/libmpfr/libmpfr.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,73 +1,0 @@
-#!/bin/bash
-#Gebruik deze file als voorbeeld. Plaats de source tar.gz file in de zelfde directory als deze slackbuild
-#Met de NEED en DEP opties is het mogelijk om build dependencies aan te geven.
-#Voor de meeste packages hoeft er verder niks aan de variabellen veranderd te worden.
-##################################### Build dependency info:
-
-#Strict build-dependencies. 
-#Only use when really neccesary, this will rebuild our package if the dependencie has changed:
-##DEP:linux
-##DEP:linux_src
-
-#Loose build-dependencies.
-#Use this to specify the packages that are required to build our package:
-##NEED:libcairo
-##NEED:glib
-##NEED:gtk+
-##NEED:glib2
-##NEED:gtk+2
-##NEED:xorg_lib
-##NEED:xorg_proto
-
-#######Essential package info.
-#Change these if autodetection fails.
-
-#Name of the Syn-3 package that we are going to create
-NAME=`basename $0|sed 's/.SlackBuild//'`
-
-#Archive of the sourcefiles to unpack 
-SRC_ARC=`ls *.tar.*`
-
-#Version of the sourcefiles
-VER=`echo $SRC_ARC| sed 's/.*-//g' | sed 's/\.tar\..*$//g'`
-
-#Directory of the sourcefiles to build (after optional unpacking)
-SRC_DIR=`echo $SRC_ARC| sed 's/\.tar\..*$//g'`
-
-#Architecture that the created binaries run on.
-#Use noarch for scripts.
-ARCH=`arch`
-
-
-########Build and create the pacakge.
-#Uncomment the stuff that you dont want or need
-
-#Unpack source 
-#(uncomment if not needed)
-syn3_unpack $SRC_ARC || exit 1
-
-#apply patches
-#patch -p1 -d $SRC_DIR < fluxkiosk.patch || exit 1
-
-#build and install sourcefiles
-#./configure optiones:
-export CONFIGURE_OPTS=""
-#options for all make commands:
-export MAKE_OPTS=""
-#skip testing:
-#export NOTEST=1
-#extra optiones for the make install command, use with INSTALL_BASE for example:
-export INSTALL_OPTS=""
-syn3_build_automake $SRC_DIR /tmp/pkg || exit 1
-
-#strip bins and other stuff
-syn3_strip /tmp/pkg || exit 1
-
-#move development stuff and create seperate development package
-syn3_move_dev /tmp/pkg /tmp/pkgdev || exit 1
-syn3_makepkg /tmp/pkgdev $NAME""_dev $VER $ARCH || exit 1
-
-#make main package
-syn3_makepkg /tmp/pkg $NAME $VER $ARCH || exit 1
-
-
Index: npl/system/libmpfr/libmpfr.arch
===================================================================
--- npl/system/libmpfr/libmpfr.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-i586
Index: npl/system/libmpfr/libmpfr.build
===================================================================
--- npl/system/libmpfr/libmpfr.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-3684
Index: npl/system/libmpfr/libmpfr.md5
===================================================================
--- npl/system/libmpfr/libmpfr.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,4 +1,0 @@
-21110c3cb7d175f8f3c1382453d71717  ./libmpfr.SlackBuild
-6db4358b0f69ef7a6da06b8e84303a7e  ./libmpfr.pkg
-1caf5548c2ee11575bd712da2ce224b7  ./libmpfr_dev.pkg
-cf7c743e4be122e63eb6f372fc58b657  ./mpfr-2.3.0.tar.bz2
Index: npl/system/libmpfr/libmpfr.version
===================================================================
--- npl/system/libmpfr/libmpfr.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-2.3.0
Index: npl/system/libmpfr/libmpfr_dev.arch
===================================================================
--- npl/system/libmpfr/libmpfr_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-i586
Index: npl/system/libmpfr/libmpfr_dev.build
===================================================================
--- npl/system/libmpfr/libmpfr_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-3684
Index: npl/system/libmpfr/libmpfr_dev.version
===================================================================
--- npl/system/libmpfr/libmpfr_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ 	(revision )
@@ -1,1 +1,0 @@
-2.3.0
Index: npl/system/mpfr/mpfr.SlackBuild
===================================================================
--- npl/system/mpfr/mpfr.SlackBuild	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr.SlackBuild	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,139 +1,13 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/l/mpfr/
+# Created at Tue Jan 31 00:10:47 CET 2017
+#DEP:gmp
 
-# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-PKGNAM=mpfr
-VERSION=${VERSION:-$(echo mpfr-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-mpfr
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-# Determine patchlevel:
-PATCHLEVEL=$(/bin/ls $CWD/patches/* 2> /dev/null | rev | cut -f 1 -d / | cut -b4- | rev | cut -b6- | tail -n 1 )
-if [ ! "$PATCHLEVEL" = "" ]; then
-  PATCHLEVEL="p${PATCHLEVEL}"
-fi
-
-cd $TMP
-rm -rf mpfr-$VERSION
-tar xvf $CWD/mpfr-$VERSION.tar.xz || exit 1
-cd mpfr-$VERSION
-chown -R root:root .
-
-if [ ! -z "$(ls $CWD/patches/* 2> /dev/null)" ]; then
-  for file in $CWD/patches/* ; do
-    ( zcat $file 2> /dev/null | patch -p1 --verbose --batch 2> /dev/null || exit 1 )
-    if [ ! $? = 0 ]; then
-      exit 1
-    fi
-  done
-fi
-
-# End of preparations
-if echo "$*" | grep -qw -- --prep ; then
-  exit 0
-fi
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/mpfr-$VERSION \
-  --enable-static=yes \
-  --enable-shared=yes \
-  --build=$TARGET
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Hardly a savings doing this...
-#strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
-mkdir -p $PKG/usr/doc/mpfr-$VERSION
-cp -a \
-  AUTHORS BUGS COPYING* FAQ.html INSTALL NEWS README* TODO VERSION \
-  examples \
-  $PKG/usr/doc/mpfr-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/mpfr-${VERSION}${PATCHLEVEL}-${ARCH}-${BUILD}.txz
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./mpfr.SlackBuild.orig
 
 
@@ -141,5 +15,5 @@
 cd $CWD
 for PKG in /tmp/package-*; do
-        NAME=`echo $PKG| sed 's/.*-//'`
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
 
         #seperate dev-package
Index: npl/system/mpfr/mpfr.SlackBuild.orig
===================================================================
--- npl/system/mpfr/mpfr.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/mpfr/mpfr.SlackBuild.orig	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port.
+
+PKGNAM=mpfr
+VERSION=${VERSION:-$(echo mpfr-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i586 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
+  esac
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mpfr
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+# Determine patchlevel:
+PATCHLEVEL=$(/bin/ls $CWD/patches/* 2> /dev/null | rev | cut -f 1 -d / | cut -b4- | rev | cut -b6- | tail -n 1 )
+if [ ! "$PATCHLEVEL" = "" ]; then
+  PATCHLEVEL="p${PATCHLEVEL}"
+fi
+
+cd $TMP
+rm -rf mpfr-$VERSION
+tar xvf $CWD/mpfr-$VERSION.tar.xz || exit 1
+cd mpfr-$VERSION
+chown -R root:root .
+
+if [ ! -z "$(ls $CWD/patches/* 2> /dev/null)" ]; then
+  for file in $CWD/patches/* ; do
+    ( zcat $file 2> /dev/null | patch -p1 --verbose --batch 2> /dev/null || exit 1 )
+    if [ ! $? = 0 ]; then
+      exit 1
+    fi
+  done
+fi
+
+# End of preparations
+if echo "$*" | grep -qw -- --prep ; then
+  exit 0
+fi
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/mpfr-$VERSION \
+  --enable-static=yes \
+  --enable-shared=yes \
+  --build=$TARGET
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Hardly a savings doing this...
+#strip -g $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+mkdir -p $PKG/usr/doc/mpfr-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING* INSTALL NEWS README* TODO VERSION \
+  examples \
+  $PKG/usr/doc/mpfr-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/mpfr-${VERSION}${PATCHLEVEL}-${ARCH}-${BUILD}.txz
+
Index: npl/system/mpfr/mpfr.arch
===================================================================
--- npl/system/mpfr/mpfr.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/mpfr/mpfr.build
===================================================================
--- npl/system/mpfr/mpfr.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+2
Index: npl/system/mpfr/mpfr.depver
===================================================================
--- npl/system/mpfr/mpfr.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
+++ npl/system/mpfr/mpfr.depver	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -0,0 +1,1 @@
+gmp	0
Index: npl/system/mpfr/mpfr.md5
===================================================================
--- npl/system/mpfr/mpfr.md5	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr.md5	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,7 +1,8 @@
-e3d203d188b8fe60bb6578dd3152e05c  ./mpfr-3.1.2.tar.xz
-20602a01e54286a63e8a1491240559b1  ./mpfr-3.1.2.tar.xz.sig
-4f8908a6099b832b0f1d5b221e428eed  ./mpfr_dev.pkg
-e80c038325a46255e628e5a684dac86a  ./mpfr.pkg
-b05ef06dd64934324c6aa225c6b394db  ./mpfr.SlackBuild
-7a0f36ad73f48a6b2f1314a782df308d  ./mpfr.SlackBuild.log.gz
+c4ac246cf9795a4491e7766002cd528f  ./mpfr-3.1.5.tar.xz
+5b43a30cf6509ea6b340b21a1d36cb7a  ./mpfr-3.1.5.tar.xz.sig
+6ea807e7aacf96c09ceeb6896393d4c0  ./mpfr_dev.pkg
+e32ebc269246105fcb90a7b1e5cb1a1c  ./mpfr.pkg
+5ba2929ca0da4f15852f7111991d9f70  ./mpfr.SlackBuild
+0d3d2e577b4eca96f4d80ed23b7b290f  ./mpfr.SlackBuild.log.gz
+5c4107dceae46006be0d465312bccf70  ./mpfr.SlackBuild.orig
 9b4ea54625eff3cbce0840af75eaf5de  ./slack-desc
Index: npl/system/mpfr/mpfr.version
===================================================================
--- npl/system/mpfr/mpfr.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-3.1.2
+3.1.5
Index: npl/system/mpfr/mpfr_dev.arch
===================================================================
--- npl/system/mpfr/mpfr_dev.arch	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr_dev.arch	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-i486
+i586
Index: npl/system/mpfr/mpfr_dev.build
===================================================================
--- npl/system/mpfr/mpfr_dev.build	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr_dev.build	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-6130
+2
Index: npl/system/mpfr/mpfr_dev.version
===================================================================
--- npl/system/mpfr/mpfr_dev.version	(revision 90f43e52628c9bbe952fdbbbe4183772a6675fb2)
+++ npl/system/mpfr/mpfr_dev.version	(revision 031ab693def62c4aaf3e6440e1655c4fe368b6c4)
@@ -1,1 +1,1 @@
-3.1.2
+3.1.5
