X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcups;h=2c71388464c0e1c397ee8881c290638b1049fb86;hb=9e245967d21883c6b921c0f1d9101a526ef9b084;hp=e0ef96256d87171b5cbafeb129f6c4656ddf83c1;hpb=a46b97969c2a15a9347dbb2d5ae5a273825a31ed;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/cups b/lfs/cups
index e0ef96256d..2c71388464 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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,17 +24,17 @@
 
 include Config
 
-VER        = 2.0.3
+VER        = 2.3.3
 
 THISAPP    = cups-$(VER)
-DL_FILE    = $(THISAPP)-source.tar.bz2
+DL_FILE    = $(THISAPP)-source.tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 12
+PAK_VER    = 21
 
-DEPS       = "ghostscript"
+DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8d98b85edbdab7ab03739c9622f570e8
+$(DL_FILE)_MD5 = 412434ceefbdf3ec71bc9188a035f589
 
 install : $(TARGET)
 
@@ -76,22 +76,25 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
 			--sysconfdir=/var/ipfire \
 			--localstatedir=/var \
-			--enable-libusb \
-			--disable-dbus \
-			--disable-avahi
+			--enable-debug \
+			--enable-avahi \
+			--enable-dbus \
+			--enable-gnutls \
+			--enable-libusb
 
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
 	cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
 
-	install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/cups /etc/rc.d/init.d
+	# install initscript
+	$(call INSTALL_INITSCRIPT,cups)
 	cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
 
 	@rm -rf $(DIR_APP)