diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2015-04-01 15:22:16 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2015-04-01 15:22:16 +0000 |
| commit | 31ecb1151d9babfc128786cc5335e99e3d0dc33f (patch) | |
| tree | f540f767e5ff0861b44d82711773f79ac6675329 /x11-plugins | |
| parent | Version bump. (diff) | |
| download | historical-31ecb1151d9babfc128786cc5335e99e3d0dc33f.tar.gz historical-31ecb1151d9babfc128786cc5335e99e3d0dc33f.tar.bz2 historical-31ecb1151d9babfc128786cc5335e99e3d0dc33f.zip | |
Fix compilation with format-security, bug #544644
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmswallow/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-plugins/wmswallow/Manifest | 35 | ||||
| -rw-r--r-- | x11-plugins/wmswallow/files/wmswallow-0.6.1-format-security.patch | 16 | ||||
| -rw-r--r-- | x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild | 5 |
4 files changed, 43 insertions, 19 deletions
diff --git a/x11-plugins/wmswallow/ChangeLog b/x11-plugins/wmswallow/ChangeLog index eda75d50670b..efe2edc75fb1 100644 --- a/x11-plugins/wmswallow/ChangeLog +++ b/x11-plugins/wmswallow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmswallow # Copyright 2000-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.11 2015/03/27 16:28:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.12 2015/04/01 15:22:06 voyageur Exp $ + + 01 Apr 2015; Bernard Cafarelli <voyageur@gentoo.org> + wmswallow-0.6.1-r1.ebuild, +files/wmswallow-0.6.1-format-security.patch: + Fix compilation with format-security, bug #544644 27 Mar 2015; Agostino Sarubbo <ago@gentoo.org> wmswallow-0.6.1-r1.ebuild: Stable for amd64, wrt bug #541774 diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest index 532fcd95c913..4e3f7442640f 100644 --- a/x11-plugins/wmswallow/Manifest +++ b/x11-plugins/wmswallow/Manifest @@ -1,25 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX wmswallow-0.6.1-format-security.patch 498 SHA256 192353599ed45738a1bbdf258c0c0b11925112b9a4d7a0ed0c3dbebdd100704c SHA512 9690c74b0f86ddc71ea4f7b190af8ec4d7634454a867654cae8cf2cc48560ab3182e8e3ce312db9eb6b858ef4ec0b9eb63f4c11e962cd17a3638d6d38fcf86cb WHIRLPOOL b905b9e643615ece9352f4936bf05f5368ea2f846722e76a0f0d1528da2351b76551509a442bb4a1772c8ef18f4e5a77f74c2f4674d2793c23c3fe184d545954 DIST wmswallow.tar.Z 28567 SHA256 7d7a3dc64b89eeb388bb2f66815fc94cb551d0899f0e41d204f367109a2cda02 SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc WHIRLPOOL 1d6d6e19075b9a8daba03f99ef04357fc48bdb71e2373386f29a2636611ae20b56398b1871c8b163d069fbb4ee07c98cf1b27fd6bd5178a7756a011cd4d44be8 -EBUILD wmswallow-0.6.1-r1.ebuild 911 SHA256 90a4ed9f670614d6b90599963f463f33ee7827fdafba4edbc7cf02a3c81dba2b SHA512 cd6ea1e614e9f21a9e05d7a18a329569b7748eeb1644acf982d5de61fad161ad0941cc30817cae27ca44ffb8dfc3348183a4ae065ee698ffd54029ff30fc54d2 WHIRLPOOL c4dae205dd4f78c39ca7125144d65a0cba69c48bc78fcc48c57cb92a70f6097ff9a70f4da52352c9ef46b085ee0b65b7e84683bdd310d9f0a58196d239c2b3dd +EBUILD wmswallow-0.6.1-r1.ebuild 972 SHA256 51d62e1659434094308dead79cc8df61dbaf83e0ec5f54feead7b98a4973ac83 SHA512 c17fb8937e2e7a1788c0877a2a8eacbf8b481ae35858da95982ac97d53862d1373cd57a053a1875fbf4cc6569ed180cca70a12e5fadc9c361a2cbbce1edfa35a WHIRLPOOL f2e91d0db8e4a91423e741be9f03f8b55bbf36a9a3bbb0af49d80155a7e954f9e05511585a92b908f913d5c6c0d4115d0adfbb3d65c93c2a6cf6b96902a41bf8 EBUILD wmswallow-0.6.1.ebuild 914 SHA256 b4bf9d40ef3497f513960ee2146124f4f9651e9ec4c4f91ebc6926c367a9c956 SHA512 fafff6da23d572d8ac25715557347a66ebda6a6daf872e6c5d89948132140b13301004c9132f3e570a19fca7f22b445f9d5bf5c7585f22248fded6deb644c05b WHIRLPOOL 747e24a5ad47caae30a14eb89432e3159e33b29f762d43795b013140b2d4e08f3d6a01c0c9fee587bf4e927b88f5c3c4be643a2499dd9969351c19fc9d9b0793 -MISC ChangeLog 1473 SHA256 2de18f2a04cf06626f657931f64358fc296d338f76f8392f547b59f3c461cb5d SHA512 71b1e982e72e0c0e0dc665cbde42b8a13302bf2a4ae699630eed4af2a9b63a8fe876da9f19fe29e25757d429a2e13783dae0d89d48c58790299622c1fbbf6f6b WHIRLPOOL 070fb0d412d24dbabe3ed76acad75cca35b686a62dc0ac51a9c590b6de5d346c08a600f12d1fbc3c6a87f719dc82b8e0a6e0a73bc51c2fbf39088f10edf8cbec +MISC ChangeLog 1661 SHA256 a4dbd7214ef13edc7a3f2352db9eace6439c1a81191a52e1e76c1a048a0d0031 SHA512 99ccb2ea28b801c0e6e8c56cea64ca71a38def8d57760c98e7d878b1656fe9275dda8f46284182b683841b438205df46bb093321603feed4a5da7757ac18d952 WHIRLPOOL b6230b23e42997f7ae651284d2b0ea5f23c01a2c7e6d78cc06d6a798182e4a979ec9f42689f105fda9aee055e16cf96bbdb36bbf5c76594aa99494936db746af MISC metadata.xml 560 SHA256 0317444ef8a4bc39314abaf687e037a6cec5438ce8164155bb99bfd607c5a4f3 SHA512 9fc97f0baddffad3352334b2ecdbd61b9f3b9fe4e02c919c9b22ad9decbec55c8cfd3780969dbd0dee7ba10aeaaa05053570307ae17ba11ac0fe70b28b0cd9ba WHIRLPOOL bcc1f2d65f467ea4e9c2492a693a3c65832f5dbc8b353b825921ef3880140fbcfbef0749bd4f2a07f666b0ce1c1e81932720e78a4f4a542c392554116e984884 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJVFYVBAAoJELp701BxlEWf+m4P/1W9hUGD9Y4KpCfiyMQWLkem -vKfTB1AepslYm770d3i0yMRdhWLIqkHZJYRay7D01omejPA3zYQrXswnIr8nl1kF -lGWbhekyD4mO7AaxXj9ovUlWP/bO2PF0fmymuqMAuq2QU7nkzVRMtJsEoEK5cAZc -AgxjrpcsYDkHPDw42GSvE+pMNOm0C6jSTxPW/FGKpsYpCigTESGHzcF1aURnRM7D -1NItNitOXvTzqqs2Mj0kn7C12cLKRNapnD4ANyhTaoSkuflb6mybmGh1PLTahGYE -198UjG+P0P4zmZcmE0QlSvKjgJDEqglQgCMzu64JaT0OxHjMcXNLvQu3pYQxz96S -JwK6w9HV2r+KIFhv11PJDJAMpiijsYNuoe4iCkepFDGPGgUNUQtEzsdzWma9FMrd -hmTMJF05/AT8Xmnd9VjkCOrnH6Edo8ShPwwDRXFXzWBGRjtp2AMwbU5EAMBbHqtL -gMJUBthFB2zQYc7lgFEJ430iIEcEixFqVKM2bSRa3kvGw7QzAzP4KjiASlVO1O9G -LagznRH4aVacLcTsD19eUSAeOQ+7fMLED7gPMlZw6KONpqccfut4TpTFbgMGCf1k -LXaUZH3otpLns8subjS33morsvtpG7LN99EyarobZ2AQXnDlBZHSeJf3N127c7qo -QDqirJrSVjmcUNX043To -=its7 +iQJ8BAEBCABmBQJVHA0jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw +MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/3GEP/2Xo8mz48TVXt11YQplWDVmb +Ml7XKtUGHS9Iapgh6Wxx87ddGF1MwebbGFT+d0DRPGvgm0nMOg4TKXXPCaiTVgrd +G87Neo7EcksvKm4RlD9Z/ElCewXJ1xboVu3LTtJfT8TLHkuULmO9qQFYzcEBaI0f +YIlkcIv10QuYIKI1boz3FJq2PMvRvj6JyUN0+IcERIMox9eL0Sj/9iyRrMy0491n +HYHZCLbwFGY/zbslZXFlrs/FyqRAsHt2bTxlknkqxn5zdOHgANU1UjacxvohYUaV +5j6FpH+EeDIH3VzmKtcChcpiQl5ArKgZCijVTnQ1T7ctT+iGHeFvn/VbabuNHZEP +UobGMN7CT+SkKugVIrtN8+LIotswa2XtdUddQkNJ5lz94qIRlz22TtnANvaFvKS4 +ovDWTO9+Sx8azuVzZw9eADw37RtdLyCSAGL7gXsc9kCBXavw6n89Jf56kOh5YQ60 +XN9OALbjPQ1IA/lZJJeZH1jm1OqCUYTY/IvmDsV3K/fFwaoZ5UykQ+By5Nqidw3D +jcS/c167cbWyGCpYlh23td62ELkjha4XrujJ9FPTbH75h46meqDFh204LklCaemb +mMF0y++b5lPZjqDUQ0G87px2IRqm1PJPh8syLSapSEgRjawI5KdozXeHerq7Jqny +kTzs5Vgs32DEoZ06vyKr +=vG++ -----END PGP SIGNATURE----- diff --git a/x11-plugins/wmswallow/files/wmswallow-0.6.1-format-security.patch b/x11-plugins/wmswallow/files/wmswallow-0.6.1-format-security.patch new file mode 100644 index 000000000000..7a2fe4cf1f36 --- /dev/null +++ b/x11-plugins/wmswallow/files/wmswallow-0.6.1-format-security.patch @@ -0,0 +1,16 @@ +--- wmswallow.c.orig 2015-04-01 17:12:29.420177608 +0200 ++++ wmswallow.c 2015-04-01 17:13:14.947182921 +0200 +@@ -445,11 +445,11 @@ + int printlist(FILE * stream, char * string, char **stringlist) { + int i=0; + +- fprintf(stream, string); ++ fprintf(stream, "%s", string); + if (stringlist!=NULL) { + while (stringlist[i]!=NULL) { + fprintf(stream, " §"); +- fprintf(stream, stringlist[i]); ++ fprintf(stream, "%s", stringlist[i]); + fprintf(stream, "§ "); + ++i; + } diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild index 5a50a0bfdf16..7a157c99b6e8 100644 --- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild +++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild,v 1.2 2015/03/27 16:28:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild,v 1.3 2015/04/01 15:22:06 voyageur Exp $ EAPI=5 -inherit toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="A dock applet to make any application dockable" HOMEPAGE="http://burse.uni-hamburg.de/~friedel/software/wmswallow.html" @@ -22,6 +22,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/wmswallow src_prepare() { + epatch "${FILESDIR}"/${P}-format-security.patch sed -e "s:\${OBJS} -o:\${OBJS} \${LDFLAGS} -o:" \ -e "/LIBS/s/-lXext/-lX11 \0/"\ -i Makefile || die |