From owner-svn-ports-all@freebsd.org Fri Jan 29 03:21:34 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 235C5A716E6; Fri, 29 Jan 2016 03:21:34 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6BAE1633; Fri, 29 Jan 2016 03:21:33 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0T3LWpI030964; Fri, 29 Jan 2016 03:21:32 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0T3LWWk030958; Fri, 29 Jan 2016 03:21:32 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201601290321.u0T3LWWk030958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 29 Jan 2016 03:21:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407441 - in head: graphics/graphopt/files mail/dovecot/files sysutils/screen-legacy/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2016 03:21:34 -0000 Author: danfe Date: Fri Jan 29 03:21:32 2016 New Revision: 407441 URL: https://svnweb.freebsd.org/changeset/ports/407441 Log: Merge patches that patch the same file. Deleted: head/graphics/graphopt/files/patch-src__classes__nodes.cc head/graphics/graphopt/files/patch-src__classes__optFileWriter.cc head/graphics/graphopt/files/patch-src__classes__visioExporter.cc head/mail/dovecot/files/patch-src__login-common__ssl-proxy-openssl.c head/sysutils/screen-legacy/files/patch-doc__Makefile.in Modified: head/graphics/graphopt/files/patch-src_classes_nodes.cc head/graphics/graphopt/files/patch-src_classes_optFileWriter.cc head/graphics/graphopt/files/patch-src_classes_visioExporter.cc head/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c head/sysutils/screen-legacy/files/patch-doc_Makefile.in Modified: head/graphics/graphopt/files/patch-src_classes_nodes.cc ============================================================================== --- head/graphics/graphopt/files/patch-src_classes_nodes.cc Fri Jan 29 03:11:35 2016 (r407440) +++ head/graphics/graphopt/files/patch-src_classes_nodes.cc Fri Jan 29 03:21:32 2016 (r407441) @@ -1,8 +1,9 @@ ---- src/classes/nodes.cc.intermediate 2015-09-20 00:14:03 UTC +--- src/classes/nodes.cc.orig 2003-03-19 05:21:33 UTC +++ src/classes/nodes.cc -@@ -1,5 +1,6 @@ - #include - #include +@@ -1,4 +1,6 @@ +-#include ++#include ++#include +#include #include "nodes.h" Modified: head/graphics/graphopt/files/patch-src_classes_optFileWriter.cc ============================================================================== --- head/graphics/graphopt/files/patch-src_classes_optFileWriter.cc Fri Jan 29 03:11:35 2016 (r407440) +++ head/graphics/graphopt/files/patch-src_classes_optFileWriter.cc Fri Jan 29 03:21:32 2016 (r407441) @@ -1,8 +1,8 @@ ---- src/classes/optFileWriter.cc.intermediate 2015-09-20 01:43:24 UTC +--- src/classes/optFileWriter.cc.orig 2003-01-25 05:17:43 UTC +++ src/classes/optFileWriter.cc -@@ -1,5 +1,6 @@ +@@ -1,4 +1,6 @@ #include "optFileWriter.h" - #include ++#include +#include Modified: head/graphics/graphopt/files/patch-src_classes_visioExporter.cc ============================================================================== --- head/graphics/graphopt/files/patch-src_classes_visioExporter.cc Fri Jan 29 03:11:35 2016 (r407440) +++ head/graphics/graphopt/files/patch-src_classes_visioExporter.cc Fri Jan 29 03:21:32 2016 (r407441) @@ -1,8 +1,8 @@ ---- src/classes/visioExporter.cc.intermediate 2015-09-20 01:43:24 UTC +--- src/classes/visioExporter.cc.orig 2003-04-16 02:55:39 UTC +++ src/classes/visioExporter.cc -@@ -1,5 +1,6 @@ +@@ -1,4 +1,6 @@ #include "visioExporter.h" - #include ++#include +#include Modified: head/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c ============================================================================== --- head/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c Fri Jan 29 03:11:35 2016 (r407440) +++ head/mail/dovecot/files/patch-src_login-common_ssl-proxy-openssl.c Fri Jan 29 03:21:32 2016 (r407441) @@ -1,5 +1,5 @@ ---- src/login-common/ssl-proxy-openssl.c.orig 2015-03-07 13:25:36.487131678 +0100 -+++ src/login-common/ssl-proxy-openssl.c 2015-03-07 13:24:28.303136938 +0100 +--- src/login-common/ssl-proxy-openssl.c.orig 2011-01-20 21:16:59 UTC ++++ src/login-common/ssl-proxy-openssl.c @@ -21,6 +21,7 @@ #include #include @@ -8,3 +8,12 @@ #define DOVECOT_SSL_DEFAULT_CIPHER_LIST "ALL:!LOW:!SSLv2" /* Check every 30 minutes if parameters file has been updated */ +@@ -817,7 +818,7 @@ static void ssl_proxy_ctx_init(SSL_CTX * + { + const char *cafile; + +- SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); ++ SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); + + cafile = getenv("SSL_CA_FILE"); + if (cafile != NULL) { Modified: head/sysutils/screen-legacy/files/patch-doc_Makefile.in ============================================================================== --- head/sysutils/screen-legacy/files/patch-doc_Makefile.in Fri Jan 29 03:11:35 2016 (r407440) +++ head/sysutils/screen-legacy/files/patch-doc_Makefile.in Fri Jan 29 03:21:32 2016 (r407441) @@ -1,7 +1,11 @@ ---- doc/Makefile.in.orig 2007-10-29 13:08:52.000000000 -0700 -+++ doc/Makefile.in 2007-10-29 13:11:09.000000000 -0700 -@@ -30,7 +30,10 @@ - $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info +--- doc/Makefile.in.orig 2006-10-23 13:06:32 UTC ++++ doc/Makefile.in +@@ -27,25 +27,34 @@ pdf screen.pdf: screen.texinfo mostlycle + + info screen.info: screen.texinfo + @rm -f screen.info* +- $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info ++ $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info install: installdirs +.if defined(WITH_MAN) @@ -11,8 +15,10 @@ -$(MAKE) screen.info -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ if test -f $$d/screen.info; then \ -@@ -39,13 +42,19 @@ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ + for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \ + if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ +- install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \ ++ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ else true; fi; \ fi +.endif