Fixed changelist to represent changes

.gitea/workflows/arch.yaml

@@ -0,0 +1,42 @@
+name: Archlinux build
+run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀
+on: 
+  - push
+  - workflow_dispatch
+
+jobs:
+  build-arch:
+    runs-on: arch-latest
+    if: ${{ github.ref }} == 'refs/head/master' 
+    branches:
+      - 'master'
+      - 'zx'
+    steps:
+      - name: Checking environment
+        continue-on-error: true
+        run: printenv
+      - name: Installing prerequisites - update pacman
+        run: pacman -Sy
+      - name: Installing prerequisites - install nodejs for actions & git
+        run: pacman --disable-sandbox --noconfirm -v -S git nodejs
+      - name: Adding user builder
+        continue-on-error: true
+        run: useradd -d /builder -g users -m builder
+      - name: Downloading PKGBUILD
+        run: |
+          su - builder -c "curl -O http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/bforce.install"
+          su - builder -c "curl -o PKGBUILD http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/PKGBUILD.ci"
+      - name: Building archlinux package
+        run: |
+          su -w GITHUB_SHA,GITHUB_REF_NAME,GITHUB_REF_TYPE - builder -c makepkg
+          su - builder -c "ls -la"
+      - name: Constructing artifact name and version
+        run: |
+          echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV
+      - name: Retrieving artifact files
+        run: mkdir bforce && cp /builder/bforce-r*.pkg.tar.zst bforce
+      - name: Try to upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: bforce-${{ env.BFORCE_VER }}-Arch
+          path: bforce

.gitea/workflows/debpkg.yaml

@@ -0,0 +1,50 @@
+name: Debian build
+run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀
+on: [push]
+jobs:
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    branches:
+      - 'master'
+      - 'zx'
+    steps:
+      - name: Checking environment
+        continue-on-error: true
+        run: printenv
+      - name: Installing build-essentials
+        continue-on-error: false
+        run: |
+            apt update
+            apt install -y build-essential fakeroot devscripts debhelper pkg-config --no-install-recommends
+      - name: Installing dependencies
+        continue-on-error: false
+        run: |
+            echo '---- bison ----'
+            apt install -y bison
+            echo '---- tcl ------'
+            apt install -y tcl
+      - name: Cloning source
+        uses: actions/checkout@v4
+      - name: Getting version info
+        run: |
+            echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV
+      - name: Building package
+        continue-on-error: false
+        run: |
+            pwd
+            echo '---------------------'
+            cd ${GITHUB_WORKSPACE}/debian
+            ls -l
+            debuild -us -uc -b
+            echo '---build complete---'
+            ls -l ${{ env.GITHUB_WORKSPACE }}/../
+      - name: Collecting artifacts
+        run: |
+            mkdir -pv ${{ env.GITHUB_WORKSPACE }}/artifacts
+            mv -v ${{ env.GITHUB_WORKSPACE }}/../*.deb ${{ env.GITHUB_WORKSPACE }}/artifacts/
+      - name: Try to upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: bforce-${{ env.BFORCE_VER }}-Ubuntu
+          path: ${{ env.GITHUB_WORKSPACE }}/artifacts/bforce*.deb
+      - run: echo "This job's over"

.gitea/workflows/demo.yaml

@@ -1,19 +0,0 @@
-name: Gitea Actions Demo
-run-name: $ is testing out Gitea Actions 🚀
-on: [push]
-jobs:
-  Explore-Gitea-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ gitea_event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - name: Check out repository code
-        uses: ischanx/checkout@v4
-      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.basedir }}
-      - run: echo "🍏 This job's status is ${{ gitea.status }}."
-

CHANGES

@@ -275,3 +275,7 @@ Alexey Khromov (zx@zxalexis.ru)
  + Fixed incorrect binkp protocol realization in unprotected sessions.
  + Fixed binkp override appliance in incoming handshake
  
+0.26.1
+ + Fixed binkp stuck on overrides in config
+ + ReDebianized
+ + Added CI automation: builds for Archlinux and Ubuntu

README.md

@@ -1,3 +1,5 @@
+![zx branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=zx)
+
 BinkleyForce FTN mailer
 -----------------------
 
@@ -56,4 +58,4 @@ Copyright <br>
 > (c) 2007-2008 Sergey Babitch<br>
 > (c) 2011-2014 Sergey Dorofeev<br>
 > (c) 2014      Alexander Skovpen<br>
-> (c) 2024      Alexey Khromov<br>
+> (c) 2024-2025 Alexey Khromov<br>

archlinux/PKGBUILD

@@ -33,6 +33,7 @@ package() {
     mkdir -p ${pkgdir}/usr/bin
     mkdir -p ${pkgdir}/usr/local/bin
     mkdir -p ${pkgdir}/usr/share/doc/bforce
+    mkdir -p ${pkgdir}/usr/share/man/man1
     mkdir -p ${pkgdir}/var/log/bforce
     mkdir -p ${pkgdir}/var/spool/bforce
     mkdir -p ${pkgdir}/var/spool/bforce/bt/in
@@ -44,6 +45,7 @@ package() {
     /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfindex ${pkgdir}/usr/bin/bfindex
     /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfstat ${pkgdir}/usr/bin/bfstat
     /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/nlookup ${pkgdir}/usr/bin/nlookup
+    /usr/bin/install -c ${srcdir}/${pkgname}/man/*.1 ${pkgdir}/usr/share/man/man1/
     /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.conf ${pkgdir}/etc/bforce.conf.sample
     /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.subst ${pkgdir}/etc/bforce.subst.sample
     /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.passwd ${pkgdir}/etc/bforce.passwd.sample

archlinux/PKGBUILD.ci

@@ -0,0 +1,60 @@
+pkgname=bforce
+pkgver=r235.a1c93b8
+pkgrel=1
+pkgdesc="binkleyforce FTN mailer"
+arch=('i686' 'x86_64' 'aarch64')
+url="https://prj.zxalexis.ru/gitea/zx/bforce/"
+license=('GPL2')
+source=(
+    "${pkgname}::git+https://prj.zxalexis.ru/gitea/${GITHUB_REF_NAME}/bforce.git"
+)
+makedepends=('git' 'gcc' 'make' 'glibc')
+provides=('bforce')
+
+build() {
+    cd "${srcdir}/${pkgname}/source"
+    ./configure --prefix=/ --disable-syslog --with-owner=fido --with-group=uucp
+    make
+}
+
+prepare() {
+    cd "${pkgname}"
+    git checkout "${GITHUB_SHA}"
+    printf "$( pwd )\n"
+}
+
+pkgver() {
+    cd "$pkgname"
+    printf "r%s.%s.%s" "$(git rev-list --count ${GITHUB_SHA})" "$(git rev-parse --short ${GITHUB_SHA})" "${GITHUB_REF_NAME}"
+}
+
+package() {
+    cd ${pkgdir}
+    mkdir -p ${pkgdir}/etc
+    mkdir -p ${pkgdir}/usr/bin
+    mkdir -p ${pkgdir}/usr/local/bin
+    mkdir -p ${pkgdir}/usr/share/doc/bforce
+    mkdir -p ${pkgdir}/usr/share/man/man1
+    mkdir -p ${pkgdir}/var/log/bforce
+    mkdir -p ${pkgdir}/var/spool/bforce
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/in
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/pin
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/out
+    mkdir -p ${pkgdir}/var/spool/bforce/ndl
+    mkdir -p ${pkgdir}/var/spool/bforce/bforce
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bforce ${pkgdir}/usr/bin/bforce
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfindex ${pkgdir}/usr/bin/bfindex
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfstat ${pkgdir}/usr/bin/bfstat
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/nlookup ${pkgdir}/usr/bin/nlookup
+    /usr/bin/install -c ${srcdir}/${pkgname}/man/*.1 ${pkgdir}/usr/share/man/man1/
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.conf ${pkgdir}/etc/bforce.conf.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.subst ${pkgdir}/etc/bforce.subst.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.passwd ${pkgdir}/etc/bforce.passwd.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/freq.aliases ${pkgdir}/etc/freq.aliases.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/freq.dirs ${pkgdir}/etc/freq.dirs.sample
+    /usr/bin/install -c ${srcdir}/${pkgname}/contrib/outman ${pkgdir}/usr/local/bin/outman
+    echo "Please, edit /usr/local/bin/outman"
+    cp ${srcdir}/${pkgname}/docs/* ${pkgdir}/usr/share/doc/bforce/    
+}
+
+sha256sums=('SKIP')

debian/changelog

@@ -1,3 +1,15 @@
+bforce (0.26.1) UNRELEASED; urgency=medium
+
+  * Fixed for ubuntu/debian builds and CI actions
+
+ -- Alexey Khromov <zx@zxalexis.ru>  Sun, 13 Apr 2025 20:06:54 +0300
+
+bforce (0.26) UNRELEASED; urgency=medium
+
+  * Fixed for IPv6 and build on amd64 and aarch64 platforms
+
+ -- Alexey Khromov <zx@zxalexis.ru>  Sun, 13 Apr 2025 12:53:54 +0000
+
 bforce (0.22.9-3) unstable; urgency=low
 
   * fixes in init.d script

debian/compat

@@ -1 +1 @@
-4
+3

debian/conffiles

@@ -1,6 +0,0 @@
-/etc/bforce/bforce.conf
-/etc/bforce/bforce.subst
-/etc/bforce/bforce.passwd
-/etc/bforce/freq.dirs
-/etc/bforce/freq.aliases
-

debian/control

@@ -1,13 +1,13 @@
 Source: bforce
 Section: net
 Priority: optional
-Maintainer: Evgeniy Kozhuhovskiy <e.kozhuhovskiy@gmail.com>
+Maintainer: Alexey Khromov <zx@zxalexis.ru>
 Build-Depends: debhelper (>> 3.0.0), bison (>> 1.0.0)
 Standards-Version: 3.5.10
 
 Package: bforce
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, tclsh:any
 Description: Binkey Force FTN mailer
  FTN mailer is a program that transmit files (netmail and echomail)
  between your FTN node and other. 

debian/dirs

@@ -1,5 +1,6 @@
 usr/bin
 usr/lib/bforce
+usr/lib/systemd/system
 etc/bforce
 etc/default
 etc/default/bforce

debian/docs

@@ -1,9 +1,5 @@
-README
-README.kst
-README.ugenk
+README.md
 TODO
-CHANGES
-CHANGES.kst
-CHANGES.ugenk
 INSTALL
-INSTALL.ru
+INSTALL.ru
+SYSLOG

debian/postinst

@@ -26,15 +26,15 @@ set -e
 case "$1" in
     configure)
 
-	if ! grep -s news /etc/group >/dev/null 2>&1; then
-	    addgroup --system news
-	fi
-	
-	if ! id uucp >/dev/null 2>&1; then
-	    adduser --system --disabled-password uucp
-	    chsh -s /bin/sh uucp
-	    adduser uucp dialout
-	fi
+#	if ! grep -s news /etc/group >/dev/null 2>&1; then
+#	    addgroup --system news
+#	fi
+#	
+#	if ! id uucp >/dev/null 2>&1; then
+#	    adduser --system --disabled-password uucp
+#	    chsh -s /bin/sh uucp
+#	    adduser uucp dialout
+#	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/rules

@@ -6,8 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
+export DH_COMPAT=11
 
 PACKAGE = bforce
 
@@ -49,7 +48,7 @@ clean:
 	rm -f build-stamp configure-stamp
 
 #	 Add here commands to clean up after the build process.
-	-$(MAKE) -C source clean
+#	-$(MAKE) -C source clean
 	dh_clean
 	rm -f source/config.cache source/include/config.h source/config.log\
 		source/config.status source/Makefile
@@ -57,7 +56,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 #	Add here commands to install the package into debian/bforce.
@@ -74,7 +73,7 @@ install: build
 	/usr/bin/install -c -m 600 -o $(USER) -g $(GROUP) examples/bforce.passwd $(CURDIR)/debian/bforce/etc/bforce/bforce.passwd	
 	/usr/bin/install -c -m 644 -o $(USER) -g $(GROUP) examples/freq.aliases $(CURDIR)/debian/bforce/etc/bforce/freq.aliases
 	/usr/bin/install -c -m 644 -o $(USER) -g $(GROUP) examples/freq.dirs $(CURDIR)/debian/bforce/etc/bforce/freq.dirs
-
+	/usr/bin/install -c -m 660 contrib/systemd/bforce.service $(CURDIR)/debian/bforce/usr/lib/systemd/system/bforce.service
 	/usr/bin/install $(CURDIR)/debian/bfha.def $(CURDIR)/debian/bforce/etc/default/bforce/bfha
 	/usr/bin/install $(CURDIR)/contrib/bfha/bfha-debian.pl $(CURDIR)/debian/bforce/usr/lib/bforce/bfha.pl
 
@@ -92,8 +91,8 @@ binary-arch: build install
 #	dh_installlogrotate
 	dh_installinit
 #	dh_installcron
-	dh_installman $(CURDIR)/debian/bfindex.1 $(CURDIR)/debian/bforce.1 \
-			$(CURDIR)/debian/bfstat.1 $(CURDIR)/debian/nlookup.1
+	dh_installman $(CURDIR)/man/bfindex.1 $(CURDIR)/man/bforce.1 \
+			$(CURDIR)/man/bfstat.1 $(CURDIR)/man/nlookup.1 $(CURDIR)/man/outman.1
 #	dh_installinfo
 	dh_installchangelogs CHANGES
 	dh_link

rpm/bforce.spec

@@ -1,7 +1,7 @@
 Summary: Bforce, Fidonet mailer
 Name: bforce
-Version: 0.22.8
-Release: ugenk4
+Version: 0.26.1
+Release: 0
 Copyright: GPL
 Group: Fidonet/mailer
 Source0: bforce-%{version}.%{release}.tar.gz
@@ -56,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(550,uucp,news) /usr/bin/bfstat
 %attr(550,uucp,news) /usr/bin/nlookup
 %attr(550,uucp,news) /usr/bin/outman
-%attr(644,root,root) /usr/share/doc/bforce-0.22.8/*
+%attr(644,root,root) /usr/share/doc/bforce/*
 %dir %attr(770,uucp,news)  /var/log/bforce
 %dir %attr(770,uucp,news)  /var/spool/fido/ndl
 %attr(775,uucp,news) /var/spool/fido/bt

source/.version

@@ -1 +1 @@
-0.26
+0.26.1

source/bforce/prot_binkp.c

@@ -523,20 +523,21 @@ case 3: // send password on outgoing or pw confirmation on incoming
 
 
 case 4:
-        char *p;
+        ;
         char pbuf[32];
         int pwset = 0;
         
         if (bstate->mode==bmode_incoming_handshake) {
+            char * p;
             DEB((D_24554, "incoming handshake is complete"));
             bstate->complete = true;
             
             for (i=0;i<state.n_remoteaddr;i++)
                 if( !session_get_password(state.remoteaddrs[i].addr, pbuf, sizeof(pbuf)) ){
 					pwset = 1;
-                    init_keys(bstate->remote_data->keys_in, pbuf?pbuf:"-");
+                    init_keys(bstate->remote_data->keys_in, pbuf[0]?pbuf:"-");
                     init_keys(bstate->remote_data->keys_out,  "-");
-                    for (p=pbuf?pbuf:"-"; *p; p++)
+                    for (p=pbuf[0]?pbuf:"-"; *p; p++)
                         update_keys(bstate->remote_data->keys_out, (int)*p);
                 }
             //TODO: FIX incoming options 
@@ -954,10 +955,10 @@ got_skip:
 
 check_that_all_files_are_confirmed:
             {
-                int i;
-                for (i = 0; i < bstate->pi->n_sentfiles; i++) {
+                int j;
+                for (j = 0; j < bstate->pi->n_sentfiles; j++) {
                     if (bstate->pi->sentfiles[i].status == FSTAT_WAITACK) {
-                        DEB((D_24554, "sent file %d waits for acknowlede", i));
+                        DEB((D_24554, "sent file %d waits for acknowlede", j));
                         return 1;
                     }
                 }
@@ -1156,7 +1157,7 @@ default:
 
 void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer)
 {
-	char *p, *q;
+	
 	
 	if( strncmp(buffer, "SYS ", 4) == 0 )
 		strnxcpy(remote_data->systname, buffer+4, sizeof(remote_data->systname));
@@ -1184,9 +1185,11 @@ void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer)
 	}
 	else if( strncmp(buffer, "VER ", 4) == 0 )
 	{
+		char *p;
 		/* <mailer> [<protocol>/<vermaj>.<vermin>] */
 		if( (p = strchr(buffer+4, ' ')) )
 		{
+			char *q;
 			strnxcpy(remote_data->progname, buffer+4,
 					MIN(sizeof(remote_data->progname), p - (buffer+4) + 1));
 			++p;

source/bforce/sess_call.c

@@ -536,7 +536,7 @@ defalt:
 	if ( ! resflg ) 
 	{
 		
-		char *p = strcasestr(pbuf, target);
+		char *p = string_casestr(pbuf, target);
 		
 		if ( p ) 
 		{

source/bforce/sess_main.c

@@ -264,7 +264,7 @@ int session_check_addr(s_faddr addr)
 int session_get_password(s_faddr addr, char *buffer, size_t buflen)
 {
 	s_cval_entry *pwd_ptr;
-
+	buffer[0]='\0';
 	for( pwd_ptr = conf_first(cf_password); pwd_ptr;
 	     pwd_ptr = conf_next(pwd_ptr) )
 	{