summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanomi Mocelopolis <d_mo1234@yahoo.com>2011-11-26 20:56:25 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-11-26 20:56:25 (GMT)
commitec02a34b0aaa06b61e26ec284370dea9896805f1 (patch)
treeaccb5447cac95617890abe2c1cd8268941ceae77
parent6d985f97c87a963674c6d9230b5fc6fe9982ff87 (diff)
downloadbuildroot-ec02a34b0aaa06b61e26ec284370dea9896805f1.tar.gz
buildroot-ec02a34b0aaa06b61e26ec284370dea9896805f1.tar.bz2
Prevent patch commands from accessing source control
Closes #4357 Add -g0 option to patch to ensure it doesn't try to access source control. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES1
-rw-r--r--boot/grub/grub.mk2
-rwxr-xr-xsupport/scripts/apply-patches.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index b8bb451..3173fe6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@
Issues resolved (http://bugs.uclibc.org):
+ #4357: Prevent patch commands from accessing source control
#4369: Fix permissions on untared lsof archive
2011.11-rc2, Released November 18th, 2011:
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index fbff867..1b5ca0d 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -41,7 +41,7 @@ GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
define GRUB_DEBIAN_PATCHES
# Apply the patches from the Debian patch
(cd $(@D) ; for f in `cat debian/patches/00list | grep -v ^#` ; do \
- cat debian/patches/$$f | patch -p1 ; \
+ cat debian/patches/$$f | patch -g0 -p1 ; \
done)
endef
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 76cb9f7..1aef47e 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -21,7 +21,7 @@ if [ ! -d "${patchdir}" ] ; then
fi
for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
- apply="patch -p1 -E -d"
+ apply="patch -g0 -p1 -E -d"
uncomp_parm=""
if [ -d "${patchdir}/$i" ] ; then
type="directory overlay"