From 90d2600fc9654bc2d1b857b453cf246e451882c8 Mon Sep 17 00:00:00 2001
From: Lukas Braun <lukas.braun@fau.de>
Date: Fri, 19 May 2017 16:10:15 +0200
Subject: [PATCH] Build PAM module only
Debian jessie doesn't have the Go dependencies, but we can get away with
only building the PAM module (which is C) since the server is running on
stretch already.
---
debian/control | 13 +------------
debian/goatherd.conf | 3 ---
debian/goatherd.install | 1 -
debian/goatherd.postinst | 18 ------------------
debian/goatherd.postrm | 15 ---------------
debian/goatherd.service | 11 -----------
debian/rules | 14 ++++++++------
7 files changed, 9 insertions(+), 66 deletions(-)
delete mode 100644 debian/goatherd.conf
delete mode 100644 debian/goatherd.install
delete mode 100644 debian/goatherd.postinst
delete mode 100644 debian/goatherd.postrm
delete mode 100644 debian/goatherd.service
diff --git a/debian/control b/debian/control
index e36d7c1..cf22fa9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,7 @@ Maintainer: CIP-Admins <problems@cip.cs.fau.de>
Uploaders: Lukas Braun <no25qusu@stud.informatik.uni-erlangen.de>
Build-Depends: debhelper (>= 9),
libpam0g-dev,
- libgnutls28-dev,
- golang-go,
- golang-github-lib-pq-dev,
- golang-github-gokyle-hotp-dev,
- golang-github-mattn-go-sqlite3-dev,
- postgresql,
- pamtester, libpam-wrapper, oathtool, xxd
+ libgnutls28-dev
Standards-Version: 3.9.8
Section: admin
Homepage: https://gitlab.cs.fau.de/koomi/goatherd
@@ -21,8 +15,3 @@ Package: libpam-goatherd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: goatherd PAM module
-
-Package: goatherd
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: goatherd authentication server
diff --git a/debian/goatherd.conf b/debian/goatherd.conf
deleted file mode 100644
index 3661fa2..0000000
--- a/debian/goatherd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "db_url": "/var/lib/goatherd/goatherd.sqlite3"
-}
diff --git a/debian/goatherd.install b/debian/goatherd.install
deleted file mode 100644
index 797b8de..0000000
--- a/debian/goatherd.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/sbin/goatherd
diff --git a/debian/goatherd.postinst b/debian/goatherd.postinst
deleted file mode 100644
index a5ca3e9..0000000
--- a/debian/goatherd.postinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -eu
-
-if test "$1" = "configure"; then
- statedir=/var/lib/goatherd
-
- if ! getent passwd goatherd >/dev/null; then
- adduser --quiet --system --group --no-create-home --home $statedir goatherd
- fi
-
- if ! dpkg-statoverride --list $statedir >/dev/nill; then
- dpkg-statoverride --quiet --update --add goatherd goatherd 0700 $statedir
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/goatherd.postrm b/debian/goatherd.postrm
deleted file mode 100644
index 236b51b..0000000
--- a/debian/goatherd.postrm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -eu
-
-#DEBHELPER#
-
-if test "$1" = "purge"; then
- statedir=/var/lib/goatherd
-
- rm -f $statedir/goatherd.sqlite3
- rmdir $statedir >/dev/null 2>/dev/null || true
-
- dpkg-statoverride --remove $statedir >/dev/null 2>/dev/null || true
-fi
-
-exit 0
diff --git a/debian/goatherd.service b/debian/goatherd.service
deleted file mode 100644
index 8dd169b..0000000
--- a/debian/goatherd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=HOTP authentication daemon
-Wants=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/goatherd
-User=goatherd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/rules b/debian/rules
index cf06598..dd86f4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export PAMDIR := /lib/$(DEB_HOST_MULTIARCH)/security
-export GOPATH := /usr/share/gocode
-
%:
dh $@
-override_dh_install:
- dh_install
- install -D -t $(CURDIR)/debian/goatherd/etc/ $(CURDIR)/debian/goatherd.conf
- install -Dd -m 0700 $(CURDIR)/debian/goatherd/var/lib/goatherd
+override_dh_auto_build:
+ make pam_goatherd.so
+
+override_dh_auto_install:
+ make install_pam DESTDIR=debian/tmp
+
+override_dh_auto_test:
+ # tests for pam module need working goatherd
--
GitLab