diff options
Diffstat (limited to 'source/n/cyrus-sasl')
| -rw-r--r-- | source/n/cyrus-sasl/cyrus-sasl-2.1.26-null-crypt.patch | 86 | ||||
| -rw-r--r-- | source/n/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch | 12 | ||||
| -rwxr-xr-x | source/n/cyrus-sasl/cyrus-sasl.SlackBuild | 46 | ||||
| -rw-r--r-- | source/n/cyrus-sasl/cyrus-sasl.url | 1 | ||||
| -rw-r--r-- | source/n/cyrus-sasl/slack-desc | 10 |
5 files changed, 33 insertions, 122 deletions
diff --git a/source/n/cyrus-sasl/cyrus-sasl-2.1.26-null-crypt.patch b/source/n/cyrus-sasl/cyrus-sasl-2.1.26-null-crypt.patch deleted file mode 100644 index ce9b5e25..00000000 --- a/source/n/cyrus-sasl/cyrus-sasl-2.1.26-null-crypt.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up cyrus-sasl-2.1.26/pwcheck/pwcheck_getpwnam.c.null-crypt cyrus-sasl-2.1.26/pwcheck/pwcheck_getpwnam.c ---- cyrus-sasl-2.1.26/pwcheck/pwcheck_getpwnam.c.null-crypt 2012-01-28 00:31:36.000000000 +0100 -+++ cyrus-sasl-2.1.26/pwcheck/pwcheck_getpwnam.c 2012-12-20 17:00:14.614580310 +0100 -@@ -31,7 +31,7 @@ char *pwcheck(userid, password) - char *userid; - char *password; - { -- char* r; -+ char* r, *cryptbuf; - struct passwd *pwd; - - pwd = getpwnam(userid); -@@ -41,11 +41,13 @@ char *password; - else if (pwd->pw_passwd[0] == '*') { - r = "Account disabled"; - } -- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) { -- r = "Incorrect password"; -- } - else { -- r = "OK"; -+ cryptbuf = crypt(password, pwd->pw_passwd); -+ if((cryptbuf == NULL) || (strcmp(pwd->pw_passwd, cryptbuf) != 0)) { -+ r = "Incorrect password"; -+ } else { -+ r = "OK"; -+ } - } - - endpwent(); -diff -up cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c.null-crypt cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c ---- cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c.null-crypt 2012-10-12 16:05:48.000000000 +0200 -+++ cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c 2012-12-20 17:03:17.940793653 +0100 -@@ -78,6 +78,7 @@ auth_getpwent ( - /* VARIABLES */ - struct passwd *pw; /* pointer to passwd file entry */ - int errnum; -+ char *cryptbuf; - /* END VARIABLES */ - - errno = 0; -@@ -105,7 +106,8 @@ auth_getpwent ( - } - } - -- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) { -+ cryptbuf = crypt(password, pw->pw_passwd); -+ if ((cryptbuf == NULL) || strcmp(pw->pw_passwd, cryptbuf)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login); - } -diff -up cyrus-sasl-2.1.26/saslauthd/auth_shadow.c.null-crypt cyrus-sasl-2.1.26/saslauthd/auth_shadow.c ---- cyrus-sasl-2.1.26/saslauthd/auth_shadow.c.null-crypt 2012-12-20 17:00:14.000000000 +0100 -+++ cyrus-sasl-2.1.26/saslauthd/auth_shadow.c 2012-12-20 17:16:44.190360006 +0100 -@@ -214,8 +214,8 @@ auth_shadow ( - RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)"); - } - -- cpw = strdup((const char *)crypt(password, sp->sp_pwdp)); -- if (strcmp(sp->sp_pwdp, cpw)) { -+ cpw = crypt(password, sp->sp_pwdp); -+ if ((cpw == NULL) || strcmp(sp->sp_pwdp, cpw)) { - if (flags & VERBOSE) { - /* - * This _should_ reveal the SHADOW_PW_LOCKED prefix to an -@@ -225,10 +225,8 @@ auth_shadow ( - syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'", - sp->sp_pwdp, cpw); - } -- free(cpw); - RETURN("NO Incorrect password"); - } -- free(cpw); - - /* - * The following fields will be set to -1 if: -@@ -290,7 +288,8 @@ auth_shadow ( - RETURN("NO Invalid username"); - } - -- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) { -+ cpw = crypt(password, upw->upw_passwd); -+ if ((cpw == NULL) || strcmp(upw->upw_passwd, cpw) != 0) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s", - password, upw->upw_passwd); diff --git a/source/n/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch b/source/n/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch deleted file mode 100644 index cde82383..00000000 --- a/source/n/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cyrus-sasl-2.1.26/include/sasl.h.size_t cyrus-sasl-2.1.26/include/sasl.h ---- cyrus-sasl-2.1.26/include/sasl.h.size_t 2012-10-12 09:05:48.000000000 -0500 -+++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 -@@ -223,6 +223,8 @@ extern "C" { - * they must be called before all other SASL functions: - */ - -+#include <sys/types.h> -+ - /* memory allocation functions which may optionally be replaced: - */ - typedef void *sasl_malloc_t(size_t); diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild index 0cbad20a..97a242c5 100755 --- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=cyrus-sasl -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -f 3- -d - | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -34,7 +36,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-cyrus-sasl @@ -57,11 +66,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf cyrus-sasl-$VERSION tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z* || exit 1 -cd cyrus-sasl-$VERSION || exit 1 - -# Fix for glibc-2.17 crypt() NULL return: -zcat $CWD/cyrus-sasl-2.1.26-null-crypt.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/cyrus-sasl-2.1.26-size_t.patch.gz | patch -p1 --verbose || exit 1 +cd cyrus-sasl-$(echo $VERSION | cut -f 1 -d -) || exit 1 chown -R root:root . find . -perm 777 -exec chmod 755 {} \; @@ -81,33 +86,35 @@ CFLAGS="$SLKCFLAGS" \ --without-ldap \ --with-saslauthd \ --with-gdbm \ - --with-dblib=gdbm + --with-devrandom=/dev/urandom \ + --with-dblib=gdbm || exit 1 + # How stupid that I need to specify 'sasldir' again for 'make' or else you get # the warning "Plugins are being installed into /usr/lib/sasl2, but the library # will look for them in /usr/lib64/sasl2" and advised to create a symlink... make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 || exit 1 make sasldir=/usr/lib${LIBDIRSUFFIX}/sasl2 install DESTDIR=$PKG || exit 1 -# NOTE: I'd _like_ to get rid of these, but they are already tangled into -# other .la files, and then those packages would need to be recompiled. And -# likely I'd want to get rid of those .la files, which would lead to more -# fallout, etc, etc. So we'll put these back and plan a giant .la eradication -# effort early in a future development cycle. -# -# Don't ship .la files. -#rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la $PKG/usr/lib${LIBDIRSUFFIX}/sasl2/*.la +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) + mkdir -p $PKG/var/state/saslauthd mkdir -p $PKG/etc/rc.d +mkdir -p $PKG/etc/sasl2 + zcat $CWD/rc.saslauthd.gz > $PKG/etc/rc.d/rc.saslauthd.new + # Fix sloppy man page installation: rm -r $PKG/usr/man/cat8 cat saslauthd/saslauthd.mdoc > $PKG/usr/man/man8/saslauthd.8 gzip -9 $PKG/usr/man/man?/*.? + +# Add other documentation: mkdir -p $PKG/usr/doc/cyrus-sasl-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README* \ @@ -115,10 +122,11 @@ cp -a \ $PKG/usr/doc/cyrus-sasl-$VERSION find $PKG/usr/doc/cyrus-sasl-$VERSION -type f -exec chmod 644 {} \; rm -f $PKG/usr/doc/cyrus-sasl-$VERSION/doc/*Makefile* + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/cyrus-sasl-$VERSION-$ARCH-$BUILD.txz +makepkg -l y -c n $TMP/cyrus-sasl-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz diff --git a/source/n/cyrus-sasl/cyrus-sasl.url b/source/n/cyrus-sasl/cyrus-sasl.url new file mode 100644 index 00000000..305d0f34 --- /dev/null +++ b/source/n/cyrus-sasl/cyrus-sasl.url @@ -0,0 +1 @@ +ftp://ftp.cyrusimap.org/cyrus-sasl/ diff --git a/source/n/cyrus-sasl/slack-desc b/source/n/cyrus-sasl/slack-desc index f437c6a6..e714c71b 100644 --- a/source/n/cyrus-sasl/slack-desc +++ b/source/n/cyrus-sasl/slack-desc @@ -1,16 +1,16 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| cyrus-sasl: cyrus-sasl (Simple Authentication and Security Layer) cyrus-sasl: -cyrus-sasl: This is the Cyrus SASL library. Cyrus SASL is used by mail programs +cyrus-sasl: This is the Cyrus SASL library. Cyrus SASL is used by mail programs cyrus-sasl: on the client or server side to provide authentication and -cyrus-sasl: authorization services. See RFC 2222 for more information. +cyrus-sasl: authorization services. See RFC 2222 for more information. cyrus-sasl: cyrus-sasl: cyrus-sasl: |