diff --git a/packages/3rdparty/download/CouchPotato/meta b/packages/3rdparty/download/CouchPotato/meta index 722ac51d39..bebddf403e 100644 --- a/packages/3rdparty/download/CouchPotato/meta +++ b/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" diff --git a/packages/3rdparty/download/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta index a755d459a1..e08671e3b9 100644 --- a/packages/3rdparty/download/SABnzbd/meta +++ b/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" diff --git a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.7-001_remove_default_settings-0.3.patch similarity index 100% rename from packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch rename to packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.7-001_remove_default_settings-0.3.patch diff --git a/packages/3rdparty/download/SickBeard/meta b/packages/3rdparty/download/SickBeard/meta index e12b28c787..f150605502 100644 --- a/packages/3rdparty/download/SickBeard/meta +++ b/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" diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-001-remove_logo_update-header_and_donate_button-0.1.patch similarity index 100% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-001-remove_logo_update-header_and_donate_button-0.1.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-001-remove_logo_update-header_and_donate_button-0.1.patch diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-002-remove_default_settings-0.3.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-002-remove_default_settings-0.3.patch similarity index 100% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-002-remove_default_settings-0.3.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-e0e8f0e-002-remove_default_settings-0.3.patch diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt index bdbaa447b1..29c2731754 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt +++ b/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 diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta index e140363331..fece62edaa 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta +++ b/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" diff --git a/packages/addons/service/downloadmanager/transmission/addon b/packages/addons/service/downloadmanager/transmission/addon index 909fab06e8..fe5af47fb9 100755 --- a/packages/addons/service/downloadmanager/transmission/addon +++ b/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 diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt index 386c74a05d..4de1cdf8b0 100644 --- a/packages/addons/service/downloadmanager/transmission/changelog.txt +++ b/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 diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta index 0bcd3d5d17..af2627b927 100644 --- a/packages/addons/service/downloadmanager/transmission/meta +++ b/packages/addons/service/downloadmanager/transmission/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="transmission" -PKG_VERSION="2.31" -PKG_REV="7" +PKG_VERSION="2.33" +PKG_REV="8" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.transmissionbt.com/" diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service index 3b7a8d5038..d596a80c98 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service +++ b/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 diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt index 9533695ab5..44d2d5045a 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt +++ b/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 diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta index 30e4146356..1bd25a2461 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/meta +++ b/packages/addons/service/multimedia/hts-tvheadend/meta @@ -19,13 +19,13 @@ ################################################################################ PKG_NAME="hts-tvheadend" -PKG_VERSION="ca68ed4" -PKG_REV="5" +PKG_VERSION="9d775da" +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" diff --git a/packages/audio/libogg/meta b/packages/audio/libogg/meta index 4051144976..dc3963acb2 100644 --- a/packages/audio/libogg/meta +++ b/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" diff --git a/packages/devel/file/meta b/packages/devel/file/meta index 5f4974fc87..c4f4896f78 100644 --- a/packages/devel/file/meta +++ b/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" diff --git a/packages/devel/file/patches/file-5.07-dos.patch b/packages/devel/file/patches/file-5.07-dos.patch deleted file mode 100644 index 9e173555b0..0000000000 --- a/packages/devel/file/patches/file-5.07-dos.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 19f5096d0b4c1a49af6cc4e0d086d6128c493bd8 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -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 - diff --git a/packages/devel/file/patches/file-5.07-rpm-archs.patch b/packages/devel/file/patches/file-5.07-rpm-archs.patch deleted file mode 100644 index 23d2fb49b6..0000000000 --- a/packages/devel/file/patches/file-5.07-rpm-archs.patch +++ /dev/null @@ -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 diff --git a/packages/devel/file/patches/file-5.07-zip64.patch b/packages/devel/file/patches/file-5.07-zip64.patch deleted file mode 100644 index e4115ee1ff..0000000000 --- a/packages/devel/file/patches/file-5.07-zip64.patch +++ /dev/null @@ -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 diff --git a/packages/devel/file/patches/file-5.07-zip.patch b/packages/devel/file/patches/file-5.08-zip.patch similarity index 100% rename from packages/devel/file/patches/file-5.07-zip.patch rename to packages/devel/file/patches/file-5.08-zip.patch diff --git a/packages/linux/meta b/packages/linux/meta index 56f3faf066..6c7409efb4 100644 --- a/packages/linux/meta +++ b/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" diff --git a/packages/linux/modprobe.d/ath9k.conf b/packages/linux/modprobe.d/ath9k.conf index 48dd6f62c9..e10b4ce285 100644 --- a/packages/linux/modprobe.d/ath9k.conf +++ b/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 diff --git a/packages/linux/modprobe.d/ati_remote.conf b/packages/linux/modprobe.d/ati_remote.conf new file mode 100644 index 0000000000..24f7a51bb1 --- /dev/null +++ b/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 diff --git a/packages/linux/patches/linux-3.0-000_crosscompile.patch b/packages/linux/patches/linux-3.0.1-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.0-000_crosscompile.patch rename to packages/linux/patches/linux-3.0.1-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.0-003-no_dev_console.patch b/packages/linux/patches/linux-3.0.1-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.0-003-no_dev_console.patch rename to packages/linux/patches/linux-3.0.1-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.0-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.0.1-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.0-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.0.1-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.0-006_enable_utf8.patch b/packages/linux/patches/linux-3.0.1-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.0-006_enable_utf8.patch rename to packages/linux/patches/linux-3.0.1-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.0-007_die_floppy_die.patch b/packages/linux/patches/linux-3.0.1-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.0-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.0.1-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.0-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-3.0.1-008-hda_intel_prealloc_4mb_dmabuffer.patch similarity index 100% rename from packages/linux/patches/linux-3.0-008-hda_intel_prealloc_4mb_dmabuffer.patch rename to packages/linux/patches/linux-3.0.1-008-hda_intel_prealloc_4mb_dmabuffer.patch diff --git a/packages/linux/patches/linux-3.0-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.0.1-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.0-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.0.1-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.0-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-3.0.1-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-3.0-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-3.0.1-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-3.0-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.0.1-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.0.1-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.0-053-ati_remote-0.1.patch b/packages/linux/patches/linux-3.0.1-053-ati_remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-053-ati_remote-0.1.patch rename to packages/linux/patches/linux-3.0.1-053-ati_remote-0.1.patch diff --git a/packages/linux/patches/linux-3.0-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-3.0.1-053_ati-remote_all_keys_and_keychange-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-053_ati-remote_all_keys_and_keychange-0.1.patch rename to packages/linux/patches/linux-3.0.1-053_ati-remote_all_keys_and_keychange-0.1.patch diff --git a/packages/linux/patches/linux-3.0-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.0.1-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch similarity index 100% rename from packages/linux/patches/linux-3.0-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch rename to packages/linux/patches/linux-3.0.1-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.0-055-add_wiimote_hid_driver-0.1.patch b/packages/linux/patches/linux-3.0.1-055-add_wiimote_hid_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-055-add_wiimote_hid_driver-0.1.patch rename to packages/linux/patches/linux-3.0.1-055-add_wiimote_hid_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.0-058-add_rtl2832u_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.0.1-058-add_rtl2832u_dvb-usb_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-058-add_rtl2832u_dvb-usb_driver-0.1.patch rename to packages/linux/patches/linux-3.0.1-058-add_rtl2832u_dvb-usb_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.0-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch b/packages/linux/patches/linux-3.0.1-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch rename to packages/linux/patches/linux-3.0.1-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch diff --git a/packages/linux/patches/linux-3.0-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.0.1-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.0.1-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.0-072-silence_acpi-0.1.patch b/packages/linux/patches/linux-3.0.1-072-silence_acpi-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-072-silence_acpi-0.1.patch rename to packages/linux/patches/linux-3.0.1-072-silence_acpi-0.1.patch diff --git a/packages/linux/patches/linux-3.0-110-nouveau_drm_update-20110726.patch b/packages/linux/patches/linux-3.0.1-110-nouveau_drm_update-20110726.patch similarity index 100% rename from packages/linux/patches/linux-3.0-110-nouveau_drm_update-20110726.patch rename to packages/linux/patches/linux-3.0.1-110-nouveau_drm_update-20110726.patch diff --git a/packages/linux/patches/linux-3.0-322-omap4_pandaboard_fix_dvi_support-0.1.patch b/packages/linux/patches/linux-3.0.1-322-omap4_pandaboard_fix_dvi_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-322-omap4_pandaboard_fix_dvi_support-0.1.patch rename to packages/linux/patches/linux-3.0.1-322-omap4_pandaboard_fix_dvi_support-0.1.patch diff --git a/packages/linux/patches/linux-3.0-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-3.0.1-716_mm-zero_swappiness.patch similarity index 100% rename from packages/linux/patches/linux-3.0-716_mm-zero_swappiness.patch rename to packages/linux/patches/linux-3.0.1-716_mm-zero_swappiness.patch diff --git a/packages/network/iptables/install b/packages/network/iptables/install index 4721b5dff5..7536ea6d2b 100755 --- a/packages/network/iptables/install +++ b/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 diff --git a/packages/network/openssh/meta b/packages/network/openssh/meta index c869342df1..e9abd1b200 100644 --- a/packages/network/openssh/meta +++ b/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 + diff --git a/packages/security/sshguard/build b/packages/security/sshguard/build new file mode 100755 index 0000000000..ffcc37562c --- /dev/null +++ b/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 diff --git a/packages/security/sshguard/install b/packages/security/sshguard/install new file mode 100755 index 0000000000..a3f545d922 --- /dev/null +++ b/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 diff --git a/packages/security/sshguard/meta b/packages/security/sshguard/meta new file mode 100644 index 0000000000..9ef7d674dc --- /dev/null +++ b/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" diff --git a/packages/toolchain/devel/binutils/meta b/packages/toolchain/devel/binutils/meta index 100059d37f..d116613a7a 100644 --- a/packages/toolchain/devel/binutils/meta +++ b/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" diff --git a/packages/toolchain/devel/binutils/patches/binutils-2.21.52.0.2-multi_os_directory.patch b/packages/toolchain/devel/binutils/patches/binutils-2.21.53.0.1-multi_os_directory.patch similarity index 100% rename from packages/toolchain/devel/binutils/patches/binutils-2.21.52.0.2-multi_os_directory.patch rename to packages/toolchain/devel/binutils/patches/binutils-2.21.53.0.1-multi_os_directory.patch diff --git a/packages/toolchain/devel/binutils/patches/binutils-2.21.52.0.2-visibility.patch b/packages/toolchain/devel/binutils/patches/binutils-2.21.53.0.1-visibility.patch similarity index 100% rename from packages/toolchain/devel/binutils/patches/binutils-2.21.52.0.2-visibility.patch rename to packages/toolchain/devel/binutils/patches/binutils-2.21.53.0.1-visibility.patch diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build index 3b9acde3d8..844a791b50 100755 --- a/packages/x11/driver/xf86-video-intel/build +++ b/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 diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 55283a3048..f40540d2dd 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/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" diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index a2da15b171..effac65c8c 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/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 diff --git a/projects/ATV/options b/projects/ATV/options index fe337796ea..5ba3bcaf25 100644 --- a/projects/ATV/options +++ b/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) diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index d417a7541b..b0c7d1bde4 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/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 diff --git a/projects/Fusion/options b/projects/Fusion/options index 082af9c099..3749ad4ae1 100644 --- a/projects/Fusion/options +++ b/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) diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index e93f26dd2d..56e79a58bf 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/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 diff --git a/projects/Generic/options b/projects/Generic/options index f756bd0c98..13fa7f4c3d 100644 --- a/projects/Generic/options +++ b/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) diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 8d31b69d52..6d6dc2729c 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/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 diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 9f34ce8598..196bbd8adc 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/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 diff --git a/projects/ION/options b/projects/ION/options index d27b6558a5..aad807238a 100644 --- a/projects/ION/options +++ b/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) diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 482edd82be..a8ef205ed3 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/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 diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 86920e32fd..d0e07c94a8 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/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 diff --git a/projects/Intel/options b/projects/Intel/options index d64994d5f7..b9dbd0df27 100644 --- a/projects/Intel/options +++ b/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) diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 8c9ff3a039..044d1cb048 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/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 diff --git a/projects/Ultra/options b/projects/Ultra/options index 833b71461e..3ceafcb899 100644 --- a/projects/Ultra/options +++ b/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) diff --git a/tools/mkpkg/mkpkg_couchpotato b/tools/mkpkg/mkpkg_couchpotato index affee0f4c5..27943ba1c8 100755 --- a/tools/mkpkg/mkpkg_couchpotato +++ b/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 diff --git a/tools/mkpkg/mkpkg_sickbeard b/tools/mkpkg/mkpkg_sickbeard index e960023a74..5531367dd9 100755 --- a/tools/mkpkg/mkpkg_sickbeard +++ b/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 diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend index f81c7dd0ca..0dff804519 100755 --- a/tools/mkpkg/mkpkg_tvheadend +++ b/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