svn commit: r407441 - in head: graphics/graphopt/files mail/dovecot/files sysutils/screen-legacy/files

[Alexey Dokuchaev]

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 <cstdio>
- #include <cstdlib>
+@@ -1,4 +1,6 @@
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
 +#include <cstring>
  #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 <cstdlib>
++#include <cstdlib>
 +#include <cstring>
  
  

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 <cstdlib>
++#include <cstdlib>
 +#include <cstring>
  
  

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 <openssl/ssl.h>
  #include <openssl/err.h>
@@ -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