Stuart Henderson <st...@openbsd.org> writes: > On 2014/12/23 22:54, Timo Myyrä wrote: >> I was trying to port notmuch mail indexer but got little stuck with it as it >> requires newer Zlib version than whats in base. I got little spare time in >> my >> hands and here's a rough patch which updates the base libz 1.2.3 to version >> 1.2.8. So >> far I've only compiled the library itself and tried it with notmuch on my >> amd64. > > This diff removes our local changes, most of which relate to saving space > on ramdisks, we still need these. >
Yeah, I noticed few of them but missed quite lot of others. I'll be more careful in the future. > Note that there are two main copies of libz (lib/libz and sys/lib/libz) > to keep in sync. (there are also other copies in Perl and cvs, I'm not sure > whether they are used or not). Seems that the update isn't as trivial as I initially thought. > > I prepared an update to 1.2.6 before (my method was to diff the two > upstream versions and apply that to our tree, resolving conflicts by > hand, so as not to lose local changes), but as the reaction was less > than positive I didn't go as far as updating the kernel copy. That would be clearer, no need to figure out which change was due to version update and which is local change. Timo
