sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e6d7d1df1c43376a7ff9f5c563e88c15c32582bb)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e6d7d1df1c43376a7ff9f5c563e88c15c32582bb)
- Date: Sat, 17 Nov 2018 18:35:23 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
crypto/cyrus-sasl/DETAILS | 4 -
crypto/cyrus-sasl/HISTORY | 4 +
crypto/cyrus-sasl/PRE_BUILD | 9 --
crypto/cyrus-sasl/cve-2013-4122.patch | 116
----------------------------------
crypto/cyrus-sasl/imap-logout.patch | 48 --------------
crypto/cyrus-sasl/imap-loop.patch | 89 --------------------------
crypto/cyrus-sasl/ldapdb-buffer.patch | 10 --
crypto/cyrus-sasl/size_t.patch | 12 ---
crypto/cyrus-sasl/sqlite.patch | 26 -------
9 files changed, 6 insertions(+), 312 deletions(-)
New commits:
commit e6d7d1df1c43376a7ff9f5c563e88c15c32582bb
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/cyrus-sasl: version 2.1.27
diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
index 1faee6b..9056028 100755
--- a/crypto/cyrus-sasl/DETAILS
+++ b/crypto/cyrus-sasl/DETAILS
@@ -1,10 +1,10 @@
SPELL=cyrus-sasl
- VERSION=2.1.26
+ VERSION=2.1.27
+
SOURCE_HASH=sha512:d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=ftp://ftp.cyrusimap.org/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.cyrusimap.org/$SPELL/OLD-VERSIONS/$SOURCE
-
SOURCE_HASH=sha512:78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOCS="doc/*.txt doc/*.html doc/TODO"
LICENSE[0]=BSD
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index 18f458e..8abce77 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,7 @@
+2018-11-17 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.1.27
+ * PRE_BUILD, *.patch: deleted
+
2015-07-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.1.26; gpg -> hash; SECURITY_PATCH++;
updated long desc; updated source urls
diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
deleted file mode 100755
index 2112b7e..0000000
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < $SPELL_DIRECTORY/cve-2013-4122.patch &&
-patch -p1 < $SPELL_DIRECTORY/imap-logout.patch &&
-patch -p1 < $SPELL_DIRECTORY/ldapdb-buffer.patch &&
-patch -p0 < $SPELL_DIRECTORY/imap-loop.patch &&
-patch -p0 < $SPELL_DIRECTORY/size_t.patch &&
-patch -p0 < $SPELL_DIRECTORY/sqlite.patch
diff --git a/crypto/cyrus-sasl/cve-2013-4122.patch
b/crypto/cyrus-sasl/cve-2013-4122.patch
deleted file mode 100644
index 09c9ce8..0000000
--- a/crypto/cyrus-sasl/cve-2013-4122.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
-From: mancha <mancha1 AT hush.com>
-Date: Thu, 11 Jul 2013 09:08:07 +0000
-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.
-
-Patch by mancha1 AT hush.com.
----
-diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
-index 4b34222..400289c 100644
---- a/pwcheck/pwcheck_getpwnam.c
-+++ b/pwcheck/pwcheck_getpwnam.c
-@@ -32,6 +32,7 @@ char *userid;
- 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 {
-diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
-index 2b11286..6d607bb 100644
---- a/pwcheck/pwcheck_getspnam.c
-+++ b/pwcheck/pwcheck_getspnam.c
-@@ -32,13 +32,15 @@ char *userid;
- 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) {
-+ crpt_passwd = crypt(password, pwd->sp_pwdp);
-+ if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) !=
0) {
- return "Incorrect password";
- }
- else {
-diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
-index fc8029d..d4ebe54 100644
---- a/saslauthd/auth_getpwent.c
-+++ b/saslauthd/auth_getpwent.c
-@@ -77,6 +77,7 @@ auth_getpwent (
- {
- /* VARIABLES */
- struct passwd *pw; /* pointer to passwd file
entry */
-+ char *crpt_passwd; /* encrypted password */
- int errnum;
- /* END VARIABLES */
-
-@@ -105,7 +106,8 @@ auth_getpwent (
- }
- }
-
-- if (strcmp(pw->pw_passwd, (const char *)crypt(password,
pw->pw_passwd))) {
-+ crpt_passwd = crypt(password, pw->pw_passwd);
-+ if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
- if (flags & VERBOSE) {
- syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password",
login);
- }
-diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
-index 677131b..1988afd 100644
---- a/saslauthd/auth_shadow.c
-+++ b/saslauthd/auth_shadow.c
-@@ -210,8 +210,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 || strcmp(sp->sp_pwdp, (const char *)cpw)) {
- if (flags & VERBOSE) {
- /*
- * This _should_ reveal the SHADOW_PW_LOCKED prefix to an
-@@ -221,10 +221,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:
-@@ -286,7 +284,7 @@ auth_shadow (
- RETURN("NO Invalid username");
- }
-
-- 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);
---
-cgit v0.9.0.2
diff --git a/crypto/cyrus-sasl/imap-logout.patch
b/crypto/cyrus-sasl/imap-logout.patch
deleted file mode 100644
index d8b4b6e..0000000
--- a/crypto/cyrus-sasl/imap-logout.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- cyrus-sasl2.orig/saslauthd/auth_rimap.c
-+++ cyrus-sasl2/saslauthd/auth_rimap.c
-@@ -90,6 +90,7 @@ static struct addrinfo *ai = NULL; /* re
- service we connect to. */
- #define TAG "saslauthd" /* IMAP command tag */
- #define LOGIN_CMD (TAG " LOGIN ") /* IMAP login command (with tag) */
-+#define LOGOUT_CMD (TAG " LOGOUT ") /* IMAP logout command (with tag)*/
- #define NETWORK_IO_TIMEOUT 30 /* network I/O timeout (seconds) */
- #define RESP_LEN 1000 /* size of read response buffer */
-
-@@ -307,10 +308,12 @@ auth_rimap (
- int s=-1; /* socket to remote auth host
*/
- struct addrinfo *r; /* remote socket address info
*/
- struct iovec iov[5]; /* for sending LOGIN command */
-+ struct iovec iov2[2]; /* for sending LOGOUT command */
- char *qlogin; /* pointer to "quoted" login */
- char *qpass; /* pointer to "quoted" password */
- char *c; /* scratch pointer */
- int rc; /* return code scratch area */
-+ int rcl; /* return code scratch area */
- char rbuf[RESP_LEN]; /* response read buffer */
- char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
- int saved_errno;
-@@ -505,6 +508,24 @@ auth_rimap (
- }
- }
- }
-+
-+ /* close remote imap */
-+ iov2[0].iov_base = LOGOUT_CMD;
-+ iov2[0].iov_len = sizeof(LOGOUT_CMD) - 1;
-+ iov2[1].iov_base = "\r\n";
-+ iov2[1].iov_len = sizeof("\r\n") - 1;
-+
-+ if (flags & VERBOSE) {
-+ syslog(LOG_DEBUG, "auth_rimap: sending %s%s %s",
-+ LOGOUT_CMD, qlogin, qpass);
-+ }
-+ alarm(NETWORK_IO_TIMEOUT);
-+ rcl = retry_writev(s, iov2, 2);
-+ alarm(0);
-+ if (rcl == -1) {
-+ syslog(LOG_WARNING, "auth_rimap: writev logout: %m");
-+ }
-+
- (void) close(s); /* we're done with the remote */
- if (rc == -1) {
- syslog(LOG_WARNING, "auth_rimap: read (response): %m");
diff --git a/crypto/cyrus-sasl/imap-loop.patch
b/crypto/cyrus-sasl/imap-loop.patch
deleted file mode 100644
index 4da6189..0000000
--- a/crypto/cyrus-sasl/imap-loop.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- saslauthd/auth_rimap.c 2012-10-12 14:05:48.000000000 +0000
-+++ saslauthd/auth_rimap.c 2014-05-15 05:23:02.000000000 +0000
-@@ -371,7 +371,7 @@
- if ( rc>0 ) {
- /* check if there is more to read */
- fd_set perm;
-- int fds, ret;
-+ int fds, ret, loopc;
- struct timeval timeout;
-
- FD_ZERO(&perm);
-@@ -380,6 +380,7 @@
-
- timeout.tv_sec = 1;
- timeout.tv_usec = 0;
-+ loopc = 0;
- while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
- if ( FD_ISSET(s, &perm) ) {
- ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
-@@ -387,6 +388,14 @@
- rc = ret;
- break;
- } else {
-+ if (ret == 0) {
-+ loopc += 1;
-+ } else {
-+ loopc = 0;
-+ }
-+ if (loopc > sizeof(rbuf)) { // arbitrary chosen value
-+ break;
-+ }
- rc += ret;
- }
- }
-@@ -484,7 +493,7 @@
- if ( rc>0 ) {
- /* check if there is more to read */
- fd_set perm;
-- int fds, ret;
-+ int fds, ret, loopc;
- struct timeval timeout;
-
- FD_ZERO(&perm);
-@@ -493,6 +502,7 @@
-
- timeout.tv_sec = 1;
- timeout.tv_usec = 0;
-+ loopc = 0;
- while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
- if ( FD_ISSET(s, &perm) ) {
- ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
-@@ -500,6 +510,14 @@
- rc = ret;
- break;
- } else {
-+ if (ret == 0) {
-+ loopc += 1;
-+ } else {
-+ loopc = 0;
-+ }
-+ if (loopc > sizeof(rbuf)) { // arbitrary chosen value
-+ break;
-+ }
- rc += ret;
- }
- }
---- lib/checkpw.c 2012-01-27 23:31:36.000000000 +0000
-+++ lib/checkpw.c 2014-05-15 05:19:35.000000000 +0000
-@@ -587,16 +587,14 @@
- /* Timeout. */
- errno = ETIMEDOUT;
- return -1;
-- case +1:
-- if (FD_ISSET(fd, &rfds)) {
-- /* Success, file descriptor is readable. */
-- return 0;
-- }
-- return -1;
- case -1:
- if (errno == EINTR || errno == EAGAIN)
- continue;
- default:
-+ if (FD_ISSET(fd, &rfds)) {
-+ /* Success, file descriptor is readable. */
-+ return 0;
-+ }
- /* Error catch-all. */
- return -1;
- }
diff --git a/crypto/cyrus-sasl/ldapdb-buffer.patch
b/crypto/cyrus-sasl/ldapdb-buffer.patch
deleted file mode 100644
index af38218..0000000
--- a/crypto/cyrus-sasl/ldapdb-buffer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cyrus-sasl2.orig/plugins/ldapdb.c
-+++ cyrus-sasl2/plugins/ldapdb.c
-@@ -406,6 +406,7 @@ ldapdb_canon_server(void *glob_context,
- if ( len > out_max )
- len = out_max;
- memcpy(out, bvals[0]->bv_val, len);
-+ out[len] = '\0';
- *out_ulen = len;
- ber_bvecfree(bvals);
- }
diff --git a/crypto/cyrus-sasl/size_t.patch b/crypto/cyrus-sasl/size_t.patch
deleted file mode 100644
index 7f50ce6..0000000
--- a/crypto/cyrus-sasl/size_t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/sasl.h.orig 2012-10-12 17:05:48.000000000 +0300
-+++ include/sasl.h 2013-02-23 16:56:44.648786268 +0200
-@@ -121,6 +121,9 @@
- #ifndef SASL_H
- #define SASL_H 1
-
-+/* stddef.h to get size_t defined */
-+#include <stddef.h>
-+
- /* Keep in sync with win32/common.mak */
- #define SASL_VERSION_MAJOR 2
- #define SASL_VERSION_MINOR 1
diff --git a/crypto/cyrus-sasl/sqlite.patch b/crypto/cyrus-sasl/sqlite.patch
deleted file mode 100644
index dd2715e..0000000
--- a/crypto/cyrus-sasl/sqlite.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.b 2011-09-07 09:29:25.000000000 -0400
-+++ configure 2012-05-29 04:58:43.374173367 -0400
-@@ -14470,9 +14470,9 @@
- $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
- *)
- if test -d ${with_sqlite}/lib; then
-- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
-+ LIB_SQLITE="-L${with_sqlite}/lib"
- else
-- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
-+ LIB_SQLITE="-L${with_sqlite}"
- fi
-
- LIB_SQLITE_DIR=$LIB_SQLITE
-@@ -14600,9 +14600,9 @@
- $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
- *)
- if test -d ${with_sqlite3}/lib; then
-- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
-+ LIB_SQLITE3="-L${with_sqlite3}/lib"
- else
-- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
-+ LIB_SQLITE3="-L${with_sqlite3}"
- fi
-
- LIB_SQLITE3_DIR=$LIB_SQLITE3
- [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e6d7d1df1c43376a7ff9f5c563e88c15c32582bb), Pavel Vinogradov, 11/17/2018
Archive powered by MHonArc 2.6.24.