| 1 |
commit: f9921e9eb94a060287dbedb71012c729fe5750b7 |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Sun Feb 26 08:40:39 2023 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 27 08:28:55 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9921e9e |
| 7 |
|
| 8 |
java-pkg-simple.eclass: MANIFEST.MF show Gentoo in "Created-By: " |
| 9 |
|
| 10 |
Presently, MANIFEST.MF can receive upstream's "Created-By:" if such line |
| 11 |
is found in a predefined META-INF/MANIFEST.MF in ${JAVA_RESOURCE_DIRS}. |
| 12 |
This change removes such line before the jar command creates the final |
| 13 |
MANIFEST.MF putting "Created-By: (Gentoo)" |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/897786 |
| 16 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/29801 |
| 18 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 19 |
|
| 20 |
eclass/java-pkg-simple.eclass | 3 ++- |
| 21 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass |
| 24 |
index abac18ca03f8..a1589b025617 100644 |
| 25 |
--- a/eclass/java-pkg-simple.eclass |
| 26 |
+++ b/eclass/java-pkg-simple.eclass |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 2004-2022 Gentoo Authors |
| 29 |
+# Copyright 2004-2023 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
# @ECLASS: java-pkg-simple.eclass |
| 33 |
@@ -417,6 +417,7 @@ java-pkg-simple_src_compile() { |
| 34 |
# package |
| 35 |
local jar_args |
| 36 |
if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then |
| 37 |
+ sed '/Created-By: /Id' -i ${classes}/META-INF/MANIFEST.MF |
| 38 |
jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" |
| 39 |
else |
| 40 |
jar_args="cf ${JAVA_JAR_FILENAME}" |
Archives