diff options
Diffstat (limited to 'remote/modules/pam')
| -rw-r--r-- | remote/modules/pam/module.build | 7 | ||||
| -rw-r--r-- | remote/modules/pam/module.conf.ubuntu | 4 | ||||
| -rw-r--r-- | remote/modules/pam/module.conf.ubuntu.14 | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build index 3f0d8861..067cd431 100644 --- a/remote/modules/pam/module.build +++ b/remote/modules/pam/module.build @@ -28,12 +28,13 @@ build() { tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}" # 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_BUILD_DIR" - local PAM_UNIX_LOCATION=$(find . -name pam_unix.so) cd "${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}" || perror "Could not cd to ${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}." - ./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$(dirname ${PAM_UNIX_LOCATION:1})" || perror "pam-script: ./configure failed." + ./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." + + # openSuse 13.1 has no package nss-pam-ldapd. So, we compile it. if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then cd "${MODULE_DIR}/src/$REQUIRED_NSS_LDAPD_VERSION" diff --git a/remote/modules/pam/module.conf.ubuntu b/remote/modules/pam/module.conf.ubuntu index 31023197..4a3635fc 100644 --- a/remote/modules/pam/module.conf.ubuntu +++ b/remote/modules/pam/module.conf.ubuntu @@ -39,13 +39,11 @@ REQUIRED_BINARIES+=" mount.cifs " REQUIRED_DIRECTORIES+=" + $SYS_PAM_MODULES_PATH /lib /usr/lib " REQUIRED_SYSTEM_FILES+=" /etc/pam.conf /etc/default/locale - /lib/security - /lib/${ARCH_TRIPLET}/security - /sbin/mkhomedir_helper " diff --git a/remote/modules/pam/module.conf.ubuntu.14 b/remote/modules/pam/module.conf.ubuntu.14 index 2f46770c..26307d84 100644 --- a/remote/modules/pam/module.conf.ubuntu.14 +++ b/remote/modules/pam/module.conf.ubuntu.14 @@ -39,20 +39,19 @@ REQUIRED_BINARIES+=" mount.cifs " REQUIRED_DIRECTORIES+=" + $SYS_PAM_MODULES_PATH /lib /usr/lib " REQUIRED_SYSTEM_FILES+=" /etc/pam.conf /etc/default/locale - /lib/${ARCH_TRIPLET}/security - /sbin/mkhomedir_helper " # For Ubuntu 14.04: Both packages were dropped from official repos. Do not change the # order, as these packages will be installed via dpkg and depend on each other. REQUIRED_DOWNLOAD_URLS=" - de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb + de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libpam-ncp_2.2.6-9ubuntu1_amd64.deb de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/ncpfs_2.2.6-9ubuntu1_amd64.deb " |