6 files changed, 38 insertions, 26 deletions
diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml
index 4355ecb8..8b93e636 100644
--- a/.github/workflows/trigger_rebuild_packages.yml
+++ b/.github/workflows/trigger_rebuild_packages.yml
@@ -74,6 +74,8 @@ jobs:
               - 'scripts/package-build/radvd/**'
             strongswan:
               - 'scripts/package-build/strongswan/**'
+            tacacs:
+              - 'scripts/package-build/tacacs/**'
             telegraf:
               - 'scripts/package-build/telegraf/**'
             waagent:
@@ -199,6 +201,10 @@ jobs:
             trigger_build "strongswan"
           fi
 
+          if [ "${{ steps.changes.outputs.tacacs }}" == "true" ]; then
+            trigger_build "tacacs"
+          fi
+
           if [ "${{ steps.changes.outputs.telegraf }}" == "true" ]; then
             trigger_build "telegraf"
           fi
diff --git a/scripts/package-build/pam_tacplus/.gitignore b/scripts/package-build/pam_tacplus/.gitignore
deleted file mode 100644
index 04e8d4e9..00000000
--- a/scripts/package-build/pam_tacplus/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-pam_tacplus/
-pam_tacplus-debian/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
diff --git a/scripts/package-build/pam_tacplus/package.toml b/scripts/package-build/pam_tacplus/package.toml
deleted file mode 100644
index 79b28544..00000000
--- a/scripts/package-build/pam_tacplus/package.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[[packages]]
-name = "pam_tacplus-debian"
-commit_id = "50c6fd7"
-scm_url = "https://github.com/kravietz/pam_tacplus-debian"
-build_cmd = "/bin/true"
-
-[[packages]]
-name = "pam_tacplus"
-#commit_id = "4f91b0d" # This commit cannot build the package
-commit_id = "b839c44"
-scm_url = "https://github.com/kravietz/pam_tacplus"
-
-#build_cmd = "sudo mk-build-deps --install --tool 'apt-get --yes --no-install-recommends'; cd ..; ./build.sh"
-build_cmd = """
-cp -a ../pam_tacplus-debian debian
-rm -f debian/compat
-sudo mk-build-deps --install --tool 'apt-get --yes --no-install-recommends'
-dpkg-buildpackage -uc -us -tc -b -d
-"""
diff --git a/scripts/package-build/tacacs/.gitignore b/scripts/package-build/tacacs/.gitignore
new file mode 100644
index 00000000..7588fff4
--- /dev/null
+++ b/scripts/package-build/tacacs/.gitignore
@@ -0,0 +1,8 @@
+libnss-tacplus/
+libpam-tacplus/
+libtacplus-map/
+*.buildinfo
+*.build
+*.changes
+*.deb
+*.dsc
diff --git a/scripts/package-build/pam_tacplus/build.py b/scripts/package-build/tacacs/build.py
index 3c76af73..3c76af73 120000
--- a/scripts/package-build/pam_tacplus/build.py
+++ b/scripts/package-build/tacacs/build.py
diff --git a/scripts/package-build/tacacs/package.toml b/scripts/package-build/tacacs/package.toml
new file mode 100644
index 00000000..ec50ca85
--- /dev/null
+++ b/scripts/package-build/tacacs/package.toml
@@ -0,0 +1,24 @@
+[[packages]]
+name = "libtacplus-map"
+commit_id = "master"
+scm_url = "https://github.com/vyos/libtacplus-map.git"
+build_cmd = "dpkg-buildpackage -us -uc -tc -b"
+
+[[packages]]
+name = "libpam-tacplus"
+commit_id = "master"
+scm_url = "https://github.com/vyos/libpam-tacplus.git"
+build_cmd = "sudo dpkg -i ../libtacplus-map*.deb; dpkg-buildpackage -us -uc -tc -b"
+
+[[packages]]
+name = "libnss-tacplus"
+commit_id = "master"
+scm_url = "https://github.com/vyos/libnss-tacplus.git"
+build_cmd = "sudo dpkg -i ../libtac*.deb ../libpam-tacplus*.deb; dpkg-buildpackage -us -uc -tc -b"
+
+[packages.dependencies]
+packages = [
+    "libpam-dev",
+    "autoconf-archive",
+    "libaudit-dev"
+]