diff options
| author | sem <sem@FreeBSD.org> | 2007-03-02 20:10:08 +0000 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2007-03-02 20:10:08 +0000 |
| commit | 945b76e700715b21953d6232432b5207748e4441 (patch) | |
| tree | 4781974815ee8a972eb488d31218d0b197273405 /ports-mgmt/portupgrade | |
| parent | 2b8c0a03913a145b62aa76b5088a6e12b6164657 (diff) | |
| download | FreeBSD-ports-945b76e700715b21953d6232432b5207748e4441.zip FreeBSD-ports-945b76e700715b21953d6232432b5207748e4441.tar.gz | |
- Fix a long standing bug when shelljoin() function wrong placed ""
when more than one variables (WITH_*, WITHOUT_*) passed.
Diffstat (limited to 'ports-mgmt/portupgrade')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 0f89a5b..e446b29 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.2.6 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb b/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb new file mode 100644 index 0000000..ce7d672 --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb @@ -0,0 +1,17 @@ +Index: lib/pkgmisc.rb +=================================================================== +RCS file: /cvsroot/portupgrade/pkgtools/lib/pkgmisc.rb,v +retrieving revision 1.2.2.2 +diff -u -r1.2.2.2 pkgmisc.rb +--- lib/pkgmisc.rb 24 Feb 2007 12:32:11 -0000 1.2.2.2 ++++ lib/pkgmisc.rb 2 Mar 2007 19:59:30 -0000 +@@ -93,7 +93,8 @@ + def shelljoin(*args) + args.collect { |arg| + if /[*?{}\[\]<>()~&|\\$;\'\`\"\s]/ =~ arg +- '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"' ++ a = '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"' ++ a.gsub(/\s/, '" "') + else + arg + end |
