You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/11/06 21:18:11 UTC

[tomcat] branch main updated: Add ALv2 headers - hopefully these don; t break anything

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 5af9745  Add ALv2 headers - hopefully these don;t break anything
5af9745 is described below

commit 5af9745ffd2d95e6f0e9910ee2f4b6260db54273
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Nov 6 21:18:04 2021 +0000

    Add ALv2 headers - hopefully these don;t break anything
---
 modules/openssl-panama-foreign/openssl-tomcat.conf | 15 +++++++++++++++
 modules/openssl-panama-foreign/openssl.conf        | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/modules/openssl-panama-foreign/openssl-tomcat.conf b/modules/openssl-panama-foreign/openssl-tomcat.conf
index 25e121b..8775c52 100644
--- a/modules/openssl-panama-foreign/openssl-tomcat.conf
+++ b/modules/openssl-panama-foreign/openssl-tomcat.conf
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 --source
 -t org.apache.tomcat.util.openssl
 -lssl
diff --git a/modules/openssl-panama-foreign/openssl.conf b/modules/openssl-panama-foreign/openssl.conf
index f61cf86..cf69b49 100644
--- a/modules/openssl-panama-foreign/openssl.conf
+++ b/modules/openssl-panama-foreign/openssl.conf
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #### Extracted from: /usr/include/alloca.h
 
 --include-function alloca    # header: /usr/include/alloca.h

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


Re: [tomcat] branch main updated: Add ALv2 headers - hopefully these don; t break anything

Posted by Mark Thomas <ma...@apache.org>.
On 06/11/2021 21:42, Rémy Maucherat wrote:
> On Sat, Nov 6, 2021 at 10:18 PM <ma...@apache.org> wrote:
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to branch main
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/main by this push:
>>       new 5af9745  Add ALv2 headers - hopefully these don;t break anything
>> 5af9745 is described below
>>
>> commit 5af9745ffd2d95e6f0e9910ee2f4b6260db54273
>> Author: Mark Thomas <ma...@apache.org>
>> AuthorDate: Sat Nov 6 21:18:04 2021 +0000
>>
>>      Add ALv2 headers - hopefully these don;t break anything
> 
> I cannot believe I missed it, I was too focused on the headers for the
> generated sources I guess. Sorry for the trouble.

No trouble. I wouldn't have even noticed them if I hadn't been working 
on the BuildBot migration and checking the RAT files.

Mark

> 
> Rémy
> 
>> ---
>>   modules/openssl-panama-foreign/openssl-tomcat.conf | 15 +++++++++++++++
>>   modules/openssl-panama-foreign/openssl.conf        | 15 +++++++++++++++
>>   2 files changed, 30 insertions(+)
>>
>> diff --git a/modules/openssl-panama-foreign/openssl-tomcat.conf b/modules/openssl-panama-foreign/openssl-tomcat.conf
>> index 25e121b..8775c52 100644
>> --- a/modules/openssl-panama-foreign/openssl-tomcat.conf
>> +++ b/modules/openssl-panama-foreign/openssl-tomcat.conf
>> @@ -1,3 +1,18 @@
>> +# Licensed to the Apache Software Foundation (ASF) under one or more
>> +# contributor license agreements.  See the NOTICE file distributed with
>> +# this work for additional information regarding copyright ownership.
>> +# The ASF licenses this file to You under the Apache License, Version 2.0
>> +# (the "License"); you may not use this file except in compliance with
>> +# the License.  You may obtain a copy of the License at
>> +#
>> +#     http://www.apache.org/licenses/LICENSE-2.0
>> +#
>> +# Unless required by applicable law or agreed to in writing, software
>> +# distributed under the License is distributed on an "AS IS" BASIS,
>> +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>> +# See the License for the specific language governing permissions and
>> +# limitations under the License.
>> +
>>   --source
>>   -t org.apache.tomcat.util.openssl
>>   -lssl
>> diff --git a/modules/openssl-panama-foreign/openssl.conf b/modules/openssl-panama-foreign/openssl.conf
>> index f61cf86..cf69b49 100644
>> --- a/modules/openssl-panama-foreign/openssl.conf
>> +++ b/modules/openssl-panama-foreign/openssl.conf
>> @@ -1,3 +1,18 @@
>> +# Licensed to the Apache Software Foundation (ASF) under one or more
>> +# contributor license agreements.  See the NOTICE file distributed with
>> +# this work for additional information regarding copyright ownership.
>> +# The ASF licenses this file to You under the Apache License, Version 2.0
>> +# (the "License"); you may not use this file except in compliance with
>> +# the License.  You may obtain a copy of the License at
>> +#
>> +#     http://www.apache.org/licenses/LICENSE-2.0
>> +#
>> +# Unless required by applicable law or agreed to in writing, software
>> +# distributed under the License is distributed on an "AS IS" BASIS,
>> +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>> +# See the License for the specific language governing permissions and
>> +# limitations under the License.
>> +
>>   #### Extracted from: /usr/include/alloca.h
>>
>>   --include-function alloca    # header: /usr/include/alloca.h
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


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


Re: [tomcat] branch main updated: Add ALv2 headers - hopefully these don; t break anything

Posted by Rémy Maucherat <re...@apache.org>.
On Sat, Nov 6, 2021 at 10:18 PM <ma...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/main by this push:
>      new 5af9745  Add ALv2 headers - hopefully these don;t break anything
> 5af9745 is described below
>
> commit 5af9745ffd2d95e6f0e9910ee2f4b6260db54273
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Sat Nov 6 21:18:04 2021 +0000
>
>     Add ALv2 headers - hopefully these don;t break anything

I cannot believe I missed it, I was too focused on the headers for the
generated sources I guess. Sorry for the trouble.

Rémy

> ---
>  modules/openssl-panama-foreign/openssl-tomcat.conf | 15 +++++++++++++++
>  modules/openssl-panama-foreign/openssl.conf        | 15 +++++++++++++++
>  2 files changed, 30 insertions(+)
>
> diff --git a/modules/openssl-panama-foreign/openssl-tomcat.conf b/modules/openssl-panama-foreign/openssl-tomcat.conf
> index 25e121b..8775c52 100644
> --- a/modules/openssl-panama-foreign/openssl-tomcat.conf
> +++ b/modules/openssl-panama-foreign/openssl-tomcat.conf
> @@ -1,3 +1,18 @@
> +# Licensed to the Apache Software Foundation (ASF) under one or more
> +# contributor license agreements.  See the NOTICE file distributed with
> +# this work for additional information regarding copyright ownership.
> +# The ASF licenses this file to You under the Apache License, Version 2.0
> +# (the "License"); you may not use this file except in compliance with
> +# the License.  You may obtain a copy of the License at
> +#
> +#     http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing, software
> +# distributed under the License is distributed on an "AS IS" BASIS,
> +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +# See the License for the specific language governing permissions and
> +# limitations under the License.
> +
>  --source
>  -t org.apache.tomcat.util.openssl
>  -lssl
> diff --git a/modules/openssl-panama-foreign/openssl.conf b/modules/openssl-panama-foreign/openssl.conf
> index f61cf86..cf69b49 100644
> --- a/modules/openssl-panama-foreign/openssl.conf
> +++ b/modules/openssl-panama-foreign/openssl.conf
> @@ -1,3 +1,18 @@
> +# Licensed to the Apache Software Foundation (ASF) under one or more
> +# contributor license agreements.  See the NOTICE file distributed with
> +# this work for additional information regarding copyright ownership.
> +# The ASF licenses this file to You under the Apache License, Version 2.0
> +# (the "License"); you may not use this file except in compliance with
> +# the License.  You may obtain a copy of the License at
> +#
> +#     http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing, software
> +# distributed under the License is distributed on an "AS IS" BASIS,
> +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +# See the License for the specific language governing permissions and
> +# limitations under the License.
> +
>  #### Extracted from: /usr/include/alloca.h
>
>  --include-function alloca    # header: /usr/include/alloca.h
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>

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