diff --git a/config/functions b/config/functions index 16c7feedf8..6c687ecc59 100644 --- a/config/functions +++ b/config/functions @@ -322,7 +322,6 @@ show_config() { config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON" config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER" config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER" - config_message="$config_message\n - SSH Guard support:\t\t\t $SSHGUARD_SUPPORT" config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT" config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT" config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT" diff --git a/packages/network/openssh/meta b/packages/network/openssh/meta index 711113ae98..9c51c715a6 100644 --- a/packages/network/openssh/meta +++ b/packages/network/openssh/meta @@ -35,7 +35,3 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -if [ "$SSHGUARD_SUPPORT" = yes ]; then - PKG_DEPENDS="$PKG_DEPENDS sshguard" -fi - diff --git a/packages/security/sshguard/build b/packages/security/sshguard/build deleted file mode 100755 index 1ebab49e9d..0000000000 --- a/packages/security/sshguard/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -ac_cv_func_malloc_0_nonnull=yes \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --with-firewall="iptables" \ - --with-iptables="/usr/sbin/iptables" \ - -make diff --git a/packages/security/sshguard/install b/packages/security/sshguard/install deleted file mode 100755 index 3907d81821..0000000000 --- a/packages/security/sshguard/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/src/sshguard $INSTALL/usr/sbin diff --git a/packages/security/sshguard/meta b/packages/security/sshguard/meta deleted file mode 100644 index 9f0fa731fe..0000000000 --- a/packages/security/sshguard/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="sshguard" -PKG_VERSION="1.5" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="BSD" -PKG_SITE="http://www.sshguard.net/" -PKG_URL="$SOURCEFORGE_SRC/project/sshguard/sshguard/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="iptables" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="security" -PKG_SHORTDESC="sshguard: monitors servers from their logging activity." -PKG_LONGDESC="Sshguard monitors servers from their logging activity. When logs convey that someone is doing a Bad Thing, sshguard reacts by blocking he/she/it for a bit. Sshguard has a touchy personality: when a naughty tyke insists disturbing your host, it reacts firmer and firmer." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/security/sshguard/patches/sshguard-1.5-automake-1.13.patch b/packages/security/sshguard/patches/sshguard-1.5-automake-1.13.patch deleted file mode 100644 index bcf8073342..0000000000 --- a/packages/security/sshguard/patches/sshguard-1.5-automake-1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur sshguard-1.5/configure.ac sshguard-1.5.patch/configure.ac ---- sshguard-1.5/configure.ac 2011-02-09 13:01:47.000000000 +0100 -+++ sshguard-1.5.patch/configure.ac 2013-01-12 01:13:22.735102536 +0100 -@@ -5,7 +5,7 @@ - AC_INIT(sshguard, 1.5, mij@sshguard.net) - AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([src/simclist.c]) --AM_CONFIG_HEADER([src/config.h]) -+AC_CONFIG_HEADERS([src/config.h]) - # test if we are on Solaris, which requires outstanding practices - AC_CANONICAL_BUILD - AS_CASE([$build_os], diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 88fdc8ef7b..0354a845ba 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="no" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/ATV/options b/projects/ATV/options index 4b928f86d0..e2a64d04cf 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 68774c960a..072d5a9c64 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 1ecc1bb60a..78898fe200 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 7af2c75347..fffa5a516f 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/ION/options b/projects/ION/options index 24f5cdbf24..5fd73b495c 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/Intel/options b/projects/Intel/options index bf4b486d1b..d7ace6ff90 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index c77db212d2..adf2ff9724 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="no" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index 669719f069..e4f9e6d949 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -219,9 +219,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index 2ac310246d..a6251569c9 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -214,9 +214,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install SSH Guard (yes / no) - SSHGUARD_SUPPORT="yes" - # build and install PPP support (yes / no) PPTP_SUPPORT="yes"