Any objections to this in trunk / branches/2.2.x ? Minor comment changes? -------- Original Message -------- Subject: Re: ports/133704: www/apache22 apxs does not work as expected Date: Sat, 08 May 2010 14:17:33 +0200 From: olli hauer <oha...@gmx.de> To: pgollu...@freebsd.org, bug-follo...@freebsd.org CC: apa...@freebsd.org, Olli Hauer <oha...@gmx.de>
pgollu...@freebsd.org wrote: > Synopsis: www/apache22 apxs does not work as expected > > State-Changed-From-To: analyzed->closed > State-Changed-By: pgollucci > State-Changed-When: Fri May 7 21:49:05 UTC 2010 > State-Changed-Why: > done and done! > > http://www.freebsd.org/cgi/query-pr.cgi?pr=133704 > Hi, thanks for fixing this bug;) Btw. since you are a member off apache.org, maybe you want to close the following bugzilla issue. https://issues.apache.org/bugzilla/show_bug.cgi?id=47397 One note: The FreeBSD hack removes the line complete so it is possible to breaks apache if someone use apxs to control modules not installed by a port since it removes the line completely. What do you think about this hack (add an addition parameter [-r] to remove the line) --- patch_apxs.txt begins here --- --- /usr/local/sbin/apxs 2010-05-08 11:38:09.000000000 +0200 +++ apxs 2010-05-08 13:55:32.000000000 +0200 @@ -72,6 +72,7 @@ my $opt_i = 0; my $opt_a = 0; my $opt_A = 0; +my $opt_r = 0; my $opt_q = 0; my $opt_h = 0; my $opt_p = 0; @@ -148,12 +149,14 @@ print STDERR " [-Wl,<flags>] [-p] <files> ...\n"; print STDERR " apxs -i [-S <var>=<val>] [-a] [-A] [-n <modname>] <dsofile> ...\n"; print STDERR " apxs -e [-S <var>=<val>] [-a] [-A] [-n <modname>] <dsofile> ...\n"; + # FreeBSD hack, remove the line instead commenting out + print STDERR " apxs -e [-r] [-A] [-n <modname>] <dsofile> ...\n"; exit(1); } # option handling my $rc; -($rc, @ARGV) = &Getopts("qn:gco:I+D+L+l+W+S+eiaAp", @ARGV); +($rc, @ARGV) = &Getopts("qn:gco:I+D+L+l+W+S+eiaApr", @ARGV); &usage if ($rc == 0); &usage if ($#ARGV == -1 and not $opt_g); &usage if (not $opt_q and not ($opt_g and $opt_n) and not $opt_i and not $opt_c and not $opt_e); @@ -614,7 +617,7 @@ } else { # replace already existing LoadModule line # Custom FreeBSD mod - if ($opt_A) { + if ($opt_A and $opt_r) { $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1|s; } else { --- patch_apxs.txt ends here ---
