gentoo resync : 16.06.2018

3 files changed, 129 insertions, 1 deletions

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 8f4c5e2d018e..a9a34d467bfd 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -3,10 +3,11 @@ AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938
 AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 BLAKE2B 31a9898e8a9741833acacdfa40db23b252a7c4de8491d7c9b80ed700499e11c078205889e402aa415a9e718cfa72783ac40ecc9956dc2e86db45cd5d90964fdc SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd
 AUX gpac-0.5.3-static-libs.patch 2843 BLAKE2B 99b301f9e4e0e87d9d93763dc40daa2bc2c57cbac4e09de4e9e86baff98c5ad62e598d532ba843e3eef8e0445c5fe66b03be0e3ef42b54c6dd3a84cff975878f SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c
 AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
+AUX gpac-0.7.1-openssl-1.1.patch 4037 BLAKE2B e03c781c54a78ae3b36aec5766b47a8bc1fafceccf03e04517bdf5756cc15214dc22fe3ee20a1deb1a68b4ead6b198fd30fac04bccb584fd2fda321e4ff2204e SHA512 1ffdde35f09e0ae8b037d00c0e57fabf402053acc46201ed3be791b16436bcdebd6c0ed232de45d40279891c06ddb9bf26a3a5093fd379850495808930f878bb
 AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1.ebuild 3461 BLAKE2B 60a5c9e6acd71c5254fd0ca26e38f161ba53f8a24ea9a8856f55d9a80d8fc877566e83344ae20ab2941787292b54d1ef00ec43eddd5077157e2f2e243c272f03 SHA512 3499a090bc797415b05e138f55aa8fa57292a790d6f5a305e9ee7a0d6cceeada5306048027257f272cd2804d61e2dc99a402498f3a2a4745d8d31fd159040df4
+EBUILD gpac-0.7.1.ebuild 3499 BLAKE2B 30ef351d63cc2e35d1380fcd973accdec5dbf2fd0e486e44fd7693e6ee889f13dd4e7d0166a4f947f61943b0bb1935247b1d2113f15e8174d69c1de4a49530ae SHA512 3db6c70aee8146a3db6a862d0919dbb96a58fc9077f9b6b4d8a23ab077ae2c209fddf392c1a1e5961af952ff35efe0299f85f052f88cf852c8113755f19df368
 EBUILD gpac-9999.ebuild 3095 BLAKE2B 5a1223e8f93f7b0ac751e1a8f46c305b60d578bb8235d23c9bb9f9619db405ee35607714df635d003a0e742b425265114f3e4b2dca527b2601691ee93ce90ba5 SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
new file mode 100644
index 000000000000..e25a5bca78bb
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
@@ -0,0 +1,126 @@
+From e64a7d229fdcb5c190064b7860ade50124dcc735 Mon Sep 17 00:00:00 2001
+From: Aurelien David <aurelien.david@telecom-paristech.fr>
+Date: Fri, 6 Oct 2017 16:46:18 +0200
+Subject: [PATCH] compatibility with OpenSSL 1.1.x (#616)
+
+diff --git a/src/utils/downloader.c b/src/utils/downloader.c
+index b8c923b88..3b7d37b41 100644
+--- a/src/utils/downloader.c
++++ b/src/utils/downloader.c
+@@ -204,7 +204,7 @@ struct __gf_download_manager
+ 	u32 limit_data_rate, read_buf_size;
+ 	u64 max_cache_size;
+ 	Bool allow_broken_certificate;
+-	
++
+ 	GF_List *skip_proxy_servers;
+ 	GF_List *credentials;
+ 	GF_List *cache_entries;
+@@ -392,10 +392,18 @@ static Bool init_ssl_lib() {
+ 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
+ 		return GF_TRUE;
+ 	}
++
++	/* per https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
++	** As of version 1.1.0 OpenSSL will automatically allocate all resources that it needs so no explicit initialisation is required.
++	** Similarly it will also automatically deinitialise as required.
++	*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
+ 	SSLeay_add_all_algorithms();
+ 	SSLeay_add_ssl_algorithms();
++#endif
++
+ 	_ssl_is_initialized = GF_TRUE;
+ 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
+ 	return GF_FALSE;
+@@ -422,6 +430,7 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+ 	}
+ 
+ 	switch (mode) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case 0:
+ 		meth = SSLv23_client_method();
+ 		break;
+@@ -436,6 +445,11 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+ 	case 3:
+ 		meth = TLSv1_client_method();
+ 		break;
++#else /* for openssl 1.1+ this is the prefered method */
++	case 0:
++		meth = TLS_client_method();
++		break;
++#endif
+ 	default:
+ 		goto error;
+ 	}
+@@ -771,7 +785,7 @@ void gf_dm_sess_del(GF_DownloadSession *sess)
+ 		gf_sk_del(sess->sock);
+ 	gf_list_del(sess->headers);
+ 	gf_mx_del(sess->mx);
+-	
++
+ 	gf_free(sess);
+ 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
+ }
+@@ -1145,7 +1159,7 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+ {
+ 	GF_DownloadSession *sess;
+ 	if (!dm) return NULL;
+-	
++
+ 	GF_SAFEALLOC(sess, GF_DownloadSession);
+ 	if (!sess) {
+ 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
+@@ -1166,8 +1180,8 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+ 		gf_free(sess);
+ 		return NULL;
+ 	}
+-	
+-	
++
++
+ 	assert( dm );
+ 
+ 	*e = gf_dm_sess_setup_from_url(sess, url);
+@@ -1225,7 +1239,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
+ 		gf_mx_v(sess->mx);
+ 		return GF_IP_CONNECTION_CLOSED;
+ 	}
+-	
++
+ #ifdef GPAC_HAS_SSL
+ 	if (sess->ssl) {
+ 		s32 size;
+@@ -1451,7 +1465,11 @@ static void gf_dm_connect(GF_DownloadSession *sess)
+ 							const GENERAL_NAME *altname = sk_GENERAL_NAME_value(altnames, i);
+ 							if (altname->type == GEN_DNS)
+ 							{
+-								unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
++								#if OPENSSL_VERSION_NUMBER < 0x10100000L
++									unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
++								#else
++									unsigned char *altname_str = (unsigned char *)ASN1_STRING_get0_data(altname->d.ia5);
++								#endif
+ 								gf_list_add(valid_names, altname_str);
+ 							}
+ 						}
+@@ -1806,7 +1824,7 @@ GF_DownloadManager *gf_dm_new(GF_Config *cfg)
+ 		dm->limit_data_rate = 1000 * atoi(opt) / 8;
+ 	else
+ 		gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
+-	
++
+ 
+ 	dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
+ 	//when rate is limited, use smaller smaller read size
+@@ -2943,7 +2961,7 @@ static GF_Err wait_for_header_and_parse(GF_DownloadSession *sess, char * sHTTP)
+ 			hdrp->value = gf_strdup(hdr_val);
+ 			gf_list_add(sess->headers, hdrp);
+ 		}
+-	
++
+ 		if (sep) sep[0]=':';
+ 		if (hdr_sep) hdr_sep[0] = '\r';
+ 	}
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index ed5c090d045f..fea54fdfefe0 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.7.1-configure.patch"
 	"${FILESDIR}/ffmpeg4.patch"
 	"${FILESDIR}/${PN}-freetype.patch"
+	"${FILESDIR}/${P}-openssl-1.1.patch"
 )
 
 DOCS=(