suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/cups b/lfs/cups
index 2c71388464c0e1c397ee8881c290638b1049fb86..ee90953cc64b151896f3d8ed0c1493baf94219e4 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  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,7 +24,8 @@
 
 include Config
 
-VER        = 2.3.3
+VER        = 2.4.6
+SUMMARY    = The Common UNIX Printing System
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.gz
@@ -32,9 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 21
+PAK_VER    = 38
 
-DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
+DEPS       = avahi cups-filters dbus ghostscript libexif
+
+SERVICES   = cups
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 412434ceefbdf3ec71bc9188a035f589
+$(DL_FILE)_BLAKE2 = 4e61112ddaa46f20b1cfcb8f523dd07ba7d82604b9857754b288a2a9c5bc50ce242cfa119867347e4696818dc2eb505cf7fff1f9a0634e314edb2500395b83e4
 
 install : $(TARGET)
 
@@ -52,13 +55,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
        $(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -67,8 +70,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -77,15 +80,16 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
                        --sysconfdir=/var/ipfire \
                        --localstatedir=/var \
                        --enable-debug \
-                       --enable-avahi \
+                       --with-dnssd=avahi \
                        --enable-dbus \
-                       --enable-gnutls \
+                       --with-tls=openssl \
                        --enable-libusb
 
        cd $(DIR_APP) && make $(MAKETUNING)
@@ -93,9 +97,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
 
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/cups \
+                         /var/ipfire/backup/addons/includes/cups
+
        # install initscript
-       $(call INSTALL_INITSCRIPT,cups)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
        cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
 
+       # Install convenience link
+       ln -svf /var/ipfire/cups /etc/cups
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)