Re: project website update

[Dave Fisher]

> On Sep 8, 2021, at 5:05 AM, ste...@eissing.org wrote:
> 
> 
> 
>> Am 08.09.2021 um 12:53 schrieb Christophe JAILLET 
>> :
>> 
>> Le 08/09/2021 à 12:13, ste...@eissing.org a écrit :
>>> Need help to figure out how out website updates now after the "move" 
>>> (whatever that means).
>>> Formerly:
>>> - changes committed into 
>>> https://svn.apache.org/repos/asf/httpd/site/trunk/content
>> Changes committed in https://github.com/apache/httpd-site
>> (so needs to be listed as a contributor, I guess)
> 
> Thanks, Christophe. So that needs some git handling to update the site. Hmm, 
> either
> being submitter or make a fork and create a PR. The former sounds simpler.

As the one who moved the site for Infra I suggest that you clone from either 
Gitbox or Github. Make your changes, add the files, commit, and push.

If you use Github then you may need to associate your GitHub with your Apache 
ID. Go to id.apache.org  or check your Apache details at 
whimsy.apache.org 

Your Github account must have 2FA setup. Changes to Github access rights are 
pushed hourly from Gitbox to Github.

Regards,
Dave

> 
>>> - TMP_KEY for from https://cms.apache.org/httpd/publish
>>> - POST with same form fields done to trigger the update (I assume)
>> Nothing to do, it is now done automatically by some magic put in place by 
>> infra.
>> When pushed on github, it lands on h.a.o.
> 
> Ack.
> 
>> CJ
>> 
>>> So, what is now the way?
>>> - Stefan
>> 
> 

Re: svn commit: r1893136 - /httpd/httpd/tags/candidate-2.4.49-rc1/

[Yann Ylavic]

On Wed, Sep 8, 2021 at 4:06 PM Yann Ylavic  wrote:
>
> On Wed, Sep 8, 2021 at 3:23 PM Yann Ylavic  wrote:
> >
> > On Wed, Sep 8, 2021 at 3:00 PM  wrote:
> > >
> > > Author: icing
> > > Date: Wed Sep  8 13:00:17 2021
> > > New Revision: 1893136
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1893136=rev
> > > Log:
> > > Tag branches/2.4.x@1893131 as 2.4.49-rc1
> > >
> > > Added:
> > > httpd/httpd/tags/candidate-2.4.49-rc1/   (props changed)
> > >   - copied from r1893131, httpd/httpd/branches/2.4.x/
> >
> > Maybe the script should bail out if `make update-log-tags
> > update-changes` would do anything?
>
> Something like the attached patch maybe?

Well it looks more complicated than that, no Makefile on fresh checkout.
So I borrowed the right command from tag.sh I got this v2 instead
(attached, not tested..).

Also we probably shouldn't put a potential failure for update-log-tags
on the RM (let's not lose you this far :), so the patch is checking
for update-changes only.

Cheers;
Yann.
Index: dev-tools/release/r0-make-candidate.sh
===
--- dev-tools/release/r0-make-candidate.sh	(revision 1893144)
+++ dev-tools/release/r0-make-candidate.sh	(working copy)
@@ -45,6 +45,15 @@ source `dirname $0`/common-lib.sh
 source `dirname $0`/env.sh
 
 detect_checkout
+
+# Updating the CHANGES entries should be a noop, that is still a clean checkout
+# afterward (per assure_clean_checkout). The Makefile is not available at this
+# point but since the update-changes target has not much dependencies we use
+# Makefile.in directly with some little preparations.
+touch build/rules.mk
+make -f Makefile.in update-changes SVN=/usr/bin/svn top_srcdir=. top_builddir=. 

Re: svn commit: r1893136 - /httpd/httpd/tags/candidate-2.4.49-rc1/

[Yann Ylavic]

On Wed, Sep 8, 2021 at 3:23 PM Yann Ylavic  wrote:
>
> On Wed, Sep 8, 2021 at 3:00 PM  wrote:
> >
> > Author: icing
> > Date: Wed Sep  8 13:00:17 2021
> > New Revision: 1893136
> >
> > URL: http://svn.apache.org/viewvc?rev=1893136=rev
> > Log:
> > Tag branches/2.4.x@1893131 as 2.4.49-rc1
> >
> > Added:
> > httpd/httpd/tags/candidate-2.4.49-rc1/   (props changed)
> >   - copied from r1893131, httpd/httpd/branches/2.4.x/
>
> Maybe the script should bail out if `make update-log-tags
> update-changes` would do anything?

Something like the attached patch maybe?
Index: dev-tools/release/r0-make-candidate.sh
===
--- dev-tools/release/r0-make-candidate.sh	(revision 1893144)
+++ dev-tools/release/r0-make-candidate.sh	(working copy)
@@ -45,6 +45,8 @@ source `dirname $0`/common-lib.sh
 source `dirname $0`/env.sh
 
 detect_checkout
+# Updating the CHANGES entries and log tags should be a noop (i.e. still a clean checkout afterward)
+make update-changes update-log-tags 

Re: svn commit: r1893136 - /httpd/httpd/tags/candidate-2.4.49-rc1/

[Yann Ylavic]

On Wed, Sep 8, 2021 at 3:00 PM  wrote:
>
> Author: icing
> Date: Wed Sep  8 13:00:17 2021
> New Revision: 1893136
>
> URL: http://svn.apache.org/viewvc?rev=1893136=rev
> Log:
> Tag branches/2.4.x@1893131 as 2.4.49-rc1
>
> Added:
> httpd/httpd/tags/candidate-2.4.49-rc1/   (props changed)
>   - copied from r1893131, httpd/httpd/branches/2.4.x/

Maybe the script should bail out if `make update-log-tags
update-changes` would do anything?

In this case I think that at r1893131 there is still
"changes-entries/ssl_keylogging_backport_1869842.txt", so the RM would
have to `make update-log-tags && svn commit` first.

Cheers;
Yann.

Re: project website update

[ste...@eissing.org]

> Am 08.09.2021 um 12:53 schrieb Christophe JAILLET 
> :
> 
> Le 08/09/2021 à 12:13, ste...@eissing.org a écrit :
>> Need help to figure out how out website updates now after the "move" 
>> (whatever that means).
>> Formerly:
>> - changes committed into 
>> https://svn.apache.org/repos/asf/httpd/site/trunk/content
> Changes committed in https://github.com/apache/httpd-site
> (so needs to be listed as a contributor, I guess)

Thanks, Christophe. So that needs some git handling to update the site. Hmm, 
either
being submitter or make a fork and create a PR. The former sounds simpler.

>> - TMP_KEY for from https://cms.apache.org/httpd/publish
>> - POST with same form fields done to trigger the update (I assume)
> Nothing to do, it is now done automatically by some magic put in place by 
> infra.
> When pushed on github, it lands on h.a.o.

Ack.

> CJ
> 
>> So, what is now the way?
>> - Stefan
> 

Re: project website update

[Christophe JAILLET]

Le 08/09/2021 à 12:13, ste...@eissing.org a écrit :

Need help to figure out how out website updates now after the "move" (whatever 
that means).

Formerly:

- changes committed into 
https://svn.apache.org/repos/asf/httpd/site/trunk/content

Changes committed in https://github.com/apache/httpd-site
(so needs to be listed as a contributor, I guess)


- TMP_KEY for from https://cms.apache.org/httpd/publish
- POST with same form fields done to trigger the update (I assume)
Nothing to do, it is now done automatically by some magic put in place 
by infra.

When pushed on github, it lands on h.a.o.

CJ



So, what is now the way?

- Stefan

project website update

[ste...@eissing.org]

Need help to figure out how out website updates now after the "move" (whatever 
that means).

Formerly:

- changes committed into 
https://svn.apache.org/repos/asf/httpd/site/trunk/content
- TMP_KEY for from https://cms.apache.org/httpd/publish
- POST with same form fields done to trigger the update (I assume)

So, what is now the way?

- Stefan

Re: release scripts

[Yann Ylavic]

Awesome, great work Stefan, thanks a lot!

On Tue, Sep 7, 2021 at 4:22 PM ste...@eissing.org  wrote:
>
> After some learning experience (*cough*) I committed a new
> version of the scripts, now in $DEV_TOOLS/release that go
> so far as staging local changes to all repositories after
> a successful vote.
>
> I will test some more tomorrow and add the announce mailing
> part. The real test will then come when actually doing a
> release as testing is hard to cover all code paths otherwise.
>
> I have silently sneaked in - as some fringe benefit to all
> the pain - a '-rcN' suffix for vote candidates. Since we
> will be able to cancel a release much later now without
> modifying a source repository.
>
> The -rcN tars for voting are named as such, but the directories
> contained have the version without any suffix. So, a -rcN
> tar can be renamed to the release tar without changes when
> the vote has passed.
>
>
> Cheers, Stefan

Re: svn commit: r1893113 - /httpd/httpd/branches/2.4.x/STATUS

[ste...@eissing.org]

> Am 08.09.2021 um 10:36 schrieb Yann Ylavic :
> 
> On Wed, Sep 8, 2021 at 10:30 AM ste...@eissing.org  wrote:
>> 
>> The way I do 2.4.x updates right now:
>> 
>> while true; do svn up; sleep .1; done
>> 
>> ;-)
> 
> Personally I whine once the checkin fails only :)

Touchè!

Re: svn commit: r1893113 - /httpd/httpd/branches/2.4.x/STATUS

[Yann Ylavic]

On Wed, Sep 8, 2021 at 10:30 AM ste...@eissing.org  wrote:
>
> The way I do 2.4.x updates right now:
>
> while true; do svn up; sleep .1; done
>
> ;-)

Personally I whine once the checkin fails only :)

Re: svn commit: r1893113 - /httpd/httpd/branches/2.4.x/STATUS

[ste...@eissing.org]

The way I do 2.4.x updates right now:

while true; do svn up; sleep .1; done

;-)

> Am 08.09.2021 um 10:29 schrieb yla...@apache.org:
> 
> Author: ylavic
> Date: Wed Sep  8 08:29:19 2021
> New Revision: 1893113
> 
> URL: http://svn.apache.org/viewvc?rev=1893113=rev
> Log:
> Backported in r1893111. [skip ci]
> 
> Modified:
>httpd/httpd/branches/2.4.x/STATUS
> 
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1893113=1893112=1893113=diff
> ==
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Wed Sep  8 08:29:19 2021
> @@ -141,12 +141,6 @@ RELEASE SHOWSTOPPERS:
> PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
>   [ start all new proposals below, under PATCHES PROPOSED. ]
> 
> -  *) mod_proxy: Don't canonicalize with both nocanon and 
> ProxyPassInterpolateEnv
> - On.  PR 65549.
> - trunk patch: http://svn.apache.org/r1893016
> - 2.4.x patch: svn merge -c 1893016 ^/httpd/httpd/trunk .
> - +1: ylavic, covener, rpluem
> -
>   *) mod_unique_id: Earlier request_time initialization in 
> read_request_line(),
>  plus use of an atomic counter to close the race condition.
>  trunk patch: http://svn.apache.org/r1893001
> 
> 

Re: svn commit: r1893011 - /httpd/httpd/trunk/test/time-sem.c

[ste...@eissing.org]

> Am 07.09.2021 um 22:04 schrieb Christophe JAILLET 
> :
> 
> Le 07/09/2021 à 10:52, yla...@apache.org a écrit :
>> Author: ylavic
>> Date: Tue Sep  7 08:52:23 2021
>> New Revision: 1893011
>> URL: http://svn.apache.org/viewvc?rev=1893011=rev
>> Log:
>> test/time-sem.c: unlock the accept mutex before exiting (error conditions).
>> Modified:
>> httpd/httpd/trunk/test/time-sem.c
> 
> Hi,
> 
> just for my understanding, does anyone use these tests?
> Are they run on travis? If no, should they be?
> 
> Same question, concerning the unitest framework (httpdunit)?
> This is a great idea, but it looks mostly unused.

I had a quick look since in mod_h2 I have some unit tests that may get 
transferred too. But then other things occupied my time.

> 
> It tried to play with it a few years ago and found it quite hard to use, 
> because most of our functions need some "context" (i.e. a request, a pool, a 
> config, ...)
> I was wondering if implementing such unittest as a module would make sense?
> We could plug nearly anywhere with some hooks to have a meaningful context. 
> We could also implement a new hook to let modules implement tests for 
> functions that are not exported.
> All this done, it could be run from our perl test framework as any other 
> module.

Hmm, that would be a neat way to solve the export restrictions. Build in 
maintainer mode only or some other define.