Merge remote-tracking branch 'upstream/master' into openelec-3.2

packages/initramfs/sysutils/open-iscsi/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="open-iscsi"
-PKG_VERSION="ae94266"
+PKG_VERSION="bf39941"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch

@@ -0,0 +1,26 @@
+From d5b4400d2c50190474a6000d60f05deb95f97e0b Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Thu, 8 Aug 2013 18:08:44 +0300
+Subject: [PATCH] enable multicast
+
+source: https://groups.google.com/forum/#!msg/open-iscsi/nuLFqxgsHAA/53-JE3gNNjEJ
+---
+ usr/iscsi_net_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c
+index 6d0ebf9..3801ac7 100644
+--- a/usr/iscsi_net_util.c
++++ b/usr/iscsi_net_util.c
+@@ -229,7 +229,7 @@ int net_setup_netdev(char *netdev, char *local_ip, char *mask, char *gateway,
+ 		/* Bring up interface */
+ 		memset(&ifr, 0, sizeof(ifr));
+ 		strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
+-		ifr.ifr_flags = IFF_UP | IFF_RUNNING;
++		ifr.ifr_flags = IFF_UP | IFF_RUNNING | IFF_MULTICAST;
+ 		if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
+ 			log_error("Could not bring up netdev %s (err %d - %s)",
+ 				  netdev, errno, strerror(errno));
+-- 
+1.8.1.2
+

packages/network/avahi/package.mk

@@ -85,6 +85,12 @@ post_makeinstall_target() {
   sed -e "s,^.*disallow-other-stacks=.*$,disallow-other-stacks=yes,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
 # disable wide-area
   sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
+# publish-hinfo
+  sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
+# publish-workstation
+  sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
+# browse domains?
+  sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
 
   rm -rf $INSTALL/etc/avahi/avahi-autoipd.action
   rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action
@@ -93,6 +99,12 @@ post_makeinstall_target() {
     rm -rf $INSTALL/etc/avahi/services/sftp-ssh.service
   fi
   rm -rf $INSTALL/lib/systemd
+  rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
+  rm -f $INSTALL/usr/sbin/avahi-autoipd
+  rm -f $INSTALL/usr/sbin/avahi-dnsconfd
+  rm -f $INSTALL/usr/bin/avahi-bookmarks
+  rm -f $INSTALL/usr/bin/avahi-publish*
+  rm -f $INSTALL/usr/bin/avahi-resolve*
 }
 
 post_install() {

packages/network/openssh/config/sshd_config

@@ -107,7 +107,7 @@ SyslogFacility AUTHPRIV
 #ChrootDirectory none
 
 # override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
+Subsystem	sftp	/usr/lib/openssh/sftp-server
 
 # Example of overriding settings on a per-user basis
 #Match User anoncvs

packages/sysutils/udisks/init.d/31_mount-disks

@@ -28,7 +28,7 @@
 
   wait_for_dbus
 
-  for DEVICE in `find /sys/class/block/sd*/removable`; do
+  for DEVICE in `ls /sys/class/block/sd*/removable 2>/dev/null`; do
     if [ "$(cat $DEVICE)" = "0" ]; then
       DISK=$(echo "$DEVICE" | sed -e "s,/sys/class/block,/dev," -e "s,/removable,,")
       for PART in $(ls "$DISK"[0-9]*);do