commit: e6a81a66efc3b3150375e11cfc1e206db01cae91 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat Jul 15 18:24:06 2023 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sat Jul 15 18:24:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a81a66
dev-util/jenkins-bin: fix systemd service file The --daemon option is no longer available with Jenkins. Closes: https://bugs.gentoo.org/904101 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> dev-util/jenkins-bin/Manifest | 1 + dev-util/jenkins-bin/files/jenkins-bin-r5.service | 11 ++++++ dev-util/jenkins-bin/jenkins-bin-2.401.2-r1.ebuild | 45 ++++++++++++++++++++++ dev-util/jenkins-bin/jenkins-bin-2.414.ebuild | 45 ++++++++++++++++++++++ 4 files changed, 102 insertions(+) diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index 89cb0df079f8..c79d9acbdbac 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,3 +1,4 @@ DIST jenkins-bin-2.401.1.war 98362423 BLAKE2B b1c3853b463a4003ff5d40dc5299ce2ea717fc018adf4b80a241ba6912b3642ebb334681a08b7cb8b7088d3abe37775ed1e3d51feefc5953ce68be15c4482648 SHA512 6150e9b871ba2b0b1366751e9ef3c67a50e129ec091fea3c336325cc1a5c15b1182a3c71ea3092de1ec85e035e0edb97de9c2801654c8e116501cc6f3f7eb077 DIST jenkins-bin-2.401.2.war 98406337 BLAKE2B 58f5b2ddc8883816423f577c1a10f5de256b34d40f7b71d78f1948330187ee76dff02c2afa7754b677a578639e81a0d0af4d7b1210b13f3138bc8467c9c448d0 SHA512 82029df261d823556616198a1f8e9371ef991abf9d6ac08d5582b7c1b97a52c4fd3220012d22b0720c297520fb7083b22e14cda2797e17e23de3d359e6d025b4 DIST jenkins-bin-2.410.war 93652415 BLAKE2B df4bf3939fd785e963b59e2cb6e434e2f89a78c3c3e36001189c9eb6f1a74c6c722a68835e189535f669977cd911f24819e9a015028c51bf6e94b7c6c55f0735 SHA512 61d69190b7fcc28fadbec678f3e0d815e6e5809f7dfdaf3ddff80573589a67d8b84b5487b35a5af16e444bf4876708d3f3e4d254b1432c2e1359ec8f76d2029c +DIST jenkins-bin-2.414.war 89528534 BLAKE2B c97c854504dcf04bc0ccdb45efd6b348e13523ed8ef4486b8acabca3fa8bab234dd327261053306c2679be5a2bfef918203ad1615e0188d2d5178c95e003cce0 SHA512 3b64155df9f14f791b3129ebb4d95989513bafb54df379a952cb6ff980c833756a15d34457724fa9f1534205cf1b24d1ad1087d2522198f4f98d5a6ddd93dec6 diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r5.service b/dev-util/jenkins-bin/files/jenkins-bin-r5.service new file mode 100644 index 000000000000..e92f1d0a19f7 --- /dev/null +++ b/dev-util/jenkins-bin/files/jenkins-bin-r5.service @@ -0,0 +1,11 @@ +[Unit] +Description=Jenkins Daemon + +[Service] +EnvironmentFile=/etc/conf.d/jenkins +Type=simple +ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS} +User=jenkins + +[Install] +WantedBy=multi-user.target diff --git a/dev-util/jenkins-bin/jenkins-bin-2.401.2-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.401.2-r1.ebuild new file mode 100644 index 000000000000..e8b333002f60 --- /dev/null +++ b/dev-util/jenkins-bin/jenkins-bin-2.401.2-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="The leading open source automation server" +HOMEPAGE="https://jenkins.io/"; +LICENSE="MIT" +SRC_URI="https://get.jenkins.io/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:17 virtual/jre:11 )" + +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}-r3.logrotate ${PN/-bin/} + + newinitd "${FILESDIR}"/${PN}-r3.init jenkins + newconfd "${FILESDIR}"/${PN}-r1.confd jenkins + + systemd_newunit "${FILESDIR}"/${PN}-r5.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.414.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.414.ebuild new file mode 100644 index 000000000000..94f16b3ed823 --- /dev/null +++ b/dev-util/jenkins-bin/jenkins-bin-2.414.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="The leading open source automation server" +HOMEPAGE="https://jenkins.io/"; +LICENSE="MIT" +SRC_URI="https://get.jenkins.io/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:17 virtual/jre:11 )" + +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}-r3.logrotate ${PN/-bin/} + + newinitd "${FILESDIR}"/${PN}-r3.init jenkins + newconfd "${FILESDIR}"/${PN}-r1.confd jenkins + + systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service + + fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup +}
