Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 4 insertions, 42 deletions

diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 9b137a4a3..02ba031dc 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -6,11 +6,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		ImageMagick
 PKG_VERSION:=		6.7.6
 PKG_EXTRAVER:=		1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8134257e3fbb43cc06fb32a6d725d3d0
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
 PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv libtool e2fsprogs
+PKG_BUILDDEP+=		pango
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
 PKG_NEED_CXX:=		1
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7531561de..2f89753c5 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		53
+PKG_RELEASE:=		54
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
index 030502efc..f69f273d0 100755
--- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless
+++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
@@ -4,7 +4,6 @@ set -e
 [ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
 
 [ "$IF_WIRELESS_SSID" ] || exit 1
-[ "$IF_WIRELESS_CHANNEL" ] || exit 1
 [ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g
 [ "$IF_WIRELESS_EXTENSION" ] || IF_WIRELESS_EXTENSION=0
 
diff --git a/package/base-files/src/etc/network/interfaces b/package/base-files/src/etc/network/interfaces
index 80a51f145..11174c152 100644
--- a/package/base-files/src/etc/network/interfaces
+++ b/package/base-files/src/etc/network/interfaces
@@ -37,7 +37,6 @@ iface eth0 inet dhcp
 #auto wlan0
 #iface wlan0 inet dhcp
 #  wireless-ssid myap
-#  wireless-channel 11
 #  wireless-mode sta
 #  wireless-security wpa2
 #  wireless-passphrase xxxxxx
@@ -50,8 +49,8 @@ iface eth0 inet dhcp
 #  netmask 255.255.255.0
 #  broadcast +
 #  wireless-ssid myap
-#  wireless-channel 8
 #  wireless-mode ap
+#  wireless-channel 8
 #  wireless-security wpa2
 #  wireless-passphrase xxxxxxxx
 ##
diff --git a/package/xfsprogs/patches/patch-libxfs_linux_c b/package/xfsprogs/patches/patch-libxfs_linux_c
deleted file mode 100644
index 3ace20dab..000000000
--- a/package/xfsprogs/patches/patch-libxfs_linux_c
+++ /dev/null
@@ -1,37 +0,0 @@
---- xfsprogs-3.1.10.orig/libxfs/linux.c	2012-12-13 22:29:24.000000000 +0100
-+++ xfsprogs-3.1.10/libxfs/linux.c	2013-04-04 16:47:19.000000000 +0200
-@@ -16,14 +16,12 @@
-  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
--#define ustat __kernel_ustat
- #include <xfs/libxfs.h>
- #include <mntent.h>
- #include <sys/stat.h>
--#undef ustat
--#include <sys/ustat.h>
- #include <sys/mount.h>
- #include <sys/ioctl.h>
-+#include <sys/statvfs.h>
- #include <sys/sysinfo.h>
- 
- int platform_has_uuid = 1;
-@@ -49,8 +47,7 @@ static int max_block_alignment;
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
--	/* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
--	struct ustat	ust[2];
-+	struct statvfs info;
- 	struct stat64	st;
- 
- 	if (!s) {
-@@ -61,7 +58,7 @@ platform_check_ismounted(char *name, cha
- 		s = &st;
- 	}
- 
--	if (ustat(s->st_rdev, ust) >= 0) {
-+	if (statvfs(name, &info) >= 0) {
- 		if (verbose)
- 			fprintf(stderr,
- 				_("%s: %s contains a mounted filesystem\n"),