Merge branch 'next' into initscripts-cleanup

diff --combined lfs/cups
index f94bb6d244c68fabc64596e4ba8766050dfbb5a1,5f900048b703cc0755d9ef03289284cd59bceef5..b6860672e278c0bd93b442c79e6634688c011db0
--- 1/lfs/cups
--- 2/lfs/cups
+++ b/lfs/cups
@@@ -24,17 -24,17 +24,17 @@@
  
  include Config
  
- VER        = 2.0.4
+ 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    = 13
+ PAK_VER    = 15
  
- DEPS       = "ghostscript"
+ DEPS       = "cups-filters ghostscript"
  
  ###############################################################################
  # Top-level Rules
@@@ -44,7 -44,7 +44,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = f5c847d9a4fac6c4c66fb0526a7afaae
+ $(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4
  
  install : $(TARGET)
  
@@@ -76,7 -76,7 +76,7 @@@ $(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 \
@@@ -91,8 -91,7 +91,8 @@@
  
        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)