diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2006-10-13 20:50:04 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2006-10-13 20:50:04 +0000 |
| commit | 35eff68ccbd27a78ebf3dedbe2492e8f13b85208 (patch) | |
| tree | 3de164ec521d3e44f9e5bf6d4c595163599d6fcb /app-portage | |
| parent | Stable on x86, bug #151141. (diff) | |
| download | gentoo-2-35eff68ccbd27a78ebf3dedbe2492e8f13b85208.tar.gz gentoo-2-35eff68ccbd27a78ebf3dedbe2492e8f13b85208.tar.bz2 gentoo-2-35eff68ccbd27a78ebf3dedbe2492e8f13b85208.zip | |
Treat any unquoted # as starting a comment (#151086)
(Portage version: 2.1.2_pre2-r9)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/ufed/ChangeLog | 6 | ||||
| -rw-r--r-- | app-portage/ufed/files/digest-ufed-0.40-r1 | 2 | ||||
| -rw-r--r-- | app-portage/ufed/files/digest-ufed-0.40-r3 | 2 | ||||
| -rw-r--r-- | app-portage/ufed/files/ufed-0.40-comments.patch | 32 | ||||
| -rw-r--r-- | app-portage/ufed/ufed-0.40-r3.ebuild | 3 |
5 files changed, 43 insertions, 2 deletions
diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog index 97e458d41597..6aa0d2bf70d7 100644 --- a/app-portage/ufed/ChangeLog +++ b/app-portage/ufed/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/ufed # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.44 2006/06/02 07:35:26 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.45 2006/10/13 20:50:04 truedfx Exp $ + + 13 Oct 2006; Harald van Dijk <truedfx@gentoo.org> + +files/ufed-0.40-comments.patch, ufed-0.40-r3.ebuild: + Treat any unquoted # as starting a comment (#151086) *ufed-0.40-r3 (02 Jun 2006) diff --git a/app-portage/ufed/files/digest-ufed-0.40-r1 b/app-portage/ufed/files/digest-ufed-0.40-r1 index 2345f518f492..7e70efd006a3 100644 --- a/app-portage/ufed/files/digest-ufed-0.40-r1 +++ b/app-portage/ufed/files/digest-ufed-0.40-r1 @@ -1 +1,3 @@ MD5 81c6dc3af93d6ab2f592ba2cd7b1ee7f ufed-0.40.tar.bz2 20288 +RMD160 f360eb01f952acb4f52cfa571927a523f1fe3015 ufed-0.40.tar.bz2 20288 +SHA256 85d8894b7d163dacf7dfc94fff4e8c4a9cbb0302a66fc7e545a6d5c1c6c9318c ufed-0.40.tar.bz2 20288 diff --git a/app-portage/ufed/files/digest-ufed-0.40-r3 b/app-portage/ufed/files/digest-ufed-0.40-r3 index 2345f518f492..7e70efd006a3 100644 --- a/app-portage/ufed/files/digest-ufed-0.40-r3 +++ b/app-portage/ufed/files/digest-ufed-0.40-r3 @@ -1 +1,3 @@ MD5 81c6dc3af93d6ab2f592ba2cd7b1ee7f ufed-0.40.tar.bz2 20288 +RMD160 f360eb01f952acb4f52cfa571927a523f1fe3015 ufed-0.40.tar.bz2 20288 +SHA256 85d8894b7d163dacf7dfc94fff4e8c4a9cbb0302a66fc7e545a6d5c1c6c9318c ufed-0.40.tar.bz2 20288 diff --git a/app-portage/ufed/files/ufed-0.40-comments.patch b/app-portage/ufed/files/ufed-0.40-comments.patch new file mode 100644 index 000000000000..852545ea5050 --- /dev/null +++ b/app-portage/ufed/files/ufed-0.40-comments.patch @@ -0,0 +1,32 @@ +--- ufed-0.40/Portage.pm ++++ ufed-0.40/Portage.pm +@@ -220,9 +220,9 @@ + + sub read_sh($) { + my $BLANK = qr{(?:[ \n\t]+|#.*)+}; # whitespace and comments +- my $IDENT = qr{([^ \\\n\t'"{}=]+)}; # identifiers ++ my $IDENT = qr{([^ \\\n\t'"{}=#]+)}; # identifiers + my $ASSIG = qr{=}; # assignment operator +- my $UQVAL = qr{((?:[^ \\\n\t'"]+|\\.)+)}s; # unquoted value ++ my $UQVAL = qr{((?:[^ \\\n\t'"#]+|\\.)+)}s;# unquoted value + my $SQVAL = qr{'([^']*)'}; # singlequoted value + my $DQVAL = qr{"((?:[^\\"]|\\.)*)"}s; # doublequoted value + +--- ufed-0.40/ufed.pl ++++ ufed-0.40/ufed.pl +@@ -140,12 +140,12 @@ + [ \n\t]+ | + \#[ \t]*USE[ \t]*=.*(\n?) | # place capture after USE=... line + \#.*)+}x; +- my $IDENT = qr{([^ \\\n\t'"{}=]+)}; # identifiers ++ my $IDENT = qr{([^ \\\n\t'"{}=#]+)}; # identifiers + my $ASSIG = qr{=}; # assignment operator +- my $UQVAL = qr{(?:[^ \\\n\t'"]+|\\.)+}s; # unquoted value ++ my $UQVAL = qr{(?:[^ \\\n\t'"#]+|\\.)+}s; # unquoted value + my $SQVAL = qr{'[^']*'}; # singlequoted value + my $DQVAL = qr{"(?:[^\\"]|\\.)*"}s; # doublequoted value +- my $BNUQV = qr{(?:[^ \\\n\t'"]+|\\\n()|\\.)+}s; # unquoted value (scan for \\\n) ++ my $BNUQV = qr{(?:[^ \\\n\t'"#]+|\\\n()|\\.)+}s;# unquoted value (scan for \\\n) + my $BNDQV = qr{"(?:[^\\"]|\\\n()|\\.)*"}s; # doublequoted value (scan for \\\n) + + my (@flags) = @_; diff --git a/app-portage/ufed/ufed-0.40-r3.ebuild b/app-portage/ufed/ufed-0.40-r3.ebuild index 7f6f99ec49f5..429dcaad0d6d 100644 --- a/app-portage/ufed/ufed-0.40-r3.ebuild +++ b/app-portage/ufed/ufed-0.40-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r3.ebuild,v 1.1 2006/06/02 07:35:26 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r3.ebuild,v 1.2 2006/10/13 20:50:04 truedfx Exp $ inherit eutils @@ -22,6 +22,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-useorder.patch epatch "${FILESDIR}"/${P}-source.patch + epatch "${FILESDIR}"/${P}-comments.patch } src_compile() { |