X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcups;h=a9e2b1ac032aa20c333517543c90081ab75c76a0;hp=7f40a35b9e34490f8bfc9d7548490fa144f1dd46;hb=076ad71576609f66f9a99cf4c14c75dbcd1a8220;hpb=8f93036659944bbd3c9b770de01d910227aa4f60

diff --git a/lfs/cups b/lfs/cups
index 7f40a35b9e..a9e2b1ac03 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015  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        = 1.3.7
+VER        = 2.2.2
 
 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    = 2
+PAK_VER    = 16
 
-DEPS       = "ghostscript cyrus-sasl"
+DEPS       = "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 = db4a45a17104f10f3ee599d88267c9e5
+$(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4
 
 install : $(TARGET)
 
@@ -76,13 +76,26 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-#	cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
-	cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
-	cd $(DIR_APP) && make
+	@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-debug \
+			--enable-dbus \
+			--enable-gnutls \
+			--enable-libusb \
+			--disable-avahi
+
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	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)
 	@$(POSTBUILD)