Fix the lock warning (#1111), also add another download source

SVN-Revision: 5944

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 2688777c0036388b66eb3e820d8623da0cf51c11..2927d70436c34ac72f821089fadbcb9ee1fc4745 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -13,7 +13,8 @@ PKG_VERSION:=1.3.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.busybox.net/downloads
+PKG_SOURCE_URL:=http://www.busybox.net/downloads \
+               http://distfiles.gentoo.org/distfiles/
 PKG_MD5SUM:=571531cfa83726947ccb566de017ad4f
 PKG_CAT:=bzcat
 

diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index f832df7d91478b4ba53012937832b325c9ca9f7f..a92fa3e047df79ab03768b8f80484aa496ceee43 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -39,7 +39,7 @@ diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild
 diff -ruN busybox-1.3.1-old/miscutils/lock.c busybox-1.3.1/miscutils/lock.c
 --- busybox-1.3.1-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100
 +++ busybox-1.3.1/miscutils/lock.c     2006-12-28 03:11:36.000000000 +0100
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,136 @@
 +/*
 + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 + *
@@ -136,6 +136,7 @@ diff -ruN busybox-1.3.1-old/miscutils/lock.c busybox-1.3.1/miscutils/lock.c
 +
 +              return 0;
 +      }
++      return 0;
 +}
 +
 +#ifndef CONFIG_LOCK