diff options
author | 2011-12-18 06:31:00 +0000 | |
---|---|---|
committer | 2011-12-18 06:31:00 +0000 | |
commit | 06ec860c87b7dee2f184748fa395d33dd719baad (patch) | |
tree | 3d376573abcefe362704d7c1e25c3c750cd47720 /www-client | |
parent | Add security fix. #390769 (diff) | |
download | historical-06ec860c87b7dee2f184748fa395d33dd719baad.tar.gz historical-06ec860c87b7dee2f184748fa395d33dd719baad.tar.bz2 historical-06ec860c87b7dee2f184748fa395d33dd719baad.zip |
Fix build with glibc-2.14
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/w3m/ChangeLog | 6 | ||||
-rw-r--r-- | www-client/w3m/Manifest | 25 | ||||
-rw-r--r-- | www-client/w3m/files/w3m-0.5.3-glibc214.patch | 58 | ||||
-rw-r--r-- | www-client/w3m/w3m-0.5.3-r1.ebuild | 5 |
4 files changed, 84 insertions, 10 deletions
diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog index f37fd55bcd71..1210ddb220ec 100644 --- a/www-client/w3m/ChangeLog +++ b/www-client/w3m/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/w3m # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.67 2011/05/18 03:44:20 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.68 2011/12/18 06:31:00 naota Exp $ + + 18 Dec 2011; Naohiro Aota <naota@gentoo.org> w3m-0.5.3-r1.ebuild, + +files/w3m-0.5.3-glibc214.patch: + Fix build with glibc-2.14 18 May 2011; Naohiro Aota <naota@gentoo.org> w3m-0.5.3-r1.ebuild: Remove CVS directories. Fix bug #367499 diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest index 4238a5e95a79..5730c68672db 100644 --- a/www-client/w3m/Manifest +++ b/www-client/w3m/Manifest @@ -1,23 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX w3m-0.5.2-ambwidth.patch 13634 RMD160 21d967a5b6816e55aac12a161e575121065a336f SHA1 a9a040d2e9b17ed5ca454a0133e525a0ec542ba2 SHA256 9cad290d4c0122964ecb674e636fb7551b400b4f32a2697ca15d68e2fe8cf4ce AUX w3m-0.5.2-form.patch 309 RMD160 8f208c562fdce59ef97009e373925a33815a3dcd SHA1 e703286d1a67e67b2b052ef9806e202a5ef434ec SHA256 a0e6084c82db55c746cd00410c8781887fd52b61eca86a8a61269570622c41bf AUX w3m-0.5.2-gc72.patch 769 RMD160 475b22c156c6be49729e9a563d5d5493ba249c4d SHA1 d0332b8dcdf3fac1f91485d6858ad8c8b25ada69 SHA256 6a6a736db1edc3936a604d7b63512510158b4decfbdadaff85f7bf14d6377a86 +AUX w3m-0.5.3-glibc214.patch 1673 RMD160 ab4f6e18287a960e15350f0d90c3e564eda1c86b SHA1 c0270149250c180cbfc88eacb917cbe5f0ed5fa9 SHA256 9cad0a1ba6a15d28a705d43d7d82621d18e298d771c750b01809eed935b0370d AUX w3m-0.5.3-parallel-make.patch 351 RMD160 d253ca9e1e47e67c31ad1320573d034447022d42 SHA1 11fb11ba105cfbbf695eb9fa299a7ea0ea84c01c SHA256 606ecdf4b41a49f71efd76a24e6f69fb9aa2ef69d0d27f2e1a7ad42e3a1e47db AUX w3m-CVE-2010-2074.patch 1597 RMD160 2a0f198a18ddec42ac070a9433d39177a41860f1 SHA1 e7e9502af2e749fff7e173c5eb6e27158591f5b8 SHA256 3ceb88f635f2b26509acf99c4817d746f4bd50f2cb6ff3152e919fdfb234d0e2 AUX w3m.mailcap 44 RMD160 86f571fda5a25bc7ffe2a2094c2bc590c0395ce0 SHA1 dccd475e42a34e132adfc2aa13c3c789cd2e6fff SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803c1de1890b5 DIST w3m-0.5.2.tar.gz 1906812 RMD160 09ce72d8ef5e621a2e49496b63e22f2773edbe79 SHA1 484522547ae6dbb342d3858a2a53a65451e273f9 SHA256 5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646 DIST w3m-0.5.3.tar.gz 2202328 RMD160 6a0153bc53f7c107c700404262ce1b4d02e6dd91 SHA1 444b6c8cf7094ee95f8e9de96b37f814b9d83237 SHA256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3 EBUILD w3m-0.5.2-r4.ebuild 3333 RMD160 8953d6e3673bd3407e213c2fc48100a4172d7838 SHA1 44878214cf86bcb665881f4c8ea1e36000ff0671 SHA256 ac6e7acb0a51dc91f394bbdadbcf72bc66328a02911a529487e3bd957d6f0b26 -EBUILD w3m-0.5.3-r1.ebuild 3305 RMD160 421d08bb36a42eb2a19d96942fe77225a0f201d2 SHA1 3d36e5a45108cd7f17d838e35e302e86c7ca5ed8 SHA256 42d866f915026077ea4c60c83eabaf5a75a22d5ae7e8eae91f51e57eea1942cd +EBUILD w3m-0.5.3-r1.ebuild 3350 RMD160 b2ffe77c845dbb43d985774a1d3f5b2498a1cc4a SHA1 0449d056e5290c0ca07146832ecdb775649b43e5 SHA256 2a4d40764f5d4ab799d6713da761c136fa1b26fd4c8e1fd9291201bfdccb0fbf EBUILD w3m-0.5.3.ebuild 3206 RMD160 340e06493c4f73a476bab19d3289da1dfcdd41c8 SHA1 cf3bd6d1d5223ddd80ce13496eb38fa696e343cd SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c -MISC ChangeLog 19471 RMD160 d17b9f38e1a2a5301ff4405c9741fafdf85ad6a8 SHA1 9e11766ff5085abbfcf977a6d14153d60c86804e SHA256 70a4d9a1ea7368662cdaa581d0935e55ce9e271fe4866ee8998088225425cfa2 +MISC ChangeLog 19603 RMD160 5be28efaeb0b4493f7645a5fc0ce5d89297a5646 SHA1 dc46c445e804815c0e1c25611dc51884b41b2261 SHA256 e1ee557c24f907fd57b949a73005862746c5b349e8a48eb27e2ffb8995b0514e MISC metadata.xml 237 RMD160 795d70d06b61c12bd15a97e596afed87747e7553 SHA1 a1a1f21305275c396fb2784bb261595fbf510a6f SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk3TQIYACgkQGpDnPLSHuMAo2QCgvGCBLZsnMwWlH0jD+CkD9JS8 -G1wAoIww+eJC81f8MrjD4yX9l/H0mDMs -=Bv94 +iQIcBAEBCAAGBQJO7YilAAoJEDYO1FT4VRUU+QAP/0Sow+1Xz9bn10O+wPi6fmSR +e4UkEJX55ww+QY75ovML0Nk+gEY0IkX/DTSDmcSn3yD8ekXnROj840QY3PYO9aYp +OPrwFQzWTaegZmVm1ZofwCIwaKAzIARSR/IZ+B59tumtMV6WpU+FlxxHxhgzIHav +fdhj1s1f5arRLg6WZ0GhJZAEnGhkdBgraqp2YZ1s3QmcRTKbZBCCsLBJHxBNn1ic +9+1LYV+5UbUxftw8q2HtqoYAIPA3BJfKZdYEeP3F/XU2BShkKARcqmtRmHy9b3AJ +1+g4KezRpq+KmwxIwN/tugkFjpXS9EnJbtmIWB6GaLlZW4va0nhAvAsZ++JDdrPN +R1r5Omd5KQK+kSDfPs9QUCuvdXXqD+/9qGQpdhSIJL6nkZ3/ClbUZm6ce5JlUMkx +V131LeCDe+0k995DvwV2vv86HNrGIHLIFM7fV61FauOyXqa5QLSZKbYXS7YzoHcH +eikiPIScdw5Chl7yNPOjX0vNAeFJltJzgYmgqj6yJm4uOTudqqoFH82sPp2j202C +PEHQE1hVy9KqC9+WIDopl1rZUv7fFxOq0Q0M9Vj8lSpmO72mNcXNCCrLs5o1XhV+ +DALHsGa7YPIztR2YKoUb0okGsduSqlsH0O/76hVCbCcqAORXDp2KUHtgHMKF24mI +3l0jtfy6NHtr5UuLKvzB +=vdvB -----END PGP SIGNATURE----- diff --git a/www-client/w3m/files/w3m-0.5.3-glibc214.patch b/www-client/w3m/files/w3m-0.5.3-glibc214.patch new file mode 100644 index 000000000000..2b18a8d112db --- /dev/null +++ b/www-client/w3m/files/w3m-0.5.3-glibc214.patch @@ -0,0 +1,58 @@ +--- istream.c.~1.27.~ 2011-01-04 18:22:22.000000000 +0900 ++++ istream.c 2011-06-24 08:15:23.522990618 +0900 +@@ -22,8 +22,8 @@ + static void basic_close(int *handle); + static int basic_read(int *handle, char *buf, int len); + +-static void file_close(struct file_handle *handle); +-static int file_read(struct file_handle *handle, char *buf, int len); ++static void file_close(struct afile_handle *handle); ++static int file_read(struct afile_handle *handle, char *buf, int len); + + static int str_read(Str handle, char *buf, int len); + +@@ -114,7 +114,7 @@ + stream = New(union input_stream); + init_base_stream(&stream->base, STREAM_BUF_SIZE); + stream->file.type = IST_FILE; +- stream->file.handle = New(struct file_handle); ++ stream->file.handle = New(struct afile_handle); + stream->file.handle->f = f; + if (closep) + stream->file.handle->close = closep; +@@ -658,13 +658,13 @@ + } + + static void +-file_close(struct file_handle *handle) ++file_close(struct afile_handle *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct afile_handle *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } +--- istream.h.~1.12.~ 2003-10-21 01:41:56.000000000 +0900 ++++ istream.h 2011-06-24 08:15:54.392991144 +0900 +@@ -20,7 +20,7 @@ + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct afile_handle { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct afile_handle *handle; + char type; + char iseos; + int (*read) (); diff --git a/www-client/w3m/w3m-0.5.3-r1.ebuild b/www-client/w3m/w3m-0.5.3-r1.ebuild index 5317d51c4878..1cd4a129283a 100644 --- a/www-client/w3m/w3m-0.5.3-r1.ebuild +++ b/www-client/w3m/w3m-0.5.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r1.ebuild,v 1.4 2011/05/18 03:44:20 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r1.ebuild,v 1.5 2011/12/18 06:31:00 naota Exp $ EAPI="3" inherit eutils @@ -31,7 +31,8 @@ RDEPEND="${DEPEND}" src_prepare() { epatch \ "${FILESDIR}/${PN}-0.5.2-gc72.patch" \ - "${FILESDIR}/${PN}-0.5.3-parallel-make.patch" + "${FILESDIR}/${PN}-0.5.3-parallel-make.patch" \ + "${FILESDIR}/${PN}-0.5.3-glibc214.patch" find . -name CVS -type d | xargs rm -r } |