From 448068621cbec79a084941f96b7f3cf8d65b2805 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 19 Aug 2013 22:17:25 +0300
Subject: [PATCH 1/7] busybox: mount-filesystem: ensure that /storage/log is a
 directory

---
 packages/sysutils/busybox/init.d/01_mount-filesystem | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/sysutils/busybox/init.d/01_mount-filesystem b/packages/sysutils/busybox/init.d/01_mount-filesystem
index 2808c45191..c99c9f666b 100644
--- a/packages/sysutils/busybox/init.d/01_mount-filesystem
+++ b/packages/sysutils/busybox/init.d/01_mount-filesystem
@@ -34,6 +34,7 @@ progress "mounting needed filesystems"
   mount -n -t debugfs debugfs /sys/kernel/debug
 
   if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then
+    [ ! -d $HOME/log ] && rm -rf $HOME/log &>/dev/null
     mkdir -p $HOME/log
     ln -sf $HOME/log /var/log
   else

From 5abdd364ba27ce69a9af09cb78db4cb8f6ee24ce Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 19 Aug 2013 22:22:18 +0300
Subject: [PATCH 2/7] avahi: run as daemon, enable optional debug, remove
 startup hacks

---
 packages/network/avahi/init.d/53_avahi | 29 ++++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi
index 6144abbcc1..fea84f3150 100644
--- a/packages/network/avahi/init.d/53_avahi
+++ b/packages/network/avahi/init.d/53_avahi
@@ -27,23 +27,20 @@
   # ensure that environment is sane
   . /etc/profile
 
-  # wait for network
-  wait_for_inet_addr force
-
   progress "Starting Avahi Daemon"
 
+  if [ "$DEBUG" = "yes" ]; then
+    AVAHI_DEBUG="--debug"
+  fi
+
   mkdir -p /var/run/avahi-daemon
-  while true; do
-    AVAHI_ENABLED=true
-    if [ -f $CONFIG_CACHE/services/avahi.conf ]; then
-      . $CONFIG_CACHE/services/avahi.conf
-    fi
-    if [ "$AVAHI_ENABLED" == "true" ]; then
-      wait_for_dbus
-      avahi-daemon --syslog > /dev/null 2>&1
-    else
-      break
-    fi
-    usleep 2000000
-  done
+  AVAHI_ENABLED=true
+  if [ -f $CONFIG_CACHE/services/avahi.conf ]; then
+    . $CONFIG_CACHE/services/avahi.conf
+  fi
+  if [ "$AVAHI_ENABLED" == "true" ]; then
+    wait_for_dbus
+    rm /var/run/avahi-daemon/pid &>/dev/null
+    avahi-daemon $AVAHI_DEBUG -D --syslog > /dev/null 2>&1
+  fi
 )&

From 24ee705b6424ea6e011eaf7b9002d623b378b5d5 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 20 Aug 2013 13:52:29 +0300
Subject: [PATCH 3/7] openvpn: cleanup

---
 packages/network/openvpn/build | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/network/openvpn/build b/packages/network/openvpn/build
index d75a99afd1..c6abaff577 100755
--- a/packages/network/openvpn/build
+++ b/packages/network/openvpn/build
@@ -23,14 +23,21 @@
 . config/options $1
 
 cd $PKG_BUILD
+ac_cv_have_decl_TUNSETPERSIST=no \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --disable-server \
             --enable-password-save \
-            --disable-plugin-auth-pam \
-            --disable-plugin-down-root \
+            --disable-plugins \
             --enable-iproute2 IPROUTE="/sbin/ip" \
+            --disable-management \
+            --disable-socks \
+            --disable-http-proxy \
+            --disable-fragment \
+            --disable-multihome \
+            --disable-port-share \
+            --disable-debug \
 
 
 make

From 48e29bcfd0fd919206c62db0c50d41ce2363be7a Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 20 Aug 2013 19:13:56 +0300
Subject: [PATCH 4/7] busybox: re-add 'free' applet

---
 packages/sysutils/busybox/config/busybox.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index e52b291fdf..94beeccd83 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -904,7 +904,7 @@ CONFIG_FEATURE_TOP_SMP_PROCESS=y
 CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-# CONFIG_FREE is not set
+CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y

From ac407c5468fc03dfa618317d326ec8ad54c58590 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 20 Aug 2013 19:15:02 +0300
Subject: [PATCH 5/7] remove package: 'procps-ng'

if anyone still need it - feel free to move to unofficial-addons
---
 packages/sysutils/busybox/meta      |  2 +-
 packages/sysutils/procps-ng/build   | 37 -----------------------------
 packages/sysutils/procps-ng/install | 35 ---------------------------
 packages/sysutils/procps-ng/meta    | 36 ----------------------------
 4 files changed, 1 insertion(+), 109 deletions(-)
 delete mode 100755 packages/sysutils/procps-ng/build
 delete mode 100755 packages/sysutils/procps-ng/install
 delete mode 100644 packages/sysutils/procps-ng/meta

diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta
index 7ad27bf8e3..9ca1daecfb 100644
--- a/packages/sysutils/busybox/meta
+++ b/packages/sysutils/busybox/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils less procps-ng"
+PKG_DEPENDS="kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils less"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
 PKG_PRIORITY="required"
 PKG_SECTION="system"
diff --git a/packages/sysutils/procps-ng/build b/packages/sysutils/procps-ng/build
deleted file mode 100755
index 8884177cd0..0000000000
--- a/packages/sysutils/procps-ng/build
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
-#
-#  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
-
-export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses"
-export LIBS="-ltinfo"
-
-cd $PKG_BUILD
-ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_realloc_0_nonnull=yes \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-skill \
-            --disable-kill
-
-make
diff --git a/packages/sysutils/procps-ng/install b/packages/sysutils/procps-ng/install
deleted file mode 100755
index e8e9439da0..0000000000
--- a/packages/sysutils/procps-ng/install
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
-#
-#  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/lib/
-  cp -P $PKG_BUILD/proc/.libs/libprocps.so* $INSTALL/usr/lib/
-
-mkdir -p $INSTALL/usr/bin/
-  cp $PKG_BUILD/.libs/free $INSTALL/usr/bin/
-  cp $PKG_BUILD/.libs/pgrep $INSTALL/usr/bin/
-  ln -sf pgrep $INSTALL/usr/bin/pkill
-  cp $PKG_BUILD/.libs/pmap $INSTALL/usr/bin/
-  cp $PKG_BUILD/.libs/slabtop $INSTALL/usr/bin/
-  cp $PKG_BUILD/.libs/vmstat $INSTALL/usr/bin/
-  cp $PKG_BUILD/.libs/watch $INSTALL/usr/bin/
diff --git a/packages/sysutils/procps-ng/meta b/packages/sysutils/procps-ng/meta
deleted file mode 100644
index c3fcfedcc3..0000000000
--- a/packages/sysutils/procps-ng/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
-#
-#  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="procps-ng"
-PKG_VERSION="3.3.8"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://gitorious.org/procps/procps"
-PKG_URL="$SOURCEFORGE_SRC/procps-ng/Production/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="ncurses"
-PKG_BUILD_DEPENDS="toolchain ncurses"
-PKG_PRIORITY="optional"
-PKG_SECTION="debug"
-PKG_SHORTDESC="procps: Small useful utilities that give information about processes"
-PKG_LONGDESC="procps is the package that has a bunch of small useful utilities that give information about processes using the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"

From 6a7ed6e3999f53e28b26e016aed041d3b8cbc6c5 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 20 Aug 2013 19:25:41 +0300
Subject: [PATCH 6/7] busybox: re-add 'less' applet

---
 packages/sysutils/busybox/config/busybox.conf | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index 94beeccd83..ea6551a98e 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -635,16 +635,16 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
-# CONFIG_LESS is not set
-CONFIG_FEATURE_LESS_MAXLINES=0
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=16384
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_ASK_TERMINAL=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=y
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
 CONFIG_SETSERIAL=y

From 260c51162a906ca9cbd5cb584a3b8a57f670b222 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 20 Aug 2013 19:27:57 +0300
Subject: [PATCH 7/7] remove package: 'less'

if anyone still need it - feel free to move to unofficial-addons
---
 packages/sysutils/busybox/meta |  2 +-
 packages/sysutils/less/build   | 37 ----------------------------------
 packages/sysutils/less/install | 27 -------------------------
 packages/sysutils/less/meta    | 35 --------------------------------
 4 files changed, 1 insertion(+), 100 deletions(-)
 delete mode 100755 packages/sysutils/less/build
 delete mode 100755 packages/sysutils/less/install
 delete mode 100644 packages/sysutils/less/meta

diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta
index 9ca1daecfb..6d68639492 100644
--- a/packages/sysutils/busybox/meta
+++ b/packages/sysutils/busybox/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils less"
+PKG_DEPENDS="kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
 PKG_PRIORITY="required"
 PKG_SECTION="system"
diff --git a/packages/sysutils/less/build b/packages/sysutils/less/build
deleted file mode 100755
index f2d771b2af..0000000000
--- a/packages/sysutils/less/build
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
-#
-#  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
-
-# make sourcefiles writable and run autotools
-  find . -type f -exec chmod +w "{}" ";"
-  do_autoreconf
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --bindir=/usr/bin \
-
-make
-
diff --git a/packages/sysutils/less/install b/packages/sysutils/less/install
deleted file mode 100755
index a4a8e48ae3..0000000000
--- a/packages/sysutils/less/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
-#
-#  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/bin/
-  cp $PKG_BUILD/less $INSTALL/usr/bin/
-
diff --git a/packages/sysutils/less/meta b/packages/sysutils/less/meta
deleted file mode 100644
index 3294fb3daa..0000000000
--- a/packages/sysutils/less/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 (dag@wieers.com)
-#
-#  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="less"
-PKG_VERSION="451"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_URL="http://www.greenwoodsoftware.com/less/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="ncurses"
-PKG_BUILD_DEPENDS="toolchain ncurses"
-PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="less: free, open-source file pager"
-PKG_LONGDESC="Less is a free, open-source file pager. It can be found on most versions of Linux, Unix and Mac OS, as well as on many other operating systems."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"