Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at 2022-04-01 21:34:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zlib (Old) and /work/SRC/openSUSE:Factory/.zlib.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zlib" Fri Apr 1 21:34:49 2022 rev:82 rq:965637 version:1.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/zlib/zlib.changes 2020-12-03 18:38:11.133693509 +0100 +++ /work/SRC/openSUSE:Factory/.zlib.new.1900/zlib.changes 2022-04-01 21:34:57.262256019 +0200 @@ -1,0 +2,18 @@ +Fri Mar 25 14:59:29 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com> + +- Fix memory corruption on deflate, bsc#1197459 + * bsc1197459.patch - CVE-2018-25032 +- Update 410.patch + * Remove included patches: + bsc1174551-fxi-imcomplete-raw-streams.patch + zlib-compression-switching.patch + zlib-s390x-z15-fix-hw-compression.patch +- Refresh bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch + +------------------------------------------------------------------- +Fri Mar 11 17:38:09 UTC 2022 - Arjen de Korte <suse+bu...@de-korte.org> + +- Don't install (internal) crypt.h header in minizip + * minizip-dont-install-crypt-header.patch + +------------------------------------------------------------------- Old: ---- bsc1174551-fxi-imcomplete-raw-streams.patch zlib-compression-switching.patch zlib-s390x-z15-fix-hw-compression.patch New: ---- bsc1197459.patch minizip-dont-install-crypt-header.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.odFiDa/_old 2022-04-01 21:34:58.054247135 +0200 +++ /var/tmp/diff_new_pack.odFiDa/_new 2022-04-01 21:34:58.054247135 +0200 @@ -1,7 +1,7 @@ # # spec file for package zlib # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,16 +36,16 @@ Patch2: 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch #PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/335 Patch3: zlib-power8-fate325307.patch -#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/410 -Patch4: 410.patch #PATCH-FIX-SUSE do not check exact version match as the lib can be updated # we should simply rely on soname versioning to protect us Patch5: zlib-no-version-check.patch Patch6: bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch -Patch7: bsc1174551-fxi-imcomplete-raw-streams.patch -Patch8: zlib-compression-switching.patch -#PATCH-FIX-SUSE: bsc#1176201, sent upstream by IBM -Patch9: zlib-s390x-z15-fix-hw-compression.patch +#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/229 +Patch10: minizip-dont-install-crypt-header.patch +#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/commit/5c44459c3b28a9bd3283aaceab7c615f8020c531 +Patch11: bsc1197459.patch +#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/410 +Patch101: 410.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -134,22 +134,16 @@ %patch1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch101 -p1 cp %{SOURCE4} . %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export LDFLAGS="-Wl,-z,relro,-z,now" -%ifarch s390x s390 - export CFLAGS="%{optflags} -DDFLTCC_LEVEL_MASK=0x7e" -%else - export CFLAGS="%{optflags}" -%endif # For sure not autotools build CC="cc" ./configure \ --shared \ @@ -157,6 +151,7 @@ --libdir=%{_libdir} \ %ifarch s390x s390 --dfltcc \ + --dfltcc-level-mask=0x7e \ %endif %{nil} ++++++ 410.patch ++++++ ++++ 950 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/zlib/410.patch ++++ and /work/SRC/openSUSE:Factory/.zlib.new.1900/410.patch ++++++ bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch ++++++ --- /var/tmp/diff_new_pack.odFiDa/_old 2022-04-01 21:34:58.134246237 +0200 +++ /var/tmp/diff_new_pack.odFiDa/_new 2022-04-01 21:34:58.138246193 +0200 @@ -11,15 +11,14 @@ _tr_init(s); -@@ -601,13 +601,13 @@ int ZEXPORT deflateParams(strm, level, s +@@ -582,12 +582,12 @@ int ZEXPORT deflateParams(strm, level, s func = configuration_table[s->level].func; - if ((strategy != s->strategy || func != configuration_table[level].func || -- hook_flush != Z_NO_FLUSH) && s->high_water) { -+ hook_flush != Z_NO_FLUSH) && s->last_flush != -2) { + if ((strategy != s->strategy || func != configuration_table[level].func) && +- s->high_water) { ++ s->last_flush != -2) { /* Flush the last buffer: */ - int err = deflate(strm, RANK(hook_flush) > RANK(Z_BLOCK) ? - hook_flush : Z_BLOCK); + int err = deflate(strm, Z_BLOCK); if (err == Z_STREAM_ERROR) return err; - if (strm->avail_out == 0) ++++++ bsc1174551-fxi-imcomplete-raw-streams.patch -> bsc1197459.patch ++++++ --- /work/SRC/openSUSE:Factory/zlib/bsc1174551-fxi-imcomplete-raw-streams.patch 2020-08-17 11:59:14.514489012 +0200 +++ /work/SRC/openSUSE:Factory/.zlib.new.1900/bsc1197459.patch 2022-04-01 21:34:57.246256199 +0200 @@ -1,34 +1,343 @@ -diff --git a/deflate.c b/deflate.c -index 3c302bc..1ab1635 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -1110,7 +1110,6 @@ int ZEXPORT deflate (strm, flush) - } - - if (flush != Z_FINISH) return Z_OK; -- if (s->wrap <= 0) return Z_STREAM_END; - - /* Write the trailer */ - #ifdef GZIP -@@ -1126,7 +1125,7 @@ int ZEXPORT deflate (strm, flush) - } - else - #endif -- { -+ if (s->wrap == 1) { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); +From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 +From: Mark Adler <mad...@alumni.caltech.edu> +Date: Tue, 17 Apr 2018 22:09:22 -0700 +Subject: [PATCH] Fix a bug that can crash deflate on some input when using + Z_FIXED. + +This bug was reported by Danilo Ramos of Eideticom, Inc. It has +lain in wait 13 years before being found! The bug was introduced +in zlib 1.2.2.2, with the addition of the Z_FIXED option. That +option forces the use of fixed Huffman codes. For rare inputs with +a large number of distant matches, the pending buffer into which +the compressed data is written can overwrite the distance symbol +table which it overlays. That results in corrupted output due to +invalid distances, and can result in out-of-bound accesses, +crashing the application. + +The fix here combines the distance buffer and literal/length +buffers into a single symbol buffer. Now three bytes of pending +buffer space are opened up for each literal or length/distance +pair consumed, instead of the previous two bytes. This assures +that the pending buffer cannot overwrite the symbol table, since +the maximum fixed code compressed length/distance is 31 bits, and +since there are four bytes of pending space for every three bytes +of symbol space. +--- + deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- + deflate.h | 25 +++++++++---------- + trees.c | 50 +++++++++++-------------------------- + 3 files changed, 79 insertions(+), 70 deletions(-) + +Index: zlib-1.2.11/deflate.c +=================================================================== +--- zlib-1.2.11.orig/deflate.c ++++ zlib-1.2.11/deflate.c +@@ -251,11 +251,6 @@ int ZEXPORT deflateInit2_(strm, level, m + deflate_state *s; + int wrap = 1; + +- ushf *overlay; +- /* We overlay pending_buf and d_buf+l_buf. This works since the average +- * output size for (length,distance) codes is <= 24 bits. +- */ +- + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; +@@ -321,9 +316,47 @@ int ZEXPORT deflateInit2_(strm, level, m + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + +- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +- s->pending_buf = (uchf *) overlay; +- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); ++ /* We overlay pending_buf and sym_buf. This works since the average size ++ * for length/distance pairs over any compressed block is assured to be 31 ++ * bits or less. ++ * ++ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 ++ * extra bits, for lengths 131 to 257. The longest fixed distance codes are ++ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest ++ * possible fixed-codes length/distance pair is then 31 bits total. ++ * ++ * sym_buf starts one-fourth of the way into pending_buf. So there are ++ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol ++ * in sym_buf is three bytes -- two for the distance and one for the ++ * literal/length. As each symbol is consumed, the pointer to the next ++ * sym_buf value to read moves forward three bytes. From that symbol, up to ++ * 31 bits are written to pending_buf. The closest the written pending_buf ++ * bits gets to the next sym_buf symbol to read is just before the last ++ * code is written. At that time, 31*(n-2) bits have been written, just ++ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at ++ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 ++ * symbols are written.) The closest the writing gets to what is unread is ++ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and ++ * can range from 128 to 32768. ++ * ++ * Therefore, at a minimum, there are 142 bits of space between what is ++ * written and what is read in the overlain buffers, so the symbols cannot ++ * be overwritten by the compressed data. That space is actually 139 bits, ++ * due to the three-bit fixed-code block header. ++ * ++ * That covers the case where either Z_FIXED is specified, forcing fixed ++ * codes, or when the use of fixed codes is chosen, because that choice ++ * results in a smaller compressed block than dynamic codes. That latter ++ * condition then assures that the above analysis also covers all dynamic ++ * blocks. A dynamic-code block will only be chosen to be emitted if it has ++ * fewer bits than a fixed-code block would for the same set of symbols. ++ * Therefore its average symbol length is assured to be less than 31. So ++ * the compressed data for a dynamic block also cannot overwrite the ++ * symbols from which it is being constructed. ++ */ ++ ++ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); ++ s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { +@@ -332,8 +365,12 @@ int ZEXPORT deflateInit2_(strm, level, m + deflateEnd (strm); + return Z_MEM_ERROR; + } +- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); +- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; ++ s->sym_buf = s->pending_buf + s->lit_bufsize; ++ s->sym_end = (s->lit_bufsize - 1) * 3; ++ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K ++ * on 16 bit machines and because stored blocks are restricted to ++ * 64K-1 bytes. ++ */ + + s->level = level; + s->strategy = strategy; +@@ -544,7 +581,7 @@ int ZEXPORT deflatePrime (strm, bits, va + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +@@ -1103,7 +1140,6 @@ int ZEXPORT deflateCopy (dest, source) + #else + deflate_state *ds; + deflate_state *ss; +- ushf *overlay; + + + if (deflateStateCheck(source) || dest == Z_NULL) { +@@ -1123,8 +1159,7 @@ int ZEXPORT deflateCopy (dest, source) + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); +- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); +- ds->pending_buf = (uchf *) overlay; ++ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { +@@ -1138,8 +1173,7 @@ int ZEXPORT deflateCopy (dest, source) + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); +- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); +- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; ++ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; +@@ -1911,7 +1945,7 @@ local block_state deflate_fast(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2042,7 +2076,7 @@ local block_state deflate_slow(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2117,7 +2151,7 @@ local block_state deflate_rle(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2156,7 +2190,7 @@ local block_state deflate_huff(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; } -@@ -1135,7 +1134,11 @@ int ZEXPORT deflate (strm, flush) - * to flush the rest. +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +Index: zlib-1.2.11/deflate.h +=================================================================== +--- zlib-1.2.11.orig/deflate.h ++++ zlib-1.2.11/deflate.h +@@ -217,7 +217,7 @@ typedef struct internal_state { + /* Depth of each subtree used as tie breaker for trees of equal frequency */ - if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ -- return s->pending != 0 ? Z_OK : Z_STREAM_END; -+ if (s->pending == 0) { -+ Assert(s->bi_valid == 0, "bi_buf not flushed"); -+ return Z_STREAM_END; -+ } -+ return Z_OK; + +- uchf *l_buf; /* buffer for literals or lengths */ ++ uchf *sym_buf; /* buffer for distances and literals/lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for +@@ -239,13 +239,8 @@ typedef struct internal_state { + * - I can't count above 4 + */ + +- uInt last_lit; /* running index in l_buf */ +- +- ushf *d_buf; +- /* Buffer for distances. To simplify the code, d_buf and l_buf have +- * the same number of elements. To use different lengths, an extra flag +- * array would be necessary. +- */ ++ uInt sym_next; /* running index in sym_buf */ ++ uInt sym_end; /* symbol table full when sym_next reaches this */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ +@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF(( + + # define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ +- s->d_buf[s->last_lit] = 0; \ +- s->l_buf[s->last_lit++] = cc; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = cc; \ + s->dyn_ltree[cc].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + # define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ +- s->d_buf[s->last_lit] = dist; \ +- s->l_buf[s->last_lit++] = len; \ ++ s->sym_buf[s->sym_next++] = dist; \ ++ s->sym_buf[s->sym_next++] = dist >> 8; \ ++ s->sym_buf[s->sym_next++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + #else + # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +Index: zlib-1.2.11/trees.c +=================================================================== +--- zlib-1.2.11.orig/trees.c ++++ zlib-1.2.11/trees.c +@@ -416,7 +416,7 @@ local void init_block(s) + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; +- s->last_lit = s->matches = 0; ++ s->sym_next = s->matches = 0; } - /* ========================================================================= */ + #define SMALLEST 1 +@@ -947,7 +947,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, bu + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, +- s->last_lit)); ++ s->sym_next / 3)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + +@@ -1016,8 +1016,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ + { +- s->d_buf[s->last_lit] = (ush)dist; +- s->l_buf[s->last_lit++] = (uch)lc; ++ s->sym_buf[s->sym_next++] = dist; ++ s->sym_buf[s->sym_next++] = dist >> 8; ++ s->sym_buf[s->sym_next++] = lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; +@@ -1032,30 +1033,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } +- +-#ifdef TRUNCATE_BLOCK +- /* Try to guess if it is profitable to stop the current block here */ +- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { +- /* Compute an upper bound for the compressed length */ +- ulg out_length = (ulg)s->last_lit*8L; +- ulg in_length = (ulg)((long)s->strstart - s->block_start); +- int dcode; +- for (dcode = 0; dcode < D_CODES; dcode++) { +- out_length += (ulg)s->dyn_dtree[dcode].Freq * +- (5L+extra_dbits[dcode]); +- } +- out_length >>= 3; +- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", +- s->last_lit, in_length, out_length, +- 100L - out_length*100L/in_length)); +- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; +- } +-#endif +- return (s->last_lit == s->lit_bufsize-1); +- /* We avoid equality with lit_bufsize because of wraparound at 64K +- * on 16 bit machines and because stored blocks are restricted to +- * 64K-1 bytes. +- */ ++ return (s->sym_next == s->sym_end); + } + + /* =========================================================================== +@@ -1068,13 +1046,14 @@ local void compress_block(s, ltree, dtre + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ +- unsigned lx = 0; /* running index in l_buf */ ++ unsigned sx = 0; /* running index in sym_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + +- if (s->last_lit != 0) do { +- dist = s->d_buf[lx]; +- lc = s->l_buf[lx++]; ++ if (s->sym_next != 0) do { ++ dist = s->sym_buf[sx++] & 0xff; ++ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; ++ lc = s->sym_buf[sx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); +@@ -1099,11 +1078,10 @@ local void compress_block(s, ltree, dtre + } + } /* literal or match pair ? */ + +- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ +- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, +- "pendingBuf overflow"); ++ /* Check that the overlay between pending_buf and sym_buf is ok: */ ++ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); + +- } while (lx < s->last_lit); ++ } while (sx < s->sym_next); + + send_code(s, END_BLOCK, ltree); + } ++++++ minizip-dont-install-crypt-header.patch ++++++ >From e490ddad3091574a0c2e3b5a66a8fee9a7ab212f Mon Sep 17 00:00:00 2001 From: Pavel Raiskup <prais...@redhat.com> Date: Sun, 19 Feb 2017 16:42:12 +0100 Subject: [PATCH] minizip: don't install crypt.h People did mistakenly or unintentionally include crypt.h before, don't install this internal header from now. --- contrib/minizip/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am index d343011eb..4f4661023 100644 --- a/contrib/minizip/Makefile.am +++ b/contrib/minizip/Makefile.am @@ -26,13 +26,15 @@ libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz minizip_includedir = $(includedir)/minizip minizip_include_HEADERS = \ - crypt.h \ ioapi.h \ mztools.h \ unzip.h \ zip.h \ ${iowin32_h} +noinst_HEADERS = \ + crypt.h + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = minizip.pc
