diff --git a/.gitea/workflows/arch.yaml b/.gitea/workflows/arch.yaml index 42f79ea..a4ac02b 100644 --- a/.gitea/workflows/arch.yaml +++ b/.gitea/workflows/arch.yaml @@ -8,7 +8,7 @@ jobs: - 'master' - 'zx' steps: - - run: echo "🎉 The job was automatically triggered by a ${{ inputs }} event." + - run: echo "🎉 The job was automatically triggered by a ${{ inputs.event }} 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 }}." - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner." diff --git a/.gitea/workflows/debpkg.yaml b/.gitea/workflows/debpkg.yaml new file mode 100644 index 0000000..019b060 --- /dev/null +++ b/.gitea/workflows/debpkg.yaml @@ -0,0 +1,28 @@ +name: Debian build +run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀 +on: [push] +jobs: + build: + runs-on: ubuntu-latest + branches: + - 'master' + - 'zx' + steps: + - name: Checking environment + continue-on-error: true + run: printenv + - name: Cloning source + uses: actions/checkout@v3 + - name: Installing build-essential + continue-on-error: true + run: dpkg -V + - name: Building package + continue-on-error: true + run: cd ${{gitea.basedir}} && pwd && cd debian && debuild -us -uc -b + - name: Try to upload artifacts + uses: actions/upload-artifact@v3 + with: + name: bforce + path: bforce*.deb + - run: echo "This job's over" + diff --git a/README.md b/README.md index 2b7f93a..8a774c9 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ - -![zx branch] - - -![master branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=master) +![zx branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=zx) BinkleyForce FTN mailer ----------------------- diff --git a/debian/changelog b/debian/changelog index d113956..0415121 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bforce (0.26) UNRELEASED; urgency=medium + + * Fixed for IPv6 and build on amd64 and aarch64 platforms + + -- Alexey Khromov Sun, 13 Apr 2025 12:53:54 +0000 + bforce (0.22.9-3) unstable; urgency=low * fixes in init.d script diff --git a/debian/compat b/debian/compat index b8626c4..00750ed 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +3 diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index 2a12f5d..0000000 --- a/debian/conffiles +++ /dev/null @@ -1,6 +0,0 @@ -/etc/bforce/bforce.conf -/etc/bforce/bforce.subst -/etc/bforce/bforce.passwd -/etc/bforce/freq.dirs -/etc/bforce/freq.aliases - diff --git a/debian/control b/debian/control index c21eb6f..8242f85 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Standards-Version: 3.5.10 Package: bforce Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, tclsh:any +Optdepends: tclsh:any Description: Binkey Force FTN mailer FTN mailer is a program that transmit files (netmail and echomail) between your FTN node and other. diff --git a/debian/dirs b/debian/dirs index af0225d..87c1475 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,5 +1,6 @@ usr/bin usr/lib/bforce +usr/lib/systemd/system etc/bforce etc/default etc/default/bforce diff --git a/debian/docs b/debian/docs index e14b036..7f52963 100644 --- a/debian/docs +++ b/debian/docs @@ -1,9 +1,5 @@ -README -README.kst -README.ugenk +README.md TODO -CHANGES -CHANGES.kst -CHANGES.ugenk INSTALL -INSTALL.ru \ No newline at end of file +INSTALL.ru +SYSLOG diff --git a/debian/postinst b/debian/postinst index 2eca34a..632f96e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -26,6 +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 ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/rules b/debian/rules index 1b04728..e1d8b61 100755 --- a/debian/rules +++ b/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 @@ -93,7 +92,7 @@ binary-arch: build install dh_installinit # dh_installcron dh_installman $(CURDIR)/man/bfindex.1 $(CURDIR)/man/bforce.1 \ - $(CURDIR)/man/bfstat.1 $(CURDIR)/man/nlookup.1 + $(CURDIR)/man/bfstat.1 $(CURDIR)/man/nlookup.1 $(CURDIR)/man/outman.1 # dh_installinfo dh_installchangelogs CHANGES dh_link