X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcups;h=dfa41188c32e4fc753efa8786609a03252997c82;hp=1dcc55b53f7820742854a7caa025308d646e1f1e;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=5fcb6d5a39c4aa7fe75fae2ba6bfcc617ee384ef

diff --git a/lfs/cups b/lfs/cups
index 1dcc55b53f..dfa41188c3 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,28 +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-2018  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>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,13 +24,17 @@
 
 include Config
 
-VER        = 1.1.23
+VER        = 2.2.2
 
-THISAPP    = cups-$(VER)-source
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.easysw.com/pub/cups/$(VER)
+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    = 18
+
+DEPS       = "avahi bluetooth cups-filters dbus ghostscript krb5 libtiff"
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4ce09b1dce09b6b9398af0daae9adf63
+$(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4
 
 install : $(TARGET)
 
@@ -59,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh cups $(THISAPP)-ipfire-beta-1
+	$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -80,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) && 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-debug \
+			--enable-avahi \
+			--enable-dbus \
+			--enable-gnutls \
+			--enable-libusb
+
+	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 initscript
+	$(call INSTALL_INITSCRIPT,cups)
+	cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)