zlib was removed due to minimization efforts prior to public launch
This commit is contained in:
parent
1edfcf16da
commit
2d61f976f8
@ -1 +0,0 @@
|
|||||||
1
|
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +0,0 @@
|
|||||||
/zlib-1.2.11.tar.xz
|
|
||||||
/zlib-1.2.12.tar.gz
|
|
||||||
/zlib-1.2.12.tar.xz
|
|
||||||
/zlib-1.2.13.tar.xz
|
|
13
STAGE1-zlib
13
STAGE1-zlib
@ -1,13 +0,0 @@
|
|||||||
srpm zlib
|
|
||||||
mcd $BUILDDIR/t-zlib
|
|
||||||
rsync -av $SRC/zlib-*/ ./
|
|
||||||
if [ "$SUFFIX" = "64" ]
|
|
||||||
then
|
|
||||||
ARGS="--libdir=/usr/lib64"
|
|
||||||
fi
|
|
||||||
CHOST=${TARGET} \
|
|
||||||
prefix=/usr \
|
|
||||||
./configure $ARGS
|
|
||||||
make
|
|
||||||
make $J install DESTDIR=${ROOTFS}
|
|
||||||
fix_la zlib
|
|
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
|||||||
|
zlib was removed due to minimization efforts prior to public launch
|
27
gating.yaml
27
gating.yaml
@ -1,27 +0,0 @@
|
|||||||
# Branched Fedora (non-Rawhide)
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_testing
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
|
|
||||||
|
|
||||||
|
|
||||||
# Rawhide Fedora
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_stable
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
|
|
||||||
|
|
||||||
# Gating RHEL
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-*
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal.functional}
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
|
|
@ -1,21 +0,0 @@
|
|||||||
summary: Private (RHEL) beakerlib tests
|
|
||||||
enabled: false
|
|
||||||
adjust:
|
|
||||||
- when: distro == rhel
|
|
||||||
enabled: true
|
|
||||||
because: private tests are accesible only within rhel pipline
|
|
||||||
discover:
|
|
||||||
- name: rhel-zlib
|
|
||||||
how: fmf
|
|
||||||
url: git://pkgs.devel.redhat.com/tests/zlib
|
|
||||||
filter: "tag:-NoGating"
|
|
||||||
- name: distribution
|
|
||||||
how: fmf
|
|
||||||
url: git://pkgs.devel.redhat.com/tests/distribution
|
|
||||||
test: /rebuild/TC#0517975
|
|
||||||
- name: file
|
|
||||||
how: fmf
|
|
||||||
url: git://pkgs.devel.redhat.com/tests/file
|
|
||||||
test: /Sanity/command-line-options
|
|
||||||
execute:
|
|
||||||
how: tmt
|
|
@ -1,7 +0,0 @@
|
|||||||
summary: Public (Fedora) beakerlib tests
|
|
||||||
discover:
|
|
||||||
- name: fedora
|
|
||||||
how: fmf
|
|
||||||
url: https://src.fedoraproject.org/tests/zlib.git
|
|
||||||
execute:
|
|
||||||
how: tmt
|
|
1
sources
1
sources
@ -1 +0,0 @@
|
|||||||
SHA512 (zlib-1.2.13.tar.xz) = 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
|
|
@ -1,30 +0,0 @@
|
|||||||
From 1e56dd1e7285d3026092ba794078edb290b4c1b1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ondrej Dubaj <odubaj@redhat.com>
|
|
||||||
Date: Mon, 15 Mar 2021 13:06:35 +0100
|
|
||||||
Subject: [PATCH] fixed isues found by covscan
|
|
||||||
|
|
||||||
---
|
|
||||||
contrib/minizip/mztools.c | 8 ++++++++
|
|
||||||
contrib/minizip/zip.c | 4 ++--
|
|
||||||
deflate.c | 5 +++--
|
|
||||||
3 files changed, 13 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/contrib/minizip/mztools.c b/contrib/minizip/mztools.c
|
|
||||||
index 96891c2..1197928 100644
|
|
||||||
--- a/contrib/minizip/mztools.c
|
|
||||||
+++ b/contrib/minizip/mztools.c
|
|
||||||
@@ -286,6 +286,14 @@ uLong* bytesRecovered;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
err = Z_STREAM_ERROR;
|
|
||||||
+ if(fpZip != NULL)
|
|
||||||
+ fclose(fpZip);
|
|
||||||
+
|
|
||||||
+ if(fpOut != NULL)
|
|
||||||
+ fclose(fpOut);
|
|
||||||
+
|
|
||||||
+ if(fpOutCD != NULL)
|
|
||||||
+ fclose(fpOutCD);
|
|
||||||
}
|
|
||||||
return err;
|
|
||||||
}
|
|
@ -1,23 +0,0 @@
|
|||||||
From f776e1609cc63bf486634ee9bc6226dac2c0d2f3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ondrej Dubaj <odubaj@redhat.com>
|
|
||||||
Date: Tue, 15 Oct 2019 11:27:15 +0200
|
|
||||||
Subject: [PATCH] fixed covscan issues
|
|
||||||
|
|
||||||
---
|
|
||||||
deflate.c | 2 +-
|
|
||||||
test/crc32_test.c | 8 ++++----
|
|
||||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/deflate.c b/deflate.c
|
|
||||||
index 089285a..9b09718 100644
|
|
||||||
--- a/deflate.c
|
|
||||||
+++ b/deflate.c
|
|
||||||
@@ -1015,7 +1015,7 @@ int ZEXPORT deflate (strm, flush)
|
|
||||||
*/
|
|
||||||
if (strm->avail_in != 0 || s->lookahead != 0 ||
|
|
||||||
(flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
|
|
||||||
- block_state bstate;
|
|
||||||
+ block_state bstate = 0;
|
|
||||||
|
|
||||||
bstate = DEFLATE_HOOK(strm, flush, &bstate) ? bstate :
|
|
||||||
s->level == 0 ? deflate_stored(s, flush) :
|
|
@ -1,30 +0,0 @@
|
|||||||
From e554695638228b846d49657f31eeff0ca4680e8a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Adler <madler@alumni.caltech.edu>
|
|
||||||
Date: Thu, 15 Dec 2022 09:07:13 -0800
|
|
||||||
Subject: [PATCH] Fix bug in deflateBound() for level 0 and memLevel 9.
|
|
||||||
|
|
||||||
memLevel 9 would cause deflateBound() to assume the use of fixed
|
|
||||||
blocks, even if the compression level was 0, which forces stored
|
|
||||||
blocks. That could result in a bound less than the size of the
|
|
||||||
compressed data. Now level 0 always uses the stored blocks bound.
|
|
||||||
---
|
|
||||||
deflate.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/deflate.c b/deflate.c
|
|
||||||
index cd538b8..4a512e1 100644
|
|
||||||
--- a/deflate.c
|
|
||||||
+++ b/deflate.c
|
|
||||||
@@ -752,7 +752,8 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
|
|
||||||
|
|
||||||
/* if not default parameters, return one of the conservative bounds */
|
|
||||||
if (s->w_bits != 15 || s->hash_bits != 8 + 7)
|
|
||||||
- return (s->w_bits <= s->hash_bits ? fixedlen : storelen) + wraplen;
|
|
||||||
+ return (s->w_bits <= s->hash_bits && s->level ? fixedlen : storelen) +
|
|
||||||
+ wraplen;
|
|
||||||
|
|
||||||
/* default settings: return tight bound for that case -- ~0.03% overhead
|
|
||||||
plus a small constant */
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
@ -1,39 +0,0 @@
|
|||||||
From 73331a6a0481067628f065ffe87bb1d8f787d10c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hans Wennborg <hans@chromium.org>
|
|
||||||
Date: Fri, 18 Aug 2023 11:05:33 +0200
|
|
||||||
Subject: [PATCH] Reject overflows of zip header fields in minizip.
|
|
||||||
|
|
||||||
This checks the lengths of the file name, extra field, and comment
|
|
||||||
that would be put in the zip headers, and rejects them if they are
|
|
||||||
too long. They are each limited to 65535 bytes in length by the zip
|
|
||||||
format. This also avoids possible buffer overflows if the provided
|
|
||||||
fields are too long.
|
|
||||||
---
|
|
||||||
contrib/minizip/zip.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
|
|
||||||
index 3d3d4ca..0446109 100644
|
|
||||||
--- a/contrib/minizip/zip.c
|
|
||||||
+++ b/contrib/minizip/zip.c
|
|
||||||
@@ -1043,6 +1043,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c
|
|
||||||
return ZIP_PARAMERROR;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ // The filename and comment length must fit in 16 bits.
|
|
||||||
+ if ((filename!=NULL) && (strlen(filename)>0xffff))
|
|
||||||
+ return ZIP_PARAMERROR;
|
|
||||||
+ if ((comment!=NULL) && (strlen(comment)>0xffff))
|
|
||||||
+ return ZIP_PARAMERROR;
|
|
||||||
+ // The extra field length must fit in 16 bits. If the member also requires
|
|
||||||
+ // a Zip64 extra block, that will also need to fit within that 16-bit
|
|
||||||
+ // length, but that will be checked for later.
|
|
||||||
+ if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff))
|
|
||||||
+ return ZIP_PARAMERROR;
|
|
||||||
+
|
|
||||||
zi = (zip64_internal*)file;
|
|
||||||
|
|
||||||
if (zi->in_opened_file_inzip == 1)
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
|||||||
--- zlib-1.2.13/deflate.c.old 2022-11-24 16:41:34.527200490 +0000
|
|
||||||
+++ zlib-1.2.13/deflate.c 2022-11-24 16:43:28.064200490 +0000
|
|
||||||
@@ -1305,15 +1305,16 @@ local void lm_init(s)
|
|
||||||
* string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
|
|
||||||
* OUT assertion: the match length is not greater than s->lookahead.
|
|
||||||
*/
|
|
||||||
-local uInt longest_match(s, cur_match)
|
|
||||||
+local uInt longest_match(s, pcur_match)
|
|
||||||
deflate_state *s;
|
|
||||||
- IPos cur_match; /* current match */
|
|
||||||
+ IPos pcur_match; /* current match */
|
|
||||||
{
|
|
||||||
+ ptrdiff_t cur_match = pcur_match; /* extend to pointer width */
|
|
||||||
unsigned chain_length = s->max_chain_length;/* max hash chain length */
|
|
||||||
register Bytef *scan = s->window + s->strstart; /* current string */
|
|
||||||
register Bytef *match; /* matched string */
|
|
||||||
register int len; /* length of current match */
|
|
||||||
- int best_len = (int)s->prev_length; /* best match length so far */
|
|
||||||
+ ptrdiff_t best_len = s->prev_length; /* best match length so far */
|
|
||||||
int nice_match = s->nice_match; /* stop if match long enough */
|
|
||||||
IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
|
|
||||||
s->strstart - (IPos)MAX_DIST(s) : NIL;
|
|
||||||
@@ -1328,12 +1329,12 @@ local uInt longest_match(s, cur_match)
|
|
||||||
* Try with and without -DUNALIGNED_OK to check.
|
|
||||||
*/
|
|
||||||
register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
|
|
||||||
- register ush scan_start = *(ushf*)scan;
|
|
||||||
- register ush scan_end = *(ushf*)(scan + best_len - 1);
|
|
||||||
+ register uInt scan_start = *(ushf*)scan;
|
|
||||||
+ register uInt scan_end = *(ushf*)(scan+best_len-1);
|
|
||||||
#else
|
|
||||||
register Bytef *strend = s->window + s->strstart + MAX_MATCH;
|
|
||||||
- register Byte scan_end1 = scan[best_len - 1];
|
|
||||||
- register Byte scan_end = scan[best_len];
|
|
||||||
+ register uInt scan_end1 = scan[best_len-1];
|
|
||||||
+ register uInt scan_end = scan[best_len];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
|
|
File diff suppressed because it is too large
Load Diff
@ -1,428 +0,0 @@
|
|||||||
From 6ae549062cb4b766c5cc726406f8612310cc12b5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ilya Leoshkevich <iii@linux.ibm.com>
|
|
||||||
Date: Thu, 19 Mar 2020 11:52:03 +0100
|
|
||||||
Subject: [PATCH] s390x: vectorize crc32
|
|
||||||
|
|
||||||
Use vector extensions when compiling for s390x and binutils knows
|
|
||||||
about them. At runtime, check whether kernel supports vector
|
|
||||||
extensions (it has to be not just the CPU, but also the kernel) and
|
|
||||||
choose between the regular and the vectorized implementations.
|
|
||||||
---
|
|
||||||
Makefile.in | 9 ++
|
|
||||||
configure | 28 +++++
|
|
||||||
contrib/gcc/zifunc.h | 21 +++-
|
|
||||||
contrib/s390/crc32-vx.c | 195 ++++++++++++++++++++++++++++++++
|
|
||||||
contrib/s390/crc32_z_resolver.c | 41 +++++++
|
|
||||||
crc32.c | 11 +-
|
|
||||||
6 files changed, 301 insertions(+), 4 deletions(-)
|
|
||||||
create mode 100644 contrib/s390/crc32-vx.c
|
|
||||||
create mode 100644 contrib/s390/crc32_z_resolver.c
|
|
||||||
|
|
||||||
diff --git a/Makefile.in b/Makefile.in
|
|
||||||
index a811c10..af62c22 100644
|
|
||||||
--- a/Makefile.in
|
|
||||||
+++ b/Makefile.in
|
|
||||||
@@ -25,6 +25,7 @@ LDFLAGS=
|
|
||||||
TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
|
|
||||||
LDSHARED=$(CC)
|
|
||||||
CPP=$(CC) -E
|
|
||||||
+VGFMAFLAG=
|
|
||||||
|
|
||||||
STATICLIB=libz.a
|
|
||||||
SHAREDLIB=libz.so
|
|
||||||
@@ -175,6 +176,9 @@ crc32.o: $(SRCDIR)crc32.c
|
|
||||||
crc32_z_power8.o: $(SRCDIR)contrib/power/crc32_z_power8.c
|
|
||||||
$(CC) $(CFLAGS) -mcpu=power8 $(ZINC) -c -o $@ $(SRCDIR)contrib/power/crc32_z_power8.c
|
|
||||||
|
|
||||||
+crc32-vx.o: $(SRCDIR)contrib/s390/crc32-vx.c
|
|
||||||
+ $(CC) $(CFLAGS) $(VGFMAFLAG) $(ZINC) -c -o $@ $(SRCDIR)contrib/s390/crc32-vx.c
|
|
||||||
+
|
|
||||||
deflate.o: $(SRCDIR)deflate.c
|
|
||||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
|
|
||||||
|
|
||||||
@@ -225,6 +229,11 @@ crc32.lo: $(SRCDIR)crc32.c
|
|
||||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
|
|
||||||
-@mv objs/crc32.o $@
|
|
||||||
|
|
||||||
+crc32-vx.lo: $(SRCDIR)contrib/s390/crc32-vx.c
|
|
||||||
+ -@mkdir objs 2>/dev/null || test -d objs
|
|
||||||
+ $(CC) $(SFLAGS) $(VGFMAFLAG) $(ZINC) -DPIC -c -o objs/crc32-vx.o $(SRCDIR)contrib/s390/crc32-vx.c
|
|
||||||
+ -@mv objs/crc32-vx.o $@
|
|
||||||
+
|
|
||||||
crc32_z_power8.lo: $(SRCDIR)contrib/power/crc32_z_power8.c
|
|
||||||
-@mkdir objs 2>/dev/null || test -d objs
|
|
||||||
$(CC) $(SFLAGS) -mcpu=power8 $(ZINC) -DPIC -c -o objs/crc32_z_power8.o $(SRCDIR)contrib/power/crc32_z_power8.c
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index ab3204a..04ee943 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -921,6 +921,32 @@ else
|
|
||||||
echo "Checking for Power optimizations support... No." | tee -a configure.log
|
|
||||||
fi
|
|
||||||
|
|
||||||
+# check if we are compiling for s390 and binutils support vector extensions
|
|
||||||
+VGFMAFLAG=-march=z13
|
|
||||||
+cat > $test.c <<EOF
|
|
||||||
+#ifndef __s390__
|
|
||||||
+#error
|
|
||||||
+#endif
|
|
||||||
+EOF
|
|
||||||
+if try $CC -c $CFLAGS $VGFMAFLAG $test.c; then
|
|
||||||
+ CFLAGS="$CFLAGS -DHAVE_S390X_VX"
|
|
||||||
+ SFLAGS="$SFLAGS -DHAVE_S390X_VX"
|
|
||||||
+ OBJC="$OBJC crc32-vx.o"
|
|
||||||
+ PIC_OBJC="$PIC_OBJC crc32-vx.lo"
|
|
||||||
+ echo "Checking for s390 vector extensions... Yes." | tee -a configure.log
|
|
||||||
+
|
|
||||||
+ for flag in -mzarch -fzvector; do
|
|
||||||
+ if try $CC -c $CFLAGS $VGFMAFLAG $flag $test.c; then
|
|
||||||
+ VGFMAFLAG="$VGFMAFLAG $flag"
|
|
||||||
+ echo "Checking for $flag... Yes." | tee -a configure.log
|
|
||||||
+ else
|
|
||||||
+ echo "Checking for $flag... No." | tee -a configure.log
|
|
||||||
+ fi
|
|
||||||
+ done
|
|
||||||
+else
|
|
||||||
+ echo "Checking for s390 vector extensions... No." | tee -a configure.log
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
# show the results in the log
|
|
||||||
echo >> configure.log
|
|
||||||
echo ALL = $ALL >> configure.log
|
|
||||||
@@ -952,6 +978,7 @@ echo mandir = $mandir >> configure.log
|
|
||||||
echo prefix = $prefix >> configure.log
|
|
||||||
echo sharedlibdir = $sharedlibdir >> configure.log
|
|
||||||
echo uname = $uname >> configure.log
|
|
||||||
+echo VGFMAFLAG = $VGFMAFLAG >> configure.log
|
|
||||||
|
|
||||||
# udpate Makefile with the configure results
|
|
||||||
sed < ${SRCDIR}Makefile.in "
|
|
||||||
@@ -961,6 +988,7 @@ sed < ${SRCDIR}Makefile.in "
|
|
||||||
/^LDFLAGS *=/s#=.*#=$LDFLAGS#
|
|
||||||
/^LDSHARED *=/s#=.*#=$LDSHARED#
|
|
||||||
/^CPP *=/s#=.*#=$CPP#
|
|
||||||
+/^VGFMAFLAG *=/s#=.*#=$VGFMAFLAG#
|
|
||||||
/^STATICLIB *=/s#=.*#=$STATICLIB#
|
|
||||||
/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
|
|
||||||
/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
|
|
||||||
diff --git a/contrib/gcc/zifunc.h b/contrib/gcc/zifunc.h
|
|
||||||
index daf4fe4..b62379e 100644
|
|
||||||
--- a/contrib/gcc/zifunc.h
|
|
||||||
+++ b/contrib/gcc/zifunc.h
|
|
||||||
@@ -8,9 +8,28 @@
|
|
||||||
|
|
||||||
/* Helpers for arch optimizations */
|
|
||||||
|
|
||||||
+#if defined(__clang__)
|
|
||||||
+#if __has_feature(coverage_sanitizer)
|
|
||||||
+#define Z_IFUNC_NO_SANCOV __attribute__((no_sanitize("coverage")))
|
|
||||||
+#else /* __has_feature(coverage_sanitizer) */
|
|
||||||
+#define Z_IFUNC_NO_SANCOV
|
|
||||||
+#endif /* __has_feature(coverage_sanitizer) */
|
|
||||||
+#else /* __clang__ */
|
|
||||||
+#define Z_IFUNC_NO_SANCOV
|
|
||||||
+#endif /* __clang__ */
|
|
||||||
+
|
|
||||||
+#ifdef __s390__
|
|
||||||
+#define Z_IFUNC_PARAMS unsigned long hwcap
|
|
||||||
+#define Z_IFUNC_ATTRS Z_IFUNC_NO_SANCOV
|
|
||||||
+#else /* __s390__ */
|
|
||||||
+#define Z_IFUNC_PARAMS void
|
|
||||||
+#define Z_IFUNC_ATTRS
|
|
||||||
+#endif /* __s390__ */
|
|
||||||
+
|
|
||||||
#define Z_IFUNC(fname) \
|
|
||||||
typeof(fname) fname __attribute__ ((ifunc (#fname "_resolver"))); \
|
|
||||||
- local typeof(fname) *fname##_resolver(void)
|
|
||||||
+ Z_IFUNC_ATTRS \
|
|
||||||
+ local typeof(fname) *fname##_resolver(Z_IFUNC_PARAMS)
|
|
||||||
/* This is a helper macro to declare a resolver for an indirect function
|
|
||||||
* (ifunc). Let's say you have function
|
|
||||||
*
|
|
||||||
diff --git a/contrib/s390/crc32-vx.c b/contrib/s390/crc32-vx.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..fa5387c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/contrib/s390/crc32-vx.c
|
|
||||||
@@ -0,0 +1,195 @@
|
|
||||||
+/*
|
|
||||||
+ * Hardware-accelerated CRC-32 variants for Linux on z Systems
|
|
||||||
+ *
|
|
||||||
+ * Use the z/Architecture Vector Extension Facility to accelerate the
|
|
||||||
+ * computing of bitreflected CRC-32 checksums.
|
|
||||||
+ *
|
|
||||||
+ * This CRC-32 implementation algorithm is bitreflected and processes
|
|
||||||
+ * the least-significant bit first (Little-Endian).
|
|
||||||
+ *
|
|
||||||
+ * This code was originally written by Hendrik Brueckner
|
|
||||||
+ * <brueckner@linux.vnet.ibm.com> for use in the Linux kernel and has been
|
|
||||||
+ * relicensed under the zlib license.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include "../../zutil.h"
|
|
||||||
+
|
|
||||||
+#include <stdint.h>
|
|
||||||
+#include <vecintrin.h>
|
|
||||||
+
|
|
||||||
+typedef unsigned char uv16qi __attribute__((vector_size(16)));
|
|
||||||
+typedef unsigned int uv4si __attribute__((vector_size(16)));
|
|
||||||
+typedef unsigned long long uv2di __attribute__((vector_size(16)));
|
|
||||||
+
|
|
||||||
+uint32_t crc32_le_vgfm_16(uint32_t crc, const unsigned char *buf, size_t len) {
|
|
||||||
+ /*
|
|
||||||
+ * The CRC-32 constant block contains reduction constants to fold and
|
|
||||||
+ * process particular chunks of the input data stream in parallel.
|
|
||||||
+ *
|
|
||||||
+ * For the CRC-32 variants, the constants are precomputed according to
|
|
||||||
+ * these definitions:
|
|
||||||
+ *
|
|
||||||
+ * R1 = [(x4*128+32 mod P'(x) << 32)]' << 1
|
|
||||||
+ * R2 = [(x4*128-32 mod P'(x) << 32)]' << 1
|
|
||||||
+ * R3 = [(x128+32 mod P'(x) << 32)]' << 1
|
|
||||||
+ * R4 = [(x128-32 mod P'(x) << 32)]' << 1
|
|
||||||
+ * R5 = [(x64 mod P'(x) << 32)]' << 1
|
|
||||||
+ * R6 = [(x32 mod P'(x) << 32)]' << 1
|
|
||||||
+ *
|
|
||||||
+ * The bitreflected Barret reduction constant, u', is defined as
|
|
||||||
+ * the bit reversal of floor(x**64 / P(x)).
|
|
||||||
+ *
|
|
||||||
+ * where P(x) is the polynomial in the normal domain and the P'(x) is the
|
|
||||||
+ * polynomial in the reversed (bitreflected) domain.
|
|
||||||
+ *
|
|
||||||
+ * CRC-32 (IEEE 802.3 Ethernet, ...) polynomials:
|
|
||||||
+ *
|
|
||||||
+ * P(x) = 0x04C11DB7
|
|
||||||
+ * P'(x) = 0xEDB88320
|
|
||||||
+ */
|
|
||||||
+ const uv16qi perm_le2be = {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}; /* BE->LE mask */
|
|
||||||
+ const uv2di r2r1 = {0x1C6E41596, 0x154442BD4}; /* R2, R1 */
|
|
||||||
+ const uv2di r4r3 = {0x0CCAA009E, 0x1751997D0}; /* R4, R3 */
|
|
||||||
+ const uv2di r5 = {0, 0x163CD6124}; /* R5 */
|
|
||||||
+ const uv2di ru_poly = {0, 0x1F7011641}; /* u' */
|
|
||||||
+ const uv2di crc_poly = {0, 0x1DB710641}; /* P'(x) << 1 */
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Load the initial CRC value.
|
|
||||||
+ *
|
|
||||||
+ * The CRC value is loaded into the rightmost word of the
|
|
||||||
+ * vector register and is later XORed with the LSB portion
|
|
||||||
+ * of the loaded input data.
|
|
||||||
+ */
|
|
||||||
+ uv2di v0 = {0, 0};
|
|
||||||
+ v0 = (uv2di)vec_insert(crc, (uv4si)v0, 3);
|
|
||||||
+
|
|
||||||
+ /* Load a 64-byte data chunk and XOR with CRC */
|
|
||||||
+ uv2di v1 = vec_perm(((uv2di *)buf)[0], ((uv2di *)buf)[0], perm_le2be);
|
|
||||||
+ uv2di v2 = vec_perm(((uv2di *)buf)[1], ((uv2di *)buf)[1], perm_le2be);
|
|
||||||
+ uv2di v3 = vec_perm(((uv2di *)buf)[2], ((uv2di *)buf)[2], perm_le2be);
|
|
||||||
+ uv2di v4 = vec_perm(((uv2di *)buf)[3], ((uv2di *)buf)[3], perm_le2be);
|
|
||||||
+
|
|
||||||
+ v1 ^= v0;
|
|
||||||
+ buf += 64;
|
|
||||||
+ len -= 64;
|
|
||||||
+
|
|
||||||
+ while (len >= 64) {
|
|
||||||
+ /* Load the next 64-byte data chunk */
|
|
||||||
+ uv16qi part1 = vec_perm(((uv16qi *)buf)[0], ((uv16qi *)buf)[0], perm_le2be);
|
|
||||||
+ uv16qi part2 = vec_perm(((uv16qi *)buf)[1], ((uv16qi *)buf)[1], perm_le2be);
|
|
||||||
+ uv16qi part3 = vec_perm(((uv16qi *)buf)[2], ((uv16qi *)buf)[2], perm_le2be);
|
|
||||||
+ uv16qi part4 = vec_perm(((uv16qi *)buf)[3], ((uv16qi *)buf)[3], perm_le2be);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Perform a GF(2) multiplication of the doublewords in V1 with
|
|
||||||
+ * the R1 and R2 reduction constants in V0. The intermediate result
|
|
||||||
+ * is then folded (accumulated) with the next data chunk in PART1 and
|
|
||||||
+ * stored in V1. Repeat this step for the register contents
|
|
||||||
+ * in V2, V3, and V4 respectively.
|
|
||||||
+ */
|
|
||||||
+ v1 = (uv2di)vec_gfmsum_accum_128(r2r1, v1, part1);
|
|
||||||
+ v2 = (uv2di)vec_gfmsum_accum_128(r2r1, v2, part2);
|
|
||||||
+ v3 = (uv2di)vec_gfmsum_accum_128(r2r1, v3, part3);
|
|
||||||
+ v4 = (uv2di)vec_gfmsum_accum_128(r2r1, v4, part4);
|
|
||||||
+
|
|
||||||
+ buf += 64;
|
|
||||||
+ len -= 64;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Fold V1 to V4 into a single 128-bit value in V1. Multiply V1 with R3
|
|
||||||
+ * and R4 and accumulating the next 128-bit chunk until a single 128-bit
|
|
||||||
+ * value remains.
|
|
||||||
+ */
|
|
||||||
+ v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v2);
|
|
||||||
+ v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v3);
|
|
||||||
+ v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v4);
|
|
||||||
+
|
|
||||||
+ while (len >= 16) {
|
|
||||||
+ /* Load next data chunk */
|
|
||||||
+ v2 = vec_perm(*(uv2di *)buf, *(uv2di *)buf, perm_le2be);
|
|
||||||
+
|
|
||||||
+ /* Fold next data chunk */
|
|
||||||
+ v1 = (uv2di)vec_gfmsum_accum_128(r4r3, v1, (uv16qi)v2);
|
|
||||||
+
|
|
||||||
+ buf += 16;
|
|
||||||
+ len -= 16;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Set up a vector register for byte shifts. The shift value must
|
|
||||||
+ * be loaded in bits 1-4 in byte element 7 of a vector register.
|
|
||||||
+ * Shift by 8 bytes: 0x40
|
|
||||||
+ * Shift by 4 bytes: 0x20
|
|
||||||
+ */
|
|
||||||
+ uv16qi v9 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
|
||||||
+ v9 = vec_insert((unsigned char)0x40, v9, 7);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Prepare V0 for the next GF(2) multiplication: shift V0 by 8 bytes
|
|
||||||
+ * to move R4 into the rightmost doubleword and set the leftmost
|
|
||||||
+ * doubleword to 0x1.
|
|
||||||
+ */
|
|
||||||
+ v0 = vec_srb(r4r3, (uv2di)v9);
|
|
||||||
+ v0[0] = 1;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Compute GF(2) product of V1 and V0. The rightmost doubleword
|
|
||||||
+ * of V1 is multiplied with R4. The leftmost doubleword of V1 is
|
|
||||||
+ * multiplied by 0x1 and is then XORed with rightmost product.
|
|
||||||
+ * Implicitly, the intermediate leftmost product becomes padded
|
|
||||||
+ */
|
|
||||||
+ v1 = (uv2di)vec_gfmsum_128(v0, v1);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Now do the final 32-bit fold by multiplying the rightmost word
|
|
||||||
+ * in V1 with R5 and XOR the result with the remaining bits in V1.
|
|
||||||
+ *
|
|
||||||
+ * To achieve this by a single VGFMAG, right shift V1 by a word
|
|
||||||
+ * and store the result in V2 which is then accumulated. Use the
|
|
||||||
+ * vector unpack instruction to load the rightmost half of the
|
|
||||||
+ * doubleword into the rightmost doubleword element of V1; the other
|
|
||||||
+ * half is loaded in the leftmost doubleword.
|
|
||||||
+ * The vector register with CONST_R5 contains the R5 constant in the
|
|
||||||
+ * rightmost doubleword and the leftmost doubleword is zero to ignore
|
|
||||||
+ * the leftmost product of V1.
|
|
||||||
+ */
|
|
||||||
+ v9 = vec_insert((unsigned char)0x20, v9, 7);
|
|
||||||
+ v2 = vec_srb(v1, (uv2di)v9);
|
|
||||||
+ v1 = vec_unpackl((uv4si)v1); /* Split rightmost doubleword */
|
|
||||||
+ v1 = (uv2di)vec_gfmsum_accum_128(r5, v1, (uv16qi)v2);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Apply a Barret reduction to compute the final 32-bit CRC value.
|
|
||||||
+ *
|
|
||||||
+ * The input values to the Barret reduction are the degree-63 polynomial
|
|
||||||
+ * in V1 (R(x)), degree-32 generator polynomial, and the reduction
|
|
||||||
+ * constant u. The Barret reduction result is the CRC value of R(x) mod
|
|
||||||
+ * P(x).
|
|
||||||
+ *
|
|
||||||
+ * The Barret reduction algorithm is defined as:
|
|
||||||
+ *
|
|
||||||
+ * 1. T1(x) = floor( R(x) / x^32 ) GF2MUL u
|
|
||||||
+ * 2. T2(x) = floor( T1(x) / x^32 ) GF2MUL P(x)
|
|
||||||
+ * 3. C(x) = R(x) XOR T2(x) mod x^32
|
|
||||||
+ *
|
|
||||||
+ * Note: The leftmost doubleword of vector register containing
|
|
||||||
+ * CONST_RU_POLY is zero and, thus, the intermediate GF(2) product
|
|
||||||
+ * is zero and does not contribute to the final result.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ /* T1(x) = floor( R(x) / x^32 ) GF2MUL u */
|
|
||||||
+ v2 = vec_unpackl((uv4si)v1);
|
|
||||||
+ v2 = (uv2di)vec_gfmsum_128(ru_poly, v2);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Compute the GF(2) product of the CRC polynomial with T1(x) in
|
|
||||||
+ * V2 and XOR the intermediate result, T2(x), with the value in V1.
|
|
||||||
+ * The final result is stored in word element 2 of V2.
|
|
||||||
+ */
|
|
||||||
+ v2 = vec_unpackl((uv4si)v2);
|
|
||||||
+ v2 = (uv2di)vec_gfmsum_accum_128(crc_poly, v2, (uv16qi)v1);
|
|
||||||
+
|
|
||||||
+ return ((uv4si)v2)[2];
|
|
||||||
+}
|
|
||||||
diff --git a/contrib/s390/crc32_z_resolver.c b/contrib/s390/crc32_z_resolver.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..9749cab
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/contrib/s390/crc32_z_resolver.c
|
|
||||||
@@ -0,0 +1,41 @@
|
|
||||||
+#include <sys/auxv.h>
|
|
||||||
+#include "../gcc/zifunc.h"
|
|
||||||
+
|
|
||||||
+#define VX_MIN_LEN 64
|
|
||||||
+#define VX_ALIGNMENT 16L
|
|
||||||
+#define VX_ALIGN_MASK (VX_ALIGNMENT - 1)
|
|
||||||
+
|
|
||||||
+unsigned int crc32_le_vgfm_16(unsigned int crc, const unsigned char FAR *buf, z_size_t len);
|
|
||||||
+
|
|
||||||
+local unsigned long s390_crc32_vx(unsigned long crc, const unsigned char FAR *buf, z_size_t len)
|
|
||||||
+{
|
|
||||||
+ uintptr_t prealign, aligned, remaining;
|
|
||||||
+
|
|
||||||
+ if (buf == Z_NULL) return 0UL;
|
|
||||||
+
|
|
||||||
+ if (len < VX_MIN_LEN + VX_ALIGN_MASK)
|
|
||||||
+ return crc32_z_default(crc, buf, len);
|
|
||||||
+
|
|
||||||
+ if ((uintptr_t)buf & VX_ALIGN_MASK) {
|
|
||||||
+ prealign = VX_ALIGNMENT - ((uintptr_t)buf & VX_ALIGN_MASK);
|
|
||||||
+ len -= prealign;
|
|
||||||
+ crc = crc32_z_default(crc, buf, prealign);
|
|
||||||
+ buf += prealign;
|
|
||||||
+ }
|
|
||||||
+ aligned = len & ~VX_ALIGN_MASK;
|
|
||||||
+ remaining = len & VX_ALIGN_MASK;
|
|
||||||
+
|
|
||||||
+ crc = crc32_le_vgfm_16(crc ^ 0xffffffff, buf, (size_t)aligned) ^ 0xffffffff;
|
|
||||||
+
|
|
||||||
+ if (remaining)
|
|
||||||
+ crc = crc32_z_default(crc, buf + aligned, remaining);
|
|
||||||
+
|
|
||||||
+ return crc;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+Z_IFUNC(crc32_z)
|
|
||||||
+{
|
|
||||||
+ if (hwcap & HWCAP_S390_VX)
|
|
||||||
+ return s390_crc32_vx;
|
|
||||||
+ return crc32_z_default;
|
|
||||||
+}
|
|
||||||
diff --git a/crc32.c b/crc32.c
|
|
||||||
index 4e5830b..0b458ce 100644
|
|
||||||
--- a/crc32.c
|
|
||||||
+++ b/crc32.c
|
|
||||||
@@ -745,12 +745,12 @@ local z_word_t crc_word_big(data)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* ========================================================================= */
|
|
||||||
-#ifdef Z_POWER_OPT
|
|
||||||
+#if defined(Z_POWER_OPT) || defined(HAVE_S390X_VX)
|
|
||||||
/* Rename function so resolver can use its symbol. The default version will be
|
|
||||||
* returned by the resolver if the host has no support for an optimized version.
|
|
||||||
*/
|
|
||||||
#define crc32_z crc32_z_default
|
|
||||||
-#endif /* Z_POWER_OPT */
|
|
||||||
+#endif /* defined(Z_POWER_OPT) || defined(HAVE_S390X_VX) */
|
|
||||||
|
|
||||||
unsigned long ZEXPORT crc32_z(crc, buf, len)
|
|
||||||
unsigned long crc;
|
|
||||||
@@ -1073,10 +1073,15 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
|
|
||||||
return crc ^ 0xffffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef Z_POWER_OPT
|
|
||||||
+#if defined(Z_POWER_OPT) || defined(HAVE_S390X_VX)
|
|
||||||
#undef crc32_z
|
|
||||||
+#ifdef Z_POWER_OPT
|
|
||||||
#include "contrib/power/crc32_z_resolver.c"
|
|
||||||
#endif /* Z_POWER_OPT */
|
|
||||||
+#ifdef HAVE_S390X_VX
|
|
||||||
+#include "contrib/s390/crc32_z_resolver.c"
|
|
||||||
+#endif /* HAVE_S390X_VX */
|
|
||||||
+#endif /* defined(Z_POWER_OPT) || defined(HAVE_S390X_VX) */
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--
|
|
||||||
2.37.3
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -up zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt zlib-1.2.5/contrib/minizip/unzip.c
|
|
||||||
--- zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt 2011-11-11 12:13:56.335867758 -0500
|
|
||||||
+++ zlib-1.2.5/contrib/minizip/unzip.c 2011-11-11 12:14:01.747799372 -0500
|
|
||||||
@@ -68,10 +68,6 @@
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
-#ifndef NOUNCRYPT
|
|
||||||
- #define NOUNCRYPT
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#include "zlib.h"
|
|
||||||
#include "unzip.h"
|
|
||||||
|
|
656
zlib.spec
656
zlib.spec
@ -1,656 +0,0 @@
|
|||||||
%bcond_without minizip
|
|
||||||
|
|
||||||
Name: zlib
|
|
||||||
Version: 1.2.13
|
|
||||||
Release: 5%{?dist}
|
|
||||||
Summary: Compression and decompression library
|
|
||||||
# /contrib/dotzlib/ have Boost license
|
|
||||||
License: Zlib AND BSL-1.0
|
|
||||||
URL: https://www.zlib.net/
|
|
||||||
|
|
||||||
Source: https://www.zlib.net/zlib-%{version}.tar.xz
|
|
||||||
# https://github.com/madler/zlib/pull/210
|
|
||||||
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
|
|
||||||
# resolves: #805113
|
|
||||||
Patch1: zlib-1.2.13-optimized-s390.patch
|
|
||||||
# Upstream commit: https://github.com/madler/zlib/commit/e554695638228b846d49657f31eeff0ca4680e8a
|
|
||||||
# This patch is needed for a clean apply of the Patch19
|
|
||||||
Patch2: zlib-1.2.13-Fix-bug-in-deflateBound.patch
|
|
||||||
# IBM optimized crc32 for Power 8+ processors
|
|
||||||
# ref: https://github.com/madler/zlib/pull/750
|
|
||||||
Patch18: zlib-1.2.13-power-optimizations.patch
|
|
||||||
# IBM Z hardware-accelerated deflate
|
|
||||||
# ref: https://github.com/madler/zlib/pull/410
|
|
||||||
Patch19: zlib-1.2.13-IBM-Z-hw-accelerated-deflate.patch
|
|
||||||
# Patch for s390x crc32vx
|
|
||||||
# ref: https://github.com/iii-i/zlib/releases/tag/crc32vx-v3
|
|
||||||
Patch20: zlib-1.2.13-s390x-vectorize-crc32.patch
|
|
||||||
# fixed covscan issues
|
|
||||||
Patch22: zlib-1.2.11-covscan-issues.patch
|
|
||||||
# fixed issues found by covscan for rhel-9
|
|
||||||
# ref: https://github.com/madler/zlib/pull/554
|
|
||||||
Patch23: zlib-1.2.11-covscan-issues-rhel9.patch
|
|
||||||
# Upstream patch: https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c
|
|
||||||
Patch24: zlib-1.2.13-Reject-overflows-of-zip-header-fields-in-minizip.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: automake, autoconf, libtool
|
|
||||||
|
|
||||||
%global __provides_exclude_from ^%{_libdir}/pkgconfig/minizip\\.pc$
|
|
||||||
|
|
||||||
%description
|
|
||||||
Zlib is a general-purpose, patent-free, lossless data compression
|
|
||||||
library which is used by many different programs.
|
|
||||||
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: Header files and libraries for Zlib development
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
|
||||||
The zlib-devel package contains the header files and libraries needed
|
|
||||||
to develop programs that use the zlib compression and decompression
|
|
||||||
library.
|
|
||||||
|
|
||||||
|
|
||||||
%package static
|
|
||||||
Summary: Static libraries for Zlib development
|
|
||||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description static
|
|
||||||
The zlib-static package includes static libraries needed
|
|
||||||
to develop programs that use the zlib compression and
|
|
||||||
decompression library.
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with minizip}
|
|
||||||
%package -n minizip-compat
|
|
||||||
Summary: Library for manipulation with .zip archives
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description -n minizip-compat
|
|
||||||
Minizip is a library for manipulation with files from .zip archives.
|
|
||||||
|
|
||||||
|
|
||||||
%package -n minizip-compat-devel
|
|
||||||
Summary: Development files for the minizip library
|
|
||||||
Requires: minizip-compat%{?_isa} = %{version}-%{release}
|
|
||||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|
||||||
Conflicts: minizip-devel
|
|
||||||
|
|
||||||
%description -n minizip-compat-devel
|
|
||||||
This package contains the libraries and header files needed for
|
|
||||||
developing applications which use minizip.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q
|
|
||||||
%patch -P0 -p1 -b .fixuncrypt
|
|
||||||
%patch -P2 -p1
|
|
||||||
%patch -P18 -p1
|
|
||||||
%patch -P19 -p1
|
|
||||||
%patch -P20 -p1
|
|
||||||
%patch -P22 -p1
|
|
||||||
%patch -P23 -p1
|
|
||||||
%patch -P24 -p1
|
|
||||||
# Patch19 conflicts with Patch1, so the Patch1 has to be applied after,
|
|
||||||
# because it is arch specific
|
|
||||||
%ifarch s390 s390x
|
|
||||||
%patch -P1 -p1 -b .optimized-deflate
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp
|
|
||||||
mv ChangeLog.tmp ChangeLog
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
|
||||||
export CFLAGS="$RPM_OPT_FLAGS"
|
|
||||||
|
|
||||||
export LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now"
|
|
||||||
# no-autotools, %%configure is not compatible
|
|
||||||
%ifarch s390 s390x
|
|
||||||
./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix} --dfltcc
|
|
||||||
%else
|
|
||||||
./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix}
|
|
||||||
%endif
|
|
||||||
%make_build
|
|
||||||
|
|
||||||
%if %{with minizip}
|
|
||||||
cd contrib/minizip
|
|
||||||
autoreconf --install
|
|
||||||
%configure --enable-static=no
|
|
||||||
%make_build
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
|
||||||
make test
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
%make_install
|
|
||||||
|
|
||||||
%if %{with minizip}
|
|
||||||
%make_install -C contrib/minizip
|
|
||||||
# https://github.com/madler/zlib/pull/229
|
|
||||||
rm $RPM_BUILD_ROOT%_includedir/minizip/crypt.h
|
|
||||||
%endif
|
|
||||||
|
|
||||||
find $RPM_BUILD_ROOT -name '*.la' -delete
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
|
||||||
%license README
|
|
||||||
%doc ChangeLog FAQ
|
|
||||||
%{_libdir}/libz.so.*
|
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%doc doc/algorithm.txt test/example.c
|
|
||||||
%{_libdir}/libz.so
|
|
||||||
%{_libdir}/pkgconfig/zlib.pc
|
|
||||||
%{_includedir}/zlib.h
|
|
||||||
%{_includedir}/zconf.h
|
|
||||||
%{_mandir}/man3/zlib.3*
|
|
||||||
|
|
||||||
|
|
||||||
%files static
|
|
||||||
%license README
|
|
||||||
%{_libdir}/libz.a
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with minizip}
|
|
||||||
%files -n minizip-compat
|
|
||||||
%doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt
|
|
||||||
%{_libdir}/libminizip.so.*
|
|
||||||
|
|
||||||
|
|
||||||
%files -n minizip-compat-devel
|
|
||||||
%dir %{_includedir}/minizip
|
|
||||||
%{_includedir}/minizip/*.h
|
|
||||||
%{_libdir}/libminizip.so
|
|
||||||
%{_libdir}/pkgconfig/minizip.pc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Tue Oct 17 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.13-5
|
|
||||||
- Applied upstream commit 73331a6a0481067628f065ffe87bb1d8f787d10c
|
|
||||||
- Resolves: CVE-2023-45853
|
|
||||||
|
|
||||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 10 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.13-2
|
|
||||||
- Fix for the libxml2 and lxml on s390x
|
|
||||||
- Resolves #2155328
|
|
||||||
|
|
||||||
* Mon Oct 17 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.13-1
|
|
||||||
- Rebase to version 1.2.13
|
|
||||||
- Patches 21,24,25 has been upstreamed
|
|
||||||
|
|
||||||
* Tue Aug 09 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-5
|
|
||||||
- Fix heap-based buffer over-read or buffer overflow in inflate in inflate.c
|
|
||||||
- Resolves: CVE-2022-37434
|
|
||||||
|
|
||||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 04 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-3
|
|
||||||
- Upstream patch: Correct incorrect inputs provided to the CRC functions
|
|
||||||
|
|
||||||
* Tue Jun 28 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-2
|
|
||||||
- Fix covscan patch that caused compiler warnings
|
|
||||||
|
|
||||||
* Tue Apr 05 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-1
|
|
||||||
- Rebase to 1.2.12
|
|
||||||
- Resolves: CVE-2018-25032
|
|
||||||
|
|
||||||
* Mon Feb 28 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.11-32
|
|
||||||
- Apply IBM patch for compressBound() function
|
|
||||||
- Source from https://github.com/madler/zlib/issues/410#issuecomment-947212824
|
|
||||||
- Resolves: #2057484
|
|
||||||
|
|
||||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-31
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 29 2021 Dan Horák <dan[at]danny.cz> - 1.2.11-30
|
|
||||||
- Fix for IBM CRC32 optimalization rhbz#1959423
|
|
||||||
|
|
||||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-28
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 01 2021 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-27
|
|
||||||
- Enabled Z hardware-accelerated deflate for compression levels 1 through 6 (#1972057)
|
|
||||||
- IBM CRC32 optimalization rhbz#1959423
|
|
||||||
|
|
||||||
* Wed Mar 31 2021 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-26
|
|
||||||
- fixed covscan issues for rhel-9
|
|
||||||
|
|
||||||
* Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 1.2.11-25
|
|
||||||
- Remove ancient PPC64 hack
|
|
||||||
- Remove aarch64 optimalizations (#1936823)
|
|
||||||
|
|
||||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-24
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Nov 18 2020 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-23
|
|
||||||
- backport IBM Z updates to fedora
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-22
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-21
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Oct 29 2019 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-20
|
|
||||||
- Added -DDFLTCC parameter to configure to enable
|
|
||||||
- Z hardware-accelerated deflate for s390x architectures (#1659433)
|
|
||||||
|
|
||||||
* Thu Sep 05 2019 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-19
|
|
||||||
- IBM CRC32 optimalization for POWER 8+ architectures re-add
|
|
||||||
- fixed firefox crash duer to zlib (#1741266)
|
|
||||||
- added test for crc32
|
|
||||||
|
|
||||||
* Thu Aug 15 2019 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-18
|
|
||||||
- IBM CRC32 optimalization for POWER 8+ architectures revert
|
|
||||||
|
|
||||||
* Thu Aug 01 2019 Ondrej Dubaj <odubaj@redhat.com> - 1.2.11-17
|
|
||||||
- IBM Z hardware-accelerated deflate for s390x architectures
|
|
||||||
- IBM CRC32 optimalization for POWER 8+ architectures
|
|
||||||
|
|
||||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-16
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-15
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Oct 2 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.11-14
|
|
||||||
- Bump build
|
|
||||||
|
|
||||||
* Tue Sep 18 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.11-13
|
|
||||||
- Revert aarch64 neon inflate optimisation
|
|
||||||
|
|
||||||
* Wed Aug 29 2018 Patrik Novotný <panovotn@redhat.com> - 1.2.11-12
|
|
||||||
- Rename minizip and minizip-devel to minizip-compat and minizip-compat-devel respectively
|
|
||||||
|
|
||||||
* Thu Aug 23 2018 Patrik Novotný <panovotn@redhat.com> - 1.2.11-11
|
|
||||||
- Provides minizip-compat and minizip-compat-devel
|
|
||||||
|
|
||||||
* Fri Aug 03 2018 Pavel Raiskup <praiskup@redhat.com> - 1.2.11-10
|
|
||||||
- add %%bcond for minizip
|
|
||||||
- use %%make_* macros
|
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-9
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Apr 30 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.11-8
|
|
||||||
- Optimisations for aarch64
|
|
||||||
- Minor spec cleanups
|
|
||||||
|
|
||||||
* Thu Mar 15 2018 Pavel Raiskup <praiskup@redhat.com> - 1.2.11-7
|
|
||||||
- don't install crypt.h (rhbz#1424609)
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.11-5
|
|
||||||
- Switch to %%ldconfig_scriptlets
|
|
||||||
|
|
||||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Feb 09 2017 Pavel Raiskup <praiskup@redhat.com> - 1.2.11-2
|
|
||||||
- fix s390(x) optimizing patch (FTBFS on s390(x))
|
|
||||||
- simplify ppc64 hack with -O3
|
|
||||||
|
|
||||||
* Mon Jan 30 2017 Pavel Raiskup <praiskup@redhat.com> - 1.2.11-1
|
|
||||||
- latest upstream release (rhbz#1409372)
|
|
||||||
- cleanup rpmlint
|
|
||||||
- revert fix for rhbz#985344
|
|
||||||
- requires with %%_isa tag
|
|
||||||
- drop zlib Z_BLOCK flush patch (rhbz#1417355)
|
|
||||||
|
|
||||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Aug 14 2015 Adam Jackson <ajax@redhat.com> 1.2.8-9
|
|
||||||
- Link with -z now for full RELRO
|
|
||||||
|
|
||||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Aug 6 2014 Tom Callaway <spot@fedoraproject.org> - 1.2.8-6
|
|
||||||
- fix license handling
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 12 2014 jchaloup <jchaloup@redhat.com> - 1.2.8-4
|
|
||||||
- resolves: #1064213
|
|
||||||
recompiled with -O3 flag for ppc64 arch
|
|
||||||
|
|
||||||
* Sat Aug 10 2013 Kalev Lember <kalevlember@gmail.com> - 1.2.8-3
|
|
||||||
- resolves: #985344
|
|
||||||
add a patch to fix missing minizip include
|
|
||||||
|
|
||||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jun 7 2013 Peter Schiffer <pschiffe@redhat.com> - 1.2.8-1
|
|
||||||
- resolves: #957680
|
|
||||||
updated to 1.2.8
|
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.7-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Oct 4 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-9
|
|
||||||
- updated patch optimizing deflate on s390(x) architectures
|
|
||||||
|
|
||||||
* Wed Aug 29 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-8
|
|
||||||
- related: #832545
|
|
||||||
reverted changes for this bug, static libraries shouldn't be compiled with
|
|
||||||
-fPIC flag
|
|
||||||
|
|
||||||
* Mon Aug 27 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-7
|
|
||||||
- resolves: #844791
|
|
||||||
rank Z_BLOCK flush below Z_PARTIAL_FLUSH only when last flush was Z_BLOCK
|
|
||||||
- done some minor .spec file cleanup
|
|
||||||
|
|
||||||
* Mon Aug 13 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-6
|
|
||||||
- added patch from IBM which optimizes deflate on s390(x) architectures
|
|
||||||
|
|
||||||
* Thu Aug 02 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-5
|
|
||||||
- resolves: #832545
|
|
||||||
recompiled with -fPIC flag
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.7-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jun 11 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-3
|
|
||||||
- moved /lib* to /usr/lib*
|
|
||||||
|
|
||||||
* Mon Jun 11 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-2
|
|
||||||
- recompiled with -Wl,-z,relro flags
|
|
||||||
|
|
||||||
* Thu May 10 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-1
|
|
||||||
- resolves: #785726
|
|
||||||
- resolves: #805874
|
|
||||||
update to 1.2.7
|
|
||||||
|
|
||||||
* Tue Jan 10 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.5-6
|
|
||||||
- resolves: #719139
|
|
||||||
Zlib fails to read zip64 files on 64-bit system
|
|
||||||
|
|
||||||
* Fri Nov 11 2011 Tom Callaway <spot@fedoraproject.org> - 1.2.5-5
|
|
||||||
- fix minizip to permit uncrypt when NOUNCRYPT is not defined
|
|
||||||
|
|
||||||
* Wed Apr 6 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.5-4
|
|
||||||
- Resolves: #678603
|
|
||||||
zlib from minizip allowed NULL pointer parameter of function unzGetCurrentFileInfo
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.5-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jun 16 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.5-2
|
|
||||||
- Resolves: #591317
|
|
||||||
pdfedit fails to compile on i686 with zlib.h errors
|
|
||||||
|
|
||||||
* Thu Apr 22 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.5-1
|
|
||||||
- update to 1.2.5
|
|
||||||
|
|
||||||
* Mon Mar 29 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.4-1
|
|
||||||
- update to 1.2.4
|
|
||||||
use the upstream make/configure files for zlib,
|
|
||||||
change additional makefile/configure file to be used only to minizip
|
|
||||||
add pkgconfig to zlib
|
|
||||||
|
|
||||||
* Mon Mar 8 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.3-25
|
|
||||||
- add Boost license
|
|
||||||
|
|
||||||
* Tue Aug 11 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.2.3-24
|
|
||||||
- Use bzipped upstream tarball.
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-23
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Mar 18 2009 Stepan Kasal <skasal@redhat.com> - 1.2.3-22
|
|
||||||
- fix the libz.so symlink
|
|
||||||
|
|
||||||
* Tue Mar 17 2009 Stepan Kasal <skasal@redhat.com> - 1.2.3-21
|
|
||||||
- consolidate the autoconfiscation patches into one and clean it up
|
|
||||||
- consequently, clean up the %%build and %%install sections
|
|
||||||
- zconf.h includes unistd.h again (#479133)
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-20
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Dec 1 2008 Ivana Varekova <varekova@redhat.com> - 1.2.3-19
|
|
||||||
- fix 473490 - unchecked malloc
|
|
||||||
|
|
||||||
* Wed Feb 13 2008 Ivana Varekova <varekova@redhat.com> - 1.2.3-18
|
|
||||||
- change license tag (226671#c29)
|
|
||||||
|
|
||||||
* Mon Feb 11 2008 Ivana Varekova <varekova@redhat.com> - 1.2.3-17
|
|
||||||
- spec file changes
|
|
||||||
|
|
||||||
* Fri Nov 23 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-16
|
|
||||||
- remove minizip headers to minizip-devel
|
|
||||||
- spec file cleanup
|
|
||||||
- fix minizip.pc file
|
|
||||||
|
|
||||||
* Wed Nov 14 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-15
|
|
||||||
- separate static subpackage
|
|
||||||
|
|
||||||
* Wed Aug 15 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-14
|
|
||||||
- create minizip subpackage
|
|
||||||
|
|
||||||
* Mon May 21 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-13
|
|
||||||
- remove .so,.a
|
|
||||||
|
|
||||||
* Mon May 21 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-12
|
|
||||||
- Resolves #240277
|
|
||||||
Move libz to /lib(64)
|
|
||||||
|
|
||||||
* Mon Apr 23 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-11
|
|
||||||
- Resolves: 237295
|
|
||||||
fix Summary tag
|
|
||||||
|
|
||||||
* Fri Mar 23 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-10
|
|
||||||
- remove zlib .so.* packages to /lib
|
|
||||||
|
|
||||||
* Fri Mar 9 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-9
|
|
||||||
- incorporate package review feedback
|
|
||||||
|
|
||||||
* Wed Feb 21 2007 Adam Tkac <atkac redhat com> - 1.2.3-8
|
|
||||||
- fixed broken version of libz
|
|
||||||
|
|
||||||
* Tue Feb 20 2007 Adam Tkac <atkac redhat com> - 1.2.3-7
|
|
||||||
- building is now automatized
|
|
||||||
- specfile cleanup
|
|
||||||
|
|
||||||
* Tue Feb 20 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-6
|
|
||||||
- remove the compilation part to build section
|
|
||||||
some minor changes
|
|
||||||
|
|
||||||
* Mon Feb 19 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-5
|
|
||||||
- incorporate package review feedback
|
|
||||||
|
|
||||||
* Mon Oct 23 2006 Ivana Varekova <varekova@redhat.com> - 1.2.3-4
|
|
||||||
- fix #209424 - fix libz.a permissions
|
|
||||||
|
|
||||||
* Wed Jul 19 2006 Ivana Varekova <varekova@redhat.com> - 1.2.3-3
|
|
||||||
- add cflags (#199379)
|
|
||||||
|
|
||||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.2.3-2
|
|
||||||
- rebuild
|
|
||||||
|
|
||||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.2.3-1.2.1
|
|
||||||
- bump again for double-long bug on ppc(64)
|
|
||||||
|
|
||||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.2.3-1.2
|
|
||||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
|
||||||
|
|
||||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Wed Aug 24 2005 Florian La Roche <laroche@redhat.com>
|
|
||||||
- update to 1.2.3
|
|
||||||
|
|
||||||
* Fri Jul 22 2005 Ivana Varekova <varekova@redhat.com> 1.2.2.2-5
|
|
||||||
- fix bug 163038 - CAN-2005-1849 - zlib buffer overflow
|
|
||||||
|
|
||||||
* Thu Jul 7 2005 Ivana Varekova <varekova@redhat.com> 1.2.2.2-4
|
|
||||||
- fix bug 162392 - CAN-2005-2096
|
|
||||||
|
|
||||||
* Wed Mar 30 2005 Ivana Varekova <varekova@redhat.com> 1.2.2.2-3
|
|
||||||
- fix bug 122408 - zlib build process runs configure twice
|
|
||||||
|
|
||||||
* Fri Mar 4 2005 Jeff Johnson <jbj@redhat.com> 1.2.2.2-2
|
|
||||||
- rebuild with gcc4.
|
|
||||||
|
|
||||||
* Sat Jan 1 2005 Jeff Johnson <jbj@jbj.org> 1.2.2.2-1
|
|
||||||
- upgrade to 1.2.2.2.
|
|
||||||
|
|
||||||
* Fri Nov 12 2004 Jeff Johnson <jbj@jbj.org> 1.2.2.1-1
|
|
||||||
- upgrade to 1.2.2.1.
|
|
||||||
|
|
||||||
* Sun Sep 12 2004 Jeff Johnson <jbj@redhat.com> 1.2.1.2-1
|
|
||||||
- update to 1.2.1.2 to fix 2 DoS problems (#131385).
|
|
||||||
|
|
||||||
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Sun Jan 18 2004 Jeff Johnson <jbj@jbj.org> 1.2.1.1-1
|
|
||||||
- upgrade to zlib-1.2.1.1.
|
|
||||||
|
|
||||||
* Sun Nov 30 2003 Florian La Roche <Florian.LaRoche@redhat.de>
|
|
||||||
- update to 1.2.1 release
|
|
||||||
|
|
||||||
* Mon Oct 13 2003 Jeff Johnson <jbj@jbj.org> 1.2.0.7-3
|
|
||||||
- unrevert zlib.h include constants (#106291), rejected upstream.
|
|
||||||
|
|
||||||
* Wed Oct 8 2003 Jeff Johnson <jbj@jbj.org> 1.2.0.7-2
|
|
||||||
- fix: gzeof not set when reading compressed file (#106424).
|
|
||||||
- fix: revert zlib.h include constants for now (#106291).
|
|
||||||
|
|
||||||
* Tue Sep 23 2003 Jeff Johnson <jbj@redhat.com> 1.2.0.7-1
|
|
||||||
- update to 1.2.0.7, penultimate 1.2.1 release candidate.
|
|
||||||
|
|
||||||
* Tue Jul 22 2003 Jeff Johnson <jbj@redhat.com> 1.2.0.3-0.1
|
|
||||||
- update to release candidate.
|
|
||||||
|
|
||||||
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Mon May 19 2003 Jeff Johnson <jbj@redhat.com> 1.1.4-9
|
|
||||||
- rebuild, revert from 1.2.0.1.
|
|
||||||
|
|
||||||
* Mon Feb 24 2003 Jeff Johnson <jbj@redhat.com> 1.1.4-8
|
|
||||||
- fix gzprintf buffer overrun (#84961).
|
|
||||||
|
|
||||||
* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 1.1.4-7
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Thu Nov 21 2002 Elliot Lee <sopwith@redhat.com> 1.1.4-6
|
|
||||||
- Make ./configure use $CC to ease cross-compilation
|
|
||||||
|
|
||||||
* Tue Nov 12 2002 Jeff Johnson <jbj@redhat.com> 1.1.4-5
|
|
||||||
- rebuild from cvs.
|
|
||||||
|
|
||||||
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
|
|
||||||
- automated rebuild
|
|
||||||
|
|
||||||
* Thu May 23 2002 Tim Powers <timp@redhat.com>
|
|
||||||
- automated rebuild
|
|
||||||
|
|
||||||
* Fri Apr 26 2002 Jakub Jelinek <jakub@redhat.com> 1.1.4-2
|
|
||||||
- remove glibc patch, it is no longer needed (zlib uses gcc -shared
|
|
||||||
as it should)
|
|
||||||
- run tests and only build the package if they succeed
|
|
||||||
|
|
||||||
* Thu Apr 25 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.1.4-1
|
|
||||||
- 1.1.4
|
|
||||||
|
|
||||||
* Wed Jan 30 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.1.3-25.7
|
|
||||||
- Fix double free
|
|
||||||
|
|
||||||
* Sun Aug 26 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.1.3-24
|
|
||||||
- Add example.c and minigzip.c to the doc files, as
|
|
||||||
they are listed as examples in the README (#52574)
|
|
||||||
|
|
||||||
* Mon Jun 18 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
|
||||||
- Updated URL
|
|
||||||
- Add version dependency for zlib-devel
|
|
||||||
- s/Copyright/License/
|
|
||||||
|
|
||||||
* Wed Feb 14 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
|
||||||
- bumped version number - this is the old version without the performance enhancements
|
|
||||||
|
|
||||||
* Fri Sep 15 2000 Florian La Roche <Florian.LaRoche@redhat.de>
|
|
||||||
- add -fPIC for shared libs (patch by Fritz Elfert)
|
|
||||||
|
|
||||||
* Thu Sep 7 2000 Jeff Johnson <jbj@redhat.com>
|
|
||||||
- on 64bit systems, make sure libraries are located correctly.
|
|
||||||
|
|
||||||
* Thu Aug 17 2000 Jeff Johnson <jbj@redhat.com>
|
|
||||||
- summaries from specspo.
|
|
||||||
|
|
||||||
* Thu Jul 13 2000 Prospector <bugzilla@redhat.com>
|
|
||||||
- automatic rebuild
|
|
||||||
|
|
||||||
* Sun Jul 02 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
|
||||||
- rebuild
|
|
||||||
|
|
||||||
* Tue Jun 13 2000 Jeff Johnson <jbj@redhat.com>
|
|
||||||
- FHS packaging to build on solaris2.5.1.
|
|
||||||
|
|
||||||
* Wed Jun 07 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
|
||||||
- use %%{_mandir} and %%{_tmppath}
|
|
||||||
|
|
||||||
* Fri May 12 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
|
||||||
- updated URL and source location
|
|
||||||
- moved README to main package
|
|
||||||
|
|
||||||
* Mon Feb 7 2000 Jeff Johnson <jbj@redhat.com>
|
|
||||||
- compress man page.
|
|
||||||
|
|
||||||
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
|
||||||
- auto rebuild in the new build environment (release 5)
|
|
||||||
|
|
||||||
* Wed Sep 09 1998 Cristian Gafton <gafton@redhat.com>
|
|
||||||
- link against glibc
|
|
||||||
|
|
||||||
* Mon Jul 27 1998 Jeff Johnson <jbj@redhat.com>
|
|
||||||
- upgrade to 1.1.3
|
|
||||||
|
|
||||||
* Fri May 08 1998 Prospector System <bugs@redhat.com>
|
|
||||||
- translations modified for de, fr, tr
|
|
||||||
|
|
||||||
* Wed Apr 08 1998 Cristian Gafton <gafton@redhat.com>
|
|
||||||
- upgraded to 1.1.2
|
|
||||||
- buildroot
|
|
||||||
|
|
||||||
* Tue Oct 07 1997 Donnie Barnes <djb@redhat.com>
|
|
||||||
- added URL tag (down at the moment so it may not be correct)
|
|
||||||
- made zlib-devel require zlib
|
|
||||||
|
|
||||||
* Thu Jun 19 1997 Erik Troan <ewt@redhat.com>
|
|
||||||
- built against glibc
|
|
Loading…
Reference in New Issue
Block a user