Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Issue 13564004: Complete update of zlib from 1.2.3 to 1.2.5. (Closed)

Created:
7 years, 8 months ago by gavinp
Modified:
7 years, 8 months ago
CC:
chromium-reviews
Visibility:
Public.

Description

Complete update of zlib from 1.2.3 to 1.2.5. You may think that https://codereview.chromium.org/8806004 , back in 2011, did this. However, that's not correct. That update only patched files which were present in both our old, customized checkout and zlib 1.2.5. In zlib 1.2.5, gzio.c was replaced with gzclose.c, gzguts.h, gzlib.c, gzread.c and gzwrite.c. We did not add those files. We just used the gzio.c from 1.2.3 with our custom patches from Gears, together with the rest of 1.2.5. This unholy chimera worked until I went ahead and tried to fix the broken mangling for 64 bit API symbols. See https://codereview.chromium.org/13473020/ . This uncovered the lack of gzread64, which was, after that fix, referenced by libxml. Since gzio.c from 1.2.3 doesn't have gzread64, this was something of a problem. I'm thus finishing the update. R=agl@chromium.org,rsleevi@chromium.org,brettw@chromium.org,bradchen@chromium.org BUG=None Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=193127

Patch Set 1 #

Patch Set 2 : try to fix windows build (tentative) #

Patch Set 3 : narrow fix #

Patch Set 4 : very narrow #

Patch Set 5 : platform specific handling mostly done #

Patch Set 6 : #elsif --> #elif #

Patch Set 7 : fix diff #

Patch Set 8 : actually fix patch #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1909 lines, -1036 lines) Patch
M third_party/zlib/google.patch View 1 2 3 4 5 6 7 2 chunks +23 lines, -1 line 0 comments Download
A third_party/zlib/gzclose.c View 1 chunk +25 lines, -0 lines 0 comments Download
A third_party/zlib/gzguts.h View 1 chunk +132 lines, -0 lines 0 comments Download
D third_party/zlib/gzio.c View 1 chunk +0 lines, -1033 lines 0 comments Download
A third_party/zlib/gzlib.c View 1 2 3 4 5 1 chunk +539 lines, -0 lines 0 comments Download
A third_party/zlib/gzread.c View 1 chunk +653 lines, -0 lines 0 comments Download
A third_party/zlib/gzwrite.c View 1 chunk +531 lines, -0 lines 0 comments Download
M third_party/zlib/zconf.h View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M third_party/zlib/zlib.gyp View 2 1 chunk +5 lines, -1 line 0 comments Download

Messages

Total messages: 15 (0 generated)
gavinp
Folks, Please take a look. I was really concerned when I came across this chimera.
7 years, 8 months ago (2013-04-08 11:30:00 UTC) #1
agl
lgtm
7 years, 8 months ago (2013-04-08 14:30:39 UTC) #2
gavinp
brettw, can you give an OWNERS review, as zlib has no OWNERS currently?
7 years, 8 months ago (2013-04-09 07:45:55 UTC) #3
gavinp
On 2013/04/09 07:45:55, gavinp wrote: > brettw, can you give an OWNERS review, as zlib ...
7 years, 8 months ago (2013-04-09 07:46:53 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gavinp@chromium.org/13564004/31001
7 years, 8 months ago (2013-04-09 11:26:15 UTC) #5
commit-bot: I haz the power
Retried try job too often on linux_chromeos for step(s) browser_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chromeos&number=101042
7 years, 8 months ago (2013-04-09 12:14:48 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gavinp@chromium.org/13564004/31001
7 years, 8 months ago (2013-04-09 12:19:06 UTC) #7
commit-bot: I haz the power
Retried try job too often on linux_chromeos for step(s) browser_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chromeos&number=101063
7 years, 8 months ago (2013-04-09 13:37:57 UTC) #8
gavinp
On 2013/04/09 13:37:57, I haz the power (commit-bot) wrote: > Retried try job too often ...
7 years, 8 months ago (2013-04-09 13:49:51 UTC) #9
agl
On Tue, Apr 9, 2013 at 9:49 AM, <gavinp@chromium.org> wrote: > agl, I'm now admitting ...
7 years, 8 months ago (2013-04-09 14:23:20 UTC) #10
gavinp
On 2013/04/09 14:23:20, agl wrote: > On Tue, Apr 9, 2013 at 9:49 AM, <mailto:gavinp@chromium.org> ...
7 years, 8 months ago (2013-04-09 14:43:46 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gavinp@chromium.org/13564004/31001
7 years, 8 months ago (2013-04-09 14:43:59 UTC) #12
commit-bot: I haz the power
Retried try job too often on linux_chromeos for step(s) browser_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chromeos&number=101138
7 years, 8 months ago (2013-04-09 16:25:58 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gavinp@chromium.org/13564004/31001
7 years, 8 months ago (2013-04-09 16:33:26 UTC) #14
commit-bot: I haz the power
7 years, 8 months ago (2013-04-09 17:15:23 UTC) #15
Message was sent while issue was closed.
Change committed as 193127

Powered by Google App Engine
This is Rietveld 408576698