X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsane;h=b3c2a12059863c19fc3a12a9bb2b4721e87dc7a8;hp=3b0c334ed6586e197ab20d8349613959909d2fb0;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=116eb0874ab3b03dae13b24f18b2deb90419b359

diff --git a/lfs/sane b/lfs/sane
index 3b0c334ed6..b3c2a12059 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -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-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>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,14 +24,19 @@
 
 include Config
 
-VER        = 1.0.17
+VER        = 1.0.24
 
-THISAPP    = sane-backends-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = sane-$(VER)
+DL_FILE    = sane-backends-$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+PROG       = sane
+PAK_VER    = 5
+
+DEPS       = "cups libtiff"
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b51c10da8a81a04e1bae88c9e6556df2
+$(DL_FILE)_MD5 = 1ca68e536cd7c1852322822f5f6ac3a4
 
 install : $(TARGET)
 
@@ -53,7 +56,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh sane $(THISAPP)-ipfire-beta-1
+	$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -75,8 +78,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/sane --disable-translations && \
-				make
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+				     --disable-ipv6 \
+				     --enable-parport-directio
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	chmod 4755 /usr/bin/scanimage
+	cp -vf $(DIR_SRC)/config/sane/saned.conf /etc/sane.d/
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,sane)
+
+	ln -sf ../init.d/sane /etc/rc.d/rc3.d/S95sane
+	ln -sf ../init.d/sane /etc/rc.d/rc0.d/K10sane
+	ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/sane  \
+			/var/ipfire/backup/addons/includes/sane
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)