diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-08-06 15:35:24 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-08-06 15:35:24 +0000 |
| commit | f612f1ffad1e465f45b0867137a2bde63b94aaef (patch) | |
| tree | 2762357ad6c3f219cf34c4a8b13b0b6fe5311881 | |
| parent | Remove java-virtuals/javamail and replace it with oracle-javamail. Fixed bug ... (diff) | |
| download | historical-f612f1ffad1e465f45b0867137a2bde63b94aaef.tar.gz historical-f612f1ffad1e465f45b0867137a2bde63b94aaef.tar.bz2 historical-f612f1ffad1e465f45b0867137a2bde63b94aaef.zip | |
Fix for format-security, bug #556846
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!
| -rw-r--r-- | dev-util/patchutils/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/patchutils/Manifest | 33 | ||||
| -rw-r--r-- | dev-util/patchutils/files/patchutils-0.3.3-format-security.patch | 25 | ||||
| -rw-r--r-- | dev-util/patchutils/patchutils-0.3.3.ebuild | 10 |
4 files changed, 55 insertions, 19 deletions
diff --git a/dev-util/patchutils/ChangeLog b/dev-util/patchutils/ChangeLog index 171a31be14b9..3c98eac91cf5 100644 --- a/dev-util/patchutils/ChangeLog +++ b/dev-util/patchutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/patchutils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/ChangeLog,v 1.83 2015/07/30 18:05:14 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/ChangeLog,v 1.84 2015/08/06 15:35:23 jlec Exp $ + + 06 Aug 2015; Justin Lecher <jlec@gentoo.org> + +files/patchutils-0.3.3-format-security.patch, patchutils-0.3.3.ebuild: + Fix for format-security, bug #556846 30 Jul 2015; Justin Lecher <jlec@gentoo.org> -patchutils-0.3.2.ebuild: Drop old diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest index 26bd27fa3846..ce382a96f156 100644 --- a/dev-util/patchutils/Manifest +++ b/dev-util/patchutils/Manifest @@ -1,26 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX patchutils-0.3.3-format-security.patch 715 SHA256 f4c17fda9bea2e48f0265855403a64d063f7cd50fcff37cc59cc5113926bd434 SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa WHIRLPOOL 4b1f7415f3a55ee96c3b4939bc67fb14faa445524cf696ea8aea436929a10b6373fce3481f7f5beda96c07ab777f44b5bc17e16011d96ccfdd7813acdfda7624 DIST patchutils-0.3.3.tar.xz 156328 SHA256 91f4e8451b2efcac5d40c966e42c175803450f0de94c926bfecc12c90070ad3c SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268 WHIRLPOOL b4db67f2682e3bd4a37abacaa56477f7bfe79210469243c572ebd870e0e19cb54e51d6be79b737210e9de685d09470ce2d2db0452fe4b8f26f72f06a9cb6b3f8 -EBUILD patchutils-0.3.3.ebuild 797 SHA256 ef430fdea6e8d816d8ab634253f71085102fb3ce11975bb2afdf366eb140fd7d SHA512 1723723f6010471fec5ac1984026744e1c1e8f3ea6ec1cf7f9d4f76fe05356df70718cb0d15a7a6175e027893295f089aef67c13a22d4abf375b15d9da0033a5 WHIRLPOOL aac5caed3974cd017b98033b728917918689eca5143ed7515f5c28847a4107a2ed0668960368e28fd3aa51c6c9343ffde77e7ffe957aa772188231e16d431aaa -MISC ChangeLog 9738 SHA256 7121b7a5cb3c51ce6411ccc64e4a352b06d1956a5fe73e5e22c6eafa7a66fb73 SHA512 f67bca59051f526ae675443f4ff0f86bbbe55972ef7455f6ee6b70066b08869e3068b71e4abe890063489896de20ac832e7966980383b0f2f1611208fe78aa21 WHIRLPOOL 0a81acdf636d4972e8a2386050d062f987b15364319bb655bc63876dce6ea05c43a0fbc1c4a4971220e0f4ec5c8029a871223306276330bf3c3687bd20fbf59b +EBUILD patchutils-0.3.3.ebuild 882 SHA256 46657b664bf1d4a63859ab7c046b8e7f4beb25f0ee41bb7b38ce3c4472083244 SHA512 2d0889a7f95f12e35491458bd5403edebc9ebf9f71ab7168d2b0b39f0f591d683172b0d0ae91db1070af624bc37602f100c203aa63fbaeae477420a14724cca7 WHIRLPOOL 704bb16bb990c25eec8b534e1e98e738223889a6d3fcb5dd9f2d66efdc59d9f29dad621f0c52c9fcfa5b56f04fc25841cc01bd22a6235fec7571621cf6c43c8c +MISC ChangeLog 9899 SHA256 2fec93564625de38604da1f896d64e75a564d6b62cae69c0803c0bb7380e07b7 SHA512 f90b3d2d230251687edded087a3b808b6f8baaaf72ba172c3c31f022de4fc1a41baa14572b1d0485f16f9c2666ec35eb73dfaf8f6d1e681c6c347dff5d89d994 WHIRLPOOL 585bddff8c5b8f1ed7d0f441f015cebc495bc7278043a5a37ee2ecfc65594e582f2d282620560fde3edf2f7ee89ef3d16e5a8c66a131ca81535ebed2ae2faa9f MISC metadata.xml 232 SHA256 25a5577a83d2237596dafffd123634e000dad58946f9d26bbb37cab683c6117b SHA512 0f206b8038ba4f0ef2c97b7d601a43b3e12b6f8ed4c3a02c38961a436ccde8515e9ef8f2daff3ceec18b10bf40e21d76bf6d707e4dac12ca912f376c281fb3b3 WHIRLPOOL cdf86831f303481ab091f2b0d93aa1439f14dcc6954f81c953e960ae97db3b6b6a6a0d71de56b6a1f3b13f6e1ddadf99291ec14d0db77cdd197a8b35fc00ad7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 -iQJ8BAEBCgBmBQJVumdbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJVw368XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF -OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixRAP/RQ36SZQOplJSJc2EjNLVQz6 -2xiistFZGvdKX1FKEUYETsEyGG7U6roizXmr9rAae8D3nMDg95OiLJpPf4MpcZUA -b22LsYYdcuwYCguixpLHBkuYZXAmeh3inuCbwuMeJOrEHtI7Tqz/jYNx/S7Pfabl -B15bPAvWxKiN5F9WUPFGDJueIKqn8hpUBUwvjnSEc/0tMO4NTfEAdGjFcHqtiwME -KyrVzl4wWY7r0wBg6BAIdIqiz/EFtoT4BYIO/GdsvLf8B5JkmXZMMeYqBRdHQu7i -87oVdahAnZ22/ztozkNAvQ6rhBsR+EcAe4I4pNb2w1V2q7rk8QnULB6P+cyqTCLm -nJo3gteAs562uN3wpwQ9eP5nqP6kZLYXhUcWL7nukt1JrvAnBWUgQ2ChzuIjj096 -IYtLfW36h1rzSdkthCkiGRmvTrMhtNu4skv7/2vFFOmeraN5cXGT4Qr4Jr1KYooa -55c0xKqF7cQfFe5rdYks1na7okgZt1DQzXjUjcl6trVTxafQtaergav9oDtFiZ0p -K4gljX76m+kyslb25HovURR7WP1oHbZ0jJzb53u3vV2TtfRTJPCn1OmHh0erSR1P -nJlci8qxdyNozQyN2C3WopVKa9kd0Ps9QOz1QBTJzZXZF2R+MYvqsP5CNMfIYHkf -KJA7PO7rjL3cS2lS/4Ug -=TlK0 +OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIWwQAKiwmgmtbLNMVKl1CAD0UtT7 +FNqRaL88x/vaPWrBgix6Li5AzQn5WeRfagF8nRe0tyCzOqViRfRd8YaTOGL2nXB0 +wVdCz1xrhIK7Wx98eBF5pi4Yjt+R52vLyw/y0Q1NSqEZy8UAZcQ+uC0hhqL0pILO +a3CRxhgqq29ikefjPAXtUrFjiUrOwMu9Zlh++LPRQr0Fc9R5h2XaVsvKRDB+F6jV +fLP+BJk4nXhsFGfrexi6qSScP5EHoXBN7A8dq+UIofv/49BERtoOS/1YNqCqjo7N +CQjl6YgqGaJR8F2ihgohc+x1m/v1bVzx3ikSG4NNbaIY8Ra1QIwcjZXegBz9cEXn +etHbnoV88/sV16NWCpYFTbKR5PG7HL/gBQI9K3WGZqYTD38xWXdsno1RmM31+MZG +y+y+YjjIjLkm5Ke42Mh7oo0q8eaTwcZjK5hO0hvRdhTAhdAavh2r4ged3yWMm+uy +5ZLs9zjby9XKNxMxFWke+sy+JfS9YDqDUCjKg1DFvBv3vFAYPjfwoBPjALJTMpmT +2R/27CkXM+idYcZ3tUiDA35anT8Z0tIeO241rofsvqZrYp+g4Y63jX2WZ2p+osmK +W9040ngbdi/9H3eU1tVXjvxbYu8tVPjrNKe4GqHI/B8JXs+7WvuUSWslmAkyMPa5 +akUrbW0q72eskMGeUjto +=QBh6 -----END PGP SIGNATURE----- diff --git a/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch b/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch new file mode 100644 index 000000000000..be190b65a734 --- /dev/null +++ b/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch @@ -0,0 +1,25 @@ + src/filterdiff.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/filterdiff.c b/src/filterdiff.c +index eb08d49..0b2b301 100644 +--- a/src/filterdiff.c ++++ b/src/filterdiff.c +@@ -1263,7 +1263,7 @@ read_regex_file (const char *file) + char errstr[300]; + regerror (err, ®ex[num_regex - 1], errstr, + sizeof (errstr)); +- error (EXIT_FAILURE, 0, errstr); ++ error (EXIT_FAILURE, 0, "%s", errstr); + exit (1); + } + } +@@ -1509,7 +1509,7 @@ int main (int argc, char *argv[]) + char errstr[300]; + regerror (err, ®ex[num_regex - 1], errstr, + sizeof (errstr)); +- error (EXIT_FAILURE, 0, errstr); ++ error (EXIT_FAILURE, 0, "%s", errstr); + exit (1); + } + } diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild index 92818aa11179..94777ee9dbb8 100644 --- a/dev-util/patchutils/patchutils-0.3.3.ebuild +++ b/dev-util/patchutils/patchutils-0.3.3.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/patchutils-0.3.3.ebuild,v 1.11 2015/07/30 13:09:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/patchutils-0.3.3.ebuild,v 1.12 2015/08/06 15:35:23 jlec Exp $ -EAPI=4 +EAPI=5 + +inherit eutils DESCRIPTION="A collection of tools that operate on patch files" HOMEPAGE="http://cyberelk.net/tim/patchutils/" @@ -17,3 +19,7 @@ RDEPEND="" # The testsuite makes use of gendiff(1) that comes from rpm, thus if # the user wants to run tests, it should install that too. DEPEND="test? ( app-arch/rpm )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-format-security.patch +} |