forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mail-filter/libdkim: Fix patch (#568632 by Kai Peter)
Package-Manager: Portage-2.3.27, Repoman-2.3.9
- Loading branch information
Showing
5 changed files
with
168 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<[email protected]>] [-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] ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } |