From 39beeae6aa38353c735a98f24dee8e852497bb83 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 13 Sep 2019 15:10:44 +0200 Subject: [pam] Get recent pam_script from github --- core/modules/pam/module.build | 27 ++++++++++----------------- core/modules/pam/module.conf | 5 +++-- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/core/modules/pam/module.build b/core/modules/pam/module.build index 6682e4a2..88624cbe 100644 --- a/core/modules/pam/module.build +++ b/core/modules/pam/module.build @@ -2,21 +2,7 @@ fetch_source() { # get pam-script source - download_untar "$REQUIRED_PAM_SCRIPT_URL" "src/" - # Distribution switch: openSuse 13.1 has no package nss-ldap: - if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then - pinfo "Downloading $REQUIRED_NSS_LDAPD_URL ..." - download_untar "$REQUIRED_NSS_LDAPD_URL" "src/" - fi - # Distribution switch: Ubuntu 14.04 dropped packages ncpfs and libncp: - if [[ "$SYS_DISTRIBUTION" == "ubuntu" && "$SYS_VERSION" == "14.04" ]]; then - for file in $REQUIRED_DOWNLOAD_URLS; do - local package="$(basename $file)" - pinfo "Downloading and installing package $package ..." - download_if_empty "$file" "src/$package" - dpkg -i "src/$package" || perror "Could not install package $package." - done - fi + autoclone } build() { @@ -29,8 +15,15 @@ build() { # build pam-script separatly since we use a source tarball - # HACK: find pam_unix.so in MODULE_BUILD_DIR to see where to put pam_script at - cd "${MODULE_WORK_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}" || perror "Could not cd to ${MODULE_WORK_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}." + # HACK: find pam_unix.so in MODULE_BUILD_DIR to see where to put pam_script + cde "${MODULE_WORK_DIR}/src/pam_script" + for i in 1 2 3; do # FUCK THIS BRAIN DAMAGE! + libtoolize + automake --add-missing + autoreconf + aclocal + autoheader + done ./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$SYS_PAM_MODULES_PATH" || perror "pam-script: ./configure failed." make DESTDIR="${MODULE_BUILD_DIR}" install || perror "pam-script: make install to ${MODULE_BUILD_DIR} failed." } diff --git a/core/modules/pam/module.conf b/core/modules/pam/module.conf index 9839630c..14a9890a 100644 --- a/core/modules/pam/module.conf +++ b/core/modules/pam/module.conf @@ -24,5 +24,6 @@ REQUIRED_SYSTEM_FILES=" /etc/login.defs /etc/securetty " -REQUIRED_PAM_SCRIPT_VERSION="1.1.6" -REQUIRED_PAM_SCRIPT_URL="http://downloads.sourceforge.net/project/pam-script/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}.tar.gz" +REQUIRED_GIT=" + https://github.com/jeroennijhof/pam_script.git +" -- cgit v1.2.3-55-g7522