summaryrefslogtreecommitdiff
path: root/source/n/dovecot
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/dovecot')
-rwxr-xr-xsource/n/dovecot/dovecot.SlackBuild8
-rw-r--r--source/n/dovecot/dovecot.glibc228.patch45
2 files changed, 1 insertions, 52 deletions
diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild
index 81bcac08..5f175de9 100755
--- a/source/n/dovecot/dovecot.SlackBuild
+++ b/source/n/dovecot/dovecot.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dovecot
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -101,12 +101,6 @@ zcat $CWD/dovecot.default.shadow.auth.diff.gz | patch -p1 --verbose || exit 1
# any need to send people to /usr/doc. Also, make sure that TLS is recommended.
zcat $CWD/dovecot.config.README.diff.gz | patch -p1 --verbose || exit 1
-# Fix crypt() usage with glibc-2.28:
-zcat $CWD/dovecot.glibc228.patch.gz | patch -p1 --verbose || exit 1
-
-# Since the crypt() patch patches configure.ac:
-autoreconf -vif
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/source/n/dovecot/dovecot.glibc228.patch b/source/n/dovecot/dovecot.glibc228.patch
deleted file mode 100644
index 76ef33aa..00000000
--- a/source/n/dovecot/dovecot.glibc228.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <aki.tuomi@dovecot.fi>
-Date: Wed, 8 Aug 2018 12:33:20 +0300
-Subject: [PATCH] auth: mycrypt - include crypt.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes crypt usage on glibc-2.28
-
-Reported by Reuben Farrelly
-Patch provided by Thore Bödecker
----
- configure.ac | 2 +-
- src/auth/mycrypt.c | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd545ebfdc..c5d8fae666 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \
- quota.h sys/fs/quota_common.h \
- mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
- xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
-- sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h)
-+ sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h)
-
- CC_CLANG
- AC_CC_PIE
-diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c
-index c49fcf842e..0bd00bc238 100644
---- a/src/auth/mycrypt.c
-+++ b/src/auth/mycrypt.c
-@@ -14,6 +14,9 @@
- # define _XPG6 /* Some Solaris versions require this, some break with this */
- #endif
- #include <unistd.h>
-+#ifdef HAVE_CRYPT_H
-+# include <crypt.h>
-+#endif
-
- #include "mycrypt.h"
-
-