From d7dde64550dc2327df8b473104448fcb7d83c510 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 16 Dec 2017 12:38:01 +0000
Subject: [PATCH] Drop phpSANE

The upstream project is dead.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/phpSANE/phpSANE.conf           | 15 -----
 config/rootfiles/packages/phpSANE     | 22 -------
 lfs/phpSANE                           | 87 ---------------------------
 make.sh                               |  1 -
 src/patches/phpSANE-0.3.3-fixes.patch | 71 ----------------------
 5 files changed, 196 deletions(-)
 delete mode 100644 config/phpSANE/phpSANE.conf
 delete mode 100644 config/rootfiles/packages/phpSANE
 delete mode 100644 lfs/phpSANE
 delete mode 100644 src/patches/phpSANE-0.3.3-fixes.patch

diff --git a/config/phpSANE/phpSANE.conf b/config/phpSANE/phpSANE.conf
deleted file mode 100644
index 3956019ef8..0000000000
--- a/config/phpSANE/phpSANE.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-Listen 1003
-
-<VirtualHost *:1003>
-	
-	DocumentRoot /srv/web/phpSANE
-		
-	Include /etc/httpd/conf/conf.d/php*.conf
-	
-	<Directory /srv/web/phpSANE>
-		Options None
-		AllowOverride None
-		Require all granted
-	</Directory>
-	
-</VirtualHost>
diff --git a/config/rootfiles/packages/phpSANE b/config/rootfiles/packages/phpSANE
deleted file mode 100644
index 98a99f0c98..0000000000
--- a/config/rootfiles/packages/phpSANE
+++ /dev/null
@@ -1,22 +0,0 @@
-#srv/web/phpSANE
-#srv/web/phpSANE/bilder
-srv/web/phpSANE/bilder/black.gif
-srv/web/phpSANE/bilder/clear.gif
-srv/web/phpSANE/bilder/de.gif
-srv/web/phpSANE/bilder/en.gif
-srv/web/phpSANE/bilder/logo.jpg
-srv/web/phpSANE/bilder/scan.jpg
-srv/web/phpSANE/config.php
-#srv/web/phpSANE/css
-srv/web/phpSANE/css/save.css
-srv/web/phpSANE/css/style.css
-srv/web/phpSANE/index.php
-#srv/web/phpSANE/javascript
-srv/web/phpSANE/javascript/position.js
-srv/web/phpSANE/language.php
-srv/web/phpSANE/menu.php
-srv/web/phpSANE/phpsane.php
-srv/web/phpSANE/save.php
-srv/web/phpSANE/scan.php
-srv/web/phpSANE/tmp
-etc/httpd/conf/vhosts.d/phpSANE.conf
diff --git a/lfs/phpSANE b/lfs/phpSANE
deleted file mode 100644
index 6a605f1fa2..0000000000
--- a/lfs/phpSANE
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.3.3
-
-THISAPP    = phpSANE-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = phpSANE
-PAK_VER    = 2
-
-DEPS       = "sane netpbm"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 48fd77f85555ad41382bb1e0d1e373b9
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/phpSANE && patch -N -p1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes.patch
-	cd $(DIR_APP)/phpSANE && ln -s phpsane.php index.php
-	@rm -rf /srv/web/phpSANE
-	cd $(DIR_APP) && mv -vf phpSANE /srv/web/
-	cp -vf $(DIR_SRC)/config/phpSANE/phpSANE.conf /etc/httpd/conf/vhosts.d/
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 234f09496c..10a31fd9f7 100755
--- a/make.sh
+++ b/make.sh
@@ -1365,7 +1365,6 @@ buildipfire() {
   lfsmake2 qemu
   lfsmake2 sane
   lfsmake2 netpbm
-  lfsmake2 phpSANE
   lfsmake2 tunctl
   lfsmake2 netsnmpd
   lfsmake2 nagios_nrpe
diff --git a/src/patches/phpSANE-0.3.3-fixes.patch b/src/patches/phpSANE-0.3.3-fixes.patch
deleted file mode 100644
index d5b73570a1..0000000000
--- a/src/patches/phpSANE-0.3.3-fixes.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur phpSANE_org/config.php phpSANE/config.php
---- phpSANE_org/config.php	2005-02-21 07:05:00.000000000 +0100
-+++ phpSANE/config.php	2008-03-04 14:44:30.000000000 +0100
-@@ -1,7 +1,7 @@
- <?PHP
- // CONFIG ------------------------------------------------------------------------------------
- $SCANIMAGE="/usr/bin/scanimage";   //  auch mit
--$PNMTOJPEG="/usr/bin/pnmtojpeg";   //  eigenen
-+$PNMTOJPEG="/usr/local/netpbm/bin/pnmtojpeg";   //  eigenen
- $OCR="/usr/bin/gocr";              //  Parametern
- 
- //$SAVE_PLACE="/srv/www/htdocs/web/phpSANE/";
-@@ -63,7 +63,7 @@
- if($_GET['mode']) if($clear == 1) $mode="Color"; else $mode=$_GET['mode']; else $mode="Color";
- if($_GET['resolution']) if($clear == 1) $resolution=100; else $resolution=$_GET['resolution']; else $resolution=100;
- if($clear == 1) $negative="no"; else $negative=$_GET['negative'];
--if($clear == 1) $quality_cal= "yes"; else $quality_cal=$_GET['quality_cal'];
-+if($clear == 1) $quality_cal= "no"; else $quality_cal=$_GET['quality_cal'];
- if($clear == 1) $first="";
- //if($_GET['depth']) $depth=$_GET['depth']; else $depth="8";   // wers braucht
- //$brightness=$_GET['brightness'];    // die werden von meinem scanner leider nicht unterstützt
-diff -Naur phpSANE_org/menu.php phpSANE/menu.php
---- phpSANE_org/menu.php	2005-02-21 06:39:01.000000000 +0100
-+++ phpSANE/menu.php	2008-03-04 15:03:12.000000000 +0100
-@@ -74,7 +74,7 @@
- echo "<option value=\"Gray\" $selected_2>".$lang[$lang_id][16]."\n";
- echo "<option value=\"Lineart\" $selected_3>".$lang[$lang_id][17]."\n";
- echo "</SELECT></td>\n";
--if(!$_GET['first']) { $first=1; $checked1="checked"; }
-+//if(!$_GET['first']) { $first=1; $checked1="checked"; }
- if($quality_cal=="yes") { $checked1="checked"; $first=1; } else { $checked=""; $first=1; }
- echo "<input type=hidden name=\"first\" value=\"$first\">\n";
- echo "<td align=\"right\" class=\"text_padd\">".$lang[$lang_id][21]."&nbsp;<INPUT type=\"checkbox\" name=\"quality_cal\" value=\"yes\" ".$checked1."></td>\n";
-diff -Naur phpSANE_org/scan.php phpSANE/scan.php
---- phpSANE_org/scan.php	2005-02-21 07:06:19.000000000 +0100
-+++ phpSANE/scan.php	2008-03-04 15:57:37.000000000 +0100
-@@ -75,25 +75,25 @@
- 
- if($action == $lang[$lang_id][27]) {
- if($format == "jpg") {
--$cmd_scan=$cmd_scan." | pnmtojpeg --quality=100 > ".$file_scan;
--$scan_yes=`$cmd_scan`;
--echo "<script language=\"JavaScript\" type=\"text/javascript\">\n";
--echo "window.open(\"save.php?file=".$file_scan."&lang_id=".$lang_id."\",\"_blank\", \"width=400,height=100,left=320,top=200,scrollbars=no,location=no,status=no,menubar=no\");\n";
--echo "</script>\n";
--} else {
-+$cmd_scan=$cmd_scan." | $PNMTOJPEG --quality=100 > ".$file_scan;
-+} 
-+if($format == "tif") {
-+$cmd_scan=$cmd_scan." --format=tiff > ".$file_scan;
-+}
-+if($format == "pnm") {
- $cmd_scan=$cmd_scan." > ".$file_scan;
-+} 
- $scan_yes=`$cmd_scan`;
- echo "<script language=\"JavaScript\" type=\"text/javascript\">\n";
--echo "window.open(\"save.php?file=".$file_scan."%26lang_id=".$lang_id."\",\"_blank\", \"width=400,height=100,left=320,top=200,scrollbars=no,location=no,status=no,menubar=no\");\n";
-+echo "window.open(\"save.php?file=".$file_scan."&lang_id=".$lang_id."\",\"_blank\", \"width=400,height=200,left=320,top=200,scrollbars=no,location=no,status=no,menubar=no\");\n";
- echo "</script>\n";
- }
--}
- 
- if($action == $lang[$lang_id][26]) {
- $cmd_scan=$cmd_scan." | ".$OCR." - > ".$file.".txt";
- $scan_yes=`$cmd_scan`;
- echo "<script language=\"JavaScript\" type=\"text/javascript\">\n";
--echo "window.open(\"save.php?file=".$file.".txt%26lang_id=".$lang_id."\",\"_blank\", \"width=400,height=100,left=320,top=200,scrollbars=no,location=no,status=no,menubar=no\");\n";
-+echo "window.open(\"save.php?file=".$file.".txt&lang_id=".$lang_id."\",\"_blank\", \"width=400,height=100,left=320,top=200,scrollbars=no,location=no,status=no,menubar=no\");\n";
- echo "</script>\n";
- }
- }
-- 
2.39.2