X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcups;h=aab56d17720b83ed8726bc612ae5e3e904ef544e;hp=6ec781919fcae34c85c53dc173d2bc8047f2ed4a;hb=3a65a332d28616f6f6833d90b1fc936137af30fd;hpb=a138dcd0dedb3ea7fc8d03b70d28ff06ffbfcf6f

diff --git a/lfs/cups b/lfs/cups
index 6ec781919..aab56d177 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.12
+VER        = 1.3.9
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.bz2
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 1
+PAK_VER    = 3
 
-DEPS       = "ghostscript"
+DEPS       = "ghostscript cyrus-sasl"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d410658468384b5ba5d04a808f6157fe
+$(DL_FILE)_MD5 = cf63f451c356e6cabb08972d4d11c365
 
 install : $(TARGET)
 
@@ -79,8 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@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
+	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
+	cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)