From aa99e7627bf31175285487aad7b0fe3e871ce395 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 29 Apr 2010 17:49:03 +0000 Subject: [PATCH] Try two at guessing what zlib wanted to do, assume a mistake between .4 and .5 where a condition was reversed, this one makes more sense in light of 1.2.4, the definitions _and_ the comments. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-libs/zlib/ChangeLog | 11 +++++- sys-libs/zlib/Manifest | 12 +++--- .../zlib/files/zlib-1.2.5-lfs-decls.patch | 38 +++++-------------- ...b-1.2.5-r1.ebuild => zlib-1.2.5-r2.ebuild} | 2 +- 4 files changed, 26 insertions(+), 37 deletions(-) rename sys-libs/zlib/{zlib-1.2.5-r1.ebuild => zlib-1.2.5-r2.ebuild} (92%) diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 1fe6b5820f2a..e39e92e9e8d3 100644 --- a/sys-libs/zlib/ChangeLog +++ b/sys-libs/zlib/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-libs/zlib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.79 2010/04/25 22:41:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.80 2010/04/29 17:49:03 flameeyes Exp $ + +*zlib-1.2.5-r2 (29 Apr 2010) + + 29 Apr 2010; Diego E. Pettenò + -zlib-1.2.5-r1.ebuild, +zlib-1.2.5-r2.ebuild, + files/zlib-1.2.5-lfs-decls.patch: + Try two at guessing what zlib wanted to do, assume a mistake between .4 + and .5 where a condition was reversed, this one makes more sense in light + of 1.2.4, the definitions _and_ the comments. *zlib-1.2.5-r1 (25 Apr 2010) diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index 8265f09a4845..be1127d663f6 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -14,20 +14,20 @@ AUX zlib-1.2.4-LDFLAGS.patch 1352 RMD160 e7679bcc555d9a7257f762efc4f9c24279ee8f1 AUX zlib-1.2.4-build.patch 493 RMD160 ddde6573caeff6ef99081737d930b5acb5499a8b SHA1 41bea630448dd0a837339c78ddcd94c1bb41d575 SHA256 8ac2727670ddb58cfb4d254b74df8879dd1c9195668138615f1f99fc87ad4501 AUX zlib-1.2.4-configure-LANG.patch 1142 RMD160 566adf951015fe97e7ce5ff882c8057bd755dcb1 SHA1 ca05f1e512e8ac3985e6be236235c05771e51d7f SHA256 205e4066cdbf85d2455bb7a9220b6d8322e9fdb0dfee9c62750510d197650966 AUX zlib-1.2.4-visibility-support.patch 1016 RMD160 27d1eee7281e0080c69c6ca04029bc59c0198880 SHA1 ff8e8351e1c7ac97522c523009e1800c5738537c SHA256 395080c33279993fcaf7f78d60a0460349b313d07d122ea8817419185fd08ad2 -AUX zlib-1.2.5-lfs-decls.patch 1663 RMD160 0d0ab697c13f27f563d2dc67d18ea712d4aec420 SHA1 62ab38bd628c7e6fcb5302d75ad56297fc2a4710 SHA256 c4dd85ab8ad6c2b7a0a2cbb8bcb7ba282cb854ea13ca4182cd862ea11e126187 +AUX zlib-1.2.5-lfs-decls.patch 575 RMD160 7315510552d3ec059bbe2c29f127189933d8701f SHA1 ddf793bd7eb4c8a01ad5d6c31162ddd2629bcbd3 SHA256 51b252bcaa80283969f99b7d89901fd82334ba2cfd872344748dbf8368ef0037 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca DIST zlib-1.2.4.tar.bz2 483564 RMD160 8f0f17e33e36fa1427f8186b6d12cf5b2240294a SHA1 8cf10521c1927daa5e12efc5e1725a0d70e579f3 SHA256 d0fc3433bb3ff5bbf1d2db57a328c0be39ac4a74d4b39887af522acf7ecd5ecc DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 SHA1 543fa9abff0442edca308772d6cef85557677e02 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307 EBUILD zlib-1.2.3-r1.ebuild 2109 RMD160 e37d947f42dfbfd8e453feadd13cadf562871c0c SHA1 a583a5a0dc76b1f21cf6bbe38fc25587a451bc3f SHA256 114218e25aeb4bbbe39759f05e5d7d626a96077f0da963dd8249984d726f8bde EBUILD zlib-1.2.4.ebuild 1683 RMD160 067dbd6e887aadb8402f7617439bbf0d17c41a69 SHA1 b6026ab98ba060aa39dcd677c7f06591106e5c9a SHA256 1f3d629779e2450a7230caaa3597654904e1c341218e428ff5a8b536739fb707 -EBUILD zlib-1.2.5-r1.ebuild 1482 RMD160 4d2392d6055c067fb3678ad94b74728933f5e708 SHA1 6516fcbeea1b0386cccf2064ce1d0df0ac4bb3c5 SHA256 24294c582234fae9268981a76bb68a4497796720ac219c12dc3b3171250b1af7 +EBUILD zlib-1.2.5-r2.ebuild 1482 RMD160 ef9a0ac94bff1a2c959fe3f90c68384603b3e792 SHA1 4196e3299b14f4abd3904e3c6a76a978bf3312ed SHA256 a7ae2e7e3fca145b9a188c6a0b3ed5068243f6297f29a9d589c5f4eb6b55d673 EBUILD zlib-1.2.5.ebuild 1417 RMD160 2e29976fd45df00f3e9baeea6e2889920ad51291 SHA1 9d8b2632fd361e4f1e48419feed8a07e58c2c27d SHA256 911f3f41415dac202c1819aea8b5cf21dcc7f91d4c573022f6aede9181e388ef -MISC ChangeLog 11226 RMD160 cb2462ce1bd999472b63d70a7f798b7561ff9039 SHA1 9d046061d65670c7bb6bb2561e0e6cc3f0f2929d SHA256 cf987a8c3044be6d23749de5c5086316b1c937bcdc4c72b03ca4cc238714a9da +MISC ChangeLog 11595 RMD160 2c82615daea9a23a017fb116c0b24cb9b2238232 SHA1 8f7ad9fb426f16d8dcd28d795b12a261fcdc16ef SHA256 ab5f2fef2c054eebf4baad49794d4043e0eb92a8a538f9b3828143467fe85885 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvUxRUACgkQAiZjviIA2XgocACeJuiIh402YWeAGyDFTIIN9spy -3BYAoNJwnvkKHYu/1eVSUrf+WvWTKYnk -=Pr+e +iEYEARECAAYFAkvZxnUACgkQAiZjviIA2XjkZgCg9JcXkDLq2rByaKh8CSy8/L8g +b1oAoJEJMVPUH4v/Z0gTqCEsK+l9IiqB +=10E4 -----END PGP SIGNATURE----- diff --git a/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch b/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch index 8e0e1bc2748d..36e26af035a6 100644 --- a/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch +++ b/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch @@ -1,33 +1,13 @@ -diff -urNp zlib-1.2.5/zlib.h zlib-1.2.5-new/zlib.h ---- zlib-1.2.5/zlib.h 2010-04-20 09:42:48.000000000 +0530 -+++ zlib-1.2.5-new/zlib.h 2010-04-21 13:44:40.105742649 +0530 -@@ -1571,21 +1571,20 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); - #endif - --#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 -+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && \ -+ _LFS64_LARGEFILE-0 && _LARGEFILE64_SOURCE - # define gzopen gzopen64 - # define gzseek gzseek64 - # define gztell gztell64 +Index: zlib-1.2.5/zlib.h +=================================================================== +--- zlib-1.2.5.orig/zlib.h ++++ zlib-1.2.5/zlib.h +@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( # define gzoffset gzoffset64 # define adler32_combine adler32_combine64 # define crc32_combine crc32_combine64 -# ifdef _LARGEFILE64_SOURCE -- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); -- ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); -- ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); -- ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); -- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); -- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); --# endif -+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); -+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); -+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); -+ ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); -+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); -+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); - #else - ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); ++# ifndef _LARGEFILE64_SOURCE + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); diff --git a/sys-libs/zlib/zlib-1.2.5-r1.ebuild b/sys-libs/zlib/zlib-1.2.5-r2.ebuild similarity index 92% rename from sys-libs/zlib/zlib-1.2.5-r1.ebuild rename to sys-libs/zlib/zlib-1.2.5-r2.ebuild index 44ecd869245f..f42f8cb7a903 100644 --- a/sys-libs/zlib/zlib-1.2.5-r1.ebuild +++ b/sys-libs/zlib/zlib-1.2.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r1.ebuild,v 1.1 2010/04/25 22:41:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.1 2010/04/29 17:49:03 flameeyes Exp $ inherit eutils toolchain-funcs -- 2.26.2