X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcups;h=60f7e214e40964c5bdb49391924ed316d78e2c9a;hp=2f21aea21b35f60e6c835a4f23f98275b850fafe;hb=38ca33d110b4516f927e866a37db59e596f4b6a4;hpb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d

diff --git a/lfs/cups b/lfs/cups
index 2f21aea21..60f7e214e 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.12
+VER        = 1.7.0
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 2
+PAK_VER    = 10
 
 DEPS       = "ghostscript"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d410658468384b5ba5d04a808f6157fe
+$(DL_FILE)_MD5 = 5ab496a2ce27017fcdb3d7ec4818a75a
 
 install : $(TARGET)
 
@@ -77,10 +77,22 @@ $(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 \
+			--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)