From 7a32a52517e8eeb4c9e6b8f3b95cdf3049f5061a Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 11 Apr 2023 22:18:20 +1000
Subject: [PATCH] Update tags patch, remove nncp

---
 ...s-404-Reserve-space-up-to-tagsBuffer.patch |  2 +-
 Dockerfile                                    | 24 +++++++++----------
 supervisord.d/nncp.conf                       |  5 ----
 3 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 supervisord.d/nncp.conf

diff --git a/0001-Feature-main-sbbs-404-Reserve-space-up-to-tagsBuffer.patch b/0001-Feature-main-sbbs-404-Reserve-space-up-to-tagsBuffer.patch
index 609a122..2ddd498 100644
--- a/0001-Feature-main-sbbs-404-Reserve-space-up-to-tagsBuffer.patch
+++ b/0001-Feature-main-sbbs-404-Reserve-space-up-to-tagsBuffer.patch
@@ -13,7 +13,7 @@ index 53b886392..29624a79a 100644
 --- a/src/smblib/smblib.c
 +++ b/src/smblib/smblib.c
 @@ -1603,6 +1603,7 @@ int smb_addmsghdr(smb_t* smb, smbmsg_t* msg, int storage)
- 	ulong	hdrlen;
+ 	uint	hdrlen;
  	off_t	idxlen;
  	size_t	idxreclen = smb_idxreclen(smb);
 +	int	tagsBuffer = 4; /* @todo this should be determined from a system configuration item */
diff --git a/Dockerfile b/Dockerfile
index 0e613cd..6eed403 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,17 +14,17 @@ RUN apt-get -o Acquire::ForceIPv4=true update \
 RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
 
 # Add NNCP
-RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
-
-RUN apt-get -o Acquire::ForceIPv4=true update \
-        && apt-get install -yyq nncp less ssmtp \
-        && mkdir /etc/nncp \
-        && apt-get -y autoremove \
-        && apt-get clean \
-        && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp
+#RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
+#
+#RUN apt-get -o Acquire::ForceIPv4=true update \
+#        && apt-get install -yyq nncp less ssmtp \
+#        && mkdir /etc/nncp \
+#        && apt-get -y autoremove \
+#        && apt-get clean \
+#        && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp
 
 # Add in Leenooks' apt repository
-RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
+#RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
 
 # Add ZeroTier
 #RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/bullseye bullseye main" > /etc/apt/sources.list.d/zerotier.list
@@ -77,14 +77,14 @@ WORKDIR /opt/sbbs
 ENV SBBSCTRL=/opt/sbbs/ctrl
 ENV SBBSEXEC=/opt/sbbs/exec
 ENV PATH=$PATH:${SBBSEXEC}
-ENV NNCPCFG /etc/nncp/nncp.conf
+#ENV NNCPCFG /etc/nncp/nncp.conf
 
 COPY start.sh ${SBBSEXEC}/
 COPY doorparty.js ${SBBSEXEC}/
 COPY main.cnf /opt/sbbs/ctrl.orig/
 
-VOLUME [ "/var/lib/zerotier-one","/var/spool/nncp" ]
-VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/mods","/opt/sbbs/text","/etc/nncp" ]
+#VOLUME [ "/var/lib/zerotier-one","/var/spool/nncp","/etc/nncp" ]
+VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/mods","/opt/sbbs/text" ]
 
 COPY logrotate.d /etc/logrotate.d/
 RUN chmod 644 /etc/logrotate.d/*
diff --git a/supervisord.d/nncp.conf b/supervisord.d/nncp.conf
deleted file mode 100644
index df9da2d..0000000
--- a/supervisord.d/nncp.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[program:nncp]
-#environment=NNCPCFG="/etc/nncp/nncp.conf"
-command=/usr/bin/nncp-daemon -autotoss
-startsecs=10
-startretries=2