diff --git a/BUILD_ORDER b/BUILD_ORDER index 48d7874..25b9673 100644 --- a/BUILD_ORDER +++ b/BUILD_ORDER @@ -10,7 +10,6 @@ mozjs cjs cracklib pam -pam_unix2 python-pam cinnamon-desktop json-glib diff --git a/build-cinnamon.sh b/build-cinnamon.sh index e10bf2a..3ee88c1 100755 --- a/build-cinnamon.sh +++ b/build-cinnamon.sh @@ -54,7 +54,6 @@ for dir in \ cjs \ cracklib \ pam \ - pam_unix2 \ python-pam \ cinnamon-desktop \ json-glib \ diff --git a/pam_unix2/pam_unix.patch b/pam_unix2/pam_unix.patch deleted file mode 100644 index faa6a23..0000000 --- a/pam_unix2/pam_unix.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: pam_unix2-2.9.1/src/read-files.c -=================================================================== ---- pam_unix2-2.9.1.orig/src/read-files.c -+++ pam_unix2-2.9.1/src/read-files.c -@@ -30,8 +30,14 @@ - #include - #include - #include --#include -+#include - #define __libc_lock_t pthread_mutex_t -+#define __libc_lock_define_initialized(CLASS,NAME) \ -+ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; -+#define __libc_lock_lock(NAME) \ -+ pthread_mutex_lock, (&(NAME)) -+#define __libc_lock_unlock(NAME) \ -+ pthread_mutex_unlock, (&(NAME)) - - #include "read-files.h" - diff --git a/pam_unix2/pam_unix2.SlackBuild b/pam_unix2/pam_unix2.SlackBuild deleted file mode 100644 index dc47915..0000000 --- a/pam_unix2/pam_unix2.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Slackware build script for pam_unix2 - -# Copyright 2014 Willy Sudiarto Raharjo -# All rights reserved. - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=pam_unix2 -VERSION=${VERSION:-2.9.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_csb} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -wget -c https://sources.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -CWD=$(pwd) -TMP=${TMP:-/tmp/csb} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch -p1 < $CWD/pam_unix.patch - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/ \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --includedir=/usr/include/security \ - --datarootdir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-selinux \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/ -cp -a ABOUT-NLS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION/ - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/pam_unix2/slack-desc b/pam_unix2/slack-desc deleted file mode 100644 index fb0b81c..0000000 --- a/pam_unix2/slack-desc +++ /dev/null @@ -1,12 +0,0 @@ - |-----handy-ruler------------------------------------------------------| -pam_unix2: pam_unix2 (Module for traditional password authentication ) -pam_unix2: -pam_unix2: pam_unix2 is the standard Unix authentication module. -pam_unix2: The authentication component performs the task of checking the -pam_unix2: users credentials (password). -pam_unix2: -pam_unix2: Credentials information is obtained from the /etc/passwd and the -pam_unix2: /etc/shadow file as well if shadow is enabled. -pam_unix2: -pam_unix2: -pam_unix2: