Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/rundeck-bin/, app-misc/rundeck-bin/files/, profiles/
Date: Tue, 07 Dec 2021 09:55:26
Message-Id: 1638870771.3bc526951264f8106e502406a35cfc420b556b08.jsmolic@gentoo
1 commit: 3bc526951264f8106e502406a35cfc420b556b08
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 7 09:52:51 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 7 09:52:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc52695
7
8 app-misc/rundeck-bin: treeclean
9
10 Closes: https://bugs.gentoo.org/781263
11 Bug: https://bugs.gentoo.org/811168
12 Closes: https://bugs.gentoo.org/819759
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 app-misc/rundeck-bin/Manifest | 2 -
16 .../files/rundeck-bin-2.6.8-profile.patch | 55 ----------------------
17 app-misc/rundeck-bin/files/rundeckd.initd | 16 -------
18 app-misc/rundeck-bin/metadata.xml | 12 -----
19 app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild | 49 -------------------
20 profiles/package.mask | 5 --
21 6 files changed, 139 deletions(-)
22
23 diff --git a/app-misc/rundeck-bin/Manifest b/app-misc/rundeck-bin/Manifest
24 deleted file mode 100644
25 index fb0607044498..000000000000
26 --- a/app-misc/rundeck-bin/Manifest
27 +++ /dev/null
28 @@ -1,2 +0,0 @@
29 -DIST rundeck-2.6.8-1.20.GA.noarch.rpm 101053077 BLAKE2B 44dc66ebbeb105e4ed5c198ca2cff9e69a03a226e43c0e68898a225955aaca471d1ada163962e25dbd3de097aa7582a3fae351d44a9740f1e46fc64526575620 SHA512 15620e306c10cae09eec95c43207cf88ebce69d4c7fd70289fac7f2f580343c623d77605f3dd5aa98cc882ec3512196aa431a2ff72e453780b415d19ee8bcebd
30 -DIST rundeck-config-2.6.8-1.20.GA.noarch.rpm 9460 BLAKE2B 97f943904ecfaa6d7a07bb7b8635ce13184f78fa3f042b5db8a4509d558836eda05772724e5fc58864a776900afeab790bbb6c86754e0f19dab12de827fda2a4 SHA512 ab4b9933bf942706cc1b8184375122d3e122e960761582d7b00b2a8981dc9b6cd6442ad8e65699db9e80e0a64b921f2916527f4c2263a58f70363e63a99b95d7
31
32 diff --git a/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch b/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch
33 deleted file mode 100644
34 index a9ff4acd0a4a..000000000000
35 --- a/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch
36 +++ /dev/null
37 @@ -1,55 +0,0 @@
38 ---- a/etc/rundeck/profile 2016-06-10 21:37:22.000000000 +0100
39 -+++ b/etc/rundeck/profile 2016-06-14 00:02:11.630959252 +0100
40 -@@ -1,27 +1,11 @@
41 - RDECK_BASE=/var/lib/rundeck
42 - export RDECK_BASE
43 -
44 --JAVA_CMD=java
45 - RUNDECK_TEMPDIR=/tmp/rundeck
46 -
47 - RDECK_HTTP_PORT=4440
48 - RDECK_HTTPS_PORT=4443
49 -
50 --#
51 --# If JAVA_HOME is set, then add it to home and set JAVA_CMD to use the version specified in that
52 --# path. JAVA_HOME can be set in the rundeck profile. Or set in this file.
53 --#JAVA_HOME=<path/to/JDK or JRE/install>
54 --
55 --if [ ! -z $JAVA_HOME ]; then
56 -- PATH=$PATH:$JAVA_HOME/bin
57 -- export PATH
58 -- JAVA_CMD=$JAVA_HOME/bin/java
59 --fi
60 --
61 --
62 --
63 --export CLI_CP=$(find /var/lib/rundeck/cli -name \*.jar -printf %p:)
64 --export BOOTSTRAP_CP=$(find /var/lib/rundeck/bootstrap -name \*.jar -printf %p:)
65 - export RDECK_JVM="-Djava.security.auth.login.config=/etc/rundeck/jaas-loginmodule.conf \
66 - -Dloginmodule.name=RDpropertyfilelogin \
67 - -Drdeck.config=/etc/rundeck \
68 -@@ -36,7 +20,7 @@
69 - #
70 - # Set min/max heap size
71 - #
72 --RDECK_JVM="$RDECK_JVM -Xmx1024m -Xms256m -XX:MaxPermSize=256m -server"
73 -+RDECK_JVM="$RDECK_JVM -Xmx1024m -Xms256m -server"
74 - #
75 - # SSL Configuration - Uncomment the following to enable. Check SSL.properties for details.
76 - #
77 -@@ -44,15 +28,4 @@
78 -
79 - export RDECK_SSL_OPTS="-Djavax.net.ssl.trustStore=/etc/rundeck/ssl/truststore -Djavax.net.ssl.trustStoreType=jks -Djava.protocol.handler.pkgs=com.sun.net.ssl.internal.www.protocol"
80 -
81 --if test -t 0 -a -z "$RUNDECK_CLI_TERSE"
82 --then
83 -- RUNDECK_CLI_TERSE=true
84 -- export RUNDECK_CLI_TERSE
85 --fi
86 --
87 --if test -n "$JRE_HOME"
88 --then
89 -- unset JRE_HOME
90 --fi
91 --
92 - umask 002
93
94 diff --git a/app-misc/rundeck-bin/files/rundeckd.initd b/app-misc/rundeck-bin/files/rundeckd.initd
95 deleted file mode 100644
96 index f9afeb656479..000000000000
97 --- a/app-misc/rundeck-bin/files/rundeckd.initd
98 +++ /dev/null
99 @@ -1,16 +0,0 @@
100 -#!/sbin/openrc-run
101 -# Copyright 1999-2016 Gentoo Foundation
102 -# Distributed under the terms of the GNU General Public License v2
103 -
104 -command=/usr/bin/rundeckd
105 -pidfile=/var/run/rundeckd.pid
106 -command_background=yes
107 -extra_started_commands=reload
108 -servicelog=/var/log/rundeck/service.log
109 -start_stop_daemon_args="-1 ${servicelog} -2 ${servicelog} -u rundeck -g rundeck"
110 -
111 -reload() {
112 - ebegin "Reloading $RC_SVCNAME"
113 - start-stop-daemon -p ${pidfile} -s HUP
114 - eend $?
115 -}
116
117 diff --git a/app-misc/rundeck-bin/metadata.xml b/app-misc/rundeck-bin/metadata.xml
118 deleted file mode 100644
119 index c53c3f73d6b3..000000000000
120 --- a/app-misc/rundeck-bin/metadata.xml
121 +++ /dev/null
122 @@ -1,12 +0,0 @@
123 -<?xml version="1.0" encoding="UTF-8"?>
124 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
125 -<pkgmetadata>
126 - <maintainer type="person">
127 - <email>williamh@g.o</email>
128 - <name>William Hubbs</name>
129 - </maintainer>
130 - <maintainer type="project">
131 - <email>java@g.o</email>
132 - <name>Gentoo Java team</name>
133 - </maintainer>
134 -</pkgmetadata>
135
136 diff --git a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
137 deleted file mode 100644
138 index 7c0b4f11d35f..000000000000
139 --- a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
140 +++ /dev/null
141 @@ -1,49 +0,0 @@
142 -# Copyright 1999-2021 Gentoo Authors
143 -# Distributed under the terms of the GNU General Public License v2
144 -
145 -EAPI=5
146 -
147 -inherit epatch java-pkg-2 rpm user
148 -
149 -DESCRIPTION="Job Scheduler and Runbook Automation"
150 -HOMEPAGE="http://www.rundeck.org"
151 -SRC_URI="http://download.rundeck.org/rpm/rundeck-${PV}-1.20.GA.noarch.rpm
152 - http://download.rundeck.org/rpm/rundeck-config-${PV}-1.20.GA.noarch.rpm"
153 -
154 -LICENSE="Apache-2.0"
155 -SLOT="0"
156 -KEYWORDS="~amd64"
157 -
158 -RDEPEND=">=virtual/jre-1.8"
159 -
160 -S="${WORKDIR}"
161 -
162 -java_prepare() {
163 - epatch "${FILESDIR}"/${P}-profile.patch
164 -}
165 -
166 -pkg_setup() {
167 - enewgroup rundeck
168 - enewuser rundeck -1 /bin/bash /var/lib/rundeck rundeck
169 -}
170 -
171 -src_install() {
172 - insinto /etc
173 - doins -r etc/rundeck
174 - insinto /var/lib
175 - doins -r var/lib/rundeck
176 - dodir /var/log/rundeck
177 - dodir /var/rundeck/projects
178 - fowners -R rundeck:rundeck /var/lib/rundeck /var/log/rundeck
179 - fowners -R rundeck:rundeck /var/rundeck
180 -
181 - newinitd "${FILESDIR}"/rundeckd.initd rundeckd
182 - echo . \"${EPREFIX}\"/etc/rundeck/profile > "${T}"/launcher-pre.sh
183 -
184 - java-pkg_regjar "${ED}"/var/lib/rundeck/bootstrap/*.jar
185 - java-pkg_dolauncher rundeckd \
186 - -pre "${T}"/launcher-pre.sh \
187 - --main com.dtolabs.rundeck.RunServer \
188 - --java_args "\${RDECK_JVM}" \
189 - --pkg_args "${EPREFIX}/var/lib/rundeck \${RDECK_HTTP_PORT}"
190 -}
191
192 diff --git a/profiles/package.mask b/profiles/package.mask
193 index 33f7ed933b8f..09f5dca32dca 100644
194 --- a/profiles/package.mask
195 +++ b/profiles/package.mask
196 @@ -634,11 +634,6 @@ dev-libs/vc-intrinsics
197 media-libs/quvi
198 media-video/clive
199
200 -# Jakov Smolić <jsmolic@g.o> (2021-11-07)
201 -# Unresolved security vulnerability, still uses EAPI 5.
202 -# Removal on 2021-12-07. Bug #811168.
203 -app-misc/rundeck-bin
204 -
205 # Sam James <sam@g.o> (2021-11-03)
206 # Known issues with YAMA (kernel.yama.ptrace_scope=1) which is on by default
207 # in at least the sys-kernel/gento-kernel kernel config.