X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsane;h=b3c2a12059863c19fc3a12a9bb2b4721e87dc7a8;hb=14fb55a555ec567a710baf91d15caa91ecc60dcd;hp=da35cfab902e511a59b2a76fc09b432002f7c122;hpb=64187e11a10fa711171abb2e7cad0b0a7ca0fab9;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/sane b/lfs/sane
index da35cfab90..b3c2a12059 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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        #
@@ -24,17 +24,18 @@
 
 include Config
 
-VER        = 1.0.19
+VER        = 1.0.24
 
 THISAPP    = sane-$(VER)
 DL_FILE    = sane-backends-$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+
 PROG       = sane
-PAK_VER    = 1
+PAK_VER    = 5
 
-DEPS       = "libtiff"
+DEPS       = "cups libtiff"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c0936272dcfd4e98c51512699f1c06f
+$(DL_FILE)_MD5 = 1ca68e536cd7c1852322822f5f6ac3a4
 
 install : $(TARGET)
 
@@ -77,13 +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 --disable-ipv6 \
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+				     --disable-ipv6 \
 				     --enable-parport-directio
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cp -vf $(DIR_SRC)/config/sane/saned.conf /usr/etc/sane.d/
+	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)