mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
- Update to 2.2.4
PR: 110245 Submitted by: Larry Rosenman <ler@lerctr.org> Approved by: maintainer
This commit is contained in:
parent
c03bb284d6
commit
cae21566ad
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=187482
8 changed files with 56 additions and 102 deletions
|
@ -6,8 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= dbmail
|
PORTNAME= dbmail
|
||||||
PORTVERSION= 2.2.2
|
PORTVERSION= 2.2.4
|
||||||
PORTREVISION= 1
|
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= http://www.dbmail.org/download/2.2/
|
MASTER_SITES= http://www.dbmail.org/download/2.2/
|
||||||
|
|
||||||
|
@ -35,6 +34,7 @@ USE_OPENSSL= YES
|
||||||
CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
|
CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
|
||||||
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
|
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
|
||||||
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
|
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
|
||||||
|
MAKE_ARGS+= mandir=${PREFIX}/man
|
||||||
|
|
||||||
PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \
|
PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \
|
||||||
README.aliases README.exim README.ldap \
|
README.aliases README.exim README.ldap \
|
||||||
|
@ -96,6 +96,9 @@ PLIST_SUB+= SIEVE="@comment "
|
||||||
.if defined(WITH_LDAP)
|
.if defined(WITH_LDAP)
|
||||||
CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
|
CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
|
||||||
USE_OPENLDAP= yes
|
USE_OPENLDAP= yes
|
||||||
|
PLIST_SUB+= LDAP=""
|
||||||
|
.else
|
||||||
|
PLIST_SUB+= LDAP="@comment "
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE)
|
.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
MD5 (dbmail-2.2.2.tar.gz) = 7a1a0940d3ec07dc55c7e49412298b0a
|
MD5 (dbmail-2.2.4.tar.gz) = b7f56437df764e7046438f81f4b7df18
|
||||||
SHA256 (dbmail-2.2.2.tar.gz) = fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2
|
SHA256 (dbmail-2.2.4.tar.gz) = 2fdf2f22e9d0437e8331d33a956f12ca85d7370651c943f09f8886e94a93f379
|
||||||
SIZE (dbmail-2.2.2.tar.gz) = 855310
|
SIZE (dbmail-2.2.4.tar.gz) = 873538
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
--- dbmail-message.c
|
|
||||||
+++ dbmail-message.c
|
|
||||||
@@ -885,9 +885,13 @@ static int _header_get_id(const struct D
|
|
||||||
u64_t tmp;
|
|
||||||
gpointer cacheid;
|
|
||||||
gchar *safe_header;
|
|
||||||
+ gchar *tmpheader;
|
|
||||||
|
|
||||||
- if (! (safe_header = dm_strnesc(header,CACHE_WIDTH_NAME)))
|
|
||||||
+ // rfc822 headernames are case-insensitive
|
|
||||||
+ if (! (tmpheader = dm_strnesc(header,CACHE_WIDTH_NAME)))
|
|
||||||
return -1;
|
|
||||||
+ safe_header = g_ascii_strdown(tmpheader,-1);
|
|
||||||
+ g_free(tmpheader);
|
|
||||||
|
|
||||||
cacheid = g_hash_table_lookup(self->header_dict, (gconstpointer)safe_header);
|
|
||||||
if (cacheid) {
|
|
||||||
@@ -897,7 +901,7 @@ static int _header_get_id(const struct D
|
|
||||||
}
|
|
||||||
|
|
||||||
GString *q = g_string_new("");
|
|
||||||
- g_string_printf(q, "SELECT id FROM %sheadername WHERE headername='%s'", DBPFX, safe_header);
|
|
||||||
+ g_string_printf(q, "SELECT id FROM %sheadername WHERE lower(headername)='%s'", DBPFX, safe_header);
|
|
||||||
if (db_query(q->str) == -1) {
|
|
||||||
g_string_free(q,TRUE);
|
|
||||||
g_free(safe_header);
|
|
|
@ -2,30 +2,30 @@
|
||||||
etc/dbmail.conf-dist
|
etc/dbmail.conf-dist
|
||||||
@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
|
@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
|
||||||
@exec mkdir -p %D/lib/dbmail
|
@exec mkdir -p %D/lib/dbmail
|
||||||
lib/dbmail/libmysql.a
|
%%MYSQL%%lib/dbmail/libmysql.a
|
||||||
lib/dbmail/libmysql.la
|
%%MYSQL%%lib/dbmail/libmysql.la
|
||||||
lib/dbmail/libmysql.so
|
%%MYSQL%%lib/dbmail/libmysql.so
|
||||||
lib/dbmail/libmysql.so.0
|
%%MYSQL%%lib/dbmail/libmysql.so.0
|
||||||
lib/dbmail/libpgsql.a
|
%%PGSQL%%lib/dbmail/libpgsql.a
|
||||||
lib/dbmail/libpgsql.la
|
%%PGSQL%%lib/dbmail/libpgsql.la
|
||||||
lib/dbmail/libpgsql.so
|
%%PGSQL%%lib/dbmail/libpgsql.so
|
||||||
lib/dbmail/libpgsql.so.0
|
%%PGSQL%%lib/dbmail/libpgsql.so.0
|
||||||
lib/dbmail/libsqlite.a
|
%%SQLITE%%lib/dbmail/libsqlite.a
|
||||||
lib/dbmail/libsqlite.la
|
%%SQLITE%%lib/dbmail/libsqlite.la
|
||||||
lib/dbmail/libsqlite.so
|
%%SQLITE%%lib/dbmail/libsqlite.so
|
||||||
lib/dbmail/libsqlite.so.0
|
%%SQLITE%%lib/dbmail/libsqlite.so.0
|
||||||
lib/dbmail/libsort_sieve.a
|
%%SIEVE%%lib/dbmail/libsort_sieve.a
|
||||||
lib/dbmail/libsort_sieve.la
|
%%SIEVE%%lib/dbmail/libsort_sieve.la
|
||||||
lib/dbmail/libsort_sieve.so
|
%%SIEVE%%lib/dbmail/libsort_sieve.so
|
||||||
lib/dbmail/libsort_sieve.so.0
|
%%SIEVE%%lib/dbmail/libsort_sieve.so.0
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.a
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.la
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.so
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.so.0
|
||||||
lib/dbmail/libauth_sql.a
|
lib/dbmail/libauth_sql.a
|
||||||
lib/dbmail/libauth_sql.la
|
lib/dbmail/libauth_sql.la
|
||||||
lib/dbmail/libauth_sql.so
|
lib/dbmail/libauth_sql.so
|
||||||
lib/dbmail/libauth_sql.so.0
|
lib/dbmail/libauth_sql.so.0
|
||||||
lib/dbmail/libauth_ldap.a
|
|
||||||
lib/dbmail/libauth_ldap.la
|
|
||||||
lib/dbmail/libauth_ldap.so
|
|
||||||
lib/dbmail/libauth_ldap.so.0
|
|
||||||
lib/dbmail/libdbmail.a
|
lib/dbmail/libdbmail.a
|
||||||
lib/dbmail/libdbmail.la
|
lib/dbmail/libdbmail.la
|
||||||
lib/dbmail/libdbmail.so
|
lib/dbmail/libdbmail.so
|
||||||
|
|
|
@ -6,8 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= dbmail
|
PORTNAME= dbmail
|
||||||
PORTVERSION= 2.2.2
|
PORTVERSION= 2.2.4
|
||||||
PORTREVISION= 1
|
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= http://www.dbmail.org/download/2.2/
|
MASTER_SITES= http://www.dbmail.org/download/2.2/
|
||||||
|
|
||||||
|
@ -35,6 +34,7 @@ USE_OPENSSL= YES
|
||||||
CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
|
CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
|
||||||
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
|
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
|
||||||
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
|
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
|
||||||
|
MAKE_ARGS+= mandir=${PREFIX}/man
|
||||||
|
|
||||||
PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \
|
PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \
|
||||||
README.aliases README.exim README.ldap \
|
README.aliases README.exim README.ldap \
|
||||||
|
@ -96,6 +96,9 @@ PLIST_SUB+= SIEVE="@comment "
|
||||||
.if defined(WITH_LDAP)
|
.if defined(WITH_LDAP)
|
||||||
CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
|
CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
|
||||||
USE_OPENLDAP= yes
|
USE_OPENLDAP= yes
|
||||||
|
PLIST_SUB+= LDAP=""
|
||||||
|
.else
|
||||||
|
PLIST_SUB+= LDAP="@comment "
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE)
|
.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
MD5 (dbmail-2.2.2.tar.gz) = 7a1a0940d3ec07dc55c7e49412298b0a
|
MD5 (dbmail-2.2.4.tar.gz) = b7f56437df764e7046438f81f4b7df18
|
||||||
SHA256 (dbmail-2.2.2.tar.gz) = fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2
|
SHA256 (dbmail-2.2.4.tar.gz) = 2fdf2f22e9d0437e8331d33a956f12ca85d7370651c943f09f8886e94a93f379
|
||||||
SIZE (dbmail-2.2.2.tar.gz) = 855310
|
SIZE (dbmail-2.2.4.tar.gz) = 873538
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
--- dbmail-message.c
|
|
||||||
+++ dbmail-message.c
|
|
||||||
@@ -885,9 +885,13 @@ static int _header_get_id(const struct D
|
|
||||||
u64_t tmp;
|
|
||||||
gpointer cacheid;
|
|
||||||
gchar *safe_header;
|
|
||||||
+ gchar *tmpheader;
|
|
||||||
|
|
||||||
- if (! (safe_header = dm_strnesc(header,CACHE_WIDTH_NAME)))
|
|
||||||
+ // rfc822 headernames are case-insensitive
|
|
||||||
+ if (! (tmpheader = dm_strnesc(header,CACHE_WIDTH_NAME)))
|
|
||||||
return -1;
|
|
||||||
+ safe_header = g_ascii_strdown(tmpheader,-1);
|
|
||||||
+ g_free(tmpheader);
|
|
||||||
|
|
||||||
cacheid = g_hash_table_lookup(self->header_dict, (gconstpointer)safe_header);
|
|
||||||
if (cacheid) {
|
|
||||||
@@ -897,7 +901,7 @@ static int _header_get_id(const struct D
|
|
||||||
}
|
|
||||||
|
|
||||||
GString *q = g_string_new("");
|
|
||||||
- g_string_printf(q, "SELECT id FROM %sheadername WHERE headername='%s'", DBPFX, safe_header);
|
|
||||||
+ g_string_printf(q, "SELECT id FROM %sheadername WHERE lower(headername)='%s'", DBPFX, safe_header);
|
|
||||||
if (db_query(q->str) == -1) {
|
|
||||||
g_string_free(q,TRUE);
|
|
||||||
g_free(safe_header);
|
|
|
@ -2,30 +2,30 @@
|
||||||
etc/dbmail.conf-dist
|
etc/dbmail.conf-dist
|
||||||
@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
|
@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
|
||||||
@exec mkdir -p %D/lib/dbmail
|
@exec mkdir -p %D/lib/dbmail
|
||||||
lib/dbmail/libmysql.a
|
%%MYSQL%%lib/dbmail/libmysql.a
|
||||||
lib/dbmail/libmysql.la
|
%%MYSQL%%lib/dbmail/libmysql.la
|
||||||
lib/dbmail/libmysql.so
|
%%MYSQL%%lib/dbmail/libmysql.so
|
||||||
lib/dbmail/libmysql.so.0
|
%%MYSQL%%lib/dbmail/libmysql.so.0
|
||||||
lib/dbmail/libpgsql.a
|
%%PGSQL%%lib/dbmail/libpgsql.a
|
||||||
lib/dbmail/libpgsql.la
|
%%PGSQL%%lib/dbmail/libpgsql.la
|
||||||
lib/dbmail/libpgsql.so
|
%%PGSQL%%lib/dbmail/libpgsql.so
|
||||||
lib/dbmail/libpgsql.so.0
|
%%PGSQL%%lib/dbmail/libpgsql.so.0
|
||||||
lib/dbmail/libsqlite.a
|
%%SQLITE%%lib/dbmail/libsqlite.a
|
||||||
lib/dbmail/libsqlite.la
|
%%SQLITE%%lib/dbmail/libsqlite.la
|
||||||
lib/dbmail/libsqlite.so
|
%%SQLITE%%lib/dbmail/libsqlite.so
|
||||||
lib/dbmail/libsqlite.so.0
|
%%SQLITE%%lib/dbmail/libsqlite.so.0
|
||||||
lib/dbmail/libsort_sieve.a
|
%%SIEVE%%lib/dbmail/libsort_sieve.a
|
||||||
lib/dbmail/libsort_sieve.la
|
%%SIEVE%%lib/dbmail/libsort_sieve.la
|
||||||
lib/dbmail/libsort_sieve.so
|
%%SIEVE%%lib/dbmail/libsort_sieve.so
|
||||||
lib/dbmail/libsort_sieve.so.0
|
%%SIEVE%%lib/dbmail/libsort_sieve.so.0
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.a
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.la
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.so
|
||||||
|
%%LDAP%%lib/dbmail/libauth_ldap.so.0
|
||||||
lib/dbmail/libauth_sql.a
|
lib/dbmail/libauth_sql.a
|
||||||
lib/dbmail/libauth_sql.la
|
lib/dbmail/libauth_sql.la
|
||||||
lib/dbmail/libauth_sql.so
|
lib/dbmail/libauth_sql.so
|
||||||
lib/dbmail/libauth_sql.so.0
|
lib/dbmail/libauth_sql.so.0
|
||||||
lib/dbmail/libauth_ldap.a
|
|
||||||
lib/dbmail/libauth_ldap.la
|
|
||||||
lib/dbmail/libauth_ldap.so
|
|
||||||
lib/dbmail/libauth_ldap.so.0
|
|
||||||
lib/dbmail/libdbmail.a
|
lib/dbmail/libdbmail.a
|
||||||
lib/dbmail/libdbmail.la
|
lib/dbmail/libdbmail.la
|
||||||
lib/dbmail/libdbmail.so
|
lib/dbmail/libdbmail.so
|
||||||
|
|
Loading…
Add table
Reference in a new issue