| Revision 7500,
870 bytes
checked in by alanbach-guest, 2 years ago
(diff) |
- Added asterisk to Vinnie security
|
| Line | |
|---|
| 1 | Subject: relax badshell tilde test |
|---|
| 2 | Author: Faidon Liambotis <paravoid@debian.org> |
|---|
| 3 | Bug: http://issues.asterisk.org/view.php?id=14718 |
|---|
| 4 | Last-Update: 2009-12-19 |
|---|
| 5 | |
|---|
| 6 | badshell is disallowing tildes (~) in the DESTDIR directory to warn people |
|---|
| 7 | who use a shell that doesn't expand it to $HOMEDIR. |
|---|
| 8 | |
|---|
| 9 | However, we have such a tilde in our directory (~dfsg) that isn't expanded |
|---|
| 10 | to $HOMEDIR nor shouldn't be. |
|---|
| 11 | |
|---|
| 12 | This patch relaxes this test just for cases where the ~ is followed by a '/', |
|---|
| 13 | which should catch most cases. |
|---|
| 14 | |
|---|
| 15 | --- a/Makefile |
|---|
| 16 | +++ b/Makefile |
|---|
| 17 | @@ -616,7 +616,7 @@ oldmodcheck: |
|---|
| 18 | fi |
|---|
| 19 | |
|---|
| 20 | badshell: |
|---|
| 21 | -ifneq ($(findstring ~,$(DESTDIR)),) |
|---|
| 22 | +ifneq ($(findstring ~/,$(DESTDIR)),) |
|---|
| 23 | @echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")." |
|---|
| 24 | @echo "Try replacing ~ with \$$HOME, as in \"make install DESTDIR=\$$HOME/path\"." |
|---|
| 25 | @exit 1 |
|---|
Note: See
TracBrowser
for help on using the repository browser.
