diff options
Diffstat (limited to 'source/n/cyrus-sasl')
| -rwxr-xr-x | source/n/cyrus-sasl/cyrus-sasl.SlackBuild | 17 | ||||
| -rw-r--r-- | source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff | 22 |
2 files changed, 38 insertions, 1 deletions
diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild index 27512039..eea8e190 100755 --- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild @@ -22,7 +22,7 @@ PKGNAM=cyrus-sasl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -58,6 +58,10 @@ cd $TMP rm -rf cyrus-sasl-$VERSION tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z* || exit 1 cd cyrus-sasl-$VERSION || exit 1 + +# Fix compiling: +zcat $CWD/cyrus-sasl.bad_elif.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . -perm 777 -exec chmod 755 {} \; find . -perm 664 -exec chmod 644 {} \; @@ -69,6 +73,7 @@ CFLAGS="$SLKCFLAGS" \ --with-configdir=/etc/sasl2 \ --sysconfdir=/etc \ --localstatedir=/var \ + --mandir=/usr/man \ --disable-static \ --enable-login \ --disable-anon \ @@ -81,6 +86,16 @@ CFLAGS="$SLKCFLAGS" \ # 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 + ( 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 diff --git a/source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff b/source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff new file mode 100644 index 00000000..a7196b3b --- /dev/null +++ b/source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff @@ -0,0 +1,22 @@ +Index: cyrus-sasl-2.1.23/plugins/digestmd5.c +=================================================================== +--- cyrus-sasl-2.1.23.orig/plugins/digestmd5.c ++++ cyrus-sasl-2.1.23/plugins/digestmd5.c +@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, |