You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Daniel Stone <da...@sfarc.net> on 2001/11/07 11:07:41 UTC

[PATCH] syncing up

Hi guys,
Here's a quick sync up of all the patches that I have in my Debian
package that probably should go upstream. If you're in the top src dir
of HEAD, apply with -p2 (they're +++
apache2-version.diffed.against/apache2/).

003_program_build: Contributed by Thom May, does autoconf substitutions
on support/*.
004a_srclib_layout_support: Adds layout support to apr, apr-util and
pcre.
004b_debian_layout: The Debian layout. Needs to be applied to httpd-2.0,
apr and apr-util.
006_build_with_autoconf_2.5: Breaks with 2.13, this explicitly specifies
2.5 (Debian has the two in parallel, this is needed to make it use 2.5).
010_index.html.it_typo: Probably 1.3 material as well - Italian typo fix
from a native speaker.
011_mod_autoindex-symlink: Contributed patch to special case symlinks to
files and directories in mod_autoindex - ^^SYMLINK^^ and ^^SYMDIR^^,
respectively.

:) d	    

-- 
Daniel Stone						    <da...@sfarc.net>
<vile_dmg> what is netbsd good for?
<NotEvii> Porting to pocket calculators?
<ian--> porting to archaic devices that don't need any form of UNIX
<ian--> do something useful? hah. i'll port netbsd to my toaster!

Re: [PATCH] syncing up

Posted by Justin Erenkrantz <je...@ebuilt.com>.
On Sun, Nov 11, 2001 at 06:31:43PM +1100, Daniel Stone wrote:
> On Sat, Nov 10, 2001 at 11:25:16PM -0800, Justin Erenkrantz wrote:
> > On Wed, Nov 07, 2001 at 09:07:41PM +1100, Daniel Stone wrote:
> > > 003_program_build: Contributed by Thom May, does autoconf substitutions
> > > on support/*.
> > 
> > Not sure what this is doing.  Why do we need autoconf substitution
> > in the support dir?
> 
> Well, the substitutions weren't happening before, for some reason.

Hmm, support/apachectl.in is getting substituted for me.  What
files aren't getting substituted?

> <layout files patch>
>
> It doesn't depend on config-layout from httpd, I copy httpd's
> config.layout over to apr and apr-util for convenience at built time.
> 
> I won't get the chance to really look at and clean up apache2 stuff for
> another couple of weeks due to exams, tho.

No rush as this isn't a showstopper - "nice to have though."

(Tell me about exams...just finished midterms and the GREs these
 last two weeks...oh what fun...)

> No, what I'm saying is that apache2 doesn't (or didn't) build with 2.13,
> and Debian has the two in parallel. AC_PREREQ(2.5) forces the usage of
> 2.5 (Debian has a wrapper script which decides which one to use).

What error are you seeing?  2.13 works here.  We should be compatible
with 2.13 and 2.50.  I use both regularly.

> > > 011_mod_autoindex-symlink: Contributed patch to special case symlinks to
> > > files and directories in mod_autoindex - ^^SYMLINK^^ and ^^SYMDIR^^,
> > > respectively.
> > 
> > Any reason why we should include this?  Are there lots of people
> > who want this?
> 
> It's not exactly a showstopper, but it can be useful.

Okay, I may add it to the contributed patches section if I can find out
where that is.  =)  -- justin


Re: [PATCH] syncing up

Posted by Daniel Stone <da...@sfarc.net>.
On Sat, Nov 10, 2001 at 11:25:16PM -0800, Justin Erenkrantz wrote:
> On Wed, Nov 07, 2001 at 09:07:41PM +1100, Daniel Stone wrote:
> > 003_program_build: Contributed by Thom May, does autoconf substitutions
> > on support/*.
> 
> Not sure what this is doing.  Why do we need autoconf substitution
> in the support dir?

Well, the substitutions weren't happening before, for some reason.

> > 004a_srclib_layout_support: Adds layout support to apr, apr-util and
> > pcre.
> 
> It would be great if you could please clean the style up (no tabs,
> use APU instead of APRU for the prefix, etc.).  You also should remove 
> the dependency upon the config.layout in httpd.  For apr and apr-util,
> they need to be buildable on their own (i.e. independent config.layout
> files).  I'm not seeing how that happens with your patch.  I do think 
> this idea is worthwhile though.

It doesn't depend on config-layout from httpd, I copy httpd's
config.layout over to apr and apr-util for convenience at built time.

I won't get the chance to really look at and clean up apache2 stuff for
another couple of weeks due to exams, tho.

> > 006_build_with_autoconf_2.5: Breaks with 2.13, this explicitly specifies
> > 2.5 (Debian has the two in parallel, this is needed to make it use 2.5).
> 
> Obviously, we're not going to apply this as we want 2.13 and 2.5
> support.

No, what I'm saying is that apache2 doesn't (or didn't) build with 2.13,
and Debian has the two in parallel. AC_PREREQ(2.5) forces the usage of
2.5 (Debian has a wrapper script which decides which one to use).

> > 010_index.html.it_typo: Probably 1.3 material as well - Italian typo fix
> > from a native speaker.
> 
> I think someone already applied this to both trees.  I know Latin, 
> not Italian.

Indeed, it was applied.

> > 011_mod_autoindex-symlink: Contributed patch to special case symlinks to
> > files and directories in mod_autoindex - ^^SYMLINK^^ and ^^SYMDIR^^,
> > respectively.
> 
> Any reason why we should include this?  Are there lots of people
> who want this?

It's not exactly a showstopper, but it can be useful.

-- 
Daniel Stone						    <da...@sfarc.net>
* james would be more impressed if netgod's magic powers could stop the splits
in the first place...
* netgod notes debian developers are notoriously hard to impress

Re: [PATCH] syncing up

Posted by Justin Erenkrantz <je...@ebuilt.com>.
On Wed, Nov 07, 2001 at 09:07:41PM +1100, Daniel Stone wrote:
> Hi guys,
> Here's a quick sync up of all the patches that I have in my Debian
> package that probably should go upstream. If you're in the top src dir
> of HEAD, apply with -p2 (they're +++
> apache2-version.diffed.against/apache2/).

Thanks for the contributions!

> 003_program_build: Contributed by Thom May, does autoconf substitutions
> on support/*.

Not sure what this is doing.  Why do we need autoconf substitution
in the support dir?

> 004a_srclib_layout_support: Adds layout support to apr, apr-util and
> pcre.

It would be great if you could please clean the style up (no tabs,
use APU instead of APRU for the prefix, etc.).  You also should remove 
the dependency upon the config.layout in httpd.  For apr and apr-util,
they need to be buildable on their own (i.e. independent config.layout
files).  I'm not seeing how that happens with your patch.  I do think 
this idea is worthwhile though.

> 004b_debian_layout: The Debian layout. Needs to be applied to httpd-2.0,
> apr and apr-util.

Applied to httpd-2.0.  Thanks.

> 006_build_with_autoconf_2.5: Breaks with 2.13, this explicitly specifies
> 2.5 (Debian has the two in parallel, this is needed to make it use 2.5).

Obviously, we're not going to apply this as we want 2.13 and 2.5
support.

> 010_index.html.it_typo: Probably 1.3 material as well - Italian typo fix
> from a native speaker.

I think someone already applied this to both trees.  I know Latin, 
not Italian.

> 011_mod_autoindex-symlink: Contributed patch to special case symlinks to
> files and directories in mod_autoindex - ^^SYMLINK^^ and ^^SYMDIR^^,
> respectively.

Any reason why we should include this?  Are there lots of people
who want this?  -- justin