Fwd: MODERATE for zsh-announce@zsh.org

Fwd: MODERATE for zsh-announce@zsh.org

[Bart Schaefer]

[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]

---------- Forwarded message ----------
From: Baptiste Daroussin <bapt@freebsd.org>
To: Peter Stephenson <p.w.stephenson@ntlworld.com>
Cc: Zsh List <zsh-announce@zsh.org>
Bcc:
Date: Tue, 4 Sep 2018 15:54:55 +0200
Subject: Re: zsh 5.6 released
On Tue, Sep 04, 2018 at 09:41:52AM +0100, Peter Stephenson wrote:
> (This is on behalf of Daniel Shahaf, in case his announcement email
> doesn't get through.)
>
> Subject: zsh 5.6 released
>
> Version 5.6 of zsh has been released and is available from
> http://www.zsh.org/pub/ . It will shortly also be available from
> Sourceforge: https://sourceforge.net/projects/zsh/files/ .
>
> This is a security release, fixing CVE-2018-0502 and CVE-2018-13259.
> All sites are encouraged to upgrade from 5.5.1 as soon as possible.
>
> See README and NEWS in the source distribution for more information.

Am I the only one having issues with the tarbal not providing any files in
the Doc/help directory, meaning make install provides me with only dead
symlinks
in the runhelp directory?

Best regards,
Bapt

Re: Fwd: MODERATE for zsh-announce@zsh.org

[Baptiste Daroussin]

[-- Attachment #1: Type: text/plain, Size: 1393 bytes --]

On Tue, Sep 04, 2018 at 07:44:20AM -0700, Bart Schaefer wrote:
> ---------- Forwarded message ----------
> From: Baptiste Daroussin <bapt@freebsd.org>
> To: Peter Stephenson <p.w.stephenson@ntlworld.com>
> Cc: Zsh List <zsh-announce@zsh.org>
> Bcc:
> Date: Tue, 4 Sep 2018 15:54:55 +0200
> Subject: Re: zsh 5.6 released
> On Tue, Sep 04, 2018 at 09:41:52AM +0100, Peter Stephenson wrote:
> > (This is on behalf of Daniel Shahaf, in case his announcement email
> > doesn't get through.)
> >
> > Subject: zsh 5.6 released
> >
> > Version 5.6 of zsh has been released and is available from
> > http://www.zsh.org/pub/ . It will shortly also be available from
> > Sourceforge: https://sourceforge.net/projects/zsh/files/ .
> >
> > This is a security release, fixing CVE-2018-0502 and CVE-2018-13259.
> > All sites are encouraged to upgrade from 5.5.1 as soon as possible.
> >
> > See README and NEWS in the source distribution for more information.
> 
> Am I the only one having issues with the tarbal not providing any files in
> the Doc/help directory, meaning make install provides me with only dead
> symlinks
> in the runhelp directory?
> 
> Best regards,
> Bapt

In case it might help others, the solution to fix the issue and have a working
runhelp was to remove the Doc/help.txt file from the sources after extracting
the tar file.

Best regards,
Bapt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: MODERATE for zsh-announce@zsh.org

[Peter Stephenson]

On Wed, 5 Sep 2018 09:54:15 +0200
Baptiste Daroussin <bapt@FreeBSD.org> wrote:
> In case it might help others, the solution to fix the issue and have a working
> runhelp was to remove the Doc/help.txt file from the sources after extracting
> the tar file.

Hmm... the help files are supposed to be in the source rather than the
doc distribution, so logically that should be there (along with the help
files themselves).

help.txt gets removed by realclean rather than clean, I think because
it's part of the source.

Possibly we need to build from realclean when making a tarball.

pws

Re: MODERATE for zsh-announce@zsh.org

[Daniel Shahaf]

Peter Stephenson wrote on Wed, Sep 05, 2018 at 09:07:09 +0100:
> On Wed, 5 Sep 2018 09:54:15 +0200
> Baptiste Daroussin <bapt@FreeBSD.org> wrote:
> > In case it might help others, the solution to fix the issue and have a working
> > runhelp was to remove the Doc/help.txt file from the sources after extracting
> > the tar file.
> 
> Hmm... the help files are supposed to be in the source rather than the
> doc distribution, so logically that should be there (along with the help
> files themselves).
> 

I've compared the 5.5.1 artifacts (known good) to the 5.6 artifacts.

The doc tarball adds Etc/FAQ.html, likely due to workers/43333.

The src tarball omits Doc/help/*.

> help.txt gets removed by realclean rather than clean, I think because
> it's part of the source.
> 
> Possibly we need to build from realclean when making a tarball.

For the 5.6 artifacts I did an out-of-tree build in an empty builddir after
`git clean -fdx` in the srcdir.  The "out-of-tree" part is the problem (I just
did another targz-{src,doc} build to confirm that).

For now, I'll add a note to the rolling-a-release runbook to run the tarball
build in a clean tree using an in-tree build.  (I don't have time to fix
Doc/Makefile.in right this minute.)

Sorry for the regression.

Daniel

[PATCH] dist: Generate doc/help/* and doc/help.txt in builddir rather than srcdir.

[Daniel Shahaf]

Fixes creating tarballs in out-of-tree builds.

While here, remove the instruction to build zsh before building
a tarball, since that's unneeded.
---
 Doc/Makefile.in            | 7 +++----
 Etc/creating-a-release.txt | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index fded2e825..35011091b 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -201,11 +201,10 @@ runhelp: help.txt
 .PHONY: runhelp
 
 help.txt: zshbuiltins.1
-	@-rm -f $(sdir)/help.txt $(sdir)/help/*
+	@-rm -f $@ help/*
 	perl $(sdir_top)/Util/helpfiles \
-	    $(sdir)/zshbuiltins.1 $(sdir)/help $(sdir)/help.txt \
-	    || rm -f $(sdir)/help.txt $(sdir)/help/*
-	touch $(sdir)/$@
+	    $(sdir)/zshbuiltins.1 help help.txt \
+	    || rm -f help.txt help/*
 
 $(MAN): zmacros.yo zman.yo
 
diff --git a/Etc/creating-a-release.txt b/Etc/creating-a-release.txt
index 80b0dd338..bb7272368 100644
--- a/Etc/creating-a-release.txt
+++ b/Etc/creating-a-release.txt
@@ -35,17 +35,12 @@ To create a zsh release:
 	git checkout zsh-5.5.1-test-1
 	git diff HEAD # ensure no local mods
 	Util/preconfig && ./configure ...
-	make
 	make -C Etc
 	make -C Doc everything
 	make tarxz-doc tarxz-src
 	for i in zsh*.tar.?z ; do gpg -ab -- $i ; done
 
 	# The tarxz-* targets create both *.tar.gz and *.tar.xz.
-	# 
-	# They must be run in an in-tree build (where the generated 'configure'
-	# and the generated 'Makefile' are in the same directory), for now, since
-	# Doc/help/* need to be included in the src tarball.  See workers/43373.
 
 - [one time step] Add your key to http://zsh.sf.net/Arc/source.html; see README in the 'web' repository for how to do this.  Its URL is: