diff --git a/.gitea/workflows/arch.yaml b/.gitea/workflows/arch.yaml index 828965e..5a6454d 100644 --- a/.gitea/workflows/arch.yaml +++ b/.gitea/workflows/arch.yaml @@ -26,6 +26,7 @@ jobs: - run: su - builder -c "curl -O http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/bforce.install" - run: su - builder -c "curl -o PKGBUILD http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/PKGBUILD.ci" - run: su -w GITHUB_SHA,GITHUB_REF_NAME,GITHUB_REF_TYPE - builder -c makepkg + - run: su - builder -c "ls -la" - run: mkdir bforce && cp /builder/bforce-*.xz bforce - name: Try to upload artifacts uses: actions/upload-artifact@v4 diff --git a/archlinux/PKGBUILD.ci b/archlinux/PKGBUILD.ci index 2acb9b9..0f160fe 100644 --- a/archlinux/PKGBUILD.ci +++ b/archlinux/PKGBUILD.ci @@ -34,6 +34,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 @@ -45,6 +46,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}/source/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 diff --git a/debian/control b/debian/control index d2fbe19..c21eb6f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: bforce Section: net Priority: optional -Maintainer: Evgeniy Kozhuhovskiy +Maintainer: Alexey Khromov Build-Depends: debhelper (>> 3.0.0), bison (>> 1.0.0) Standards-Version: 3.5.10 diff --git a/debian/postinst b/debian/postinst index c8464be..2eca34a 100644 --- a/debian/postinst +++ b/debian/postinst @@ -26,15 +26,6 @@ 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 da92dd6..1b04728 100755 --- a/debian/rules +++ b/debian/rules @@ -92,8 +92,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 # dh_installinfo dh_installchangelogs CHANGES dh_link