Attachment #176823 for bug #214365

View | Details | Raw Unified | Return to bug 214365
Collapse All | Expand All

Lines 14-20 Link Here

(-)Makefile (-2 / +2 lines)
14		14
15	PORTNAME= dovecot	15	PORTNAME= dovecot
16	PORTVERSION= 2.2.26.0	16	PORTVERSION= 2.2.26.0
17	PORTREVISION= 1	17	PORTREVISION= 2
18	CATEGORIES= mail ipv6	18	CATEGORIES= mail ipv6
19	MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R:R}/	19	MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R:R}/
20	PKGNAMESUFFIX= 2	20	PKGNAMESUFFIX= 2
Lines 144-150 Link Here
144		144
145	.include <bsd.port.pre.mk>	145	.include <bsd.port.pre.mk>
146		146
147	CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC}	147	CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC}
148	LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB}	148	LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB}
149		149
150	post-patch:	150	post-patch:




--- src/lib-http/http-client-request.c.orig	2016-10-27 12:26:28 UTC
+++ src/lib-http/http-client-request.c
@@ -786,10 +786,16 @@ int http_client_request_send_payload(str
 	i_assert(data != NULL);
 
 	ret = http_client_request_continue_payload(&req, data, size);
-	if (ret < 0)
+	if (ret < 0) {
+		/* failed to send payload */
 		*_req = NULL;
-	else {
-		i_assert(ret == 0);
+	} else if (ret > 0) {
+		/* premature end of request;
+		   server sent error before all payload could be sent */
+		ret = -1;
+		*_req = NULL;
+	} else {
+		/* not finished sending payload */
 		i_assert(req != NULL);
 	}
 	return ret;




/usr gets changed to ${LOCALBASE} in post-patch:, so we
cheat and set xpdf's path to /usr/lib.

--- src/plugins/fts/decode2text.sh.orig	2016-10-27 12:26:25 UTC
+++ src/plugins/fts/decode2text.sh
@@ -79,16 +79,20 @@ wait_timeout() {
 LANG=en_US.UTF-8
 export LANG
 if [ $fmt = "pdf" ]; then
-  /usr/bin/pdftotext $path - 2>/dev/null&
+  if [ -x /usr/local/lib/xpdf/pdftotext ]; then
+    /usr/local/lib/xpdf/pdftotext $path - 2>/dev/null&
+  else
+    /usr/local/bin/pdftotext $path - 2>/dev/null&
+  fi
   wait_timeout 2>/dev/null
 elif [ $fmt = "doc" ]; then
-  (/usr/bin/catdoc $path; true) 2>/dev/null&
+  (/usr/local/bin/catdoc $path; true) 2>/dev/null&
   wait_timeout 2>/dev/null
 elif [ $fmt = "ppt" ]; then
-  (/usr/bin/catppt $path; true) 2>/dev/null&
+  (/usr/local/bin/catppt $path; true) 2>/dev/null&
   wait_timeout 2>/dev/null
 elif [ $fmt = "xls" ]; then
-  (/usr/bin/xls2csv $path; true) 2>/dev/null&
+  (/usr/local/bin/xls2csv $path; true) 2>/dev/null&
   wait_timeout 2>/dev/null
 elif [ $fmt = "odt" -o $fmt = "ods" -o $fmt = "odp" ]; then
   xmlunzip "content.xml"

Return to bug 214365

Line 0 Link Here

(-)files/patch-src_lib-http_http-client-request.c (+22 lines)
	1	--- src/lib-http/http-client-request.c.orig 2016-10-27 12:26:28 UTC
	2	+++ src/lib-http/http-client-request.c
	3	@@ -786,10 +786,16 @@ int http_client_request_send_payload(str
	4	i_assert(data != NULL);
	5
	6	ret = http_client_request_continue_payload(&req, data, size);
	7	- if (ret < 0)
	8	+ if (ret < 0) {
	9	+ /* failed to send payload */
	10	*_req = NULL;
	11	- else {
	12	- i_assert(ret == 0);
	13	+ } else if (ret > 0) {
	14	+ /* premature end of request;
	15	+ server sent error before all payload could be sent */
	16	+ ret = -1;
	17	+ *_req = NULL;
	18	+ } else {
	19	+ /* not finished sending payload */
	20	i_assert(req != NULL);
	21	}
	22	return ret;

Lines 1-18 Link Here

(-)files/patch-src_plugins_fts_decode2text.sh (-6 / +18 lines)
1	/usr gets changed to ${LOCALBASE} in post-patch:, so we	1	/usr gets changed to ${LOCALBASE} in post-patch:, so we
2	cheat and set xpdf's path to /usr/lib.	2	cheat and set xpdf's path to /usr/lib.
3		3
4	--- src/plugins/fts/decode2text.sh.orig 2015-12-12 16:32:01 UTC	4	--- src/plugins/fts/decode2text.sh.orig 2016-10-27 12:26:25 UTC
5	+++ src/plugins/fts/decode2text.sh	5	+++ src/plugins/fts/decode2text.sh
6	@@ -79,7 +79,11 @@ wait_timeout() {	6	@@ -79,16 +79,20 @@ wait_timeout() {
7	LANG=en_US.UTF-8	7	LANG=en_US.UTF-8
8	export LANG	8	export LANG
9	if [ $fmt = "pdf" ]; then	9	if [ $fmt = "pdf" ]; then
10	- /usr/bin/pdftotext $path - 2>/dev/null&	10	- /usr/bin/pdftotext $path - 2>/dev/null&
11	+ if [ -x /usr/lib/xpdf/pdftotext ]; then	11	+ if [ -x /usr/local/lib/xpdf/pdftotext ]; then
12	+ /usr/lib/xpdf/pdftotext $path - 2>/dev/null&	12	+ /usr/local/lib/xpdf/pdftotext $path - 2>/dev/null&
13	+ else	13	+ else
14	+ /usr/bin/pdftotext $path - 2>/dev/null&	14	+ /usr/local/bin/pdftotext $path - 2>/dev/null&
15	+ fi	15	+ fi
16	wait_timeout 2>/dev/null	16	wait_timeout 2>/dev/null
17	elif [ $fmt = "doc" ]; then	17	elif [ $fmt = "doc" ]; then
18	(/usr/bin/catdoc $path; true) 2>/dev/null&	18	- (/usr/bin/catdoc $path; true) 2>/dev/null&
		19	+ (/usr/local/bin/catdoc $path; true) 2>/dev/null&
		20	wait_timeout 2>/dev/null
		21	elif [ $fmt = "ppt" ]; then
		22	- (/usr/bin/catppt $path; true) 2>/dev/null&
		23	+ (/usr/local/bin/catppt $path; true) 2>/dev/null&
		24	wait_timeout 2>/dev/null
		25	elif [ $fmt = "xls" ]; then
		26	- (/usr/bin/xls2csv $path; true) 2>/dev/null&
		27	+ (/usr/local/bin/xls2csv $path; true) 2>/dev/null&
		28	wait_timeout 2>/dev/null
		29	elif [ $fmt = "odt" -o $fmt = "ods" -o $fmt = "odp" ]; then
		30	xmlunzip "content.xml"