projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba630db)
Revbump to apply security patch. Thanks to Corentin LABBE
authorMarkos Chandras <hwoarang@gentoo.org>
Mon, 22 Dec 2014 15:35:51 +0000 (15:35 +0000)
committerMarkos Chandras <hwoarang@gentoo.org>
Mon, 22 Dec 2014 15:35:51 +0000 (15:35 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

app-text/antiword/ChangeLog patch | blob | history
app-text/antiword/Manifest patch | blob | history
app-text/antiword/antiword-0.37-r1.ebuild [new file with mode: 0644] patch | blob
app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch [new file with mode: 0644] patch | blob

diff --git a/app-text/antiword/ChangeLog b/app-text/antiword/ChangeLog
index d833bb09e203d06368537dfecf8f5c20666605f9..0f8cec700c0fa421c72b040b96bdb81306b831f8 100644 (file)
--- a/app-text/antiword/ChangeLog
+++ b/app-text/antiword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/antiword
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.48 2013/03/17 15:46:40 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.49 2014/12/22 15:35:47 hwoarang Exp $
+
+*antiword-0.37-r1 (22 Dec 2014)
+
+  22 Dec 2014; Markos Chandras <hwoarang@gentoo.org> +antiword-0.37-r1.ebuild,
+  +files/antiword-0.37-CVE-2014-8123.patch:
+  Revbump to apply security patch. Thanks to Corentin LABBE
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 06713fb7731919441cd3ddf5f8311853a422be00..c3d5e02e0d3616e0520bd6a67ceffbf7189a7365 100644 (file)
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX antiword-0.37-CVE-2014-8123.patch 528 SHA256 130ae28174bfb30d75755e0df55eab33ffc417173c493dc53405cdd47c2ce60c SHA512 412884a236abb5ee75e5c707581c7e0158614d0e168cd9a8fe02dd8dcb8c0963ae2269c9575cd9cb9f4876efb3bec6bef7934fec5c7738530012495637a2d694 WHIRLPOOL b676eb14c31dc6555cd303f42a1c30c84b1c7597ff0de4c28d69278c8d8f67791ca040b03392c73c2e6a785b5958fad60340fce35b89a76eeea3909714c17d28
 AUX antiword-0.37-prefix.patch 2252 SHA256 ea6ee5526d7c23e5ba5dcb75a1acd65c46fc426a6bd6f1f103b0d83b3f3896cd SHA512 0c61e81d8b6dba9c4c03563b0027e728c179814851d72ed96cd0868c3578aebf8158481adc82fdd9f96c6cf1b1c91a9339f5b75d28b1103fa26ace002bd8e970 WHIRLPOOL 07a4ebd2593ce267636e6f0daf7fd91bb4bb247fd8e28cb5d880f0e7f18529ae0699938f19ca180fdc2711c2e2ed0802bb687ea851bcf9734413cae810cf68a3
 DIST antiword-0.37.tar.gz 317884 SHA256 8e2c000fcbc6d641b0e6ff95e13c846da3ff31097801e86702124a206888f5ac SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8 WHIRLPOOL 653299ddeba3c153651a664abe12d9c9960227289cfada037574d97dbb3a1a2bf958571815ce6995e38ce7a197714b1852a39aebae108986cb74e861e948c7e3
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 SHA256 62de6106d47e80a5e890bfbe4d2c85c5c78022e196857a4fca035c7c035d583d SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe WHIRLPOOL e3a578c1bb082378f0db480aaab640f56f53e23fb35416a04e06803a8fdbd0193f0fbe33cce074dad00d13feada2bc97ce62dae460123047bbe80cd49994b445
+EBUILD antiword-0.37-r1.ebuild 1560 SHA256 f8be541861f9d0e9eb208ca6fa0d3d1e5e8bf691b5bd0fca1b7cc1dbe5c9b462 SHA512 bab6265d9401429e7abfe2cc15f1e24720cb96331459f93050fad6a76fcbfa9b046e41bcd73ab1ccf2d5a2c7f352611379f3fc5077e2ee954109ce6d11c445f9 WHIRLPOOL 6e07cac2110d88766d144ac60ea9a6f1a07dd0eaae202b38b1f559624cc277fcf307b9fb195f5b488196ad5c75db4858a326f91b6e8c21ae81cfc61d843b357b
 EBUILD antiword-0.37.ebuild 1503 SHA256 b2a6082d773fea7235c48cec55cf93b25b78751a793232da219049bfb6bf4e3c SHA512 09a36032d2ab94632e6e454c17ec929fb980f338642d0c2c420e8294ac64876bcd4023dd6f55a731971cba93d70ad48c219f45e786339710678c74e661037b7c WHIRLPOOL 2c4a7d4756b2fbc894f4830f5a2121a675618e8bb72509e86d6cacb4c9d07d4ed460e324e1c817b5d0791803bff64a18ccef509fbac9a043c2e4dfe75e961440
-MISC ChangeLog 6575 SHA256 ec265e132591e4faa6a9eb887a5eb4ca8a92b11e43bd9a56a9e12843c9fb2aac SHA512 27725d06d2f7e5bbb98a41a33006c0dc9743669578233b1b89c2100407c4b8b263799aaf2f57b30b6c2c393059344fdb55f57a614334029c14dfacb667762d5c WHIRLPOOL 766fc179ea55766f797284aec550489b340f80e36795198dfe23bcdcb45fb800b96ac244463bcac951fb6b2e8ddb4923236234d3948432da4efba27e648f78cf
+MISC ChangeLog 6792 SHA256 55849e4203707bf99142799d4384bad02647e88450d4223712e1db7e232a8b27 SHA512 f4091d782b93202aaeed61baa9294c46a097b5cdf9880af21af575820cda1ca5b5f3ab6767eef14bd3086fae9fe5c503a7f22904c652917d286dfa5ef92df313 WHIRLPOOL 6a8476e1555246f3ee00b552587bf545e45bab7a538e5f41d0cf9c9d88680543a5a193e50cda7f0bf8790dd31c61df6b0f179f177b3913bb1c61e363f4c3b5ac
 MISC metadata.xml 439 SHA256 1c1b6b1283031086fdf2df760fbf1fd006c98aa8b5c2f7cf2feddf3eedcb2a25 SHA512 294f557445ab335170f3d48671a36fcb5b8bad4bbb4e90af3d8fc556d8c05ab55ff8ed12110135fb8eb8e7ddf2d6b3f7e6cf1e3eb4a66108f05244d10fc6426b WHIRLPOOL 6cf4c318a80bfc9469ae341492199493a18947de413de84cdad8a7b41c0de56a11db1b0f391f821ec878d1d7ad6d0df0cfa218e115075e4492a016d65864b375
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJRReVhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUmDpUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88E3MQAIvcOYuSm6kqmr5zQ/Vme5p5
-coTiNWL5ISTOjh1EHCiG5Op7Jnbd1lUWGzrQdY+eWJ5qZ0luoXKFDBYxxxsYd2Ti
-spo5/mMxbaM44l6r+QMBh5cbo1QoGZ6IIf4l3hd7JQ11h73Bombdlf9OuBRQWBas
-Zhb+tbwdSeRIn6lc+xm3hQLYmget+TUJlqcTjCd7KzDg18YLn8C5mTT26Q5rkgyp
-p27y6ClJz+H0PymbbtoMKjMgqjCXZHNJzIUrCOzl1vaXQVKPngIre/3uwWamHLQF
-WByjl/W8SkvxDkZuv8Kz/GKmQ97SVZzf2/VL67qkXPnVlrjMvBf9vaZOljUA4OkE
-nd/LbKe1kqHNvo57SE4wkZdhFpBNJh5Q+azcIViJWIeqprCzqOHDqY17fHSo4V0N
-55gW0pJ7kXhOoqrmystt4YWtktJh5eX7toTuHTHud7a29W5sfAcmFAkXLPd7s08o
-U9zhGF9lPSZrcbfayJIG1vfPGNn+dXOmDQpRGDIO9nwr7t//FXuOvwsDaetS8emM
-1Ha6mAllKbc5jwuYtFFFTxxv4KM+jHJsLT/r+QR4mJoOm7f6aW2OKpgVC2Iy5EhC
-ererzkbdRUKVXXtOh+xWp6L/skIX73NO9QxlMyhZKLdC/fTNu9xeIfcOM4QwoiE/
-TNsjX4pofxGeSS2n6owb
-=BQHu
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88RVgP/i/yANUDe3qm+74lfbtWxZbH
+C1bsQrQ9fG9gZivlZhx27TdE1IFyQoWDOH7KJ+XJwaGCEmK61xHm5ONFGGiRJ4NP
+TXa4cGv9lkXHNpp8AxySLEOw0JjJp0ZoBalAmkvqaUmsvADPcQEvOgh6gfikOqL3
+0/0Noit8/Y3spuU59lRsKRDzqdpfuDdLKPyOSQ4otaYqQ1B/hHjduyIGRzEZA147
+AAWFSm5kw0Z5EVS7sHOZ7le2Y05CJWJhfj75MD9vs/N0rLYSkNyvWGg16Hx/7Wz2
+DNgXTDO/S6ZqI0tOmrddS41NSHoYSlzV7ley06mblY5dgwYr0UUUloCVBbN8xzkR
+jiNxLlrXOJZNGE6ryJAez9jYfGWp/VNGQZwt6c3RNVeaj5nKHfmf71u6pjObGPhH
+PEawK+qsm38NiWd3kmlYGVLCAJvMtlFiNhdC4IZ7Dv2yywekVql9ThRCo0H9fx2E
+kEPG3xAd7A/exCI8tSHWmaomHoGJNATa5mBcEUIaRoscO6jqEhMX1cJ/fKHqsKB6
+Nhps4l80vMgFN4UwyaOAvSrGn2tHob/oZai/xMAzJcPDaq0pu2p8RBtv8M8GysCT
+wjF8IuWaHpGL9JRIzoFWlJVrke4GX7D/V29BjSBG1wsYwBOZp2bRyHao20Q+uIlY
+WCZg9rN1mm+VxIXk7nuk
+=3RqK
 -----END PGP SIGNATURE-----
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
new file mode 100644 (file)
index 0000000..1638f69
--- /dev/null
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.37-r1.ebuild,v 1.1 2014/12/22 15:35:47 hwoarang Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+IUSE="kde"
+PATCHVER="r2"
+DESCRIPTION="free MS Word reader"
+HOMEPAGE="http://www.winfield.demon.nl"
+SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
+       http://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+src_prepare() {
+       # Makefile is a symlink to Makefile.Linux, avoid that we patch it by
+       # accident using patch <2.7, see bug #435492
+       rm Makefile || die
+
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}"
+
+       # Re-add convenience symlink, see above
+       ln -s Makefile.Linux Makefile
+
+       epatch "${FILESDIR}"/${P}-CVE-2014-8123.patch
+}
+
+src_configure() { :; }
+
+src_compile() {
+       emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
+               LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+       emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install || die
+
+       use kde || rm -f "${ED}"/usr/bin/kantiword
+
+       insinto /usr/share/${PN}/examples
+       doins Docs/testdoc.doc Docs/antiword.php || die
+
+       cd Docs
+       doman antiword.1 || die
+       dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt || die
+}
diff --git a/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch b/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch
new file mode 100644 (file)
index 0000000..8b6baf9
--- /dev/null
+++ b/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch
@@ -0,0 +1,17 @@
+index 8a95fb9..7797d1f 100644
+--- a/wordole.c
++++ b/wordole.c
+@@ -259,6 +259,11 @@ bGetPPS(FILE *pFile,
+               }
+               tNameSize = (size_t)usGetWord(0x40, aucBytes);
+               tNameSize = (tNameSize + 1) / 2;
++              if (tNameSize >= sizeof(atPPSlist[0].szName)) {
++                      werr(0, "PPS %d appears to be invalid.", iIndex);
++                      atPPSlist = xfree(atPPSlist);
++                      return FALSE;
++              }
+               vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize);
+               atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes);
+               if (atPPSlist[iIndex].ucType == 5) {
+-- 
+2.1.2
Unnamed repository; edit this file 'description' to name the repository.