From 3e8ce0dd86ca945249f51657eb39ef0f0465fb7b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Feb 2018 11:44:28 +0000
Subject: [PATCH] Drop pammysql

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/pammysql    |  2 -
 config/rootfiles/core/119/update.sh |  3 +-
 lfs/pammysql                        | 77 -----------------------------
 make.sh                             |  1 -
 4 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 config/rootfiles/common/pammysql
 delete mode 100644 lfs/pammysql

diff --git a/config/rootfiles/common/pammysql b/config/rootfiles/common/pammysql
deleted file mode 100644
index fbdfadd3a6..0000000000
--- a/config/rootfiles/common/pammysql
+++ /dev/null
@@ -1,2 +0,0 @@
-#lib/security/pam_mysql.la
-lib/security/pam_mysql.so
diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh
index 5a1805d4ca..9f29ce2ce2 100644
--- a/config/rootfiles/core/119/update.sh
+++ b/config/rootfiles/core/119/update.sh
@@ -44,7 +44,8 @@ rm -vf \
 	/usr/lib/libmisdn* \
 	/usr/sbin/misdn_* \
 	/etc/rc.d/init.d/mISDN \
-	/usr/lib/libwrap*
+	/usr/lib/libwrap* \
+	/lib/security/pam_mysql.so
 
 # Extract files
 extract_files
diff --git a/lfs/pammysql b/lfs/pammysql
deleted file mode 100644
index a9f15bbe78..0000000000
--- a/lfs/pammysql
+++ /dev/null
@@ -1,77 +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.7RC1
-
-THISAPP    = pam_mysql-0.7RC1
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 6177183d7e98dc12f2e444c9fbd4f13c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --with-pam=/usr --with-pam-mods-dir=/lib/security --with-mysql=/usr --with-openssl=/usr    # --with-cyrus-sasl2=/usr
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 2e7f7c00e6..6ac0c8a510 100755
--- a/make.sh
+++ b/make.sh
@@ -1282,7 +1282,6 @@ buildipfire() {
   lfsmake2 lz4
   lfsmake2 lzo
   lfsmake2 openvpn
-  lfsmake2 pammysql
   lfsmake2 mpage
   lfsmake2 dbus
   lfsmake2 intltool
-- 
2.39.5