commit 503b2e5b678ff59288861b67f68f71b0bf78bb41 Author: Deon George Date: Fri May 22 23:32:22 2020 +1000 Initial BINKD diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..a37d3aa --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,15 @@ +stages: + - build + - deploy + +variables: + VERSION: "0.59.1" + DISTRO: "buster" + +before_script: + - env|sort + - pwd + +include: + - .gitlab-deb-x86_64.yml + - .gitlab-deb-armv7l.yml diff --git a/.gitlab-deb-armv7l.yml b/.gitlab-deb-armv7l.yml new file mode 100644 index 0000000..2a507be --- /dev/null +++ b/.gitlab-deb-armv7l.yml @@ -0,0 +1,34 @@ +build:armv7l: + image: ${CI_REGISTRY}/leenooks/ci-apt:armv7l-${DISTRO} + stage: build + script: + - apt-get update + - apt-get install -y make gcc zlib1g-dev libperl-dev libbz2-dev ncurses-dev automake flex bison + - git clone https://github.com/pgul/binkd.git + - cd binkd + - git apply ../debian.patch + - dpkg-buildpackage -us -uc + - cd .. + - mkdir build + - ls -al ./ + - mv ./${CI_PROJECT_NAME}*.deb ./build/ + tags: + - apt + - armv7l + only: + - master + artifacts: + paths: + - build/*deb + expire_in: 1 week + +deploy:armv7l: + stage: deploy + dependencies: + - build:armv7l + only: + - master + script: + - reprepro.exp -- -b /apt includedeb ${DISTRO} build/${CI_PROJECT_NAME}_${VERSION}*.deb + tags: + - reprepro diff --git a/.gitlab-deb-x86_64.yml b/.gitlab-deb-x86_64.yml new file mode 100644 index 0000000..0a13599 --- /dev/null +++ b/.gitlab-deb-x86_64.yml @@ -0,0 +1,34 @@ +build:x86_64: + image: ${CI_REGISTRY}/leenooks/ci-apt:x86_64-${DISTRO} + stage: build + script: + - apt-get update + - apt-get install -y make gcc zlib1g-dev libperl-dev libbz2-dev ncurses-dev automake flex bison + - git clone https://github.com/pgul/binkd.git + - cd binkd + - git apply ../debian.patch + - dpkg-buildpackage -us -uc + - cd .. + - mkdir build + - ls -al ./ + - mv ./${CI_PROJECT_NAME}*.deb ./build/ + tags: + - apt + - x86_64 + only: + - master + artifacts: + paths: + - build/*deb + expire_in: 1 week + +deploy:x86_64: + stage: deploy + dependencies: + - build:x86_64 + only: + - master + script: + - reprepro.exp -- -b /apt includedeb ${DISTRO} build/${CI_PROJECT_NAME}_${VERSION}*.deb + tags: + - reprepro diff --git a/debian.patch b/debian.patch new file mode 100644 index 0000000..a156fca --- /dev/null +++ b/debian.patch @@ -0,0 +1,109 @@ +From ffa0570b87d57e38e693b293b635497174bcbc07 Mon Sep 17 00:00:00 2001 +From: root +Date: Fri, 22 May 2020 13:21:10 +0000 +Subject: [PATCH] Fixes for debian build + +--- + debian/binkd.dirs | 2 +- + debian/changelog | 4 ++-- + debian/compat | 1 + + debian/control | 4 ++-- + debian/rules | 20 ++++++++++---------- + 5 files changed, 16 insertions(+), 15 deletions(-) + create mode 100644 debian/compat + +diff --git a/debian/binkd.dirs b/debian/binkd.dirs +index 7785917..0ff11bd 100644 +--- a/debian/binkd.dirs ++++ b/debian/binkd.dirs +@@ -1,4 +1,4 @@ +-etc/ftn/ ++etc/binkd/ + usr/sbin/ + var/run/ftn/ + var/spool/ftn/inbound/ +diff --git a/debian/changelog b/debian/changelog +index 508abeb..40c4495 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,10 +1,10 @@ +-binkd1 (1.0~a.535) unstable; urgency=low ++binkd (1.1a-109) unstable; urgency=low + + * Fix man page path + + -- Stas Degteff Sun, 14 Jun 2009 04:21:47 +0500 + +-binkd1 (1.0~a.531) unstable; urgency=low ++binkd (1.0~a.531) unstable; urgency=low + + * Initial Release, debianized by Stas Degteff + +diff --git a/debian/compat b/debian/compat +new file mode 100644 +index 0000000..7ed6ff8 +--- /dev/null ++++ b/debian/compat +@@ -0,0 +1 @@ ++5 +diff --git a/debian/control b/debian/control +index 6ebdfb9..1f54202 100644 +--- a/debian/control ++++ b/debian/control +@@ -1,4 +1,4 @@ +-Source: binkd1 ++Source: binkd + Section: comm + Priority: extra + Maintainer: Stas Degteff +@@ -6,7 +6,7 @@ Homepage: http://binkd.grumbler.org + Build-Depends: debhelper (>> 4.0.0), perl, libperl-dev (>=5.8.8) + Standards-Version: 3.8.0 + +-Package: binkd1 ++Package: binkd + Architecture: any + Depends: ${shlibs:Depends}, perl (>= 5.8.8), adduser + Description: Binkd - the binkp daemon for FTN communications. +diff --git a/debian/rules b/debian/rules +index ef3648e..f84a94b 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -3,16 +3,16 @@ + # Uncomment this to turn on verbose mode. + export DH_VERBOSE=1 + +-export DH_COMPAT=4 ++#export DH_COMPAT=4 + #export DEBIAN=1 +-PACKAGE=binkd1 +-MAJOR=`sed -n "/\#define MAJOR/s/.*\([0-9]\+\).*$$/\1/p" Config.h` +-MINOR=`sed -n "/\#define MINOR/s/.*\([0-9]\+\).*$$/\1/p" Config.h` +-SUFFIX=`sed -n "/\#define SUFFIX/s/.*\"\([-a-z]\+\)\".*$$/\1/p" Config.h` +-PATCHLEVEL=`sed -n "/\#define PATCHLEVEL/s/.*\([0-9]\+\).*$$/\1/p" Config.h` +-VERSION=$(MAJOR).$(MINOR)+$(SUFFIX)$(PATCHLEVEL) +-PREFIX=$(CURDIR)/debian/binkd1 +-CONFIGURE_OPTIONS += --with-zlib --with-https --with-ntlm --with-bwlim --with-perl --sysconfdir=$(PREFIX)/etc/ftn --prefix=$(PREFIX) --mandir=$(PREFIX)/usr/share/man ++PACKAGE=binkd ++MAJOR=`sed -n "/\#define MAJOR/s/.*\ \([0-9]\+\).*$$/\1/p" Config.h` ++MINOR=`sed -n "/\#define MINOR/s/.*\ \([0-9]\+\).*$$/\1/p" Config.h` ++SUFFIX=`sed -n "/\#define SUFFIX/s/.*\ \"\([-a-z]\+\)\".*$$/\1/p" Config.h` ++PATCHLEVEL=`sed -n "/\#define PATCHLEVEL/s/.*\ \([0-9]\+\).*$$/\1/p" Config.h` ++VERSION=$(MAJOR).$(MINOR)$(SUFFIX)-$(PATCHLEVEL) ++PREFIX=$(CURDIR)/debian/binkd ++CONFIGURE_OPTIONS += --with-zlib --with-https --with-ntlm --with-bwlim --with-perl --sysconfdir=$(PREFIX)/etc/binkd --prefix=$(PREFIX) --mandir=$(PREFIX)/usr/share/man + + # These are used for cross-compiling and for saving the configure script + # from having to guess our platform (since we know it already) +@@ -68,7 +68,7 @@ install: build + + $(MAKE) install + install -d $(PREFIX)/usr/share/doc/$(PACKAGE) +- install \!README* HISTORY *.[Tt][Xx][Tt]* doc/*.{txt,html,htm} $(PREFIX)/usr/share/doc/$(PACKAGE)/ ++ install \README* HISTORY *.[Tt][Xx][Tt]* doc/*.{txt,html,htm} $(PREFIX)/usr/share/doc/$(PACKAGE)/ + + # Build architecture-independent files here. + binary-indep: build install +-- +2.20.1 +