From 5ff1f3ec4d76050f1e5d718b46a7e10acda3bdcd Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Mon, 3 May 2010 16:59:36 +0000 Subject: [PATCH] Bump for #317955 with compile fix by Kerin Millar Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- net-mail/altermime/ChangeLog | 10 +++- net-mail/altermime/Manifest | 5 +- net-mail/altermime/altermime-0.3.10.ebuild | 31 +++++++++++++ .../altermime-0.3.10-fprintf-fixes.patch | 46 +++++++++++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 net-mail/altermime/altermime-0.3.10.ebuild create mode 100644 net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch diff --git a/net-mail/altermime/ChangeLog b/net-mail/altermime/ChangeLog index a088686fd595..aa13c717ffcb 100644 --- a/net-mail/altermime/ChangeLog +++ b/net-mail/altermime/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/altermime -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/ChangeLog,v 1.14 2007/07/14 12:08:58 tove Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/ChangeLog,v 1.15 2010/05/03 16:59:35 patrick Exp $ + +*altermime-0.3.10 (03 May 2010) + + 03 May 2010; Patrick Lauer +altermime-0.3.10.ebuild, + +files/altermime-0.3.10-fprintf-fixes.patch: + Bump for #317955 with compile fix by Kerin Millar *altermime-0.3.8 (14 Jul 2007) diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest index ab5803d5e381..0954982398b1 100644 --- a/net-mail/altermime/Manifest +++ b/net-mail/altermime/Manifest @@ -1,6 +1,9 @@ +AUX altermime-0.3.10-fprintf-fixes.patch 2156 RMD160 2e51be4a10212ede23cd58031adbfdacd954e409 SHA1 4134bbc57e20b50302cb5f065390ac1ce1a28d02 SHA256 924bebb750ceb8650175aa3acef8774f339c4a1cba949c50f0db9ed6e6ed64b5 +DIST altermime-0.3.10.tar.gz 85396 RMD160 e5d7f7ad1f0c7ed02e4cf85bd9233f5543e3b6cf SHA1 b94d83a86645b4916e4999e9cf41c09575e480ab SHA256 8334da6b55d4a05dfe1492389dfe1f289953053a21773849b060d7c856ddc36e DIST altermime-0.3.7.tar.gz 76212 RMD160 c49698221c7a1f139e4666fba492de187bf1d0ba SHA1 eabbc914c8bd9ddfb151b04641de437d4db03bb1 SHA256 643c573bceb2921ad4b8078e1eb7ac369d77e78499f95d95c7ba058cb42b43c9 DIST altermime-0.3.8.tar.gz 82588 RMD160 6ea554e3427bfabf709c05a773f8c3f144c5b284 SHA1 407bc3ad986d078dd0c4941cb902879393f10f5b SHA256 1894a7a0c5de7274d98f177ffb511f70e17533852f8350a908e5563e1dccb898 +EBUILD altermime-0.3.10.ebuild 944 RMD160 19ed02c45055f90b9002e0ad8d876eb95cd3e68f SHA1 69924933ddd9e0ecec8eb45e6ed0c78ea6b99abf SHA256 1d63660d2852c8030d45cc4956fed38c0f77c6311ed0c1ff7eb3f202ec8845f9 EBUILD altermime-0.3.7.ebuild 883 RMD160 c699ed4fe3246ebba930b66082d2857bcfda2933 SHA1 c81409b500ced6e71b420074ca089caf53eacc80 SHA256 a2ebf37012f2c9eebb50cb3f8b9d92a66bbe3d8c49c9dafb176fb730b9ce852c EBUILD altermime-0.3.8.ebuild 886 RMD160 5e158613f662082fa9531d922a0315d0c434be1d SHA1 bb443acbdd3cda5f095d897793d112636abc13d9 SHA256 f1bb1aef766b27c980bdc89f3057e80fa6410d87d173bee73a63737c54b22bcd -MISC ChangeLog 1901 RMD160 5883e5f9f157d78f43b2a2179f5e626d2d574081 SHA1 7163079e646db08be40f2a8ca5ae62374be3eba9 SHA256 5ca4d284e391f110da717d0b95535b4a2e6b1781c44f657cc667bfaf8149cfe4 +MISC ChangeLog 2113 RMD160 f823b6ebd5d74585395f936db7fabfb07eb51960 SHA1 f7938143fd0409d8a6807a414bfceb22e3b94214 SHA256 9afba99e3d77b354c2bfb01cd992d8bef58bc57b88926672a9d4f69ce06db1a2 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 diff --git a/net-mail/altermime/altermime-0.3.10.ebuild b/net-mail/altermime/altermime-0.3.10.ebuild new file mode 100644 index 000000000000..660da03bb604 --- /dev/null +++ b/net-mail/altermime/altermime-0.3.10.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/altermime-0.3.10.ebuild,v 1.1 2010/05/03 16:59:35 patrick Exp $ + +inherit toolchain-funcs eutils + +DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks" +SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz" +HOMEPAGE="http://pldaniels.com/altermime/" + +LICENSE="Sendmail" +KEYWORDS="~amd64 ~ppc ~s390 ~x86" +IUSE="" +SLOT="0" + +src_unpack() { + unpack ${A} + sed -i -e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \ + -e 's/${CFLAGS} altermime.c/${CFLAGS} ${LDFLAGS} altermime.c/' \ + "${S}"/Makefile || die "sed failed." + epatch "${FILESDIR}/${P}-fprintf-fixes.patch" +} + +src_compile() { + emake CC="$(tc-getCC)" || die "emake failed." +} + +src_install () { + dobin altermime || die "dobin failed." + dodoc CHANGELOG LICENCE README || die "dodoc failed." +} diff --git a/net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch b/net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch new file mode 100644 index 000000000000..74d32f375a6e --- /dev/null +++ b/net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch @@ -0,0 +1,46 @@ +diff -urp altermime-0.3.10.orig/qpe.c altermime-0.3.10/qpe.c +--- altermime-0.3.10.orig/qpe.c 2010-04-30 23:11:15.564697415 +0100 ++++ altermime-0.3.10/qpe.c 2010-04-30 23:17:22.368691711 +0100 +@@ -97,7 +97,7 @@ int qp_encode( char *out, size_t out_siz + op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/ + out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems + +- QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph); ++ QPD fprintf(stdout, "Soft break (%lu + %d > 76 char) for '%s'\n", (unsigned long)current_line_length, charout_size, paragraph); + + /** reinitialize the paragraph **/ + paragraph[0] = '\0'; +@@ -108,7 +108,7 @@ int qp_encode( char *out, size_t out_siz + } + + snprintf(pp, pp_remaining, "%s", charout); +- QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph); ++ QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%lu result='%s'\n", charout, charout_size, (unsigned long)pp_remaining, paragraph); + pp += charout_size; + pp_remaining -= charout_size; + p++; +@@ -149,13 +149,13 @@ int qp_encode_from_file( char *fname ) + out_size = in_size *3; + in_buffer = malloc( sizeof(char) *in_size +1); + if (in_buffer == NULL) { +- QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size); ++ QPD fprintf(stdout,"Error allocating %lu bytes for input buffer\n", (unsigned long)in_size); + return -1; + } + + out_buffer = malloc( sizeof(char) *out_size *3 +1); + if (in_buffer == NULL) { +- QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size); ++ QPD fprintf(stdout,"Error allocating %lu bytes for output buffer\n", (unsigned long)out_size); + return -1; + } + +@@ -169,7 +169,7 @@ int qp_encode_from_file( char *fname ) + ** we segfault ;) **/ + *(in_buffer +in_size) = '\0'; + +- QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size); ++ QPD fprintf(stdout,"file %s is loaded, size = %lu\n", fname, (unsigned long)in_size); + + qp_encode( out_buffer, out_size, in_buffer, in_size ); + -- 2.26.2