dev-util/jenkins-bin: security cleanup

Bug: https://bugs.gentoo.org/780849
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

11 files changed, 4 insertions, 244 deletions

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 01b323acff2f..1ab0b750e7ae 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,7 +1,2 @@
-DIST jenkins-bin-2.263.3.war 67287051 BLAKE2B 376612f444d6827ad270f1121c2df3f134893eb9a501b919e2c1b506f0536b506a1158152541c46a211f55ecc62b39930024bf3457e2e550900e5aa98f368f39 SHA512 c8badbb4704ad60ede50d32b9df36ca8f78da7e4238e9277a26eaa90a16bd27106bf7e04497cf2bf2ef086befc8cfdb64db9af7f4ceccb1dc22d4e21e5898e68
-DIST jenkins-bin-2.263.4.war 67287029 BLAKE2B 0e5a510fab07fccebbfae7cf5b9accb88543e5ba7a7512d120db518afb4f80e9feeb6895c3227ff52da5286440a7cd226c172a77b10a4573df2917643a1df3a3 SHA512 4f648b372a51c01b04d2057b61d2a50b2abd5d3b282b3d790eb579ebba3381cdc3fda28bcb7bad0df4ff837f66b9074e8ade66309c38b52d1f3c22f1b8d0f63e
-DIST jenkins-bin-2.277.1.war 70886703 BLAKE2B f090aa2fd7ad7eb6e8ad46afe727c01cd0cb66408ae234c5f33abc5e45d3886d960e172e964443e88a3311a36cabc99e74385ff5744d6e1b920b6f911874a0c1 SHA512 4fe4076a3145b213c9e70e5b66ca9289e01d1c9bcd8587298e7cb40d4c3b0a6d647a1f055a1c6bac9b4a04068b33a83236a08bdbec81ccb823473b9df08478f9
 DIST jenkins-bin-2.277.2.war 70887351 BLAKE2B e415752c220d75b33229a7ce93ec294d39e8ed88af160ab56d30a8df487739191e32a53b485c37deca1bb2be755ba7dd2e640537308ea9f758e6a1426c23f933 SHA512 c5b6665fcec457dfd96c6c3cfad09fe65e781e9b09ca8a79cb8b274dcaae9eba518607baa5a0f0d9a1eb297c276d4636fead6c96d4a5a8c3368dab8f88db3627
-DIST jenkins-bin-2.280.war 73385503 BLAKE2B 4322a5f9d50236a7409ce30b8d6899abada57b94bda38f7e4734e44e22a7405f30cb12218789803c0adf02ba4d6738b1f9dd2210339c4f5528ec37fc8ecd1447 SHA512 91b61b12a4cf603e923882d91767a1fa43974c023ae52422dcaa79e770bcf0feedc2dfb3627898a3179c10a3f86c1bc7846ce9ad7bc834d46552889d45fb6ccb
-DIST jenkins-bin-2.283.war 71906683 BLAKE2B bd7dbf30d0c15263207a8e024750e706f58bdb26bcb41be91e454bfab3f40e74b075ab9f6c28686f42f8c2b02c8938887a0891caf71928405399bff6c02ffd92 SHA512 44009dd243df0e704562a0e9b85f1434294f17bb9410514b42f9195a1dc07e415b29de7167991a01eef52eb853b33ead77dafcae8a064db0488d3e636d739f6c
 DIST jenkins-bin-2.287.war 74382482 BLAKE2B 90b8b765db7324b47a1d68b2e3dfb475271ccc695a60c8830ede731172592ac622e911bc64d14c4cbda58cd0e82cdcab7850c76783703281c4ded948e25bce32 SHA512 03c64fa595bd2b9b8463fcd47cdb2ccbe46cd820bcfdc2b2f0a9ae406d2dd32e6a5c8f51ddb8bdbc20498ae27672fb0b6e6f3e3f894f00bbc3f8e80dd627faf1
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.init2 b/dev-util/jenkins-bin/files/jenkins-bin-r2.init
index 93d4d5f7e687..93d4d5f7e687 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin.init2
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r2.init
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service2 b/dev-util/jenkins-bin/files/jenkins-bin-r2.service
index f109fac02cc9..f109fac02cc9 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin.service2
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r2.service
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service b/dev-util/jenkins-bin/files/jenkins-bin.service
deleted file mode 100644
index 5edaac7da40a..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Jenkins Daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/java -Djava.awt.headless=true -DJENKINS_HOME=/var/lib/jenkins/home -jar /opt/jenkins/jenkins.war --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=8080 --debug=5 --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log
-User=jenkins
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.3-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.3-r1.ebuild
deleted file mode 100644
index d60a4fb1e670..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.263.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.4.ebuild
deleted file mode 100644
index d60a4fb1e670..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.263.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.277.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.277.1.ebuild
deleted file mode 100644
index d60a4fb1e670..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.277.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.277.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.277.2.ebuild
index d60a4fb1e670..10778d0c4f4a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.277.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.277.2.ebuild
@@ -36,10 +36,10 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
 
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins
 
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
 
 	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
 }
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.280.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.280.ebuild
deleted file mode 100644
index 960720966a1b..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.280.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.283.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.283.ebuild
deleted file mode 100644
index 960720966a1b..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.283.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.287.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.287.ebuild
index 960720966a1b..6272140cb584 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.287.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.287.ebuild
@@ -36,10 +36,10 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
 
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins
 
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
 
 	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
 }