[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/

[Sam James]

commit:     ffafdfd3eed513c49aa7047f4b09fd1dd0bb6768
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 07:42:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 07:45:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffafdfd3

sys-libs/zlib: add link to upstream PR for 1.2.12 configure

Bug: https://bugs.gentoo.org/836308
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../zlib-1.2.12-fix-CC-logic-in-configure.patch    | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch b/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch
index da9455519b6f..8b6c5e26a766 100644
--- a/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch
+++ b/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch
@@ -1,20 +1,35 @@
-From 95b9053f10710f9f881f4daec2f2e78da87560cf Mon Sep 17 00:00:00 2001
+https://github.com/madler/zlib/pull/607
+
+From c9b7587ff947638412a69df5ea820c563b8b1c1b Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
-Date: Mon, 28 Mar 2022 08:21:18 +0100
+Date: Mon, 28 Mar 2022 08:40:45 +0100
 Subject: [PATCH] Fix CC logic in configure
 
 In https://github.com/madler/zlib/commit/e9a52aa129efe3834383e415580716a7c4027f8d,
 the logic was changed to try check harder for GCC, but it dropped
-the default setting of cc=${CC}.
+the default setting of cc=${CC}. It was throwing away any pre-set CC value as
+a result.
 
 This led to e.g. misdetection of inability to build shared libs
-for say, multilib cases (w/ CC being one thing (e.g. x86_64-unknown-linux-gnu-gcc -m32
-and then 'cc' used for shared libs being w/o -m32).
+for say, multilib cases (w/ CC being one thing from the environment being used
+for one test (e.g. x86_64-unknown-linux-gnu-gcc -m32 and then 'cc' used for
+shared libs (but missing "-m32"!)). Obviously just one example of how
+the old logic could break.
+
+This restores the old default of 'CC' if nothing overrides it later
+in configure.
 
+Bug: https://bugs.gentoo.org/836308
 Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 52ff4a04e..3fa3e8618 100755
 --- a/configure
 +++ b/configure
-@@ -180,7 +180,10 @@ if test -z "$CC"; then
+@@ -174,7 +174,10 @@ if test -z "$CC"; then
    else
      cc=${CROSS_PREFIX}cc
    fi
@@ -25,3 +40,4 @@ Signed-off-by: Sam James <sam@gentoo.org>
  cflags=${CFLAGS-"-O3"}
  # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
  case "$cc" in
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/

[Sam James]

commit:     beefea271d2f0f6c2975d03136dbe1f602e42c5e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 00:20:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 00:20:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beefea27

sys-libs/zlib: add commit reference to 1.2.11 patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
index 18764849b945..59d4a0919c77 100644
--- a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
+++ b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
@@ -1,3 +1,5 @@
+https://github.com/madler/zlib/commit/f9694097dd69354b03cb8af959094c7f260db0a1
+
 From f9694097dd69354b03cb8af959094c7f260db0a1 Mon Sep 17 00:00:00 2001
 From: Mark Adler <madler@alumni.caltech.edu>
 Date: Mon, 16 Jan 2017 09:49:35 -0800

[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/

[Conrad Kostecki]

commit:     31b2c136145e3fbb9ccbbf461c7e74e16ad02d32
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 28 16:51:41 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 14:42:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b2c136

sys-libs/zlib: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15
Closes: https://github.com/gentoo/gentoo/pull/27514
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../zlib-1.2.11-fix-deflateParams-usage.patch      | 69 ----------------------
 1 file changed, 69 deletions(-)

diff --git a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
deleted file mode 100644
index 59d4a0919c77..000000000000
--- a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://github.com/madler/zlib/commit/f9694097dd69354b03cb8af959094c7f260db0a1
-
-From f9694097dd69354b03cb8af959094c7f260db0a1 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Mon, 16 Jan 2017 09:49:35 -0800
-Subject: [PATCH] Permit a deflateParams() parameter change as soon as
- possible.
-
-This commit allows a parameter change even if the input data has
-not all been compressed and copied to the application output
-buffer, so long as all of the input data has been compressed to
-the internal pending output buffer. This also allows an immediate
-deflateParams change so long as there have been no deflate calls
-since initialization or reset.
----
- deflate.c |  6 +++---
- zlib.h    | 11 ++++++-----
- 2 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/deflate.c b/deflate.c
-index b63311a5..20bda4f6 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -494,7 +494,7 @@ int ZEXPORT deflateResetKeep (strm)
-         s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
- #endif
-         adler32(0L, Z_NULL, 0);
--    s->last_flush = Z_NO_FLUSH;
-+    s->last_flush = -2;
- 
-     _tr_init(s);
- 
-@@ -587,12 +587,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
-     func = configuration_table[s->level].func;
- 
-     if ((strategy != s->strategy || func != configuration_table[level].func) &&
--        s->high_water) {
-+        s->last_flush != -2) {
-         /* Flush the last buffer: */
-         int err = deflate(strm, Z_BLOCK);
-         if (err == Z_STREAM_ERROR)
-             return err;
--        if (strm->avail_out == 0)
-+        if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
-             return Z_BUF_ERROR;
-     }
-     if (s->level != level) {
-diff --git a/zlib.h b/zlib.h
-index 5daf4f28..577d81e3 100644
---- a/zlib.h
-+++ b/zlib.h
-@@ -712,11 +712,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-    used to switch between compression and straight copy of the input data, or
-    to switch to a different kind of input data requiring a different strategy.
-    If the compression approach (which is a function of the level) or the
--   strategy is changed, and if any input has been consumed in a previous
--   deflate() call, then the input available so far is compressed with the old
--   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
--   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
--   and strategy will take effect at the next call of deflate().
-+   strategy is changed, and if there have been any deflate() calls since the
-+   state was initialized or reset, then the input available so far is
-+   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
-+   There are three approaches for the compression levels 0, 1..3, and 4..9
-+   respectively.  The new level and strategy will take effect at the next call
-+   of deflate().
- 
-      If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-    not have enough output space to complete, then the parameter change will not

[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/

[Sam James]

commit:     96443d8fb60521aa813eaad631c698db2c026c83
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 07:43:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 08:04:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96443d8f

sys-libs/zlib: add upstream reference to patch

Bug: https://github.com/madler/zlib/issues/751
Bug: https://bugs.gentoo.org/879883
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...b-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
index 48d58acaaf7f..b5a1b4de2c47 100644
--- a/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
+++ b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
@@ -1,3 +1,6 @@
+https://bugs.gentoo.org/879883
+https://github.com/madler/zlib/issues/751
+
 From 2ad2713e6cb9166dcede9a020f6913b8189ff0c6 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Wed, 23 Nov 2022 04:17:16 +0000