Summary: | bug in sysutils/pkg_cutleaves exclude file processing | ||||||
---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | Mark Linimon <linimon> | ||||
Component: | Individual Port(s) | Assignee: | Mathieu Arnold <mat> | ||||
Status: | Closed FIXED | ||||||
Severity: | Affects Only Me | CC: | sw | ||||
Priority: | Normal | ||||||
Version: | Latest | ||||||
Hardware: | Any | ||||||
OS: | Any | ||||||
Attachments: |
|
Description
Mark Linimon
![]() ![]() Responsible Changed From-To: freebsd-ports-bugs->linimon Over to originator. Adding to audit trail from misfiled PR ports/65352: Date: Fri, 9 Apr 2004 11:08:09 +0200 From: Stefan Walter <sw@gegenunendlich.de> Message-Id: <20040409090809.GA1537@kyuzo.dunkelkammer.void> References: <200404081631.i38GVlH1074060@freefall.freebsd.org> Thanks for the report. The attached patch for the port fixes this - all unescaped plus signs in the exclusion file are escaped by pkg_cutleaves; those that are escaped already are left as they are. (As far as I can see, plus signs should be the only special case.) Could you commit this? Stefan --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pkg_cutleaves-20040409.patch" diff -urN pkg_cutleaves.old/Makefile pkg_cutleaves/Makefile --- pkg_cutleaves.old/Makefile Fri Apr 9 10:46:23 2004 +++ pkg_cutleaves/Makefile Fri Apr 9 10:49:46 2004 @@ -8,7 +8,7 @@ # PORTNAME= pkg_cutleaves -PORTVERSION= 20040207 +PORTVERSION= 20040409 CATEGORIES= sysutils MASTER_SITES= # none DISTFILES= # none diff -urN pkg_cutleaves.old/src/pkg_cutleaves pkg_cutleaves/src/pkg_cutleaves --- pkg_cutleaves.old/src/pkg_cutleaves Fri Apr 9 10:46:23 2004 +++ pkg_cutleaves/src/pkg_cutleaves Fri Apr 9 10:48:52 2004 @@ -64,6 +64,8 @@ chomp($exclude); # Ignore comments and empty lines, add others as regular expressions unless (($exclude =~ m/(^ *#)|(^ *$)/)) { + # Escape any '+' that isn't already escaped + $exclude =~ s/(?<!\\)(\+)/\\$1/g; $exclude = "^" . $exclude . ".*"; push @excludes, $exclude; } --zYM0uCDKw75PZbzx-- Stefan Walter, 14.04.04, 16:48h CEST:
> > Could you commit this?
>
> Please don't, I'll send a patch with some more changes soon.
Here they are.
Stefan
Responsible Changed From-To: linimon->mat I'll let mat be the Perl guru for this one. State Changed From-To: open->closed Committed |