suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/zlib b/lfs/zlib
index 6520a2374db5c43d81c7e1954521ea54b2207839..d7c723914452526e00cb1955abeedeaef3dd42c8 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2024  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        #
@@ -24,13 +24,19 @@
 
 include Config
 
-VER        = 1.2.8
+VER        = 1.3.1
 
 THISAPP    = zlib-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  CROSS_PREFIX = $(CROSSTARGET)-
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 CFLAGS    += -fPIC -DPIC
 
@@ -39,9 +45,9 @@ CFLAGS    += -fPIC -DPIC
 ###############################################################################
 objects = $(DL_FILE)
 
-$(DL_FILE)                           = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                       = 44d667c142d7cda120332623eab69f40
+$(DL_FILE)_BLAKE2 = 42d109223801a493de6d52e7343403d7fc3234a6ca816425fe41ac9c18019b01b93841acd28a235e99f2256a6a17f93624e96b2ddb58d588c8190a6bedb82910
 
 install : $(TARGET)
 
@@ -49,10 +55,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -61,8 +67,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -71,15 +77,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --shared
+       
+       cd $(DIR_APP) && CROSS_PREFIX=$(CROSS_PREFIX) ./configure --prefix=$(PREFIX) --shared
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
+ifneq "$(TOOLCHAIN)" "1"
        mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
        ln -svf libz.so.$(VER) /lib/libz.so.1
        ln -svf libz.so.$(VER) /lib/libz.so
        rm -vf /usr/lib/libz.so.1
        rm -vf /usr/lib/libz.so
+endif
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)