Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/lfs/cups b/lfs/cups
index 8d6c1fa08dbe773cd1d08447d09c912da2ff9cb0..e8d9cc0e7e08e8ef7e0160ca901f84585263fdb4 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.12
+VER        = 1.4.4
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.bz2
@@ -32,10 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 2
+PAK_VER    = 6
 
-DESCDE     = "CUPS ist ein Linux-Druck-System."
-DESCEN     = "The Common Unix Printing System."
 DEPS       = "ghostscript"
 
 ###############################################################################
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d410658468384b5ba5d04a808f6157fe
+$(DL_FILE)_MD5 = 8776403ad60fea9e85eab9c04d88560d
 
 install : $(TARGET)
 
@@ -79,10 +77,12 @@ $(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
+       cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire \
+                                       --enable-libusb=no
+       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)