master cannot build w/o USE_DB

[Aaron Jensen]

Hi there,

I was trying to build master and I can't w/o USE_DB.

It broke here:

83ebe9022d88d9493d7ee5739f4503af1e28448b

The error is:

drv_maildir.c:1779:48: error: use of undeclared identifier 'ctx'
basel = nfsnprintf( buf, sizeof(buf), "%s/", ctx->path );

I don't know the first thing about the code so I don't want to attempt
a fix, but I thought I'd let you know because it's probably an easy
fix. Thanks!

Oh, one more aside, the Changelog generation in Makefile.am can fail
if the building user has git's format.pretty set. I think you can add

--pretty=medium

to the log command to force the log format that the script expects.

Thanks,

Aaron

[Oswald Buddenhagen]

commit 1039ee25f7e19525883412d64dccaccae1100f52
Author: Oswald Buddenhagen <***@users.sf.net>
Date: Sun May 14 09:37:37 2017 +0200

fix build without BDB

amends 83ebe902.

REFMAIL: CAHyO48z0DcoFPC8rCNAL38oxVQtZNKifVd-NEF3sp1EfR-***@mail.gmail.com

src/drv_maildir.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/src/drv_maildir.c b/src/drv_maildir.c
index ff36163..673df88 100644
--- a/src/drv_maildir.c
+++ b/src/drv_maildir.c
@@ -1788,9 +1788,7 @@ static void
maildir_close_box( store_t *gctx,
void (*cb)( int sts, void *aux ), void *aux )
{
-#ifdef USE_DB
maildir_store_t *ctx = (maildir_store_t *)gctx;
-#endif /* USE_DB */
message_t *msg;
int basel, retry, ret;
char buf[_POSIX_PATH_MAX];

[Oswald Buddenhagen]

commit 4b3768806278a70db696ba52645dc1b6eb8de58a
Author: Oswald Buddenhagen <***@users.sf.net>
Date: Sun May 14 09:42:36 2017 +0200

fix 'make log' with non-default git config format.pretty

suggested by Aaron Jensen <***@gmail.com>.

REFMAIL: CAHyO48z0DcoFPC8rCNAL38oxVQtZNKifVd-NEF3sp1EfR-***@mail.gmail.com

Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 69573f4..4359009 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ $(srcdir)/ChangeLog: log
log:
@test -z "$(srcdir)" || cd $(srcdir) && \
( ! test -d .git || \
- git log --date=iso --log-size --name-only --no-merges | \
+ git log --pretty=medium --date=iso --log-size --name-only --no-merges | \
perl -e '$(LOG_PL)' > ChangeLog )

cov-scan: clean