commit: c96753d10a08e833af80a1f03e24b8c70b37fa8c Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Aug 18 10:33:26 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Sep 14 10:59:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96753d1
dev-libs/cyrus-sasl: remove unused patches. Closes: https://github.com/gentoo/gentoo/pull/2231 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> .../files/cyrus-sasl-0001_versioned_symbols.patch | 30 ---- .../files/cyrus-sasl-0002_testsuite.patch | 26 ---- .../files/cyrus-sasl-0006_library_mutexes.patch | 25 --- .../cyrus-sasl-0008_one_time_sasl_set_alloc.patch | 67 -------- .../files/cyrus-sasl-0010_maintainer_mode.patch | 13 -- ...cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch | 12 -- .../cyrus-sasl-0012_xopen_crypt_prototype.patch | 15 -- .../cyrus-sasl-0014_avoid_pic_overwrite.patch | 27 ---- ...rus-sasl-0016_pid_file_lock_creation_mask.patch | 24 --- ...rus-sasl-0026_drop_krb5support_dependency.patch | 38 ----- .../files/cyrus-sasl-2.1.17-pgsql-include.patch | 15 -- .../files/cyrus-sasl-2.1.19-checkpw.c.patch | 172 --------------------- .../files/cyrus-sasl-2.1.21-keytab.patch | 39 ----- .../files/cyrus-sasl-2.1.22-as-needed.patch | 11 -- .../cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch | 71 --------- .../cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch | 24 --- .../cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch | 22 --- .../files/cyrus-sasl-2.1.23+db-5.0.patch | 23 --- .../files/cyrus-sasl-2.1.23-CVE-2013-4122.patch | 104 ------------- .../files/cyrus-sasl-2.1.23-authd-fix.patch | 28 ---- .../files/cyrus-sasl-2.1.23-rimap-loop.patch | 28 ---- dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf | 25 --- dev-libs/cyrus-sasl/files/saslauthd2.rc6 | 21 --- 23 files changed, 860 deletions(-) diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0001_versioned_symbols.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0001_versioned_symbols.patch deleted file mode 100644 index 312afc8..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0001_versioned_symbols.patch +++ /dev/null @@ -1,30 +0,0 @@ -Author: Fabian Fagerholm <fa...@debian.org> - - Use versioned symbols for libsasl2. - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index e09fe6e..e74c507 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -61,8 +61,8 @@ LIB_DOOR= @LIB_DOOR@ - lib_LTLIBRARIES = libsasl2.la - - libsasl2_la_SOURCES = $(common_sources) $(common_headers) --libsasl2_la_LDFLAGS = -version-info $(sasl_version) --libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) -+libsasl2_la_LDFLAGS = -version-info $(sasl_version) -Wl,--version-script=$(top_srcdir)/Versions -+libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) $(top_srcdir)/Versions - libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX -new file mode 100644 -index 0000000..ff7190d ---- /dev/null -+++ b/Versions -@@ -0,0 +1,6 @@ -+SASL2 { -+ global: -+ sasl_*; prop_*; auxprop_plugin_info; _sasl_MD5*; -+}; -+ -+HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0002_testsuite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0002_testsuite.patch deleted file mode 100644 index c550927..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0002_testsuite.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Fabian Fagerholm <fa...@debian.org> -Description: Rename the testsuite program to sasltestsuite and use /etc/sasldb2 -instead of ./sasldb as default path for the sasldb database file. ---- trunk.orig/utils/testsuite.c -+++ trunk/utils/testsuite.c -@@ -464,9 +464,9 @@ - *len = (unsigned) strlen("sasldb"); - return SASL_OK; - } else if (!strcmp(option, "sasldb_path")) { -- *result = "./sasldb"; -+ *result = "/etc/sasldb2"; - if (len) -- *len = (unsigned) strlen("./sasldb"); -+ *len = (unsigned) strlen("/etc/sasldb2"); - return SASL_OK; - } else if (!strcmp(option, "canon_user_plugin")) { - *result = cu_plugin; -@@ -2925,7 +2925,7 @@ - void usage(void) - { - printf("Usage:\n" \ -- " testsuite [-g name] [-s seed] [-r tests] -a -M\n" \ -+ " sasltestsuite [-g name] [-s seed] [-r tests] -a -M\n" \ - " g -- gssapi service name to use (default: host)\n" \ - " r -- # of random tests to do (default: 25)\n" \ - " a -- do all corruption tests (and ignores random ones unless -r specified)\n" \ diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0006_library_mutexes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0006_library_mutexes.patch deleted file mode 100644 index 539bc06..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0006_library_mutexes.patch +++ /dev/null @@ -1,25 +0,0 @@ -Author: Fabian Fagerholm <fa...@debian.org> -Description: Exact description unknown; make sure mutex-related code works. ---- trunk.orig/lib/common.c -+++ trunk/lib/common.c -@@ -771,7 +771,7 @@ - result = sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_init); - if(result != SASL_OK) return result; - -- if (!free_mutex) -+ if (!free_mutex || free_mutex == 0x1) - free_mutex = sasl_MUTEX_ALLOC(); - if (!free_mutex) return SASL_FAIL; - -@@ -790,6 +790,11 @@ - - /* serialize disposes. this is necessary because we can't - dispose of conn->mutex if someone else is locked on it */ -+ -+ if (!free_mutex || free_mutex == 0x1) -+ free_mutex = sasl_MUTEX_ALLOC(); -+ if (!free_mutex) return SASL_FAIL; -+ - result = sasl_MUTEX_LOCK(free_mutex); - if (result!=SASL_OK) return; - diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0008_one_time_sasl_set_alloc.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0008_one_time_sasl_set_alloc.patch deleted file mode 100644 index e252bab..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0008_one_time_sasl_set_alloc.patch +++ /dev/null @@ -1,67 +0,0 @@ -Author: Fabian Fagerholm <fa...@debian.org> -Description: Make sasl_set_alloc a one-time function. -This patch will divert all allocations to whomever called -sasl_set_alloc first, hopefully that will be the application. If -not, we sure *hope* the library doing stupid things has sane -sasl_set_alloc semantics... -It will also deny any futher tries to sasl_set_alloc after one -of the _init functions are called. -This patch was introduced and works fine in SASL 1.5, and no -applications started behaving in insane ways, so chances are it -will also work with SASL 2.1 -Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=139568 -Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=274087 -Reference: https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=2525 ---- trunk.orig/lib/client.c -+++ trunk/lib/client.c -@@ -202,6 +202,9 @@ - { NULL, NULL } - }; - -+ /* lock allocation type */ -+ _sasl_allocation_locked++; -+ - if(_sasl_client_active) { - /* We're already active, just increase our refcount */ - /* xxx do something with the callback structure? */ ---- trunk.orig/lib/common.c -+++ trunk/lib/common.c -@@ -107,6 +107,7 @@ - (sasl_realloc_t *) &realloc, - (sasl_free_t *) &free - }; -+int _sasl_allocation_locked = 0; - - #define SASL_ENCODEV_EXTRA 4096 - -@@ -637,6 +638,8 @@ - sasl_realloc_t *r, - sasl_free_t *f) - { -+ if (_sasl_allocation_locked++) return; -+ - _sasl_allocation_utils.malloc=m; - _sasl_allocation_utils.calloc=c; - _sasl_allocation_utils.realloc=r; ---- trunk.orig/lib/saslint.h -+++ trunk/lib/saslint.h -@@ -300,6 +300,7 @@ - - extern sasl_allocation_utils_t _sasl_allocation_utils; - extern sasl_mutex_utils_t _sasl_mutex_utils; -+extern int _sasl_allocation_locked; - - /* - * checkpw.c ---- trunk.orig/lib/server.c -+++ trunk/lib/server.c -@@ -698,6 +698,9 @@ - { NULL, NULL } - }; - -+ /* lock allocation type */ -+ _sasl_allocation_locked++; -+ - /* we require the appname (if present) to be short enough to be a path */ - if (appname != NULL && strlen(appname) >= PATH_MAX) - return SASL_BADPARAM; diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0010_maintainer_mode.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0010_maintainer_mode.patch deleted file mode 100644 index 14d4456..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0010_maintainer_mode.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Fabian Fagerholm <fa...@debian.org> -Description: Enable maintainer mode to avoid auto* problems. ---- trunk.orig/configure.in -+++ trunk/configure.in -@@ -62,6 +62,8 @@ - AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.23) - CMU_INIT_AUTOMAKE - -+AM_MAINTAINER_MODE -+ - # and include our config dir scripts - ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" - diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch deleted file mode 100644 index e9b92a4..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Fabian Fagerholm <fa...@debian.org> -Description: Enable libtool use. ---- trunk.orig/saslauthd/configure.in -+++ trunk/saslauthd/configure.in -@@ -25,6 +25,7 @@ - AC_PROG_MAKE_SET - AC_PROG_LN_S - AC_PROG_INSTALL -+AC_PROG_LIBTOOL - - dnl Checks for build foo - CMU_C___ATTRIBUTE__ diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0012_xopen_crypt_prototype.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0012_xopen_crypt_prototype.patch deleted file mode 100644 index d9daad7..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Dann Frazier <da...@debian.org> -Description: When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h> -will define a correct function prototype for the crypt function. This avoids -segfaults on architectures where the size of a pointer is greater than the size -of an integer (ia64 and amd64 are examples). This may be detected by looking -for build log lines such as the following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different size ---- trunk.orig/saslauthd/auth_shadow.c -+++ trunk/saslauthd/auth_shadow.c -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0014_avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0014_avoid_pic_overwrite.patch deleted file mode 100644 index ffc69b7..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0014_avoid_pic_overwrite.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Fabian Fagerholm <fa...@debian.org> -Description: This patch makes sure the non-PIC version of libsasldb.a, which -is created out of non-PIC objects, is not going to overwrite the PIC version, -which is created out of PIC objects. The PIC version is placed in .libs, and -the non-PIC version in the current directory. This ensures that both non-PIC -and PIC versions are available in the correct locations. ---- trunk.orig/lib/Makefile.am -+++ trunk/lib/Makefile.am -@@ -76,7 +76,7 @@ - - libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) - @echo adding static plugins and dependencies -- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) -+ $(AR) cru $@ $(SASL_STATIC_OBJS) - @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ - if test ! -f $$i; then continue; fi; . $$i; \ - for j in $$dependency_libs foo; do \ ---- trunk.orig/sasldb/Makefile.am -+++ trunk/sasldb/Makefile.am -@@ -63,6 +63,6 @@ - EXTRA_libsasldb_a_SOURCES = - - libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) -- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) -+ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) - - diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0016_pid_file_lock_creation_mask.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index a80ca06..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Sam Hocevar <s...@zoy.org> -Description: pid_file_lock is created with a mask of 644 instead of 0644. This -patch fixes this octal/decimal confusion as well as the (harmless) one in the -previous umask() call. ---- trunk.orig/saslauthd/saslauthd-main.c -+++ trunk/saslauthd/saslauthd-main.c -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-0026_drop_krb5support_dependency.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-0026_drop_krb5support_dependency.patch deleted file mode 100644 index 4df6a5a..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-0026_drop_krb5support_dependency.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: Roberto C. Sanchez <robe...@connexer.com> -Description: Drop gratuitous dependency on krb5support ---- trunk.orig/aclocal.m4 -+++ trunk/aclocal.m4 -@@ -2924,9 +2924,6 @@ - fi - - if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then -- # check for libkrb5support first -- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) -- - gss_failed=0 - AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, - ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) ---- trunk.orig/cmulocal/sasl2.m4 -+++ trunk/cmulocal/sasl2.m4 -@@ -110,9 +110,6 @@ - fi - - if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then -- # check for libkrb5support first -- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) -- - gss_failed=0 - AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, - ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) ---- trunk.orig/saslauthd/aclocal.m4 -+++ trunk/saslauthd/aclocal.m4 -@@ -1333,9 +1333,6 @@ - fi - - if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then -- # check for libkrb5support first -- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) -- - gss_failed=0 - AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, - ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch deleted file mode 100644 index 0ee7236..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix include path for newer PostgreSQL versions - ---- configure.in -+++ configure.in -@@ -674,7 +674,9 @@ - LIB_PGSQL_DIR=$LIB_PGSQL - LIB_PGSQL="$LIB_PGSQL -lpq" - -- if test -d ${with_pgsql}/include/pgsql; then -+ if test -d ${with_pgsql}/include/postgresql/pgsql; then -+ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql" -+ elif test -d ${with_pgsql}/include/pgsql; then - CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql" - elif test -d ${with_pgsql}/pgsql/include; then - CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include" diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index 1779bab..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,172 +0,0 @@ -Support for crypted passwords - -http://bugs.gentoo.org/45181 - ---- cyrus-sasl-2.1.19/lib/Makefile.in -+++ cyrus-sasl-2.1.19/lib/Makefile.in -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ ---- cyrus-sasl-2.1.19/lib/checkpw.c -+++ cyrus-sasl-2.1.19/lib/checkpw.c -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.21-keytab.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.21-keytab.patch deleted file mode 100644 index 2bbacaa..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.21-keytab.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -u -r cyrus-sasl-2.1.21-orig/cmulocal/sasl2.m4 cyrus-sasl-2.1.21/cmulocal/sasl2.m4 ---- cyrus-sasl-2.1.21-orig/cmulocal/sasl2.m4 2006-08-01 08:29:59.000000000 +0200 -+++ cyrus-sasl-2.1.21/cmulocal/sasl2.m4 2006-08-01 08:31:32.000000000 +0200 -@@ -257,7 +257,21 @@ - - cmu_save_LIBS="$LIBS" - LIBS="$LIBS $GSSAPIBASE_LIBS" -- AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity) -+ dnl AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity) -+ AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_KRB5_H,,[Define if you have the gssapi/gssapi_krb5.h header file])) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#ifdef HAVE_GSSAPI_H -+#include <gssapi.h> -+#else -+#include <gssapi/gssapi.h> -+#endif -+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H -+#include <gssapi/gssapi_krb5.h> -+#endif -+]],[[gsskrb5_register_acceptor_identity("");]]) -+],[AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY,, -+ [Define if your GSSAPI implimentation defines GSSKRB5_REGISTER_ACCEPTOR_IDENTITY]) -+]) - LIBS="$cmu_save_LIBS" - else - AC_MSG_RESULT([disabled]) -diff -u -r cyrus-sasl-2.1.21-orig/plugins/gssapi.c cyrus-sasl-2.1.21/plugins/gssapi.c ---- cyrus-sasl-2.1.21-orig/plugins/gssapi.c 2004-07-21 16:39:06.000000000 +0200 -+++ cyrus-sasl-2.1.21/plugins/gssapi.c 2006-08-01 08:30:26.000000000 +0200 -@@ -50,6 +50,9 @@ - #else - #include <gssapi/gssapi.h> - #endif -+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H -+#include <gssapi/gssapi_krb5.h> -+#endif - - #ifdef WIN32 - # include <winsock2.h> diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-as-needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-as-needed.patch deleted file mode 100644 index 1294cb5..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 -+++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 -@@ -77,7 +77,7 @@ - AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) - SASL_DB_PATH_CHECK() - SASL_DB_CHECK() -- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" -+ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" - fi - - AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd35632..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch deleted file mode 100644 index e262127..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch +++ /dev/null @@ -1,24 +0,0 @@ -fix warnings with gcc-4.4 - -http://bugs.gentoo.org/248738 - ---- cyrus-sasl-2.1.22/plugins/digestmd5.c -+++ cyrus-sasl-2.1.22/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, diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch deleted file mode 100644 index 4f7b04f..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch +++ /dev/null @@ -1,22 +0,0 @@ -fix missing prototype warnings - ---- cyrus-sasl-2.1.22/lib/auxprop.c -+++ cyrus-sasl-2.1.22/lib/auxprop.c -@@ -43,6 +43,7 @@ - */ - - #include <config.h> -+#include <stdio.h> - #include <sasl.h> - #include <prop.h> - #include <ctype.h> ---- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c -+++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c -@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF - ******************************************************************/ - - #include <shadow.h> -+#include <string.h> - - extern char *crypt(); - diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23+db-5.0.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23+db-5.0.patch deleted file mode 100644 index 10be020..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23+db-5.0.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- sasldb/db_berkeley.c.orig 2010-10-04 21:11:15.044010468 -0400 -+++ sasldb/db_berkeley.c 2010-10-04 21:12:18.921998718 -0400 -@@ -100,7 +100,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); - ---- utils/dbconverter-2.c.orig 2010-10-04 21:23:39.778000256 -0400 -+++ utils/dbconverter-2.c 2010-10-04 21:24:50.384999893 -0400 -@@ -214,7 +214,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-CVE-2013-4122.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-CVE-2013-4122.patch deleted file mode 100644 index 460953b..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-CVE-2013-4122.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 0626e86d2e1d0be63a56918371a15d98cfad19d1 Mon Sep 17 00:00:00 2001 -From: mancha <manc...@hush.com> -Date: Tue, 9 Jul 2013 -Subject: Handle NULL returns from glibc 2.17+ crypt(). - -Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL -(w/ NULL return) if the salt violates specifications. Additionally, -on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords -passed to crypt() fail with EPERM (w/ NULL return). - -When using glibc's crypt(), check return value to avoid a possible -NULL pointer dereference. ---- - pwcheck/pwcheck_getpwnam.c | 3 ++- - pwcheck/pwcheck_getspnam.c | 3 ++- - saslauthd/auth_getpwent.c | 3 ++- - saslauthd/auth_shadow.c | 7 ++----- - 4 files changed, 8 insertions(+), 8 deletions(-) - ---- a/pwcheck/pwcheck_getpwnam.c -+++ b/pwcheck/pwcheck_getpwnam.c -@@ -32,6 +32,7 @@ extern char *crypt(); - char *password; - { - char* r; -+ char* crpt_passwd; - struct passwd *pwd; - - pwd = getpwnam(userid); -@@ -41,7 +42,7 @@ char *password; - else if (pwd->pw_passwd[0] == '*') { - r = "Account disabled"; - } -- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) { -+ else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) { - r = "Incorrect password"; - } - else { ---- a/saslauthd/auth_getpwent.c -+++ b/saslauthd/auth_getpwent.c -@@ -70,6 +70,7 @@ auth_getpwent ( - { - /* VARIABLES */ - struct passwd *pw; /* pointer to passwd file entry */ -+ char *crpt_passwd; /* encrypted password */ - /* END VARIABLES */ - - pw = getpwnam(login); -@@ -79,7 +80,7 @@ auth_getpwent ( - RETURN("NO"); - } - -- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) { -+ if (!(crpt_passwd = crypt(password, pw->pw_passwd)) || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) { - RETURN("NO"); - } - ---- a/saslauthd/auth_shadow.c -+++ b/saslauthd/auth_shadow.c -@@ -180,16 +180,13 @@ auth_shadow ( - * not returning any information about a login until we have validated - * the password. - */ -- cpw = strdup((const char *)crypt(password, sp->sp_pwdp)); -- if (strcmp(sp->sp_pwdp, cpw)) { -+ if (!(cpw = crypt(password, sp->sp_pwdp)) || strcmp(sp->sp_pwdp, (const char *)cpw)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'", - sp->sp_pwdp, cpw); - } -- free(cpw); - RETURN("NO"); - } -- free(cpw); - - /* - * The following fields will be set to -1 if: -@@ -251,7 +250,7 @@ auth_shadow ( - RETURN("NO"); - } - -- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) { -+ if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s", - password, upw->upw_passwd); ---- a/pwcheck/pwcheck_getspnam.c 2013-07-14 08:05:00.000000000 +0000 -+++ b/pwcheck/pwcheck_getspnam.c 2013-07-14 08:06:10.958815179 +0000 -@@ -32,13 +33,14 @@ - char *password; - { - struct spwd *pwd; -+ char *crpt_passwd; - - pwd = getspnam(userid); - if (!pwd) { - return "Userid not found"; - } - -- if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) { -+ if (!(crpt_passwd = crypt(password, pwd->sp_pwdp)) || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) { - return "Incorrect password"; - } - else { diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-authd-fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include <string.h> - #include <stdlib.h> - #include <pwd.h> -+#include <unistd.h> - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-rimap-loop.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-rimap-loop.patch deleted file mode 100644 index 5574072..00000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-rimap-loop.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/saslauthd/auth_rimap.c 2011-09-01 14:19:54.754622284 +0100 -+++ b/saslauthd/auth_rimap.c 2011-09-01 14:19:59.410561033 +0100 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf deleted file mode 100644 index 1bbe44d..00000000 --- a/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf +++ /dev/null @@ -1,25 +0,0 @@ -# $Id$ - -# Config file for /etc/init.d/saslauthd - -# Initial (empty) options. -SASLAUTHD_OPTS="" - -# Specify the authentications mechanism. -# **NOTE** For a list see: saslauthd -v -# Since 2.1.19, add "-r" to options for old behavior, -# ie. reassemble user and realm to user@realm form. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r" -SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam" - -# Specify the hostname for remote IMAP server. -# **NOTE** Only needed if rimap auth mechanism is used. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost" - -# Specify the number of worker processes to create. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5" - -# Enable credential cache, set cache size and timeout. -# **NOTE** Size is measured in kilobytes. -# Timeout is measured in seconds. -#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30" diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc6 b/dev-libs/cyrus-sasl/files/saslauthd2.rc6 deleted file mode 100644 index 50f7d60..00000000 --- a/dev-libs/cyrus-sasl/files/saslauthd2.rc6 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need net -} - -start() { - ebegin "Starting saslauthd" - start-stop-daemon --start --quiet --exec /usr/sbin/saslauthd \ - -- ${SASLAUTHD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping saslauthd" - start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/saslauthd.pid - eend $? -}
