Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr

packages/3rdparty/download/CouchPotato/meta

@@ -20,12 +20,12 @@
 ################################################################################
 
 PKG_NAME="CouchPotato"
-PKG_VERSION="2504efc"
+PKG_VERSION="6cd66ae"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/RuudBurger/CouchPotato"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="Python SABnzbd"
 PKG_BUILD_DEPENDS="toolchain Python"
 PKG_PRIORITY="optional"

packages/3rdparty/download/SABnzbd/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="SABnzbd"
-PKG_VERSION="0.6.4"
+PKG_VERSION="0.6.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/SickBeard/meta

@@ -20,12 +20,12 @@
 ################################################################################
 
 PKG_NAME="SickBeard"
-PKG_VERSION="cb76543"
+PKG_VERSION="e0e8f0e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/midgetspy/Sick-Beard"
-PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS="Python SABnzbd Cheetah"
 PKG_BUILD_DEPENDS="toolchain Python Cheetah"
 PKG_PRIORITY="optional"

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,2 +1,7 @@
+0.99.2
+- update to SABnzbd-0.6.7
+- update to SickBeard-e0e8f0e
+- update to CouchPotato-6cd66ae 
+
 0.99.1
 - initial version SABnzbd-Suite

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="SABnzbd-Suite"
 PKG_VERSION="0.99"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/downloadmanager/transmission/addon

@@ -29,3 +29,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web
   cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
   find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
   rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/libevent-[0-9]*/.libs/libevent*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/service/downloadmanager/transmission/changelog.txt

@@ -1,3 +1,7 @@
+0.99.8
+- update to transmission-2.33
+- add libevent to addon
+
 0.99.7
 - change icon
 

packages/addons/service/downloadmanager/transmission/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="transmission"
-PKG_VERSION="2.31"
+PKG_VERSION="2.33"
-PKG_REV="7"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"

packages/addons/service/downloadmanager/transmission/source/bin/transmission.service

@@ -24,6 +24,7 @@ ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission"
 LOG_FILE="$ADDON_HOME/service.log"
 
+
 export TRANSMISSION_WEB_HOME="$ADDON_DIR/web"
 
 mkdir -p $ADDON_HOME
@@ -63,5 +64,7 @@ else
 fi
 
 if [ ! $(pidof transmission-daemon) ];then
-  transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
+  chmod +x $ADDON_DIR/lib/*
+
+  LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
 fi

packages/addons/service/multimedia/hts-tvheadend/changelog.txt

@@ -1,3 +1,6 @@
+0.99.6
+- update to hts-tvheadend-9d775da
+
 0.99.5
 - update to hts-tvheadend-ca68ed4
 

packages/addons/service/multimedia/hts-tvheadend/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="hts-tvheadend"
-PKG_VERSION="ca68ed4"
+PKG_VERSION="9d775da"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 # PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS="libiconv avahi openssl"
 PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl"
 PKG_PRIORITY="optional"

packages/audio/libogg/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libogg"
-PKG_VERSION="1.2.2"
+PKG_VERSION="1.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/devel/file/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="file"
-PKG_VERSION="5.07"
+PKG_VERSION="5.08"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/devel/file/patches/file-5.07-dos.patch

@@ -1,32 +0,0 @@
-From 19f5096d0b4c1a49af6cc4e0d086d6128c493bd8 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Wed, 18 May 2011 18:11:23 +0000
-Subject: [PATCH] Fixed 0 file problem.
-
----
- magic/Magdir/msdos |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
-index 731d50b..f8852cb 100644
---- a/magic/Magdir/msdos
-+++ b/magic/Magdir/msdos
-@@ -389,10 +389,11 @@
- >>4	uleshort&0x4842			>0			\bsupport
- >0	ubyte				x			\b)
- # DOS driver cmd640x.sys has 0x12 instead of 0xffffffff for pointer field to next device header 
--0	ulequad&0x000007a0ffffffed	0x0000000000000000	DOS-executable (
-->4	uleshort&0x8000			0x8000			\bcharacter device driver
-->>10	string				x			%-.8s
-->4	uleshort&0x4000			0x4000			\b,control strings-support)
-+# Too weak, matches files that only contain 0's
-+#0	ulequad&0x000007a0ffffffed	0x0000000000000000	DOS-executable (
-+#>4	uleshort&0x8000			0x8000			\bcharacter device driver
-+#>>10	string				x			%-.8s
-+#>4	uleshort&0x4000			0x4000			\b,control strings-support)
- 
- # test too generic ?
- 0	byte		0x8c		DOS executable (COM)
--- 
-1.7.4.1
-

packages/devel/file/patches/file-5.07-rpm-archs.patch

@@ -1,57 +0,0 @@
-diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm
-index c40e1b5..d252ced 100644
---- a/magic/Magdir/rpm
-+++ b/magic/Magdir/rpm
-@@ -21,12 +21,29 @@
- >>>8	beshort		8		RS6000
- >>>8	beshort		9		IA64
- >>>8	beshort		10		Sparc64
-+>>>8	beshort		11		MIPSel
-+>>>8	beshort		12		ARM
-+>>>8	beshort		13		MiNT
-+>>>8	beshort		14		S/390
-+>>>8	beshort		15		S/390x
-+>>>8	beshort		16		PowerPC64
-+>>>8	beshort		17		SuperH
-+>>>8	beshort		18		Xtensa
- 
- #delta RPM    Daniel Novotny (dnovotny@redhat.com)
- 0	string	drpm	Delta RPM
- !:mime  application/x-rpm
- >12	string 	x	%s
--
-+>>>8	beshort		1		i386/x86_64
-+>>>8	beshort		2		Alpha/Sparc64
-+>>>8	beshort		3		Sparc
-+>>>8	beshort		4		MIPS
-+>>>8	beshort		5		PowerPC
-+>>>8	beshort		6		68000
-+>>>8	beshort		7		SGI
-+>>>8	beshort		8		RS6000
-+>>>8	beshort		9		IA64
-+>>>8	beshort		10		Sparc64
- >>>8	beshort		11		MIPSel
- >>>8	beshort		12		ARM
- >>>8	beshort		13		MiNT
-@@ -42,3 +59,21 @@
- 0	string		drpm		Delta RPM
- !:mime application/x-rpm
- >12	string		x		%s
-+>>>8	beshort		1		i386/x86_64
-+>>>8	beshort		2		Alpha/Sparc64
-+>>>8	beshort		3		Sparc
-+>>>8	beshort		4		MIPS
-+>>>8	beshort		5		PowerPC
-+>>>8	beshort		6		68000
-+>>>8	beshort		7		SGI
-+>>>8	beshort		8		RS6000
-+>>>8	beshort		9		IA64
-+>>>8	beshort		10		Sparc64
-+>>>8	beshort		11		MIPSel
-+>>>8	beshort		12		ARM
-+>>>8	beshort		13		MiNT
-+>>>8	beshort		14		S/390
-+>>>8	beshort		15		S/390x
-+>>>8	beshort		16		PowerPC64
-+>>>8	beshort		17		SuperH
-+>>>8	beshort		18		Xtensa

packages/devel/file/patches/file-5.07-zip64.patch

@@ -1,12 +0,0 @@
-diff --git a/magic/Magdir/archive b/magic/Magdir/archive
-index c998e5b..4da532a 100644
---- a/magic/Magdir/archive
-+++ b/magic/Magdir/archive
-@@ -688,6 +688,7 @@
- >>4	byte		0x0b		\b, at least v1.1 to extract
- >>0x161	string		WINZIP		\b, WinZIP self-extracting
- >>4	byte		0x14		\b, at least v2.0 to extract
-+>>4     byte            0x2d            Zip64, at least v3.0 to extract
- 
- # Zoo archiver
- 20	lelong		0xfdc4a7dc	Zoo archive data

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="3.0"
+PKG_VERSION="3.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/modprobe.d/ath9k.conf

@@ -1,4 +1,4 @@
-# /etc/modprobe.d/ath9k: setup modload options for module ath9k.
+# /etc/modprobe.d/ath9k.conf: setup modload options for module ath9k.
 # see:
 # http://openelec.tv/forum/28-issue-reports/4644-addons-download-not-working#4778
 

packages/linux/modprobe.d/ati_remote.conf

@@ -0,0 +1,5 @@
+# /etc/modprobe.d/ati_remote.conf: setup modload options for module ati_remote.
+# see:
+# http://openelec.tv/forum/28-issue-reports/8101-wipx10-remote
+
+options ati_remote keychange=1

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="a8d22f6"
+PKG_VERSION="ab67480"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="a8d22f6"
+PKG_VERSION="ab67480"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-334-libexif_byteorder-0.1.patch

@@ -1,56 +0,0 @@
-From 00e3095dd47d6474fa6befcbd85157e27f6f68fa Mon Sep 17 00:00:00 2001
-From: vdrfan <vdrfan-nospam-@xbmc.org>
-Date: Mon, 1 Aug 2011 16:53:16 +0200
-Subject: [PATCH] fixed: make sure libexif is using the correct byte order
- (intel or motorola) when processing gps information (fixes
- #8427)
-
----
- lib/libexif/ExifParse.cpp |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/xbmc/lib/libexif/ExifParse.cpp b/xbmc/lib/libexif/ExifParse.cpp
-index 41690df..74ecbbe 100644
---- a/xbmc/lib/libexif/ExifParse.cpp
-+++ b/xbmc/lib/libexif/ExifParse.cpp
-@@ -810,15 +810,15 @@ void CExifParse::ProcessGpsInfo(
-                     const unsigned char* const OffsetBase,
-                     unsigned ExifLength)
- {
--  int NumDirEntries = Get16(DirStart);
-+  int NumDirEntries = Get16(DirStart, m_MotorolaOrder);
- 
-   for (int de=0;de<NumDirEntries;de++)
-   {
-     const unsigned char* DirEntry = DIR_ENTRY_ADDR(DirStart, de);
- 
--    unsigned Tag        = Get16(DirEntry);
--    unsigned Format     = Get16(DirEntry+2);
--    unsigned Components = (unsigned)Get32(DirEntry+4);
-+    unsigned Tag        = Get16(DirEntry, m_MotorolaOrder);
-+    unsigned Format     = Get16(DirEntry+2, m_MotorolaOrder);
-+    unsigned Components = (unsigned)Get32(DirEntry+4, m_MotorolaOrder);
-     if ((Format-1) >= NUM_FORMATS)
-     {
-       // (-1) catches illegal zero case as unsigned underflows to positive large.
-@@ -834,7 +834,7 @@ void CExifParse::ProcessGpsInfo(
- 
-     if (ByteCount > 4)
-     {
--      unsigned OffsetVal = (unsigned)Get32(DirEntry+8);
-+      unsigned OffsetVal = (unsigned)Get32(DirEntry+8, m_MotorolaOrder);
-       // If its bigger than 4 bytes, the dir entry contains an offset.
-       if (OffsetVal+ByteCount > ExifLength)
-       {
-@@ -878,7 +878,7 @@ void CExifParse::ProcessGpsInfo(
-       case TAG_GPS_ALT:
-         {
-           char temp[18];
--          sprintf(temp,"%dm", Get32(ValuePtr));
-+          sprintf(temp,"%dm", Get32(ValuePtr, m_MotorolaOrder));
-           strcat(m_ExifInfo->GpsAlt, temp);
-         }
-       break;
--- 
-1.7.5.4
-

packages/network/iptables/install

@@ -23,4 +23,24 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/*.so*[.0-9] $INSTALL/usr/lib/
+  cp -P $PKG_BUILD/.libs/libxtables.so* $INSTALL/usr/lib/
+  cp -P $PKG_BUILD/libiptc/.libs/libip4tc.so* $INSTALL/usr/lib/
+  cp -P $PKG_BUILD/libiptc/.libs/libip6tc.so* $INSTALL/usr/lib/
+  cp -P $PKG_BUILD/libiptc/.libs/libiptc.so* $INSTALL/usr/lib/
+  rm -rf $INSTALL/usr/lib/libiptc.so*T
+
+mkdir -p $INSTALL/usr/sbin
+  cp -P $PKG_BUILD/.libs/ip6tables-multi $INSTALL/usr/sbin
+  cp -P $PKG_BUILD/.libs/iptables-multi $INSTALL/usr/sbin
+  ln -sf /usr/sbin/ip6tables-multi $INSTALL/usr/sbin/ip6tables
+  ln -sf /usr/sbin/ip6tables-multi $INSTALL/usr/sbin/ip6tables-restore
+  ln -sf /usr/sbin/ip6tables-multi $INSTALL/usr/sbin/ip6tables-save
+  ln -sf /usr/sbin/iptables-multi $INSTALL/usr/sbin/iptables
+  ln -sf /usr/sbin/iptables-multi $INSTALL/usr/sbin/iptables-restore
+  ln -sf /usr/sbin/iptables-multi $INSTALL/usr/sbin/iptables-save
+
+mkdir -p $INSTALL/usr/bin
+  ln -sf /usr/sbin/iptables-multi $INSTALL/usr/bin/iptables-xml
+
+mkdir -p $INSTALL/usr/libexec/xtables
+  cp -P $PKG_BUILD/extensions/*.so $INSTALL/usr/libexec/xtables

packages/network/openssh/meta

@@ -34,3 +34,8 @@ PKG_LONGDESC="This is a Linux port of OpenBSD's excellent OpenSSH. OpenSSH is ba
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
+
+if [ "$SSHGUARD_SUPPORT" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS sshguard"
+fi
+

packages/security/sshguard/build

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, 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

packages/security/sshguard/install

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, 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

packages/security/sshguard/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, 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"

packages/toolchain/devel/binutils/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="binutils"
-PKG_VERSION="2.21.52.0.2"
+PKG_VERSION="2.21.53.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/x11/driver/xf86-video-intel/build

@@ -24,9 +24,6 @@
 
 xorg_drv_configure_prepend
 
-PKG_CONFIG="$PKG_CONFIG --define-variable=sdkdir=$SYSROOT_PREFIX/usr/include/xorg"
-CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/xorg/"
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -37,6 +34,7 @@ cd $PKG_BUILD
             --enable-dri \
             --enable-kms-only \
             --disable-xvmc \
+            --enable-sna \
             --with-xorg-module-dir=$XORG_PATH_MODULES
 
 make

packages/x11/driver/xf86-video-intel/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-intel"
-PKG_VERSION="2.15.0"
+PKG_VERSION="2.15.901"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"

projects/ATV/linux/linux.i386.conf

@@ -592,7 +592,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/ATV/options

@@ -161,6 +161,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/Fusion/linux/linux.i386.conf

@@ -598,7 +598,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/Fusion/options

@@ -161,6 +161,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/Generic/linux/linux.i386.conf

@@ -606,7 +606,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/Generic/options

@@ -161,6 +161,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/ION/linux/linux.i386.conf

@@ -592,7 +592,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/ION/linux/linux.x86_64.conf

@@ -541,7 +541,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/ION/options

@@ -161,6 +161,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/Intel/linux/linux.i386.conf

@@ -594,7 +594,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/Intel/linux/linux.x86_64.conf

@@ -544,7 +544,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/Intel/options

@@ -161,6 +161,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

projects/Ultra/linux/linux.x86_64.conf

@@ -537,7 +537,56 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set

projects/Ultra/options

@@ -158,6 +158,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

tools/mkpkg/mkpkg_couchpotato

@@ -37,7 +37,7 @@ echo "cleaning sources..."
   rm -rf CouchPotato-$GIT_REV/.git
 
 echo "packing sources..."
-  tar cvjf CouchPotato-$GIT_REV.tar.bz2 CouchPotato-$GIT_REV
+  tar cvJf CouchPotato-$GIT_REV.tar.xz CouchPotato-$GIT_REV
 
 echo "remove temporary sourcedir..."
   rm -rf CouchPotato-$GIT_REV

tools/mkpkg/mkpkg_sickbeard

@@ -37,7 +37,7 @@ echo "cleaning sources..."
   rm -rf SickBeard-$GIT_REV/.git
 
 echo "packing sources..."
-  tar cvjf SickBeard-$GIT_REV.tar.bz2 SickBeard-$GIT_REV
+  tar cvJf SickBeard-$GIT_REV.tar.xz SickBeard-$GIT_REV
 
 echo "remove temporary sourcedir..."
   rm -rf SickBeard-$GIT_REV

tools/mkpkg/mkpkg_tvheadend

@@ -37,7 +37,7 @@ echo "cleaning sources..."
   rm -rf hts-tvheadend-$GIT_REV/.git
 
 echo "packing sources..."
-  tar cvjf hts-tvheadend-$GIT_REV.tar.bz2 hts-tvheadend-$GIT_REV
+  tar cvJf hts-tvheadend-$GIT_REV.tar.xz hts-tvheadend-$GIT_REV
 
 echo "remove temporary sourcedir..."
   rm -rf hts-tvheadend-$GIT_REV