zlib: Pick up upstream patch for memory corruption fix

[people/teissler/ipfire-2.x.git] / lfs / zlib

diff --git a/lfs/zlib b/lfs/zlib
index 2c89b4803bc414c50c0779cd7a2b9cb7626a4dcc..c2386778d2bde74be4ea7c21d0578aae1a429933 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -78,6 +78,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && CROSS_PREFIX=$(CROSS_PREFIX) ./configure --prefix=$(PREFIX) --shared
+
+       # https://www.openwall.com/lists/oss-security/2022/03/24/1
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/zlib-fix-a-bug-that-can-crash-deflate-on-some-input-when-using-Z_FIXED.patch
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install