gentoo resync : 22.10.2018

5 files changed, 57 insertions, 57 deletions

diff --git a/net-libs/libircclient/files/libircclient-1.10-openssl.patch b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
new file mode 100644
index 000000000000..b488f7f626c7
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
@@ -0,0 +1,38 @@
+https://sourceforge.net/p/libircclient/code/141/
+https://sourceforge.net/p/libircclient/code/142/
+
+--- libircclient-1.10/src/ssl.c
++++ libircclient-1.10/src/ssl.c
+@@ -114,26 +114,23 @@
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_library_init();
+ #else
+-	OPENSSL_init_ssl(0, NULL);
++	if ( OPENSSL_init_ssl(0, NULL) == 0 )
++	 return LIBIRC_ERR_SSL_INIT_FAILED;
+ #endif 
+ 
+ 	if ( RAND_status() == 0 )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+ 	// Create an SSL context; currently a single context is used for all connections
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ssl_context = SSL_CTX_new( SSLv23_method() );
++#else
++	ssl_context = SSL_CTX_new( TLS_client_method() );
++#endif
+ 
+ 	if ( !ssl_context )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+-	// Disable SSLv2 as it is unsecure
+-	if ( (SSL_CTX_set_options( ssl_context, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) == 0 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+-	// Enable only strong ciphers
+-	if ( SSL_CTX_set_cipher_list( ssl_context, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" ) != 1 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+ 	// Set the verification
+ 	if ( session->options & LIBIRC_OPTION_SSL_NO_VERIFY )
+ 		SSL_CTX_set_verify( ssl_context, SSL_VERIFY_NONE, 0 );
diff --git a/net-libs/libircclient/files/libircclient-1.6-shared.patch b/net-libs/libircclient/files/libircclient-1.10-shared.patch
index 44fe9ded64b6..33a1cc1d54e0 100644
--- a/net-libs/libircclient/files/libircclient-1.6-shared.patch
+++ b/net-libs/libircclient/files/libircclient-1.10-shared.patch
@@ -1,42 +1,39 @@
---- libircclient-1.6/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -1,10 +1,13 @@
- # $Id$
+--- libircclient-1.10/src/Makefile.in
++++ libircclient-1.10/src/Makefile.in
+@@ -1,8 +1,10 @@
+ # $Id: Makefile.in 137 2018-08-27 01:11:08Z gyunaev $
  CC = @CC@
--CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
-+CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
+-CFLAGS = -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
++CFLAGS = -fPIC -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
  AR=@AR@ cr
  RANLIB=@RANLIB@
-+INSTALL = install
-+LN = ln -sf
++INSTALL=install
++LN=ln -sf
  INCLUDES=-I../include
  DESTDIR=
-+APIVERSION = 1
- 
- OBJS = libircclient.o
- 
-@@ -14,19 +17,24 @@
+ APIVERSION = 1
+@@ -15,19 +17,24 @@
  shared: libircclient.so
  shared_mingw: libircclient.dll
  
--install: lib
+-install:
 -	-mkdir -p $(DESTDIR)@prefix@/include
--	-mkdir -p $(DESTDIR)@prefix@/lib
+-	-mkdir -p $(DESTDIR)@libdir@
 -	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
 -	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
 -	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
 -	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
 -	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
--	cp libircclient.so $(DESTDIR)@prefix@/lib/
--	cp libircclient.a $(DESTDIR)@prefix@/lib/
+-	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
+-	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
 +install: install-headers install-static install-shared
 +install-headers:
 +	$(INSTALL) -d $(DESTDIR)@prefix@/include
 +	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
 +	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
-+	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
-+	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
-+	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
++	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h
++	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h
++	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
 +install-shared:
 +	$(INSTALL) -d $(DESTDIR)@libdir@
 +	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
@@ -46,8 +43,8 @@
 +	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
  
  libircclient.so: libircclient.o
--	$(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
+-	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
++	$(CC) @CFLAGS@ -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
  
  libircclient.dll: libircclient.o
  	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.6-build.patch b/net-libs/libircclient/files/libircclient-1.6-build.patch
deleted file mode 100644
index d3d6c0f3edf9..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libircclient-1.6/configure.in
-+++ libircclient-1.6.new/configure.in
-@@ -61,9 +61,7 @@ AC_CHECK_FUNCS([localtime_r socket])
- AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
- 
- if test "$use_debug" = "yes"; then
--	CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
--else
--	CFLAGS="${CFLAGS} -O3"
-+	CFLAGS="${CFLAGS} -DENABLE_DEBUG"
- fi
- 
- # Choosing the target
diff --git a/net-libs/libircclient/files/libircclient-1.6-include.patch b/net-libs/libircclient/files/libircclient-1.6-include.patch
deleted file mode 100644
index c5bce1dfd947..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libircclient-1.6.orig/include/libircclient.h
-+++ libircclient-1.6/include/libircclient.h
-@@ -130,6 +130,7 @@
- #define IN_INCLUDE_LIBIRC_H
- #include "libirc_errors.h"
- #include "libirc_events.h"
-+#include "libirc_rfcnumeric.h"
- #include "libirc_options.h"
- #undef IN_INCLUDE_LIBIRC_H
- 
diff --git a/net-libs/libircclient/files/libircclient-1.6-static.patch b/net-libs/libircclient/files/libircclient-1.6-static.patch
deleted file mode 100644
index 4ecbb3362223..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libircclient-1.6.orig/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -9,6 +9,9 @@
- DESTDIR=
- APIVERSION = 1
- 
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
- OBJS = libircclient.o
- 
- all:	@TARGET@