tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rainer Jung <rj...@apache.org>
Subject Re: svn commit: r1833978 - /tomcat/trunk/build.xml
Date Thu, 21 Jun 2018 07:18:29 GMT
Noticed the missing ciphers.sh when doing the 9.0.10 check. Looking at 
the list of file mode setting in the package-tgz target of build.xml, I 
wonder:

- shouldn't we just use name="bin/*.sh" like we do for *.exe instead of 
listing each file individually? I don't see any "*.sh" we would not like 
to set to 755.

- the list contains several shell files, which do not exist and probably 
haven't existed for a long time. They go back to merging in dist.xml in 
2010. Examples: jasper.sh, jspc.sh, tool-wrapper-using-launcher.sh, 
shutdown-using-launcher.sh, startup-using-launcher.sh. This would also 
be fixed by using *.sh.

IMHO we should switch to *.sh and backport.

Regards,

Rainer

Am 21.06.2018 um 08:59 schrieb rjung@apache.org:
> Author: rjung
> Date: Thu Jun 21 06:59:29 2018
> New Revision: 1833978
> 
> URL: http://svn.apache.org/viewvc?rev=1833978&view=rev
> Log:
> Fix permissions for ciphers.sh in binary
> distribution (750 instead of 640).
> 
> Modified:
>      tomcat/trunk/build.xml
> 
> Modified: tomcat/trunk/build.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1833978&r1=1833977&r2=1833978&view=diff
> ==============================================================================
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Thu Jun 21 06:59:29 2018
> @@ -2378,6 +2378,7 @@ skip.installer property in build.propert
>           <include name="RUNNING.txt" />
>           <include name="BENCHMARKS.txt" />
>           <exclude name="bin/catalina.sh" />
> +        <exclude name="bin/ciphers.sh" />
>           <exclude name="bin/configtest.sh" />
>           <exclude name="bin/daemon.sh" />
>           <exclude name="bin/digest.sh" />
> @@ -2402,6 +2403,7 @@ skip.installer property in build.propert
>         <!-- bin directory will pick up the wrong permissions.                 -->
>         <tarfileset dir="${tomcat.dist}" dirmode="750" filemode="750" prefix="${final.name}">
>           <include name="bin/catalina.sh" />
> +        <include name="bin/ciphers.sh" />
>           <include name="bin/configtest.sh" />
>           <include name="bin/daemon.sh" />
>           <include name="bin/digest.sh" />

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message