diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-04-20 03:39:27 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-04-20 03:39:27 +0000 |
| commit | 9a2ff063f6ba0dcec5b6a40e3a6cccc04fcceed3 (patch) | |
| tree | 4a2365a18cfc123567f122dbb0510795ca4341ba /testing/dbmail/code-cleanups.patch | |
| parent | 3a40028e50c4e6ab82135d469de4ae8ccb32f7d3 (diff) | |
| parent | 983a11e3031ce51a0c7b0ded0d48713d48474522 (diff) | |
| download | aports-9a2ff063f6ba0dcec5b6a40e3a6cccc04fcceed3.tar.bz2 aports-9a2ff063f6ba0dcec5b6a40e3a6cccc04fcceed3.tar.xz | |
Merge remote-tracking branch 'alpine/master'
Conflicts:
main/libxft/APKBUILD
main/ncftp/APKBUILD
main/spandsp/APKBUILD
testing/openvcp/APKBUILD
Diffstat (limited to 'testing/dbmail/code-cleanups.patch')
| -rw-r--r-- | testing/dbmail/code-cleanups.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/testing/dbmail/code-cleanups.patch b/testing/dbmail/code-cleanups.patch new file mode 100644 index 000000000..83e8f7ea6 --- /dev/null +++ b/testing/dbmail/code-cleanups.patch @@ -0,0 +1,64 @@ +From 6af21775b8c560dd9d65cb2465299a9feae34649 Mon Sep 17 00:00:00 2001 +From: Paul J Stevens <paul@nfg.nl> +Date: Thu, 14 Apr 2011 14:01:32 +0000 +Subject: cleanups + +--- +diff --git a/debian/rules b/debian/rules +index 7804a1b..f459149 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -12,7 +12,7 @@ export SHARED=--enable-static=no + export MANPAGES=--enable-manpages=yes + export REAL_CLEAN= + +-CFLAGS = -Wall -O1 ++CFLAGS = -Wall -std=gnu99 -O1 + LDFLAGS = -lcrypt + + # These are used for cross-compiling and for saving the configure script +@@ -27,10 +27,9 @@ ifneq (,$(findstring devel,$(DEB_BUILD_OPTIONS))) + export MANPAGES= + export SHARED=--enable-shared=no + export STATIC=--enable-static=yes +- export REAL_CLEAN=mrproper + export WITH_LDAP= + export WITH_SIEVE= +- CFLAGS = -g -std=gnu99 ++ CFLAGS = -Wall -std=gnu99 -g + endif + ifneq (,$(findstring ldap,$(DEB_BUILD_OPTIONS))) + export WITH_LDAP=--with-ldap +diff --git a/src/dm_http.c b/src/dm_http.c +index 4b7d2a6..797e63b 100644 +--- a/src/dm_http.c ++++ b/src/dm_http.c +@@ -193,7 +193,7 @@ void Http_getUsers(T R) + evbuffer_add_printf(buf, "\n}}\n"); + } + +- if (buf->totallen) ++ if (EVBUFFER_LENGTH(buf)) + Request_send(R, HTTP_OK, "OK", buf); + else + Request_error(R, HTTP_SERVUNAVAIL, "Server error"); +@@ -279,7 +279,7 @@ void Http_getMailboxes(T R) + MailboxState_free(&b); + } + +- if (buf->totallen) ++ if (EVBUFFER_LENGTH(buf)) + Request_send(R, HTTP_OK, "OK", buf); + else + Request_error(R, HTTP_SERVUNAVAIL, "Server error"); +@@ -375,7 +375,7 @@ void Http_getMessages(T R) + } + } + +- if (buf->totallen) ++ if (EVBUFFER_LENGTH(buf)) + Request_send(R, HTTP_OK, "OK", buf); + else + Request_error(R, HTTP_SERVUNAVAIL, "Server error"); +-- +cgit v0.8.3.4 |