Skip to content
Snippets Groups Projects
Commit 203998a9 authored by Natanael Copa's avatar Natanael Copa
Browse files

core/busybox: fix for busybox ash and httpd

parent d64426ed
No related merge requests found
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.14.1
pkgrel=0
pkgrel=1
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
license=GPL-2
......@@ -11,9 +11,11 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
$pkgname-1.12.1-vi-path.patch
$pkgname-1.11.1-bb.patch
busybox-1.14.1-ftpd.patch
busybox-1.14.1-httpd.patch
busybox-1.14.1-modprobe.patch
busybox-1.14.1-telnetd.patch
bb-tar-numeric-owner.patch
ash.patch
$install
busyboxconfig"
......@@ -47,9 +49,11 @@ md5sums="d5186821d4f4cf6017452c7c8730cf19 busybox-1.14.1.tar.bz2
f5a8ae3145aa249868c1a1abc319c228 busybox-1.12.1-vi-path.patch
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
b49e33a98d7be2a52d772f3600c4aa78 busybox-1.14.1-ftpd.patch
9bdb6b91d7dd21253b3725c84e21347e busybox-1.14.1-httpd.patch
11877bde19afe1f6e1f55d9b5c9ee900 busybox-1.14.1-modprobe.patch
9020600467cdb1a1df7df41a1ba0c6e9 busybox-1.14.1-telnetd.patch
0b5b2d7db201f90cd08f4a3164ee29a1 bb-tar-numeric-owner.patch
fa4e7c44c423a3a42d23836d65f6e416 ash.patch
56b78c358797cd15fb64719a48939267 busybox.post-install
56b78c358797cd15fb64719a48939267 busybox.post-upgrade
6d9cd13b546d9c6063d36c0d3d963887 busyboxconfig"
commit daeeceff057dd3317f1e69aebde01dd9d489d18a
Author: Natanael Copa <natanael.copa@gmail.com>
Date: Fri Jun 12 17:11:51 2009 +0200
Revert "ash: make dot command search current directory first, as bash does."
This reverts commit 8ad78e1ec7b2e873953f9f476fb63b5893526c39.
diff --git a/shell/ash.c b/shell/ash.c
index 3452351..b62c2cd 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -11904,16 +11904,7 @@ find_dot_file(char *name)
if (strchr(name, '/'))
return name;
- /* IIRC standards do not say whether . is to be searched.
- * And it is even smaller this way, making it unconditional for now:
- */
- if (1) { /* ENABLE_ASH_BASH_COMPAT */
- fullname = name;
- goto try_cur_dir;
- }
-
while ((fullname = padvance(&path, name)) != NULL) {
- try_cur_dir:
if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) {
/*
* Don't bother freeing here, since it will
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment