Update build system for v1.9.0, use cmake

Dockerfile

@@ -9,8 +9,10 @@ ARG ZNC_RELEASE
 RUN \
   echo "**** install build packages ****" && \
   apk add -U --update --no-cache \
+    argon2-dev \
     autoconf \
     automake \
+    boost-dev\
     build-base \
     c-ares-dev \
     cyrus-sasl-dev \
@@ -21,7 +23,11 @@ RUN \
     perl-dev \
     python3-dev \
     swig \
-    tcl-dev
+    tar \
+    tcl-dev && \
+  python3 -m venv /lsiopy && \
+  pip install -U --no-cache-dir pip setuptools && \
+  pip install -U --no-cache-dir cmake
 
 RUN \
   echo "**** compile znc ****" && \
@@ -31,57 +37,47 @@ RUN \
   fi && \
   mkdir -p \
     /tmp/znc && \
+  git clone --branch "${ZNC_RELEASE}" --depth 1 \
+    --recurse-submodules \
+    https://github.com/znc/znc.git \
+    /tmp/znc && \
   curl -o \
-  /tmp/znc-src.tar.gz -L \
-    "https://znc.in/releases/archive/${ZNC_RELEASE}.tar.gz" && \
-  tar xf \
-  /tmp/znc-src.tar.gz -C \
-    /tmp/znc --strip-components=1 && \
-  curl -o \
-  /tmp/playback.tar.gz -L \
+    /tmp/playback.tar.gz -L \
     https://github.com/jpnurmi/znc-playback/archive/master.tar.gz && \
   tar xf \
-  /tmp/playback.tar.gz -C \
+    /tmp/playback.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   curl -o \
-  /tmp/znc-push.tar.gz -L \
+    /tmp/znc-push.tar.gz -L \
     https://github.com/jreese/znc-push/archive/master.tar.gz && \
   tar xf \
-  /tmp/znc-push.tar.gz -C \
+    /tmp/znc-push.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   curl -o \
-  /tmp/znc-clientbuffer.tar.gz -L \
+    /tmp/znc-clientbuffer.tar.gz -L \
     https://github.com/CyberShadow/znc-clientbuffer/archive/master.tar.gz && \
   tar xf \
-  /tmp/znc-clientbuffer.tar.gz -C \
+    /tmp/znc-clientbuffer.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   curl -o \
-  /tmp/znc-palaver.tar.gz -L \
+    /tmp/znc-palaver.tar.gz -L \
     https://github.com/cocodelabs/znc-palaver/archive/master.tar.gz && \
   tar xf \
-  /tmp/znc-palaver.tar.gz -C \
+    /tmp/znc-palaver.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   cd /tmp/znc && \
-  export CFLAGS="$CFLAGS -D_GNU_SOURCE" && \
-  ./configure \
-    --build=$CBUILD \
-    --enable-cyrus \
-    --enable-perl \
-    --enable-python \
-    --enable-swig \
-    --enable-tcl \
-    --host=$CHOST \
-    --infodir=/usr/share/info \
-    --localstatedir=/var \
-    --mandir=/usr/share/man \
-    --prefix=/usr \
-    --sysconfdir=/etc && \
+  mkdir -p build && \
+  cd build && \
+  cmake .. \
+    -DWANT_PYTHON=yes \
+    -DWANT_PERL=yes \
+    -DWANT_TCL=yes && \
   make && \
   make DESTDIR=/tmp/znc install
 
 RUN \
   echo "**** determine runtime packages ****" && \
-  scanelf --needed --nobanner /tmp/znc/usr/bin/znc \
+  scanelf --needed --nobanner /tmp/znc/usr/local/bin/znc \
     | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
     | sort -u \
     | xargs -r apk info --installed \
@@ -95,7 +91,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.19
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="notaptalca"
 
 # copy files from build stage
 COPY --from=buildstage /tmp/znc/usr/ /usr/

Dockerfile.aarch64

@@ -7,10 +7,11 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
 ARG ZNC_RELEASE
 
 RUN \
-  echo "**** install build packages ****" && \
   apk add -U --update --no-cache \
+    argon2-dev \
     autoconf \
     automake \
+    boost-dev\
     build-base \
     c-ares-dev \
     cyrus-sasl-dev \
@@ -21,7 +22,11 @@ RUN \
     perl-dev \
     python3-dev \
     swig \
-    tcl-dev
+    tar \
+    tcl-dev && \
+  python3 -m venv /lsiopy && \
+  pip install -U --no-cache-dir pip setuptools && \
+  pip install -U --no-cache-dir cmake
 
 RUN \
   echo "**** compile znc ****" && \
@@ -31,57 +36,47 @@ RUN \
   fi && \
   mkdir -p \
     /tmp/znc && \
+  git clone --branch "${ZNC_RELEASE}" --depth 1 \
+    --recurse-submodules \
+    https://github.com/znc/znc.git \
+    /tmp/znc && \
   curl -o \
-  /tmp/znc-src.tar.gz -L \
-    "https://znc.in/releases/archive/${ZNC_RELEASE}.tar.gz" && \
-  tar xf \
-  /tmp/znc-src.tar.gz -C \
-    /tmp/znc --strip-components=1 && \
-  curl -o \
-  /tmp/playback.tar.gz -L \
+    /tmp/playback.tar.gz -L \
     https://github.com/jpnurmi/znc-playback/archive/master.tar.gz && \
   tar xf \
-  /tmp/playback.tar.gz -C \
+    /tmp/playback.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   curl -o \
-  /tmp/znc-push.tar.gz -L \
+    /tmp/znc-push.tar.gz -L \
     https://github.com/jreese/znc-push/archive/master.tar.gz && \
   tar xf \
-  /tmp/znc-push.tar.gz -C \
+    /tmp/znc-push.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   curl -o \
-  /tmp/znc-clientbuffer.tar.gz -L \
+    /tmp/znc-clientbuffer.tar.gz -L \
     https://github.com/CyberShadow/znc-clientbuffer/archive/master.tar.gz && \
   tar xf \
-  /tmp/znc-clientbuffer.tar.gz -C \
+    /tmp/znc-clientbuffer.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   curl -o \
-  /tmp/znc-palaver.tar.gz -L \
+    /tmp/znc-palaver.tar.gz -L \
     https://github.com/cocodelabs/znc-palaver/archive/master.tar.gz && \
   tar xf \
-  /tmp/znc-palaver.tar.gz -C \
+    /tmp/znc-palaver.tar.gz -C \
     /tmp/znc/modules --strip-components=1 && \
   cd /tmp/znc && \
-  export CFLAGS="$CFLAGS -D_GNU_SOURCE" && \
-  ./configure \
-    --build=$CBUILD \
-    --enable-cyrus \
-    --enable-perl \
-    --enable-python \
-    --enable-swig \
-    --enable-tcl \
-    --host=$CHOST \
-    --infodir=/usr/share/info \
-    --localstatedir=/var \
-    --mandir=/usr/share/man \
-    --prefix=/usr \
-    --sysconfdir=/etc && \
+  mkdir -p build && \
+  cd build && \
+  cmake .. \
+    -DWANT_PYTHON=yes \
+    -DWANT_PERL=yes \
+    -DWANT_TCL=yes && \
   make && \
   make DESTDIR=/tmp/znc install
 
 RUN \
   echo "**** determine runtime packages ****" && \
-  scanelf --needed --nobanner /tmp/znc/usr/bin/znc \
+  scanelf --needed --nobanner /tmp/znc/usr/local/bin/znc \
     | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
     | sort -u \
     | xargs -r apk info --installed \
@@ -95,7 +90,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="notaptalca"
 
 # copy files from build stage
 COPY --from=buildstage /tmp/znc/usr/ /usr/

README.md

@@ -59,7 +59,7 @@ The architectures supported by this image are:
 
 ## Application Setup
 
-To log in to the application, browse to http://<hostip>:6501.
+To log in to the application, browse to `http://<hostip>:6501`.
 
 * Default User: admin
 * Default Password: admin
@@ -275,6 +275,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.02.24:** - Update build system for v1.9.0 (use cmake).
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **12.07.23:** - Rebasing to Alpine 3.18.
 * **07.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)

readme-vars.yml

@@ -38,14 +38,15 @@ optional_block_1: false
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  To log in to the application, browse to http://<hostip>:6501.
+  To log in to the application, browse to `http://<hostip>:6501`.
 
   * Default User: admin
   * Default Password: admin
   `change password ASAP.`
 # changelog
 changelogs:
-  - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
+  - {date: "22.02.24:", desc: "Update build system for v1.9.0 (use cmake)."}
+  - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - {date: "12.07.23:", desc: "Rebasing to Alpine 3.18."}
   - {date: "07.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}

root/etc/s6-overlay/s6-rc.d/init-znc-config/run

@@ -7,7 +7,7 @@ mkdir -p \
 
 # generate license file
 if [[ ! -f /config/znc.pem ]]; then
-    /usr/bin/znc -d /config -p
+    /usr/local/bin/znc -d /config -p
 fi
 
 while [[ ! -f "/config/znc.pem" ]]; do

root/etc/s6-overlay/s6-rc.d/svc-znc/run

@@ -5,5 +5,5 @@ PORT=$(grep "Port =" /config/configs/znc.conf | awk -F '=' '{print $2;exit}')
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${PORT}" \
-        s6-setuidgid abc /usr/bin/znc -d /config \
+        s6-setuidgid abc /usr/local/bin/znc -d /config \
         --foreground