From 30b0392a568de7fb7de23180f91e1f2e81841835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sun, 26 Oct 2014 17:23:00 +0100
Subject: [PATCH] [dev-util/jenkins-bin] sync

---
 dev-util/jenkins-bin/Manifest                 |  3 +-
 .../{jenkins-bin.init => jenkins-bin.init2}   |  3 +-
 .../jenkins-bin/files/jenkins-bin.logrotate   | 17 ++++++++
 .../jenkins-bin/jenkins-bin-1.565.3.ebuild    | 20 ++++++----
 dev-util/jenkins-bin/jenkins-bin-1.583.ebuild | 40 -------------------
 5 files changed, 31 insertions(+), 52 deletions(-)
 rename dev-util/jenkins-bin/files/{jenkins-bin.init => jenkins-bin.init2} (95%)
 create mode 100644 dev-util/jenkins-bin/files/jenkins-bin.logrotate
 delete mode 100644 dev-util/jenkins-bin/jenkins-bin-1.583.ebuild

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index a60fcfb..d3447ac 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,2 +1 @@
-DIST jenkins_1.565.3_all.deb 61821808 SHA256 6e78af83e7fc6380987e8c5d6c2605bf036ff8ff91dd833d9880294acac1c527 SHA512 5d2fd3c2784907c0d96bdb3e5b4874618b39c77902cc311673907b9a33c9d955dd74ec1a0970362b027de3cbb2a1ec22529ac3ec4b7d5db32df8ce762e980589 WHIRLPOOL eef8f96269beebce3a7af7cf25e09d289bdea8430477a4c69530c8b67908b3995b4c1c72a4cd362a7907b9ca536f3da2b6bb014768ce49aef1297f0b6be21814
-DIST jenkins_1.583_all.deb 61889344 SHA256 038f96949538805d9d9a11708f6aa5cdcafcc543f4d2f1b7e80bc47cd79cdd0b SHA512 4237e3539b5d01ea921fa0a0527ef1067b92dc76dcb9c475e1aeb8608cf2c36f61849c4b9262038a92ce36669802682bb7f283175fe4f5a9b1881899980a1305 WHIRLPOOL b2a6549176cede481bc5eddaac538af21e613cc5bd5101c5bfcaa2a15bb11ed592b5c21d2a95be1a92193fcfa4adcc18a0a85bb31e05e34ca7068632724ac37c
+DIST jenkins-bin-1.565.3.war 67867391 SHA256 a7d6f7dfc39374490861499589d5b4dfff2538f663a4f50a69f22601bf5bba7f SHA512 cef127050b39b294f7fe7f3eb627adabac9b5469af0c9fd016064ce8ab7ef51c387b9b0b618d91cd9231a38ddffcf42e0599201a6627a7601a183d9c0b2fe1d0 WHIRLPOOL 8fdebc5704099335e6d55f8831e57eab7454abc2b16e8701dfd52e414f60b8f8c796d1f65f2c39b0d5e4adc7f7a14981c18acc8a5402a651d5bb58e9ba5d592a
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.init b/dev-util/jenkins-bin/files/jenkins-bin.init2
similarity index 95%
rename from dev-util/jenkins-bin/files/jenkins-bin.init
rename to dev-util/jenkins-bin/files/jenkins-bin.init2
index f66cb30..9e326a5 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin.init
+++ b/dev-util/jenkins-bin/files/jenkins-bin.init2
@@ -11,8 +11,7 @@ checkconfig() {
         return 1
     fi
     if [ ! -d "$JENKINS_HOME" ] ; then
-        eerror "JENKINS_HOME directory does not exist: $JENKINS_HOME"
-        return 1
+        checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1
     fi
     return 0
 }
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.logrotate b/dev-util/jenkins-bin/files/jenkins-bin.logrotate
new file mode 100644
index 0000000..1a9497a
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.logrotate
@@ -0,0 +1,17 @@
+/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
+    compress
+    dateext
+    maxage 365
+    rotate 99
+    size=+4096k
+    notifempty
+    missingok
+    create 644
+    postrotate
+        [ -r /etc/conf.d/jenkins ] && source /etc/conf.d/jenkins
+        if [ -s /var/run/jenkins/jenkins.pid ]; then
+            JPID=`cat /var/run/jenkins/jenkins.pid`
+            test -n "`find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null`" && kill -s ALRM $JPID || :
+        fi
+    endscript
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild
index 46b1da8..2326168 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.584.ebuild,v 1.1 2014/10/20 21:24:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild,v 1.2 2014/10/24 10:42:46 chainsaw Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit user
 DESCRIPTION="Extensible continuous integration server"
 HOMEPAGE="http://jenkins-ci.org/"
 LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
 RESTRICT="mirror"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -21,20 +21,24 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}
 
+JENKINS_DIR=/var/lib/jenkins
+
 pkg_setup() {
 	enewgroup jenkins
-	enewuser jenkins -1 /bin/bash /var/lib/jenkins jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
 }
 
 src_install() {
-	keepdir /var/run/jenkins /var/log/jenkins
-	keepdir /var/lib/jenkins/home /var/lib/jenkins/backup
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
 
 	insinto /opt/jenkins
 	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
-	newinitd "${FILESDIR}"${PN}.init jenkins
-	newconfd "${FILESDIR}"${PN}.confd jenkins
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN/-bin/}
 
-	fowners jenkins:jenkins /var/run/jenkins /var/log/jenkins /var/lib/jenkins /var/lib/jenkins/home /var/lib/jenkins/backup
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
 }
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.583.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.583.ebuild
deleted file mode 100644
index 46b1da8..0000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.583.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.584.ebuild,v 1.1 2014/10/20 21:24:10 mrueg Exp $
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-fonts/dejavu"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.5"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 /bin/bash /var/lib/jenkins jenkins
-}
-
-src_install() {
-	keepdir /var/run/jenkins /var/log/jenkins
-	keepdir /var/lib/jenkins/home /var/lib/jenkins/backup
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	newinitd "${FILESDIR}"${PN}.init jenkins
-	newconfd "${FILESDIR}"${PN}.confd jenkins
-
-	fowners jenkins:jenkins /var/run/jenkins /var/log/jenkins /var/lib/jenkins /var/lib/jenkins/home /var/lib/jenkins/backup
-}