new PORTREVISION, using newer patchfile
minor Update of the Readme PR: 37607,37913 Submitted by: hetzels@westbend.net
This commit is contained in:
Dirk Meyer
parent
799cb22785
commit
cf5b40d956
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=59221
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= cyrus-sasl
|
||||
PORTVERSION= 1.5.27
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= security ipv6
|
||||
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
|
||||
http://www.surf.org.uk/downloads/ \
|
||||
@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
|
||||
MASTER_SITE_SUBDIR= . OLD-VERSIONS/sasl cyrus-utils
|
||||
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
|
||||
sasl-${PORTVERSION}-ldap-ssl-filter-mysql-patch3.tgz
|
||||
sasl-${PORTVERSION}-ldap-ssl-filter-mysql-patch4.tgz
|
||||
|
||||
PATCH_SITES= ftp://ftp.westbend.net/pub/cyrus-mail/contrib/ \
|
||||
http://www.imasy.or.jp/~ume/ipv6/
|
||||
@ -27,7 +27,7 @@ PATCHFILES= sasl_apop_patch.gz \
|
||||
MAINTAINER= hetzels@westbend.net
|
||||
|
||||
USE_SUBMAKE= yes
|
||||
USE_OPENSSL= YES
|
||||
USE_OPENSSL= yes
|
||||
|
||||
INSTALLS_SHLIB= yes
|
||||
|
||||
@ -98,7 +98,7 @@ PLIST_SUB= PREFIX=${PREFIX} \
|
||||
EBONES=${EBONES} \
|
||||
DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
|
||||
|
||||
LDAP_MYSQL_PATCH= ldap-mysql_sasl/sasl-ldap+mysql.patch
|
||||
LDAP_MYSQL_PATCH= ldap-mysql_sasl-${PORTVERSION}/sasl-ldap+mysql.patch
|
||||
|
||||
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||
@ -122,8 +122,7 @@ post-extract:
|
||||
@${CP} ${FILESDIR}/pwcheck_pam.c ${WRKSRC}/pwcheck
|
||||
|
||||
pre-patch:
|
||||
@(cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAP_MYSQL_PATCH} && \
|
||||
${MV} configure.orig configure)
|
||||
@(cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAP_MYSQL_PATCH})
|
||||
|
||||
# Fix sasldb name in pkg-install/deinstall scripts
|
||||
post-patch:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (cyrus-sasl-1.5.27.tar.gz) = 76ea426e2e2da3b8d2e3a43af5488f3b
|
||||
MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch3.tgz) = 19e6783c1f4095e265648d26c4679544
|
||||
MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch4.tgz) = 3dc800b8a173adb419b6ea9ed8ba5f20
|
||||
MD5 (sasl_apop_patch.gz) = 6bf7a34b73d1c8d139d2269069d1ba4c
|
||||
MD5 (cyrus-sasl-1.5.27-ipv6-20020106.diff.gz) = b2956a084954a46ba2d751f56a80a275
|
||||
|
||||
@ -17,7 +17,7 @@ How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
|
||||
|
||||
TRUST_AUTH_MECH(`DIGEST-MD5 CRAM-MD5')dnl
|
||||
define(`confAUTH_MECHANISMS',`DIGEST-MD5 CRAM-MD5')dnl
|
||||
define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLFile')dnl
|
||||
define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile')dnl
|
||||
define(`confRUN_AS_USER',`root:mail')dnl
|
||||
|
||||
----
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
--- lib/checkpw.c.orig Fri Jan 18 21:56:29 2002
|
||||
+++ lib/checkpw.c Fri Jan 18 22:14:58 2002
|
||||
@@ -1491,6 +1491,9 @@
|
||||
# define FALSE 0
|
||||
#endif
|
||||
|
||||
+#ifndef LDAP_NO_ATTRS
|
||||
+#define LDAP_NO_ATTRS "1.1"
|
||||
+#endif
|
||||
static int ldap_isdigits(char *value)
|
||||
{
|
||||
char *ptr;
|
||||
@@ -1504,6 +1507,16 @@
|
||||
return num;
|
||||
}
|
||||
|
||||
+#ifdef LDAP_VENDOR_VERSION
|
||||
+#define SASL_ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res) \
|
||||
+ ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res)
|
||||
+#define SASL_ldap_memfree(dn) ldap_memfree(dn)
|
||||
+#else
|
||||
+#define SASL_ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res) \
|
||||
+ ldap_search_st(ld, base, scope, filter, attrs, attrsonly, timeout, res)
|
||||
+#define SASL_ldap_memfree(dn) free(dn)
|
||||
+#endif
|
||||
+
|
||||
static int ldap_verify_password(sasl_conn_t *conn,
|
||||
const char *userid,
|
||||
const char *password,
|
||||
@@ -1522,18 +1535,18 @@
|
||||
*ldap_filter="",
|
||||
*ldap_bind_dn="",
|
||||
*ldap_bind_pw="",
|
||||
- *ldap_ssl="",
|
||||
*ldap_filter_mode="",
|
||||
*port_num="";
|
||||
int malloc_size; /* safety net */
|
||||
int ldap_filter_flag = 0;
|
||||
- int ldap_ssl_flag = 0;
|
||||
int ldap_port = LDAP_PORT;
|
||||
sasl_getopt_t *getopt;
|
||||
void *context;
|
||||
LDAPMessage *result, *e;
|
||||
char *attrs[]={LDAP_NO_ATTRS, NULL};
|
||||
#ifdef LDAP_OPT_X_TLS
|
||||
+ char *ldap_ssl="";
|
||||
+ int ldap_ssl_flag = 0;
|
||||
int tls_option;
|
||||
#endif
|
||||
|
||||
@@ -1625,9 +1638,11 @@
|
||||
return SASL_FAIL;
|
||||
}
|
||||
/* set ssl mode if needed */
|
||||
+#ifdef LDAP_OPT_X_TLS
|
||||
if ( ldap_ssl_flag ) {
|
||||
ldap_set_option(ld, LDAP_OPT_X_TLS, (void *)&tls_option);
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* either run the filter or just bind as them ? */
|
||||
|
||||
@@ -1657,7 +1672,7 @@
|
||||
snprintf(filter,malloc_size-1,"(&(%s=%s)%s)", ldap_uidattr, userid, ldap_filter);
|
||||
|
||||
/* Now do the search */
|
||||
- if (ldap_search_ext_s(ld, ldap_basedn, LDAP_SCOPE_SUBTREE, filter,
|
||||
+ if (SASL_ldap_search_ext_s(ld, ldap_basedn, LDAP_SCOPE_SUBTREE, filter,
|
||||
attrs, 0, NULL, NULL, LDAP_NO_LIMIT, 1, &result) !=
|
||||
LDAP_SUCCESS) {
|
||||
free(filter);
|
||||
@@ -1680,17 +1695,17 @@
|
||||
ldap_unbind(ld);
|
||||
return SASL_BADAUTH;
|
||||
}
|
||||
- if (ldap_simple_bind_s(ld,dn,password) != LDAP_SUCCESS) {
|
||||
+ if (ldap_simple_bind_s(ld,dn,(char *)password) != LDAP_SUCCESS) {
|
||||
e = NULL;
|
||||
free(filter);
|
||||
- ldap_memfree(dn);
|
||||
+ SASL_ldap_memfree(dn);
|
||||
ldap_msgfree(result);
|
||||
ldap_unbind(ld);
|
||||
return SASL_BADAUTH;
|
||||
}
|
||||
e = NULL;
|
||||
free(filter);
|
||||
- ldap_memfree(dn);
|
||||
+ SASL_ldap_memfree(dn);
|
||||
ldap_msgfree(result);
|
||||
|
||||
} else {
|
||||
@@ -1710,7 +1725,7 @@
|
||||
* If this is not so I have a version or that too
|
||||
* Simon@surf.org.uk
|
||||
*/
|
||||
- if (ldap_simple_bind_s(ld,dn,password) != LDAP_SUCCESS) {
|
||||
+ if (ldap_simple_bind_s(ld,dn,(char *)password) != LDAP_SUCCESS) {
|
||||
free(dn);
|
||||
ldap_unbind(ld);
|
||||
return SASL_BADAUTH;
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= cyrus-sasl
|
||||
PORTVERSION= 1.5.27
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= security ipv6
|
||||
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
|
||||
http://www.surf.org.uk/downloads/ \
|
||||
@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
|
||||
MASTER_SITE_SUBDIR= . OLD-VERSIONS/sasl cyrus-utils
|
||||
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
|
||||
sasl-${PORTVERSION}-ldap-ssl-filter-mysql-patch3.tgz
|
||||
sasl-${PORTVERSION}-ldap-ssl-filter-mysql-patch4.tgz
|
||||
|
||||
PATCH_SITES= ftp://ftp.westbend.net/pub/cyrus-mail/contrib/ \
|
||||
http://www.imasy.or.jp/~ume/ipv6/
|
||||
@ -27,7 +27,7 @@ PATCHFILES= sasl_apop_patch.gz \
|
||||
MAINTAINER= hetzels@westbend.net
|
||||
|
||||
USE_SUBMAKE= yes
|
||||
USE_OPENSSL= YES
|
||||
USE_OPENSSL= yes
|
||||
|
||||
INSTALLS_SHLIB= yes
|
||||
|
||||
@ -98,7 +98,7 @@ PLIST_SUB= PREFIX=${PREFIX} \
|
||||
EBONES=${EBONES} \
|
||||
DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
|
||||
|
||||
LDAP_MYSQL_PATCH= ldap-mysql_sasl/sasl-ldap+mysql.patch
|
||||
LDAP_MYSQL_PATCH= ldap-mysql_sasl-${PORTVERSION}/sasl-ldap+mysql.patch
|
||||
|
||||
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||
@ -122,8 +122,7 @@ post-extract:
|
||||
@${CP} ${FILESDIR}/pwcheck_pam.c ${WRKSRC}/pwcheck
|
||||
|
||||
pre-patch:
|
||||
@(cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAP_MYSQL_PATCH} && \
|
||||
${MV} configure.orig configure)
|
||||
@(cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAP_MYSQL_PATCH})
|
||||
|
||||
# Fix sasldb name in pkg-install/deinstall scripts
|
||||
post-patch:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (cyrus-sasl-1.5.27.tar.gz) = 76ea426e2e2da3b8d2e3a43af5488f3b
|
||||
MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch3.tgz) = 19e6783c1f4095e265648d26c4679544
|
||||
MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch4.tgz) = 3dc800b8a173adb419b6ea9ed8ba5f20
|
||||
MD5 (sasl_apop_patch.gz) = 6bf7a34b73d1c8d139d2269069d1ba4c
|
||||
MD5 (cyrus-sasl-1.5.27-ipv6-20020106.diff.gz) = b2956a084954a46ba2d751f56a80a275
|
||||
|
||||
@ -17,7 +17,7 @@ How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
|
||||
|
||||
TRUST_AUTH_MECH(`DIGEST-MD5 CRAM-MD5')dnl
|
||||
define(`confAUTH_MECHANISMS',`DIGEST-MD5 CRAM-MD5')dnl
|
||||
define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLFile')dnl
|
||||
define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile')dnl
|
||||
define(`confRUN_AS_USER',`root:mail')dnl
|
||||
|
||||
----
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
--- lib/checkpw.c.orig Fri Jan 18 21:56:29 2002
|
||||
+++ lib/checkpw.c Fri Jan 18 22:14:58 2002
|
||||
@@ -1491,6 +1491,9 @@
|
||||
# define FALSE 0
|
||||
#endif
|
||||
|
||||
+#ifndef LDAP_NO_ATTRS
|
||||
+#define LDAP_NO_ATTRS "1.1"
|
||||
+#endif
|
||||
static int ldap_isdigits(char *value)
|
||||
{
|
||||
char *ptr;
|
||||
@@ -1504,6 +1507,16 @@
|
||||
return num;
|
||||
}
|
||||
|
||||
+#ifdef LDAP_VENDOR_VERSION
|
||||
+#define SASL_ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res) \
|
||||
+ ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res)
|
||||
+#define SASL_ldap_memfree(dn) ldap_memfree(dn)
|
||||
+#else
|
||||
+#define SASL_ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res) \
|
||||
+ ldap_search_st(ld, base, scope, filter, attrs, attrsonly, timeout, res)
|
||||
+#define SASL_ldap_memfree(dn) free(dn)
|
||||
+#endif
|
||||
+
|
||||
static int ldap_verify_password(sasl_conn_t *conn,
|
||||
const char *userid,
|
||||
const char *password,
|
||||
@@ -1522,18 +1535,18 @@
|
||||
*ldap_filter="",
|
||||
*ldap_bind_dn="",
|
||||
*ldap_bind_pw="",
|
||||
- *ldap_ssl="",
|
||||
*ldap_filter_mode="",
|
||||
*port_num="";
|
||||
int malloc_size; /* safety net */
|
||||
int ldap_filter_flag = 0;
|
||||
- int ldap_ssl_flag = 0;
|
||||
int ldap_port = LDAP_PORT;
|
||||
sasl_getopt_t *getopt;
|
||||
void *context;
|
||||
LDAPMessage *result, *e;
|
||||
char *attrs[]={LDAP_NO_ATTRS, NULL};
|
||||
#ifdef LDAP_OPT_X_TLS
|
||||
+ char *ldap_ssl="";
|
||||
+ int ldap_ssl_flag = 0;
|
||||
int tls_option;
|
||||
#endif
|
||||
|
||||
@@ -1625,9 +1638,11 @@
|
||||
return SASL_FAIL;
|
||||
}
|
||||
/* set ssl mode if needed */
|
||||
+#ifdef LDAP_OPT_X_TLS
|
||||
if ( ldap_ssl_flag ) {
|
||||
ldap_set_option(ld, LDAP_OPT_X_TLS, (void *)&tls_option);
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* either run the filter or just bind as them ? */
|
||||
|
||||
@@ -1657,7 +1672,7 @@
|
||||
snprintf(filter,malloc_size-1,"(&(%s=%s)%s)", ldap_uidattr, userid, ldap_filter);
|
||||
|
||||
/* Now do the search */
|
||||
- if (ldap_search_ext_s(ld, ldap_basedn, LDAP_SCOPE_SUBTREE, filter,
|
||||
+ if (SASL_ldap_search_ext_s(ld, ldap_basedn, LDAP_SCOPE_SUBTREE, filter,
|
||||
attrs, 0, NULL, NULL, LDAP_NO_LIMIT, 1, &result) !=
|
||||
LDAP_SUCCESS) {
|
||||
free(filter);
|
||||
@@ -1680,17 +1695,17 @@
|
||||
ldap_unbind(ld);
|
||||
return SASL_BADAUTH;
|
||||
}
|
||||
- if (ldap_simple_bind_s(ld,dn,password) != LDAP_SUCCESS) {
|
||||
+ if (ldap_simple_bind_s(ld,dn,(char *)password) != LDAP_SUCCESS) {
|
||||
e = NULL;
|
||||
free(filter);
|
||||
- ldap_memfree(dn);
|
||||
+ SASL_ldap_memfree(dn);
|
||||
ldap_msgfree(result);
|
||||
ldap_unbind(ld);
|
||||
return SASL_BADAUTH;
|
||||
}
|
||||
e = NULL;
|
||||
free(filter);
|
||||
- ldap_memfree(dn);
|
||||
+ SASL_ldap_memfree(dn);
|
||||
ldap_msgfree(result);
|
||||
|
||||
} else {
|
||||
@@ -1710,7 +1725,7 @@
|
||||
* If this is not so I have a version or that too
|
||||
* Simon@surf.org.uk
|
||||
*/
|
||||
- if (ldap_simple_bind_s(ld,dn,password) != LDAP_SUCCESS) {
|
||||
+ if (ldap_simple_bind_s(ld,dn,(char *)password) != LDAP_SUCCESS) {
|
||||
free(dn);
|
||||
ldap_unbind(ld);
|
||||
return SASL_BADAUTH;
|
||||
Loading…
Reference in New Issue
Block a user