You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2023/10/12 00:26:38 UTC
[tomcat] branch 10.1.x updated (357c5e288c -> a74199a118)
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 357c5e288c Fix typo
new 29a589dafc Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.
new a74199a118 Check GPG viability without actually creating a file.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Check GPG viability without actually creating a file.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a74199a11848d3cacb9b95b5e5ae2f4040eb8fa6
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Fri Sep 29 11:07:41 2023 -0400
Check GPG viability without actually creating a file.
---
build.xml | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 0e933bef3e..be035680d5 100644
--- a/build.xml
+++ b/build.xml
@@ -2824,13 +2824,21 @@ asf.ldap.username=${release.asfusername}
<!-- Test GPG by signing build.xml as a sample file. -->
<target name="gpg-init-3" if="gpg.passphrase">
- <delete file="build.xml.asc" quiet="true" />
- <antcall target="sign">
- <param name="file" value="build.xml" />
- </antcall>
- <uptodate srcfile="build.xml" targetfile="build.xml.asc" property="gpg.success" />
- <delete file="build.xml.asc" quiet="true" />
- <fail unless="gpg.success" />
+ <exec executable="${gpg.exec}"
+ inputstring="${gpg.passphrase}"
+ failonerror="true"
+ discardOutput="true"
+ logError="true">
+ <arg value="--batch"/>
+ <arg value="--pinentry-mode"/>
+ <arg value="loopback"/>
+ <arg value="--passphrase-fd"/>
+ <arg value="0"/>
+ <arg value="-o" /><!-- write to stdout -->
+ <arg value="-" />
+ <arg value="--detach-sign"/>
+ <arg value="build.xml"/>
+ </exec>
</target>
<!-- Packages the core zip distro -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 29a589dafc66a2968fa9bcf86fd2a60fe3987fb2
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Fri Sep 29 08:39:15 2023 -0400
Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.
---
build.xml | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 1bc42bf231..0e933bef3e 100644
--- a/build.xml
+++ b/build.xml
@@ -2804,7 +2804,7 @@ asf.ldap.username=${release.asfusername}
</target>
<!-- Sets properties only required for releases -->
- <target name="release-init" depends="gpg-init-1,gpg-init-2,compile" >
+ <target name="release-init" depends="gpg-init-1,gpg-init-2,gpg-init-3,compile" >
<taskdef name="forceUtcTimeZone"
classname="org.apache.tomcat.buildutil.ForceUtcTimeZone"
classpath="${tomcat.classes}" />
@@ -2816,9 +2816,21 @@ asf.ldap.username=${release.asfusername}
</target>
<target name="gpg-init-2" if="${gpg.exec.available}">
- <input message="Enter GPG pass-phrase" addproperty="gpg.passphrase" >
- <handler type="secure"/>
- </input>
+<echo>gpg.exec.available=${gpg.exec.available}</echo>
+<echo>gpg.exec=${gpg.exec}</echo>
+ <input addproperty="gpg.passphrase"><handler type="secure"/>Enter GPG passphrase
+</input>
+ </target>
+
+ <!-- Test GPG by signing build.xml as a sample file. -->
+ <target name="gpg-init-3" if="gpg.passphrase">
+ <delete file="build.xml.asc" quiet="true" />
+ <antcall target="sign">
+ <param name="file" value="build.xml" />
+ </antcall>
+ <uptodate srcfile="build.xml" targetfile="build.xml.asc" property="gpg.success" />
+ <delete file="build.xml.asc" quiet="true" />
+ <fail unless="gpg.success" />
</target>
<!-- Packages the core zip distro -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org