gentoo resync : 02.04.2018

6 files changed, 173 insertions, 31 deletions

diff --git a/mail-filter/libdkim/Manifest b/mail-filter/libdkim/Manifest
index bd8f5cec8f8c..b41d84d8f5d1 100644
--- a/mail-filter/libdkim/Manifest
+++ b/mail-filter/libdkim/Manifest
@@ -3,11 +3,13 @@ AUX debianize/aclocal.m4 5813 BLAKE2B d2ed3f0de74e95a1360557c2cb28b1fbdfd45107d7
 AUX debianize/configure.ac 958 BLAKE2B 9599456d827b4b2189848842ae7ff137f0ef376d4ebed5fc65333847cdc668a3dfc974103b556eb65003028d5d0b9a661f9a37fdeaf0552e6673d12adc6906b3 SHA512 c78b670a4bf7b6d56253f2ba78f26fdfbce2da70f2c1c872ca98062528729f25e1e0363f7520713640fe040c42d7900350ca16c15b0d40c04a45f40709f13354
 AUX debianize/libdkim.pc.in 293 BLAKE2B 959e382abe031844cc87a55d1d131a7f509351aa34528e25150686cc8f2be71eb0252412c8d08e9373ae5402c3d2e5f93f1890ba9e7f349d55e27496d7b37a7f SHA512 4bc756efd21b2e6c3673af626e93c542a861b9e380dbf91a7f61cecd72e87d4346552350382d10acaffb19b7adfeaaa422ebd3387754441115c882a807ee4250
 AUX debianize/libdkim.ver 34 BLAKE2B b0e5b77ce0c0c0830a023bacc37e4c7b1d3ea4cc3bcc29cf911be67eed48fd46d28b275045374ca676452f8a9cecbf3940df8f723f6d40c75108f39bb7f46565 SHA512 98c6b245561e1cc7c9b21e1dfff7f44c784de2b20cee036761ff517d5521fea6fa00b734c3710504fc50bb9b143bb0343b73f730da670c22047bff9b8407adc6
-AUX libdkim-1.0.21-gcc6.patch 4944 BLAKE2B 08c13725b84995be4765357193de78366bf724d4d1b2263e3031c9a2beacc9930943a23dd5c98bc8ad34fa173a11c87441e246ee5071d32482f1cc5bd5f743e6 SHA512 e67f75d5a88458a8a5b06837986d1c50001d77f6530ccc95b9034d70df3d4f187132d5d2f4f48535a60dd62b60b123f543e443ac3ab328a460a2a785ea9dc27b
+AUX libdkim-1.0.21-gcc6.patch 4940 BLAKE2B ed4c62f075ade7741c80210174968d1f0aa0377e3cd1ab2d881cfa2deba169b03cedc3ae72376e4c73883eedf34801064cc8bf660fcbee7ef20a981d70e36c47 SHA512 59cfa92f9c1509495496c8adcdfddf08d296b8080baff37315bb68d46ff4b768ad238fbf6481f625bcd879c54134f5e612ffa468bc08ff2ce0ce41eeb2973ae9
+AUX libdkim-extra-options-r1.patch 2722 BLAKE2B bb5d7951065121c74f0d3b1244ce6cd3548f3ceeca85615838c1be6cd3487727dc9aebc32afc7092a8c52508d3fea98baec5ff932c896dbacbe0b136beebca3e SHA512 14fc04a6d67ed8982ca250323b910b20d34390772e3aa89eb28f1602e63bf1a24f38f4fb1a41fa1b7bf7226c40d3dd6b70bef1da6442344d7a980a8328ba5af8
 AUX libdkim-extra-options.patch 2614 BLAKE2B 61939530ad488a025342aeea8f4cbb97f9fbe334fb2056a0b18d4e8aa63e1795d78419eeeee07001ad8e4b22217377b8844d70475e880bde308857502c2f0a85 SHA512 da5521eca184074cf853f4438b6c0c58219ff32901c3c77de9f9ef8a894444e74854895909e55b0002f6ae561d7b065575d56193954ebf3892e0584b2386b10a
-AUX patches/fix_warnings.patch 10043 BLAKE2B 1aea98220a4b7ac9829e5c0b7be1557f4fa7ce68539b971ed5befc7cbd92a8e10cb3402bc717e16ac88cabb8ec3e64ad7ee2413bd24a0ec95a9b2b2ac3026954 SHA512 4714f34c4420d025c99895278630fa5fb72c5525181cd4e5c201d547e4d09b179542725b6b4f5f6fad79e8d7c8935976867f2fe46f7db8893151a299fca4b0c2
+AUX patches/fix_warnings.patch 9483 BLAKE2B 8a0eb57a22712348adcadb7fb09f4375f9c13866a739264fe5ebfcd568a2fe5fe59c4d0fec46a9faeae6c007e97bb21bcc3326e33bfddfa4c46929ce4768a7d4 SHA512 868f1e3c21830f8237028e0e6263c7b1e5fd6d42482faaf67ae73ab730c334270b7fcff174832cddc20cecd0f56e577b634f6c5e8739f32ea15ec65e160d774e
 AUX patches/series 34 BLAKE2B 8975814e5d91240964865f029c4e1b985b95796b20c6bd49a6e7213b0bf36a9a68cf68fdd444511ff9f6a27489844ce8804aaa1c6ead4a7e7a4f8ed6a8bd9cad SHA512 d2ba14924b9d56a2fb92ced7cc3186f061b0c9f4a7f3c6976e5051ac459998413667d7d5d7352eb05561f0f711fa104d78c7bbb47c193a383a9a5ce4ba6f44d0
-AUX patches/strtok_r.patch 3412 BLAKE2B c1a0def7f82082134c262276e3ff141b360dbb8e11d2b4650b78a5929f8c6032c1825ca5161e0ea640883b2fd2dac858ce4f800dce1465cdc53f7ceabec48a25 SHA512 ecd9ccb430654e94a285dcccc5e47a139f8b07633f77c8e056e5d21d132eec886fdf3bc01fab82b762c0d581908755be69de8e4881c3d7da2b7d546429025e00
+AUX patches/strtok_r.patch 3378 BLAKE2B f245cb047e8699084a25f1389834c0a2730bf09d013d038a8a539937336622259fd34c363c8671639150eab8c3d61784c9920e05227b3b92be6fc23967743a61 SHA512 ef6e5576ab1158e1bc05dfa20e686462e09461da870a41557d736848ea876c449e4064e7e44ba2e64647538c03208eaee06389f050feaa07cc615d547f7e061b
 DIST libdkim-1.0.21.zip 55049 BLAKE2B f7481bc41a2f43357a67aa9f6e251634f1c2850fd1dfe3c4a4e0ea64341a3625ff0e393e039d679784c8c1ce349ee7063511f988ff6cf6d5b7acfc7c9633f9da SHA512 3996c64398151dc9c07d357e8f3ac9b94e3c8d06ce5d83ebbe546416f361349d869b0b73216f28d0b732319731f31e61afd9eab0f540471760b944a90130a094
 EBUILD libdkim-1.0.21-r3.ebuild 1159 BLAKE2B 4005bbb6ac5b6cefe2ccb057e37d6fc16061987d123eaa6591be5de5bf389b482d627731a861aa0fcbe99e0a133d9637d4a5b89133d7b7f722b804b140521778 SHA512 439632cb76e30aa54834ae9a36d8e909100281d4d6f43700ff0ab61f61d7385f519a1ec45fd0d7c39cf47efc59eb6125ab70d212725d2d8cce92841f3b6663d4
+EBUILD libdkim-1.0.21-r4.ebuild 1078 BLAKE2B d381feec1ff7b56cf0750516318dd25f14956a836406c632bef830247849d9822423e2f37ed7863e26a62e2cf68e9a8c2af9f85802d3a454af58946e4a5c503a SHA512 790c84a98900be44aa11bed8f3b7e1f95db049b6fc4f685ae99085a1332898fc1789817585174ae7e880908184d84488fbd31dafb6ad21351b17207abfc3bcc3
 MISC metadata.xml 249 BLAKE2B 84210e21cccad244171f7fc855596c16abacf300aec5087825ccdfd4245a2a04f46dc99fbad2ae1998071511941f89380089cb1bf4d9e80111ecac1a5f157a03 SHA512 a2be284cf2f4e9a6c84979c88c89dc591d63b1c9093f63a72e96c7a725660467e69f780a7e6e586ec8e2665a8ae1b687cdec7cf79c16fbbd693dc5156c3f413b
diff --git a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
index 087e731d02cd..d449ce95e480 100644
--- a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
+++ b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
@@ -1,5 +1,5 @@
---- a/src/dkimverify.cpp
-+++ b/src/dkimverify.cpp
+--- src/dkimverify.cpp
++++ src/dkimverify.cpp
 @@ -211,14 +211,14 @@
  unsigned DecodeBase64(char *ptr)

  {

diff --git a/mail-filter/libdkim/files/libdkim-extra-options-r1.patch b/mail-filter/libdkim/files/libdkim-extra-options-r1.patch
new file mode 100644
index 000000000000..abedbaa8a0bc
--- /dev/null
+++ b/mail-filter/libdkim/files/libdkim-extra-options-r1.patch
@@ -0,0 +1,87 @@
+diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp
+--- src/libdkimtest.cpp	2009-03-13 16:17:45.000000000 -0500
++++ src/libdkimtest.cpp	2009-03-13 16:26:02.000000000 -0500
+@@ -55,8 +55,23 @@
+ 	return 0;

+ }

+ 

++void usage()

++{

+ 

+-

++	printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@yourdomain.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n");

++	printf( "-b<standard>         1=allman, 2=ietf or 3=both\n");

++	printf( "-c<canonicalization> r=relaxed [DEFAULT], s=simple, t=relaxed/simple, u=simple/relaxed\n");

++	printf( "-d<domain>           the domain tag, if not provided it will be determined from the sender/from header\n");

++	printf( "-l                   include body length tag\n");

++	printf( "-h                   this help\n");

++	printf( "-i<identity>         the identity, if not provided it will not be included\n");

++	printf( "-s                   sign the message\n");

++	printf( "-t                   include a timestamp tag\n");

++	printf( "-v                   verify the message\n");

++	printf( "-x<expire_time>      the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t\t     if set to - then it will not be included\n");

++	printf( "-z<hash>             1=sha1, 2=sha256, 3=both\n");

++	printf( "-y<selector>         selector tag DEFAULT=default\n");

++}

+ int main(int argc, char* argv[])

+ {

+ 	int n;

+@@ -77,7 +92,7 @@
+ 	time(&t);

+ 

+ 	opts.nCanon = DKIM_SIGN_RELAXED;

+-	opts.nIncludeBodyLengthTag = 1;

++	opts.nIncludeBodyLengthTag = 0;

+ 	opts.nIncludeQueryMethod = 0;

+ 	opts.nIncludeTimeStamp = 0;

+ 	opts.expireTime = t + 604800;		// expires in 1 week

+@@ -92,6 +107,11 @@
+ 	int nArgParseState = 0;

+ 	bool bSign = true;

+ 

++	if(argc<2){

++		usage();

++		exit(1);

++	}

++

+ 	for( n = 1; n < argc; n++ )

+ 	{

+ 		if( argv[n][0] == '-' && strlen(argv[n]) > 1 )

+@@ -121,14 +141,16 @@
+ 				}

+ 				break;

+ 

+-

++			case 'd': 

++				strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1);

++				break;

+ 			case 'l':		// body length tag

+ 				opts.nIncludeBodyLengthTag = 1;

+ 				break;

+ 

+ 

+ 			case 'h':

+-				printf( "usage: \n" );

++				usage();	

+ 				return 0;

+ 

+ 			case 'i':		// identity 

+@@ -138,7 +160,7 @@
+ 				}

+ 				else

+ 				{

+-					strcpy( opts.szIdentity, argv[n] + 2 );

++					strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 );

+ 				}

+ 				break;

+ 

+@@ -169,6 +191,9 @@
+ 				}

+ 				break;

+ 

++			case 'y':

++				strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1);

++				break;

+ 

+ 			case 'z':		// sign w/ sha1, sha256 or both 

+ 				opts.nHash = atoi( &argv[n][2] );

diff --git a/mail-filter/libdkim/files/patches/fix_warnings.patch b/mail-filter/libdkim/files/patches/fix_warnings.patch
index 56ed6ffc8a1d..84704290a60a 100644
--- a/mail-filter/libdkim/files/patches/fix_warnings.patch
+++ b/mail-filter/libdkim/files/patches/fix_warnings.patch
@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -ru libdkim-1.0.19.orig/src/dkim.cpp libdkim-1.0.19/src/dkim.cpp
---- libdkim-1.0.19.orig/src/dkim.cpp	2008-05-12 20:07:32.000000000 +1000
-+++ libdkim-1.0.19/src/dkim.cpp	2009-04-15 19:38:08.000000000 +1000
+diff -ru src/dkim.cpp src/dkim.cpp
+--- src/dkim.cpp	2008-05-12 20:07:32.000000000 +1000
++++ src/dkim.cpp	2009-04-15 19:38:08.000000000 +1000
 @@ -172,7 +172,7 @@
  }

  

@@ -42,9 +42,9 @@ diff -ru libdkim-1.0.19.orig/src/dkim.cpp libdkim-1.0.19/src/dkim.cpp
  {

  	if (ErrorCode >= 0 || ErrorCode <= DKIM_MAX_ERROR)

  		return "Unknown";

-diff -ru libdkim-1.0.19.orig/src/dkim.h libdkim-1.0.19/src/dkim.h
---- libdkim-1.0.19.orig/src/dkim.h	2009-04-15 19:37:48.000000000 +1000
-+++ libdkim-1.0.19/src/dkim.h	2009-04-15 19:38:08.000000000 +1000
+diff -ru src/dkim.h src/dkim.h
+--- src/dkim.h	2009-04-15 19:37:48.000000000 +1000
++++ src/dkim.h	2009-04-15 19:38:08.000000000 +1000
 @@ -155,14 +155,14 @@
  void DKIM_CALL DKIMSignFree( DKIMContext* pSignContext );

  

@@ -63,9 +63,9 @@ diff -ru libdkim-1.0.19.orig/src/dkim.h libdkim-1.0.19/src/dkim.h
  

  #ifdef __cplusplus

  }

-diff -ru libdkim-1.0.19.orig/src/dkimbase.cpp libdkim-1.0.19/src/dkimbase.cpp
---- libdkim-1.0.19.orig/src/dkimbase.cpp	2008-05-12 20:07:36.000000000 +1000
-+++ libdkim-1.0.19/src/dkimbase.cpp	2009-04-15 19:49:32.000000000 +1000
+diff -ru src/dkimbase.cpp src/dkimbase.cpp
+--- src/dkimbase.cpp	2008-05-12 20:07:36.000000000 +1000
++++ src/dkimbase.cpp	2009-04-15 19:49:32.000000000 +1000
 @@ -118,10 +118,10 @@
  // Process - split buffers into lines without any CRs or LFs at the end.

  //

@@ -102,9 +102,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimbase.cpp libdkim-1.0.19/src/dkimbase.cpp
  	{

  		// no colon?!

  	}

-diff -ru libdkim-1.0.19.orig/src/dkimbase.h libdkim-1.0.19/src/dkimbase.h
---- libdkim-1.0.19.orig/src/dkimbase.h	2008-05-12 20:07:24.000000000 +1000
-+++ libdkim-1.0.19/src/dkimbase.h	2009-04-15 19:49:32.000000000 +1000
+diff -ru src/dkimbase.h src/dkimbase.h
+--- src/dkimbase.h	2008-05-12 20:07:24.000000000 +1000
++++ src/dkimbase.h	2009-04-15 19:49:32.000000000 +1000
 @@ -41,7 +41,7 @@
  

  	int Init(void);

@@ -114,9 +114,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimbase.h libdkim-1.0.19/src/dkimbase.h
  	int ProcessFinal(void);

  

  	int Alloc( char*& szBuffer, int nRequiredSize );

-diff -ru libdkim-1.0.19.orig/src/dkimsign.cpp libdkim-1.0.19/src/dkimsign.cpp
---- libdkim-1.0.19.orig/src/dkimsign.cpp	2008-05-12 20:07:46.000000000 +1000
-+++ libdkim-1.0.19/src/dkimsign.cpp	2009-04-15 19:49:32.000000000 +1000
+diff -ru src/dkimsign.cpp src/dkimsign.cpp
+--- src/dkimsign.cpp	2008-05-12 20:07:46.000000000 +1000
++++ src/dkimsign.cpp	2009-04-15 19:49:32.000000000 +1000
 @@ -144,7 +144,7 @@
  

  	fwrite( szBuffer, 1, nBufLength, fpdebug );

@@ -183,9 +183,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimsign.cpp libdkim-1.0.19/src/dkimsign.cpp
  	{

        OPENSSL_free(sig);

        BIO_free_all(b64);

-diff -ru libdkim-1.0.19.orig/src/dkimsign.h libdkim-1.0.19/src/dkimsign.h
---- libdkim-1.0.19.orig/src/dkimsign.h	2008-05-12 20:07:58.000000000 +1000
-+++ libdkim-1.0.19/src/dkimsign.h	2009-04-15 19:49:32.000000000 +1000
+diff -ru src/dkimsign.h src/dkimsign.h
+--- src/dkimsign.h	2008-05-12 20:07:58.000000000 +1000
++++ src/dkimsign.h	2009-04-15 19:49:32.000000000 +1000
 @@ -32,7 +32,7 @@
  

  	int Init( DKIMSignOptions* pOptions );

@@ -206,9 +206,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimsign.h libdkim-1.0.19/src/dkimsign.h
  	void AddInterTagSpace( int nSizeOfNextTag );

  	void AddFoldedValueToSig( const string &sValue, char cbrk );

  

-diff -ru libdkim-1.0.19.orig/src/dkimverify.cpp libdkim-1.0.19/src/dkimverify.cpp
---- libdkim-1.0.19.orig/src/dkimverify.cpp	2009-04-15 19:37:48.000000000 +1000
-+++ libdkim-1.0.19/src/dkimverify.cpp	2009-04-15 19:49:32.000000000 +1000
+diff -ru src/dkimverify.cpp src/dkimverify.cpp
+--- src/dkimverify.cpp	2009-04-15 19:37:48.000000000 +1000
++++ src/dkimverify.cpp	2009-04-15 19:49:32.000000000 +1000
 @@ -440,7 +440,7 @@
  {

  	ProcessFinal();

@@ -275,9 +275,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimverify.cpp libdkim-1.0.19/src/dkimverify.cp
  		{

  			if (values[j] != NULL && values[j] < values[0])

  			{

-diff -ru libdkim-1.0.19.orig/src/libdkimtest.cpp libdkim-1.0.19/src/libdkimtest.cpp
---- libdkim-1.0.19.orig/src/libdkimtest.cpp	2008-05-12 20:08:54.000000000 +1000
-+++ libdkim-1.0.19/src/libdkimtest.cpp	2009-04-15 19:38:08.000000000 +1000
+diff -ru src/libdkimtest.cpp src/libdkimtest.cpp
+--- src/libdkimtest.cpp	2008-05-12 20:08:54.000000000 +1000
++++ src/libdkimtest.cpp	2009-04-15 19:38:08.000000000 +1000
 @@ -60,9 +60,9 @@
  int main(int argc, char* argv[])

  {

diff --git a/mail-filter/libdkim/files/patches/strtok_r.patch b/mail-filter/libdkim/files/patches/strtok_r.patch
index b3b4999aaf5f..13acc585a075 100644
--- a/mail-filter/libdkim/files/patches/strtok_r.patch
+++ b/mail-filter/libdkim/files/patches/strtok_r.patch
@@ -6,8 +6,8 @@
 @DPATCH@
 
 diff -ru libdkim-1.0.19/src/dkimverify.cpp libdkim-1.0.19-new/src/dkimverify.cpp
---- libdkim-1.0.19/src/dkimverify.cpp	2008-05-12 20:08:06.000000000 +1000
-+++ libdkim-1.0.19-new/src/dkimverify.cpp	2009-06-11 18:28:10.000000000 +1000
+--- src/dkimverify.cpp	2008-05-12 20:08:06.000000000 +1000
++++ src/dkimverify.cpp	2009-06-11 18:28:10.000000000 +1000
 @@ -855,6 +855,9 @@
  ////////////////////////////////////////////////////////////////////////////////

  int CDKIMVerify::ParseDKIMSignature( const string& sHeader, SignatureInfo &sig )

diff --git a/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild
new file mode 100644
index 000000000000..9c1009fae2ba
--- /dev/null
+++ b/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs vcs-clean
+
+DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc"
+HOMEPAGE="http://libdkim.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0 yahoo-patent-license-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	!mail-filter/libdkim-exim
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+S="${WORKDIR}/${PN}/src"
+
+src_prepare() {
+	default
+
+	ecvs_clean
+	cp  "${FILESDIR}"/debianize/* "${S}" || die
+	eapply "${FILESDIR}"/patches/*.patch
+	eapply "${FILESDIR}"/libdkim-extra-options-r1.patch
+	eapply "${FILESDIR}"/${P}-gcc6.patch
+
+	# Bug 476772
+	if ! use static-libs; then
+		 sed -i \
+			-e '/^TARGETS/s/libdkim.a//' \
+			-e '/install -m 644 libdkim.a/d' \
+			Makefile.in || die 'sed on Makefile.in failed'
+	fi
+
+	# Bug 476770
+	tc-export AR
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc ../README
+}