From ecc808bfbfb38cf41b61ce2e8562e39cdbac52bd Mon Sep 17 00:00:00 2001 From: Wonwoo Choi Date: Thu, 24 Feb 2022 21:56:18 +0900 Subject: [PATCH] Update bacchus-auth, remove pam-bacchus (moved to separate repo) --- bacchus-auth/debian/changelog | 5 +++ bacchus-auth/debian/compat | 1 + bacchus-auth/debian/control | 10 +++++ .../debian/copyright | 14 +++---- bacchus-auth/debian/rules | 25 +++++++++++ .../debian/source/format | 0 bacchus-auth/src/.gitkeep | 0 pam-bacchus/debian/changelog | 41 ------------------- pam-bacchus/debian/compat | 1 - pam-bacchus/debian/control | 11 ----- pam-bacchus/debian/pam-bacchus.postinst | 7 ---- pam-bacchus/debian/pam-bacchus.prerm | 7 ---- pam-bacchus/debian/pam-configs/bacchus | 9 ---- pam-bacchus/debian/rules | 18 -------- pam-bacchus/src/Makefile | 5 --- pam-bacchus/src/pam_bacchus | 1 - 16 files changed, 46 insertions(+), 109 deletions(-) create mode 100644 bacchus-auth/debian/changelog create mode 100644 bacchus-auth/debian/compat create mode 100644 bacchus-auth/debian/control rename {pam-bacchus => bacchus-auth}/debian/copyright (86%) create mode 100755 bacchus-auth/debian/rules rename {pam-bacchus => bacchus-auth}/debian/source/format (100%) create mode 100644 bacchus-auth/src/.gitkeep delete mode 100644 pam-bacchus/debian/changelog delete mode 100644 pam-bacchus/debian/compat delete mode 100644 pam-bacchus/debian/control delete mode 100644 pam-bacchus/debian/pam-bacchus.postinst delete mode 100644 pam-bacchus/debian/pam-bacchus.prerm delete mode 100644 pam-bacchus/debian/pam-configs/bacchus delete mode 100755 pam-bacchus/debian/rules delete mode 100644 pam-bacchus/src/Makefile delete mode 160000 pam-bacchus/src/pam_bacchus diff --git a/bacchus-auth/debian/changelog b/bacchus-auth/debian/changelog new file mode 100644 index 0000000..d373b7a --- /dev/null +++ b/bacchus-auth/debian/changelog @@ -0,0 +1,5 @@ +bacchus-auth (2022.02-1) buster; urgency=medium + + * Move PAM configuration to pam-bacchus 2.0.0 + + -- Wonwoo Choi Thu, 24 Feb 2022 21:49:43 +0900 diff --git a/bacchus-auth/debian/compat b/bacchus-auth/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/bacchus-auth/debian/compat @@ -0,0 +1 @@ +11 diff --git a/bacchus-auth/debian/control b/bacchus-auth/debian/control new file mode 100644 index 0000000..f6e8aba --- /dev/null +++ b/bacchus-auth/debian/control @@ -0,0 +1,10 @@ +Source: bacchus-auth +Section: misc +Priority: optional +Maintainer: Bacchus +Standards-Version: 4.1.3 + +Package: bacchus-auth +Architecture: any +Depends: pam-bacchus (>=2.0.0), nsscache, libnss-cache +Description: Bacchus ID authentication metapackage diff --git a/pam-bacchus/debian/copyright b/bacchus-auth/debian/copyright similarity index 86% rename from pam-bacchus/debian/copyright rename to bacchus-auth/debian/copyright index e129fe1..c28cce0 100644 --- a/pam-bacchus/debian/copyright +++ b/bacchus-auth/debian/copyright @@ -1,13 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: pam-bacchus -Source: https://github.com/bacchus-snu/pam_bacchus +Upstream-Name: bacchus-auth +Source: https://github.com/bacchus-snu/lab.git Files: * -Copyright: 2019 Bacchus -License: MIT - -Files: debian/* -Copyright: 2019 Bacchus +Copyright: Bacchus License: MIT License: MIT @@ -25,8 +21,8 @@ License: MIT OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # Please also look if there are files or directories which have a diff --git a/bacchus-auth/debian/rules b/bacchus-auth/debian/rules new file mode 100755 index 0000000..e1c367c --- /dev/null +++ b/bacchus-auth/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +%: + dh $@ + + +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) + diff --git a/pam-bacchus/debian/source/format b/bacchus-auth/debian/source/format similarity index 100% rename from pam-bacchus/debian/source/format rename to bacchus-auth/debian/source/format diff --git a/bacchus-auth/src/.gitkeep b/bacchus-auth/src/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/pam-bacchus/debian/changelog b/pam-bacchus/debian/changelog deleted file mode 100644 index 7da18ca..0000000 --- a/pam-bacchus/debian/changelog +++ /dev/null @@ -1,41 +0,0 @@ -pam-bacchus (0.2.0-3) bionic; urgency=medium - - * Fix pam-auth-update uninstall script - - -- Mon, 19 Aug 2019 05:45:22 +0000 - -pam-bacchus (0.2.0-2) bionic; urgency=medium - - * Add autoconfiguration via pam-auth-update - - -- Yongun Seong Mon, 19 Aug 2019 05:00:29 +0000 - -pam-bacchus (0.2.0-1) bionic; urgency=medium - - * Include "patch Segfault fix when input prompt was interrupted" - - -- Yongun Seong Thu, 21 Feb 2019 20:37:30 +0900 - -pam-bacchus (0.1.3-1) bionic; urgency=medium - - * Fix install directory - - -- YeonGyu Jeong <81887821@hanmail.net> Tue, 19 Feb 2019 08:17:09 +0900 - -pam-bacchus (0.1.2-2) bionic; urgency=medium - - * Upgrade dependency to libcurl4 - - -- YeonGyu Jeong <81887821@hanmail.net> Tue, 19 Feb 2019 08:17:09 +0900 - -pam-bacchus (0.1.2-1) bionic; urgency=medium - - * Updated Makefile to use $(DESTDIR) - - -- YeonGyu Jeong <81887821@hanmail.net> Tue, 19 Feb 2019 08:17:09 +0900 - -pam-bacchus (0.1.1-1) bionic; urgency=medium - - * Initial release - - -- YeonGyu Jeong <81887821@hanmail.net> Mon, 18 Feb 2019 19:16:09 +0900 diff --git a/pam-bacchus/debian/compat b/pam-bacchus/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/pam-bacchus/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/pam-bacchus/debian/control b/pam-bacchus/debian/control deleted file mode 100644 index cfe45f0..0000000 --- a/pam-bacchus/debian/control +++ /dev/null @@ -1,11 +0,0 @@ -Source: pam-bacchus -Section: misc -Priority: optional -Maintainer: Bacchus -Build-Depends: debhelper (>= 9), libpam0g-dev, libcurl4-dev -Standards-Version: 3.9.8 - -Package: pam-bacchus -Architecture: all -Depends: ${misc:Depends}, libpam0g, libcurl4 -Description: PAM module that authenticates with id backend diff --git a/pam-bacchus/debian/pam-bacchus.postinst b/pam-bacchus/debian/pam-bacchus.postinst deleted file mode 100644 index 20c9b76..0000000 --- a/pam-bacchus/debian/pam-bacchus.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -pam-auth-update --package diff --git a/pam-bacchus/debian/pam-bacchus.prerm b/pam-bacchus/debian/pam-bacchus.prerm deleted file mode 100644 index 0c061cf..0000000 --- a/pam-bacchus/debian/pam-bacchus.prerm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -pam-auth-update --package --remove bacchus diff --git a/pam-bacchus/debian/pam-configs/bacchus b/pam-bacchus/debian/pam-configs/bacchus deleted file mode 100644 index 56c593c..0000000 --- a/pam-bacchus/debian/pam-configs/bacchus +++ /dev/null @@ -1,9 +0,0 @@ -Name: Bacchus ID -Default: yes -Priority: 128 -Auth-Type: Primary -Auth: - [success=end default=ignore] pam_bacchus.so url=https://id.snucse.org/api/login/pam -Account-Type: Primary -Account: - [success=end default=ignore] pam_succeed_if.so quiet user ingroup cseusers diff --git a/pam-bacchus/debian/rules b/pam-bacchus/debian/rules deleted file mode 100755 index 87b67b9..0000000 --- a/pam-bacchus/debian/rules +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/make -f - -export DH_VERBOSE = 1 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_BUILD_MAINT_OPTIONS=hardening=+all - -%: - dh $@ - - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - -override_dh_install: - dh_install debian/pam-configs/bacchus usr/share/pam-configs - dh_install diff --git a/pam-bacchus/src/Makefile b/pam-bacchus/src/Makefile deleted file mode 100644 index df1d45f..0000000 --- a/pam-bacchus/src/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: pam-bacchus -pam-bacchus: - $(MAKE) -C pam_bacchus -install: - install -D -m 644 pam_bacchus/pam_bacchus.so $(DESTDIR)/lib/x86_64-linux-gnu/security/pam_bacchus.so diff --git a/pam-bacchus/src/pam_bacchus b/pam-bacchus/src/pam_bacchus deleted file mode 160000 index 2a84d0d..0000000 --- a/pam-bacchus/src/pam_bacchus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2a84d0df2e1c71eba1b911887365bca73ccf565a