From 2feaa7029f1e31bad83691bd4b23535ce4159ffa Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 23 Jul 2023 21:51:53 +0200 Subject: also build package for pam module --- .gitignore | 1 + whawty-auth/Makefile | 19 ++++++++++++++++--- whawty-auth/debian/changelog | 4 ++-- whawty-auth/debian/control | 7 ++++++- whawty-auth/debian/install | 1 - whawty-auth/debian/libpam-whawty.install | 1 + whawty-auth/debian/libpam-whawty.manpages | 1 + whawty-auth/debian/rules | 3 +++ whawty-auth/debian/whawty-auth.install | 1 + whawty-auth/debian/whawty-auth.manpages | 1 + whawty-auth/sha256sums.txt | 7 ++++--- 11 files changed, 36 insertions(+), 10 deletions(-) delete mode 100644 whawty-auth/debian/install create mode 100644 whawty-auth/debian/libpam-whawty.install create mode 100644 whawty-auth/debian/libpam-whawty.manpages create mode 100644 whawty-auth/debian/whawty-auth.install create mode 100644 whawty-auth/debian/whawty-auth.manpages diff --git a/.gitignore b/.gitignore index 0e2458d..ee3e84e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,6 @@ /*.buildinfo /*.changes /*.deb +/*.ddeb /*.dsc /*.tar.gz diff --git a/whawty-auth/Makefile b/whawty-auth/Makefile index a208e8f..1c90fa6 100644 --- a/whawty-auth/Makefile +++ b/whawty-auth/Makefile @@ -1,20 +1,33 @@ VERSION := "invalid" -GITHUB_BASEURL := "https://github.com/whawty/auth/releases/download" +GITHUB_RELEASES_BASEURL := "https://github.com/whawty/auth/releases/download" +GITHUB_ARCHIVE_BASEURL := "https://github.com/whawty/auth/archive/refs/tags" + .PHONY: clean -all: i386/whawty-auth amd64/whawty-auth arm64/whawty-auth +all: i386/whawty-auth i386/pam/pam_whawty.so amd64/whawty-auth amd64/pam/pam_whawty.so arm64/whawty-auth arm64/pam/pam_whawty.so %/whawty-auth: whawty-auth-v$(VERSION)-linux-%.tar.gz mkdir -p $(shell echo $@ | sed 's#/.*##') tar -C $(shell echo $@ | sed 's#/.*##') -xzf "$<" whawty-auth-v$(VERSION)-linux-%.tar.gz: - wget -nc --progress=dot:mega "$(GITHUB_BASEURL)/v$(VERSION)/$(shell echo $@ | sed s/i386/386/)" -O "$@" + wget -nc --progress=dot:mega "$(GITHUB_RELEASES_BASEURL)/v$(VERSION)/$(shell echo $@ | sed s/i386/386/)" -O "$@" + sha256sum -c --ignore-missing sha256sums.txt + +%/pam/pam_whawty.so: v$(VERSION).tar.gz + mkdir -p $(shell echo $@ | sed 's#/.*##') + tar -C $(shell echo $@ | sed 's#/.*##') -xzf "$<" --strip-components=1 --wildcards '*/pam/' + make -C $(shell echo $@ | sed 's#/.*##')/pam + +v$(VERSION).tar.gz: + wget -nc --progress=dot:mega "$(GITHUB_ARCHIVE_BASEURL)/$@" sha256sum -c --ignore-missing sha256sums.txt + clean: rm -rf i386 rm -rf amd64 rm -rf arm64 + rm -f v$(VERSION).tar.gz rm -f whawty-auth-v$(VERSION)-linux-*.tar.gz diff --git a/whawty-auth/debian/changelog b/whawty-auth/debian/changelog index c27a21d..08cec37 100644 --- a/whawty-auth/debian/changelog +++ b/whawty-auth/debian/changelog @@ -1,5 +1,5 @@ -whawty-auth (0.2-rc1-1) UNRELEASED; urgency=medium +whawty-auth (0.2-rc2-1) unstable; urgency=medium * Initial release. - -- Christian Pointner Wed, 22 Jun 2021 22:34:37 +0200 + -- Christian Pointner Sun, 23 Jul 2023 21:41:00 +0200 diff --git a/whawty-auth/debian/control b/whawty-auth/debian/control index b3d2874..389a7e0 100644 --- a/whawty-auth/debian/control +++ b/whawty-auth/debian/control @@ -3,9 +3,14 @@ Maintainer: Christian Pointner Section: utils Priority: optional Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 9), wget, ca-certificates +Build-Depends: debhelper (>= 9), wget, ca-certificates, libpam0g-dev Package: whawty-auth Architecture: amd64 i386 arm64 Depends: ${misc:Depends} Description: whawty-auth app (binaries only) + +Package: libpam-whawty +Architecture: amd64 i386 arm64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: whawty-auth PAM module (binaries only) diff --git a/whawty-auth/debian/install b/whawty-auth/debian/install deleted file mode 100644 index c66cb17..0000000 --- a/whawty-auth/debian/install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/whawty-auth diff --git a/whawty-auth/debian/libpam-whawty.install b/whawty-auth/debian/libpam-whawty.install new file mode 100644 index 0000000..c113156 --- /dev/null +++ b/whawty-auth/debian/libpam-whawty.install @@ -0,0 +1 @@ +lib/*/security/pam_whawty.so diff --git a/whawty-auth/debian/libpam-whawty.manpages b/whawty-auth/debian/libpam-whawty.manpages new file mode 100644 index 0000000..dbb6030 --- /dev/null +++ b/whawty-auth/debian/libpam-whawty.manpages @@ -0,0 +1 @@ +*/pam/pam_whawty.8 diff --git a/whawty-auth/debian/rules b/whawty-auth/debian/rules index 4e7f6b7..926c4d3 100755 --- a/whawty-auth/debian/rules +++ b/whawty-auth/debian/rules @@ -7,10 +7,13 @@ override_dh_auto_configure: override_dh_auto_build: make VERSION=$(DEB_VERSION_UPSTREAM) $(DEB_BUILD_ARCH)/whawty-auth + make VERSION=$(DEB_VERSION_UPSTREAM) $(DEB_BUILD_ARCH)/pam/pam_whawty.so override_dh_auto_install: install -d $$(pwd)/debian/tmp/usr/bin/ install -m 755 $$(pwd)/$(DEB_BUILD_ARCH)/whawty-auth $$(pwd)/debian/tmp/usr/bin/whawty-auth + install -d $$(pwd)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security/ + install -m 644 $$(pwd)/$(DEB_BUILD_ARCH)/pam/pam_whawty.so $$(pwd)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security/ override_dh_auto_clean: make VERSION=$(DEB_VERSION_UPSTREAM) clean diff --git a/whawty-auth/debian/whawty-auth.install b/whawty-auth/debian/whawty-auth.install new file mode 100644 index 0000000..c66cb17 --- /dev/null +++ b/whawty-auth/debian/whawty-auth.install @@ -0,0 +1 @@ +usr/bin/whawty-auth diff --git a/whawty-auth/debian/whawty-auth.manpages b/whawty-auth/debian/whawty-auth.manpages new file mode 100644 index 0000000..12789fd --- /dev/null +++ b/whawty-auth/debian/whawty-auth.manpages @@ -0,0 +1 @@ +*/whawty-auth.8 diff --git a/whawty-auth/sha256sums.txt b/whawty-auth/sha256sums.txt index 97b2f75..fc87926 100644 --- a/whawty-auth/sha256sums.txt +++ b/whawty-auth/sha256sums.txt @@ -1,3 +1,4 @@ -0f9c1687780061fd5a250c6f3d06042076f499a2b92d73641eae5bc4464e3a04 whawty-auth-v0.2-rc1-linux-i386.tar.gz -5ef383831614da67d34049e2e64c3dbc71b45dc0c82a7461f736d148fd659c8a whawty-auth-v0.2-rc1-linux-amd64.tar.gz -f41a0161b221c76cbea2d4215ac306dafe48dc9f212ca14b49d8abe0a8b56e20 whawty-auth-v0.2-rc1-linux-arm64.tar.gz +8d28024eb3a2df290eecc03af87f14b209e129137b77f5c2431884a411c02bb5 v0.2-rc2.tar.gz +75ebd29508e6e51a619633c47a883a6acfd21898cfa9a8056c98122ebbe6357a whawty-auth-v0.2-rc2-linux-i386.tar.gz +13e1a11359527f0ade63d415fbedfe394a332a66c37e1cad734f5721031e6b2a whawty-auth-v0.2-rc2-linux-amd64.tar.gz +6c7abb95c3681e69024d5d1f21761c434f0a95deb63cddb41d56ed17ac56b58c whawty-auth-v0.2-rc2-linux-arm64.tar.gz -- cgit v1.2.3