Update to binkd 114 and new husky build with updates

Dockerfile

@@ -23,42 +23,42 @@ RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/stretch stretch
 
 # Leenooks Utils
 RUN apt-get update \
-	&& apt-get install -y binkd=1.1a-112 makenl goldedplus qico zerotier-one \
+	&& apt-get install -y binkd=1.1a-114 makenl goldedplus qico zerotier-one \
 	&& mv /etc/binkd /etc/binkd.orig \
 	&& mv /etc/qico /etc/qico.orig \
 	&& apt-get -y autoremove \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Create Husky User
+RUN useradd -g users -M husky
+
 RUN apt-get update \
-	&& apt-get install -yqq git make gcc zlib1g-dev libperl-dev libbz2-dev ncurses-dev automake flex bison \
+	&& apt-get install -yqq git make gcc zlib1g-dev libperl-dev libbz2-dev ncurses-dev automake flex bison libtest-simple-perl libmodule-build-perl texinfo g++\
-	&& cd /tmp && git clone https://github.com/huskyproject/huskybse.git \
+	&& cd /tmp && mkdir husky\
-	&& cd huskybse \
+	&& cd husky \
-	&& sed -e 's#CFGDIR=$(PREFIX)/etc/fido#CFGDIR=/etc/ftn#' -i huskymak.cfg \
+	&& git clone https://github.com/huskyproject/huskybse.git \
-	&& sed -e 's#PERL=0#PERL=1#' -i huskymak.cfg \
-	&& sed -e 's#USE_HPTZIP=0#USE_HPTZIP=1#' -i huskymak.cfg \
 	&& git clone https://github.com/huskyproject/huskylib.git \
-	&& cd huskylib && make install && cd .. \
 	&& git clone https://github.com/huskyproject/smapi.git \
-	&& cd smapi && make install && cd .. \
 	&& git clone https://github.com/huskyproject/fidoconf.git \
-	&& cd fidoconf && make && make install && cd .. \
 	&& git clone https://github.com/huskyproject/areafix.git \
-	&& cd areafix && make install && cd .. \
 	&& git clone https://github.com/huskyproject/hptzip.git \
-	&& cd hptzip && make install && cd .. \
 	&& git clone https://github.com/huskyproject/hpt.git \
-	&& cd hpt && make install && cd .. \
-	&& cp -Ra hpt/misc /usr/local/include/hpt \
 	&& git clone https://github.com/huskyproject/htick.git \
-	&& cd htick && make install && cd .. \
-	&& cp -Ra htick/misc /usr/local/include/htick \
 	&& git clone https://github.com/huskyproject/nltools.git \
-	&& cd nltools && make install && cd .. \
 	&& git clone https://github.com/huskyproject/hptkill.git \
-	&& cd hptkill && make install && cd .. \
 	&& git clone https://github.com/huskyproject/areastat.git \
-	&& cd areastat && echo 'ZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKaW5kZXggYzA1NTBiNC4uYTQwMWIwZCAx\
+	&& git clone https://github.com/huskyproject/hptutil.git \
+	&& git clone https://github.com/huskyproject/fidostat.git \
+	&& git clone https://github.com/huskyproject/msged.git \
+	&& git clone https://github.com/huskyproject/fidoroute.git \
+	&& chown -R husky:users /tmp/husky \
+	&& cd huskybse && sed -e 's#CFGDIR=~/fido/etc/husky#CFGDIR=/etc/ftn#' -i huskymak.cfg \
+	&& sed -e 's#PERL=0#PERL=1#' -i huskymak.cfg \
+	&& sed -e 's#HTML=1#HTML=0#' -i huskymak.cfg \
+	&& sed -e 's#CODEPAGE=KOI8-R#CODEPAGE=CP437#' -i huskymak.cfg \
+	&& sed -e 's#USE_HPTZIP=0#USE_HPTZIP=1#' -i huskymak.cfg \
+	&& cd ../areastat && echo 'ZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKaW5kZXggYzA1NTBiNC4uYTQwMWIwZCAx\
 MDA2NDQKLS0tIGEvTWFrZWZpbGUKKysrIGIvTWFrZWZpbGUKQEAgLTYwLDggKzYwLDggQEAgYWxs\
 OiBhcmVhc3RhdCBtYW4KIGluc3RhbGw6IGFsbAogCSQoSU5TVEFMTCkgJChJQk9QVCkgYXJlYXN0\
 YXQgJChCSU5ESVIpCiBpZmRlZiBNQU5ESVIKLQktJChNS0RJUikgJChNS0RJUk9QVCkgJChNQU5E\
@@ -67,25 +67,25 @@ VCkgJCRtLmd6ICQoTUFORElSKSQoRElSU0VQKW1hbmBlY2hvICQkbSB8IHNlZCBzLy4qXFwuLy9g\
 LzsgZG9uZQorCS0kKE1LRElSKSAkKE1LRElST1BUKSAkKE1BTkRJUikkKERJUlNFUCltYW41CisJ\
 Zm9yIG0gaW4gJChNQU5TKTsgZG8gJChJTlNUQUxMKSAkKElNT1BUKSAkJG0uZ3ogJChNQU5ESVIp\
 JChESVJTRVApbWFuYGVjaG8gJCRtIHwgc2VkIHMvLipcXFxcLi8vYC87IGRvbmUKIGVuZGlmCiAK\
-IHVuaW5zdGFsbDoK'|base64 -d|git apply \
+IHVuaW5zdGFsbDoK'|base64 -d|git apply && cd .. \
-	&& make install && cd .. \
+	&& cd /tmp/husky\
-	&& git clone https://github.com/huskyproject/hptutil.git \
+	&& cp -f -p huskybse/Makefile Makefile \
-	&& cd hptutil && make install && cd .. \
+	&& cp -f -p huskybse/huskymak.cfg huskymak.cfg \
-	&& git clone https://github.com/huskyproject/fidostat.git \
+	&& cp -f -p huskybse/script/build.sh build.sh \
-	&& cd fidostat && make && make install && cd .. \
+	&& su - husky -c "BINDIR=foo sh -x ./build.sh" \
-	&& cd /tmp && rm -rf /tmp/huskybse \
+	&& make install \
-	&& apt-get -y purge git make gcc zlib1g-dev libperl-dev libbz2-dev ncurses-dev automake flex bison \
+	&& mkdir /usr/local/include/hpt/ /usr/local/include/htick && cp /tmp/husky/hpt/misc/areafix.hlp /usr/local/include/hpt/ \
+	&& cp /tmp/husky/htick/misc/filefix.hlp /usr/local/include/htick/ \
+	&& rm -rf /tmp/husky \
+	&& apt-get -y purge git make gcc zlib1g-dev libperl-dev libbz2-dev ncurses-dev automake flex bison libtest-simple-perl libmodule-build-perl texinfo g++\
 	&& apt-get -y autoremove \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-#	&& git clone https://github.com/huskyproject/msged.git \
+#	&& git clone https://github.com/huskyproject/emailpkt.git \
-#	&& git clone https://github.com/huskyproject/cfroute.git \ ?
+#	&& git clone https://github.com/huskyproject/cfroute.git \
-#	&& git clone https://github.com/huskyproject/lxtrack.git \ ?
+#	&& git clone https://github.com/huskyproject/bsopack.git \
-#	&& git clone https://github.com/huskyproject/bsopack.git \ ?
+#	&& git clone https://github.com/huskyproject/lxtrack.git \
-#	&& git clone https://github.com/huskyproject/emailpkt.git \ ?
 #	&& git clone https://github.com/huskyproject/mpost.git \ ?
-#	&& git clone https://github.com/huskyproject/fidoroute.git \
-#	&& git clone https://github.com/huskyproject/hptzip.git \
 
 # Other tools
 #RUN apt-get update \
@@ -97,6 +97,7 @@ IHVuaW5zdGFsbDoK'|base64 -d|git apply \
 COPY nginx/binkps.conf /etc/nginx/modules-enabled/
 COPY nginx/binkps.crt nginx/binkps.key /etc/nginx/conf.d/ssl/
 COPY xinetd.d /etc/xinetd.d/
+#COPY --chmod=644 logrotate.d /etc/logrotate.d/
 COPY logrotate.d /etc/logrotate.d/
 COPY supervisord.d /etc/supervisor/conf.d/
 COPY jamnntpd.orig/config /etc/jamnntpd.orig/

tools/showold.pl

@@ -204,6 +204,10 @@ sub listFileBoxes
 sub allFilesInBSO
 {
     my ($dir) = @_;
+
+    # Ignore dirs that are symlinks
+    return if (-l $dir);
+
     chdir($dir);
     my @files = <*.[IiCcDdFfHh][Ll][Oo]>;
     push @files, <*.[IiCcDdOoHh][Uu][Tt]>;