Version bump. Fix bashism bug #54814. Fix pid file bug #547948. Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

4 files changed, 30 insertions, 6 deletions

diff --git a/dev-util/jenkins-bin/ChangeLog b/dev-util/jenkins-bin/ChangeLog
index 2abdb42fddbd..51f0773dc192 100644
--- a/dev-util/jenkins-bin/ChangeLog
+++ b/dev-util/jenkins-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/jenkins-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.26 2015/04/20 13:35:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.27 2015/05/03 16:17:34 mrueg Exp $
+
+*jenkins-bin-1.611 (03 May 2015)
+
+  03 May 2015; Manuel Rüger <mrueg@gentoo.org> +files/jenkins-bin-r1.logrotate,
+  +jenkins-bin-1.611.ebuild, -jenkins-bin-1.610.ebuild:
+  Version bump. Fix bashism bug #54814. Fix pid file bug #547948. Remove old.
 
 *jenkins-bin-1.610 (20 Apr 2015)
 
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 75cbe36a5d92..9588f8826041 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,9 +1,10 @@
+AUX jenkins-bin-r1.logrotate 483 SHA256 8bc2cb9759a54f2674abb1264dca452c295295554f76080c77d29586c1a8fa0c SHA512 74423d3c66e2312eb3a1590e0582ccd82fc01b410d3bfc0627bef56fe6f4e7f4ea01a7a2d92a7a0c4870a1a1c48e911fe7eab3073e14db4910b52158182e5856 WHIRLPOOL 9477206b581ca1d48a9460c1c53ff2fa7d30b3c7fd4daac4fd2aef13374eb999301f62fda7e865f4605b3e5e018e1cfa2cf3b82247f4c4bd40ca3c6c09c7bc76
 AUX jenkins-bin.confd 998 SHA256 8cd3e217ae11f47b73f8a3f28beb2f94b14e24da4e822f7209b19a2f14dccb3b SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b WHIRLPOOL 5c0dee7d648c22c65fcad7ec678ac839d1ab2d61aa52c8e54dccb6a9d58bcda5cca9685e570f0fe5b5f0fd6dd6ce0a47acc616cb9c5f6568758f92125a38f8c8
 AUX jenkins-bin.init2 1781 SHA256 75f8a4dc5c3c03b2f3ac52860b11bf2a245976b4b726b35cfe20ec2acbbb7e08 SHA512 edd83f1d92433441ee2021ab096367ffa17808a4e5564cabec8d9e00276abaec8916bb55bc842ad49ffc9fe6f5b24b8e93a20b247100e96f667fb90f87e6e33c WHIRLPOOL 22735e7b9ad35cec7b7a6e9ba146345786e0d3abf25b8c7d7b93228a779e99458b10831edacc372cef62770687835f7f4096cff3ebdc2b0dfc398e2da6d31996
 AUX jenkins-bin.logrotate 502 SHA256 2c18c2a6757246fe4a1e87191ac6ca529126ab6f0b85c48f6d350c4802a71194 SHA512 86262c89495ed26b4996a55b39bd7f57826010500ef5f668ea28ffcdc3bbce73481158340d24876a3dfc6f7ea6ec872edd40f89bfd9a0bea3aa2d61eeeeddbdd WHIRLPOOL 920b5fe2e776c0a43c964c0c43209c7f2d7cef4bb2a9bfc0a4a4d99797f4be9c78b489b76c3928248ccfeadb10213d643eb12e6ffeb45824ef4f92e9d7924582
 DIST jenkins-bin-1.596.2.war 68553541 SHA256 769fee082d420819f0113d5271be98004d3f3227d98c4e445f6e5f60dde6de37 SHA512 ad853a0e1961a08b21b49e3e1e7a19479774056a2cab37f461f0974021272ab017bff07dc09962443202def4e2a78f3017f6d2389dce90bca6bc8cc0b1d4543c WHIRLPOOL eee48085e32e0a0ae5f4f866a56ad36bf625ab6d3019f4e46b0213064d95d0a989c14d385f1681ccb3300563a22a2e73656ff5a460c07703985e6d0d8a15dc0f
-DIST jenkins-bin-1.610.war 69287626 SHA256 bb5a7b29e359a3743ddf385975bca65221cee89b0a13c5309169601d23952e0e SHA512 72b5e1b802a0a9ee52f195ab89d952d99c4fd33d4e28bc17be6d214016c6ee9d741681d6a0cbf74fc3860fc5ca2cae92edc62e31daa42dfec56fb498722d2fd1 WHIRLPOOL d853df2d5f3b87f2bbe614527ff0f758efa784b412ea3cf002d7a2c3e6fd4c9efa675ab82c42844d80220946993986241c1f63ee70d12e0bcad52d69b9226b47
+DIST jenkins-bin-1.611.war 68914127 SHA256 12157975cd8c5bf54bbafdc16d826fd384d7eea5e3816c2c28f82002ad866e42 SHA512 c7b2ec8be305c44347729079c12867fca72950d4651b1784d27b8aa4f6223867dd9d2277f1cd7bd83734d82bcfe46818999673a65b24f0d7946799ffe49c2539 WHIRLPOOL c8a472b62bf20a1e1a642c75d82b83477926897f1fff22b32f3fb306b916e9092d412b1a0ed96467f83d0c42b68a48457155b87af609ab99f84d1d32bbd2bf3f
 EBUILD jenkins-bin-1.596.2.ebuild 1137 SHA256 81292a63d05bac2e513c9b0576be76b9cc42dd582cec08d8e51d7b858d772303 SHA512 cd47fb2636cc8c5dc4de05146bb0e69d34743373acab9b93f4dead303e82ea7a75f12419be397d12c5871993ea61ff6e64b6911c3f5ec2b64c756a17df65843a WHIRLPOOL e358627a50c7a0c77e842e1cb991fa5e2a5fe2799a5cc6c767281c2b270ed9c15493879564919d9e54eabe9bb1af4019e815bbd5a1dd3607930786731450e54e
-EBUILD jenkins-bin-1.610.ebuild 1128 SHA256 7d3c8f0d835b2b5551f7e92e5e9407e2abebb1cd0dce04359ed1902f1f92ee59 SHA512 11f23258bdeb85faba35fe4b4bd696629e95badc303ac2a4d2332cbb2b2209c3d406e3d7b9a27da01f5e09447ea3ba847c31d7b6f763cffc8076f9772ae10271 WHIRLPOOL bcb2c4e66bcfd146028f46fd8b8ee555cc8260c7d1242e67d1781828247f321628e6ffe188e9aed2f463fc22525ca59bf2d59ae27c1bafbd467800b464aebd32
-MISC ChangeLog 5480 SHA256 0aeb3ae63e5bd4107225faf6751868ffd7d2fe5d68abf8226c00642e54ca55f2 SHA512 9a0e23fdde8677ddbb522cc8d65fab727dd019cc85e42cbf29ddea6de1712c908896ee55f0040dc7c165904867aed17a54d222a17669e4f1b9630ab1000b4a4b WHIRLPOOL 69dad3a55e7f8293b080aa4df7e4893ccb8f60fdea0bcd27a9ec7c92df691138fe73d1c5dff9fad0e5b0a77247bcfca35397c5ea1f5c301ddefcc24c6806a563
+EBUILD jenkins-bin-1.611.ebuild 1131 SHA256 30d76940f25072acc17004421a764f2864ae29b5a4dccc9c05bf2502b840d034 SHA512 422f450225a2eb6c94b9b3e5316194a73c653b0ffbf7c378ed404b165a15aa00cbe30a4a9adaf4402073b70f63de324e05120756ad74e7f415b099e3470f2ac3 WHIRLPOOL 78e8e1aaeca35930eb96b3a47ee9e8517ec0d4454cf6edcc1eeb04af606160f1c859ec6c3201e357b3f8aae7941637c1978c5db5e5817f82795c0c3f5c49d5d6
+MISC ChangeLog 5730 SHA256 6db009d784de7f49899ba5b4b6f5a44605433c5f11923ae3992998deb813ca64 SHA512 e1c5b810662b7e9fadd28c752ca52478acb330a7f27812a8c210df5026d5db9ca432b29da29254584aa9fb642e9110367344ed32754da4a6450aeb105a533e01 WHIRLPOOL ccb7b4e496dbb8d127e239175311251442d2d8b4446bf0347f03a03642ac5440be3b3b97a1cd696e61faa8ebb23adda3808836183577db24cc3442f88e2921f9
 MISC metadata.xml 323 SHA256 1fe2512e65f90ccec2e80123923bdb2c3cb6f597c45754f6c9f8246761234a48 SHA512 3d0a3145eca160f429e10f2b48ae1415143f2175cc06a3569a8d7fb646dd14fab750c8f8df4ad71ae085915bc075fa0e3ed35ee20a84fd04deb9590bed8fd940 WHIRLPOOL 830a0c6f0046034b335756b21f7a00b081254e190e288db88161fc26ceb48f0652b2418b67022ec394489b1e23028e50bef67e808d771518bf4ac2076d7f403b
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
new file mode 100644
index 000000000000..33b16600452e
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r1.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 ] && . /etc/conf.d/jenkins
+        if [ -s /var/run/jenkins.pid ]; then
+            JPID=$(cat /var/run/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.610.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.611.ebuild
index 4a042a522cb2..e9effde77e91 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.610.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.611.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.610.ebuild,v 1.1 2015/04/20 13:35:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.611.ebuild,v 1.1 2015/05/03 16:17:34 mrueg Exp $
 
 EAPI=5
 
@@ -36,7 +36,7 @@ src_install() {
 	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN/-bin/}
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
 
 	newinitd "${FILESDIR}"/${PN}.init2 jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins