Attachment 176823 Details for Bug 214365 – update patch

[patch] update patch

dc.err500.patch (text/plain), 3.42 KB, created by Larry Rosenman on 2016-11-09 19:25:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Rosenman

Created: 2016-11-09 19:25:26 UTC

Size: 3.42 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 425779)
>+++ Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> PORTNAME=	dovecot
> PORTVERSION=	2.2.26.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail ipv6
> MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R:R}/
> PKGNAMESUFFIX=	2
>@@ -144,7 +144,7 @@
> 
> .include <bsd.port.pre.mk>
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
>+CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC} 
> LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
> 
> post-patch:
>Index: files/patch-src_lib-http_http-client-request.c
>===================================================================
>--- files/patch-src_lib-http_http-client-request.c	(nonexistent)
>+++ files/patch-src_lib-http_http-client-request.c	(working copy)
>@@ -0,0 +1,22 @@
>+--- 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;
>
>Property changes on: files/patch-src_lib-http_http-client-request.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_plugins_fts_decode2text.sh
>===================================================================
>--- files/patch-src_plugins_fts_decode2text.sh	(revision 425779)
>+++ files/patch-src_plugins_fts_decode2text.sh	(working copy)
>@@ -1,18 +1,30 @@
> /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	2015-12-12 16:32:01 UTC
>+--- src/plugins/fts/decode2text.sh.orig	2016-10-27 12:26:25 UTC
> +++ src/plugins/fts/decode2text.sh
>-@@ -79,7 +79,11 @@ wait_timeout() {
>+@@ -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/lib/xpdf/pdftotext ]; then
>-+    /usr/lib/xpdf/pdftotext $path - 2>/dev/null&
>++  if [ -x /usr/local/lib/xpdf/pdftotext ]; then
>++    /usr/local/lib/xpdf/pdftotext $path - 2>/dev/null&
> +  else
>-+    /usr/bin/pdftotext $path - 2>/dev/null&
>++    /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/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"

Actions: View | Diff

Attachments on bug 214365: 176823