diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-03-27 07:07:45 +0100 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2019-03-29 00:12:38 +0100 |
commit | 939e6c3abebeaa2a89b4a5b521b821c853156c16 (patch) | |
tree | ff13b56e82f49135a1c99a7a80af101fa675096b /net-mail/cyrus-imapd | |
parent | mail-filter/procmail: remove unused patch. (diff) | |
download | gentoo-939e6c3abebeaa2a89b4a5b521b821c853156c16.tar.gz gentoo-939e6c3abebeaa2a89b4a5b521b821c853156c16.tar.bz2 gentoo-939e6c3abebeaa2a89b4a5b521b821c853156c16.zip |
net-mail/cyrus-imapd: remove unused patches.
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'net-mail/cyrus-imapd')
-rw-r--r-- | net-mail/cyrus-imapd/files/cyrus-imapd-db.patch | 81 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch | 43 | ||||
-rw-r--r-- | net-mail/cyrus-imapd/files/cyrus.rc6 | 22 |
3 files changed, 0 insertions, 146 deletions
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch deleted file mode 100644 index f720cf2cb127..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- configure.ac 2015-07-06 01:22:19.000000000 +0000 -+++ configure.ac 2015-07-22 11:18:33.000000000 +0000 -@@ -236,50 +236,29 @@ - dnl Berkeley DB Detection - - AC_ARG_WITH(bdb, -- [AS_HELP_STRING([--with-bdb=DIR], [use Berkeley DB (in DIR) [yes]])], -- with_bdb=$withval, with_bdb="yes") -- --dnl support old-style --AC_ARG_WITH(dbdir,, with_bdb=$withval) -+ [AS_HELP_STRING([--with-bdb], [use Berkeley DB [yes]])], -+ [], -+ [with_bdb="yes"]) - -+# On a properly installed system, we build -+# by including <db.h> and by linking with -ldb - case "$with_bdb" in -- no) -- use_berkeley="no" -- ;; -- yes) -- use_berkeley="yes" -- with_bdb_lib=none -- with_bdb_inc=none -- ;; -- *) -- use_berkeley="yes" -- with_bdb_lib="$with_bdb/lib" -- with_bdb_inc="$with_bdb/include" -+ no) ;; -+ *) AC_CHECK_FILE([/usr/include/db.h], -+ [], -+ AC_CHECK_FILE([/usr/include/db/db.h]), -+ [BDB_INC="-I/usr/include/db"], -+ AC_MSG_ERROR([No <db.h> include file is found. Install the -+ appropriate db*-devel package first.])) -+ BDB_LIB="-ldb" -+ AC_SUBST(BDB_INC) -+ AC_SUBST(BDB_LIB) -+ LIBS="${LIBS} ${BDB_LIB}" -+ CPPFLAGS="${CPPFLAGS} ${BDB_INC}" -+ AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?]) - ;; - esac -- --if test "$use_berkeley" != "no"; then -- CYRUS_BERKELEY_DB_CHK() -- -- if test "$dblib" = "no"; then -- AC_MSG_ERROR([Berkeley DB 3.x or later was not found. You may need to -- supply the --with-bdb-libdir or --with-bdb-incdir configure options.]) -- fi -- -- if test "$with_bdb_lib" != "none"; then -- CMU_ADD_LIBPATH($with_bdb_lib) -- fi -- -- BDB_INC=${BDB_INCADD} -- BDB_LIB=${BDB_LIBADD} -- AC_SUBST(BDB_INC) -- AC_SUBST(BDB_LIB) -- -- LIBS="${LIBS} ${BDB_LIBADD}" -- CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}" -- AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?]) --fi --AM_CONDITIONAL([USE_BERKELEY], [test "$use_berkeley" != "no"]) -+AM_CONDITIONAL([USE_BERKELEY], [test "$with_bdb" != "no"]) - - dnl End Berkeley DB Detection - -@@ -1800,7 +1779,7 @@ - pcre: $cyrus_cv_pcre_utf8 - - Database support: -- bdb: $use_berkeley -+ bdb: $with_bdb - mysql: $with_mysql - postgresql: $use_pgsql - sqlite: $use_sqlite diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch deleted file mode 100644 index 0bfdc1d31550..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/configure.ac 2016-10-17 23:01:04.000000000 +0200 -+++ b/configure.ac 2016-12-28 02:42:37.936610002 +0100 -@@ -400,6 +379,7 @@ - fi - - LIBS="${LIBS} ${SQLITE_LIBADD}" -+ AC_SUBST(SQLITE_LIBADD) - CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}" - - AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?]) -@@ -437,7 +416,9 @@ - fi - - if test "$cyrus_cv_pcre_utf8" = "yes"; then -- LIBS="$LIBS -lpcre -lpcreposix"; -+ PCRE_LIBS="-lpcre -lpcreposix" -+ AC_SUBST(PCRE_LIBS) -+ LIBS="$LIBS $PCRE_LIBS" - AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?]) - AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?]) - else ---- a/perl/imap/Makefile.PL.in 2016-10-17 23:01:04.000000000 +0200 -+++ b/perl/imap/Makefile.PL.in 2016-12-28 02:42:04.559449967 +0100 -@@ -69,7 +69,7 @@ - 'clean' => {'FILES' => 'libcyrperl.a cyradm'}, - 'OBJECT' => 'IMAP.o', - 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', -- 'LIBS' => [ "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"], -+ 'LIBS' => [ "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"], - 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' - 'INC' => "@BDB_INC@ -I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", - 'EXE_FILES' => [cyradm], ---- a/perl/sieve/managesieve/Makefile.PL.in 2016-10-17 23:01:04.000000000 +0200 -+++ b/perl/sieve/managesieve/Makefile.PL.in 2016-12-28 02:42:34.496490437 +0100 -@@ -52,7 +52,7 @@ - 'ABSTRACT' => 'Cyrus Sieve management interface', - 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION - 'MYEXTLIB' => '../lib/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', -- 'LIBS' => ["@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"], -+ 'LIBS' => ["@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"], - 'CCFLAGS' => '@COV_CFLAGS@', - 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' - 'INC' => "@BDB_INC@ -I@top_srcdir@/lib -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@", diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6 b/net-mail/cyrus-imapd/files/cyrus.rc6 deleted file mode 100644 index 119de24c188c..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus.rc6 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use net - use dns logger - after drac saslauthd -} - -start() { - ebegin "Starting cyrus imapd" - start-stop-daemon --start --quiet --background \ - --exec /usr/lib/cyrus/master -- ${CYRUS_OPTS} - eend $? -} - -stop() { - ebegin "Stopping cyrus imapd" - start-stop-daemon --stop --quiet --pidfile /var/run/cyrus-master.pid - eend $? -} |