suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/core-updates b/lfs/core-updates
index 19b57a5a20c7e2277d9fc565e9a08a0b9c08b92f..f972964df49b50a16a08fc324ba75123193b149d 100644 (file)
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  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        #
@@ -28,7 +28,6 @@ VER = ipfire
 
 THISAPP     = core-updates
 TARGET      = $(DIR_INFO)/$(THISAPP)
-TAR_OPTIONS = --xz
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +39,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -52,7 +51,7 @@ $(TARGET) : $(CORE)
 
 .PHONY:
 core/%:
-       rm -rf /install/packages/package
+       rm -rf /install/packages/package /tmp/*
        mkdir -p /install/packages/package
        eval $$(cat /usr/src/config/rootfiles/$@/meta)
 
@@ -67,18 +66,18 @@ core/%:
        #remove excluded files from ROOTFILES
        grep -f $(DIR_SRC)/config/rootfiles/$@/exclude -v /tmp/ROOTFILES.tmp > /tmp/ROOTFILES
        rm -rf /tmp/ROOTFILES.tmp
-       
+
        #Change KVER to Kernelversion
        sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
 
        #Remove doubled files with tar/untar/tar to save space
-       tar -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='#*' --exclude='dev/pts/*' \
+       tar $(TAR_OPTIONS) -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='__pycache__' --exclude='#*' --exclude='dev/pts/*' \
                --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude \
                -C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar
        mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES
-       tar -p --numeric-owner -x  -C /tmp -f /$(SNAME).tar
+       tar $(TAR_OPTIONS) -p --numeric-owner -x  -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
-       cd /tmp && XZ_OPT="$(XZ_OPT)" tar cJf /install/packages/package/files.tar.xz $(TAR_OPTIONS) * && rm -rf *
+       cd /tmp && XZ_OPT="$(XZ_OPT)" tar $(TAR_OPTIONS) -cJf /install/packages/package/files.tar.xz $(TAR_OPTIONS) * && rm -rf *
        cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
        rm /install/packages/package/ROOTFILES
        mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES
@@ -93,8 +92,10 @@ core/%:
                update.sh files.tar.xz ROOTFILES
        rm -rf /install/packages/package
        sed -e "s/NAME/core-upgrade/g" \
+           -e "s/SUMMARY/IPFire Core Update/g" \
                -e "s/VER/$(VERSION)/g" \
                -e "s/RELEASE/$$(basename $@)/g" \
                -e "s/DEPS/$(DEPS)/g" \
                -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-$(VERSION)-$$(basename $@).ipfire | awk '{ print $$5 }'`/g" \
+               -e "s/SERVICES//g" \
                < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-$$(basename $@)