Update CUPS to 2.2.2

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

diff --git a/lfs/cups b/lfs/cups
index 8750936f2068e5dcf1ff0dfd2f914860cda69996..5f900048b703cc0755d9ef03289284cd59bceef5 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,15 +24,17 @@
 
 include Config
 
-VER        = 1.2.2
+VER        = 2.2.2
 
-THISAPP    = cups-$(VER)-source
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = cups-$(VER)
+DL_FILE    = $(THISAPP)-source.tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = ipfire-beta1
+PAK_VER    = 15
+
+DEPS       = "cups-filters ghostscript"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 091de9109c9252cb37427859e90190ad
+$(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4
 
 install : $(TARGET)
 
@@ -55,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       @$(PAK)
+       $(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -76,13 +76,23 @@ $(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) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch
-       cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
-       cd $(DIR_APP) && make
-#      cd $(DIR_APP) && make check
+       @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
+
+       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)