gentoo auto-resync : 02:12:2022 - 14:56:29

7 files changed, 131 insertions, 15 deletions

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 418282cbf695..b83cbe53d72a 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,15 +1,18 @@
+AUX jenkins-bin-r1.confd 849 BLAKE2B 72adf7227153e169cfce5f9c0b273ac5318e7e12cbec983fa32ee03be17fe8530085b82c32608fdd614dedbb3a0f7e24fda78c516fd74eddc2d423c87796467e SHA512 578bfde6ee95d5bf36c335cc27079c3038dd76b4e9f604afd19adea9e6841948a18b5921af9361e47f473ef149091effdc3dac4c6eb0e27f520cc33a9e2b1468
 AUX jenkins-bin-r2.init 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin-r2.logrotate 479 BLAKE2B ccfe2179a1c3a5a49140373bb594fd4fd2c40edb7ffc7fcdeef6dd7a8da0116bb7f1d7da42f914b779651a6b69c147cbbacd02bb6f5fc1ecd7a8b3269ace56de SHA512 b06d0900e92d14fe6bfd194d5eee667e40a49a13d57c6a1720767a925b5647da1d7b2e6239e7d64d86ff7798df215cac6332e09a89e11ab6fe1a1dc42ac818aa
-AUX jenkins-bin-r3.service 565 BLAKE2B 1a3b12c25e0d581efa2b3ab406a2f1fa4c31ee45a844e324ef5348048a462e25fe6f8c43ae9a8e1e9d162f89dff077efcc03fff590bab2c7e973c599f9be2b90 SHA512 d70ccdce90da50f32e045852cbfb341e7e9491b72119a57682228d572882d79d55a40cc59a0a351b38b2710db139fb64279c2b85cbd5f21667f61d61dd74ecec
+AUX jenkins-bin-r3.init 1590 BLAKE2B ebf33e8290d660706428987e956ff6de8b78f7c590ce46b6229a381f7d3243fbd0681bcb6deeac42d8c13feb927040a09ac0f0e00eb72ad36b390c246bd124bc SHA512 00689236137f8a272ce723d2017548d925066db71499ecf6921a370dd21da9efea9e6850a64ba3504a985fe7904a55ab988609b5f86f5193b6a4b97a1f90a843
+AUX jenkins-bin-r3.service 518 BLAKE2B bfd33c8afc8db031903c5d66dd3bba7c77b6b1ea179c91918daa8b03f7437092c948f00836f3382731096af3f3c76990412efb0b3c753d5de54709f0c64588b7 SHA512 330143f3527095cd7cf0cdfdbec0641c5bd6f10b6d62853c887193400162c9a1125de65f0baed9cec9f501d6d966a46c42b66030669c7b9f167808d2fe67f8e7
+AUX jenkins-bin-r4.service 565 BLAKE2B 1a3b12c25e0d581efa2b3ab406a2f1fa4c31ee45a844e324ef5348048a462e25fe6f8c43ae9a8e1e9d162f89dff077efcc03fff590bab2c7e973c599f9be2b90 SHA512 d70ccdce90da50f32e045852cbfb341e7e9491b72119a57682228d572882d79d55a40cc59a0a351b38b2710db139fb64279c2b85cbd5f21667f61d61dd74ecec
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
-DIST jenkins-bin-2.361.1.war 93504273 BLAKE2B dc5592c20401c19ca86a620335bb2dde803cfc786b912996308654e4db28351a2417e7a504f383b3127d46676ac43671872b1f306f38f40256b14c41945a8e03 SHA512 4feecd554aeedd94c5693f5e685ff31c882ff34c875a28d9d2d639c1d5f897dc893ee6dcfc037b457d385dbb3f62f7ab3842343711def5e01837cc5744e236b5
-DIST jenkins-bin-2.361.2.war 93504834 BLAKE2B d5e74022b83a0ee2775a01c2840ebb67212cede7cb27be980353527c522d7feb91b0b70823126f8101429381d2419834b0493da8566f8dbba8d88c60e862c90d SHA512 dc04b13ca2e1afe5f0d1c967558cbfb9720a47f93b62167c4ed4422b7a43b2ac8b806e75ac12e58dc66d85f7e34800948d857aaeb573d923c7fd61a415b8d148
 DIST jenkins-bin-2.361.3.war 93501786 BLAKE2B 36c5bafd70689603b84ad5ca86b407778b1bf686ea57d4d96566d5dcd22fa7e23f47d9f38048ec6cdf192e839f7588108c221625a94da687d8e74c079cbd1cc4 SHA512 3d0d9ad8c38a514789a8e074f3055e2ba6c8781cf333b95dd74f861011acd8d49ef3c4151f3c2646aba9007d6475304e31a85b39daaa7bb4c955beb2373c64f8
 DIST jenkins-bin-2.361.4.war 93501813 BLAKE2B 92decc0eb48ec1bbb7acf4d6e0ce568bd793c3f45cb6f68673db041ff029fddce014217f269b36645db7f2f3bac614fd3ef7de8ccc4a57bc697b28e776298bbe SHA512 ad4b91acf79ca156e456ddfefb5ac6290263aeebf16780bf886a0b1fde27e208e2ed61d45268fb7f5a74549fcf362439f819f616e916520b211f85d015753f53
 DIST jenkins-bin-2.363.war 93462629 BLAKE2B 7c35594bc03dfd97e93f75b7e05389919ee1634ec2e3a1a4934a2f6215de2420652aaed79ebcde5e7ce9a5e2d8ed7d9495e36f3ee77bcbf6a6d996c2a767c7bb SHA512 4b6207fbd166f6c336181ff224b717b154fbd97a4899e86b94b8e5f3b26d53bb2e3742086a839774edbf6fd56a1d037b14e455474fca7d6f189bb9591b42168c
-EBUILD jenkins-bin-2.361.1.ebuild 1123 BLAKE2B 2d98e57521a215f75741831a524c1c5d73928117d6d7685ccda652406b03cbaa663260144d2747bd075090a8a71594a56e4fc0e01fc3fc05465d97530b46a5e7 SHA512 8419df277167a238be4ab10603400256094f36e793e627ae4ad0f4ec885301824bf476a7adf349cb2c78095f59c724761d6ec6df3a3bb7c321de96e5fdf12089
-EBUILD jenkins-bin-2.361.2.ebuild 1123 BLAKE2B 2d98e57521a215f75741831a524c1c5d73928117d6d7685ccda652406b03cbaa663260144d2747bd075090a8a71594a56e4fc0e01fc3fc05465d97530b46a5e7 SHA512 8419df277167a238be4ab10603400256094f36e793e627ae4ad0f4ec885301824bf476a7adf349cb2c78095f59c724761d6ec6df3a3bb7c321de96e5fdf12089
+DIST jenkins-bin-2.375.1.war 93555446 BLAKE2B 23fcc5d1faa438ac6a9b20b0dc5ed2b2475e87996b8bb604c2ad1214c2d9e528f5b2fdbbfc3fc7226d9c008f4120d8bd3d831dcb6c878ecd0031817787a2d9d0 SHA512 dc7bb525b222f0fd0216304c97b8a1e84fb6c1bafbea46e83261e9db0c8cf4378fd9b621822667eaaa627d970c5e7fd88cd1b6706f1dc478d2b0fc7b9629369f
+DIST jenkins-bin-2.375.war 93552663 BLAKE2B 5a84efee01a15067a0e963f992ee4cc4a3773419c0dbe5d834e2a220f1b8e39f918526f1ccab2a0c10c77609b07e5a33b45d8cdd152b352a9ca37f670f4b4b65 SHA512 9ffdbbb53e6156f5d7c77a8db9a3969834b912e89d22580bb7502c94c6a7898a303500f4a5071c3d16253f2141495c2c57c3c2c1fb56a91e6c48549faa7d4f5b
 EBUILD jenkins-bin-2.361.3.ebuild 1123 BLAKE2B 2d98e57521a215f75741831a524c1c5d73928117d6d7685ccda652406b03cbaa663260144d2747bd075090a8a71594a56e4fc0e01fc3fc05465d97530b46a5e7 SHA512 8419df277167a238be4ab10603400256094f36e793e627ae4ad0f4ec885301824bf476a7adf349cb2c78095f59c724761d6ec6df3a3bb7c321de96e5fdf12089
 EBUILD jenkins-bin-2.361.4.ebuild 1123 BLAKE2B 2d98e57521a215f75741831a524c1c5d73928117d6d7685ccda652406b03cbaa663260144d2747bd075090a8a71594a56e4fc0e01fc3fc05465d97530b46a5e7 SHA512 8419df277167a238be4ab10603400256094f36e793e627ae4ad0f4ec885301824bf476a7adf349cb2c78095f59c724761d6ec6df3a3bb7c321de96e5fdf12089
 EBUILD jenkins-bin-2.363.ebuild 1116 BLAKE2B d45aa31094cd29f6eeb71a2cd15ce5209f72c2bfad374e082e0fdb86000161fd69470b436adbcb62696bb0139acbc1eae4996a70660f0434605e6777fef59456 SHA512 1a2d707dbce65435136fbef74cf18c3ce404725d7e8267eab255ee3200fdde3610da9bf78aec33a4c3b6ff8c1bf4c25410269763496895479de49eeb573f6e54
+EBUILD jenkins-bin-2.375.1.ebuild 1126 BLAKE2B 5adf3ebdf7a301368e2ca31dccfb1db519751490b87d5cfc7a28d1d26444f6d2658a4763d23acf92a9a6fe19966075faff5ea5a80d5351256308de1cb60ce3dc SHA512 11e5f3984468af67bc9e12feed4028cf5d90c121e5366fa1ee2bc72813d5f548ac767128b2ba0fff90119eaf4cffd3c557b03597536ccdfca45979226a67e723
+EBUILD jenkins-bin-2.375.ebuild 1119 BLAKE2B 18d8d3b3b57e78b2bb0a1607da8f9655e9cafbfafbd96b39a4ed62da4585cebb0290a0e055b1abb7d790ff5ba354587a6c4d38ea23c098bcb7dd71f13cf32175 SHA512 d27aacd7de125486e73f3ee5bcf57fc4d81ae02fc15c43db5924b20451a1ad46e9ed94805d691a75c1c2a0d418f693a465fc46d6f154f4a17469b4d20172014e
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.confd b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
new file mode 100644
index 000000000000..6bb38f3e6ce3
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
@@ -0,0 +1,52 @@
+# Config file for /etc/init.d/jenkins
+
+#
+# Directory where Jenkins store its configuration and working
+# files (checkouts, build reports, artifacts, ...).
+#
+JENKINS_HOME="/var/lib/jenkins/home"
+
+#
+# Options to pass to java when running Jenkins.
+#
+JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
+
+#
+# Port Jenkins is listening on.
+#
+JENKINS_PORT="8080"
+
+#
+# Debug level for logs -- the higher the value, the more verbose.
+# 5 is INFO.
+#
+JENKINS_DEBUG_LEVEL="5"
+
+#
+# Whether to enable access logging or not.
+#
+JENKINS_ENABLE_ACCESS_LOG="no"
+
+#
+# Pass arbitrary arguments to Jenkins.
+# Eg.: --httpListenAddress=127.0.0.1 --prefix=/jenkins
+# Full option list: java -jar jenkins.war --help
+#
+JENKINS_ARGS=""
+
+#
+# User
+#
+JENKINS_USER=jenkins
+
+
+
+#
+# Pid File 
+#
+JENKINS_PIDFILE="/var/run/jenkins.pid"
+
+#
+# War File
+#
+JENKINS_WAR="/opt/jenkins/jenkins.war"
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.init b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
new file mode 100644
index 000000000000..96ddbc1fd421
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+
+depend() {
+    need net
+    use dns logger mysql postgresql
+}
+
+checkconfig() {
+    if [ ! -n "$JENKINS_HOME" ] ; then
+        eerror "JENKINS_HOME not configured"
+        return 1
+    fi
+    if [ ! -d "$JENKINS_HOME" ] ; then
+        checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return 1
+
+    JAVA_HOME=`java-config --jre-home`
+    COMMAND=$JAVA_HOME/bin/java
+
+    JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
+
+    # Don't use --daemon here, because in this case stop will not work
+    PARAMS="--logfile=/var/log/jenkins/jenkins.log"
+    [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
+    [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
+    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
+    [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
+
+    if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
+        PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
+    fi
+
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --quiet --background \
+        --make-pidfile --pidfile $JENKINS_PIDFILE \
+        --user ${JENKINS_USER} \
+        --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
+    eend $?
+}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.service b/dev-util/jenkins-bin/files/jenkins-bin-r3.service
index 520a052f43f1..dfe0d174f365 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin-r3.service
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.service
@@ -4,7 +4,7 @@ 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} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS}
+ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --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]
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r4.service b/dev-util/jenkins-bin/files/jenkins-bin-r4.service
new file mode 100644
index 000000000000..520a052f43f1
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r4.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} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --handlerCountMax=100 --handlerCountMaxIdle=20 --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.361.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.375.1.ebuild
index aad8d1e6aa4c..b3ee52691487 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.361.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.375.1.ebuild
@@ -36,10 +36,10 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
 
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
 
-	systemd_newunit "${FILESDIR}"/${PN}-r3.service jenkins.service
+	systemd_newunit "${FILESDIR}"/${PN}-r4.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.361.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.375.ebuild
index aad8d1e6aa4c..76690ca69050 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.361.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.375.ebuild
@@ -8,8 +8,8 @@ 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"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE=""
 
@@ -20,7 +20,7 @@ RDEPEND="acct-group/jenkins
 	acct-user/jenkins
 	media-fonts/dejavu
 	media-libs/freetype
-	!dev-util/jenkins-bin:0
+	!dev-util/jenkins-bin:lts
 	|| ( virtual/jre:17 virtual/jre:11 )"
 
 S="${WORKDIR}"
@@ -36,10 +36,10 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
 
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
 
-	systemd_newunit "${FILESDIR}"/${PN}-r3.service jenkins.service
+	systemd_newunit "${FILESDIR}"/${PN}-r4.service jenkins.service
 
 	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
 }