Version bump, could need more testing

Package-Manager: portage-2.2.01.22013-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

7 files changed, 262 insertions, 7 deletions

diff --git a/net-fs/cvmfs/ChangeLog b/net-fs/cvmfs/ChangeLog
index e11c4158d7ea..9354d53509c9 100644
--- a/net-fs/cvmfs/ChangeLog
+++ b/net-fs/cvmfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/cvmfs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.1 2012/10/30 14:44:26 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.2 2013/06/17 23:03:46 bicatali Exp $
+
+*cvmfs-2.1.10 (17 Jun 2013)
+
+  17 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +cvmfs-2.1.10.ebuild,
+  +files/FindCARes.cmake, +files/Findleveldb.cmake,
+  +files/cvmfs-2.1.10-no-config.patch, +files/cvmfs-2.1.10-openrc.patch:
+  Version bump, could need more testing
 
 *cvmfs-2.0.19 (30 Oct 2012)
 
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 2d974f9e0fb4..aceaeef5eb49 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX FindCARes.cmake 1272 SHA256 fd256e7d5375f9ac65f539ae6e8ff8d0b92c7e6dbd3b9c548913ca82ea78be19 SHA512 35818e190f4861bee71f3620bcda1bbb6424587b320ee15eb9a258b04182f9b8ede316721b04622b3effcec9870981bbd245c72bb549334b3398923718a3a9c6 WHIRLPOOL 5048f07597bc411e27b816545bd6750b3ef80158f2ef429b92aff8392f439b7bfcbc74d0dae6f8bb096cc6161eb98b0ba73ec8c3ff17f1c8bd0b076e85be7165
+AUX Findleveldb.cmake 1084 SHA256 d8f123d216310d38dd7f80e2d5c4b2d599a5fca4f221332927ac26890db8404b SHA512 ad195cfc953df1fe3f32ebaad2d1b5654fc23d7080ce9d719f92b389b47fc97d8a9281a3fd8137c2f718f1bd4e1f903c334fd9c192f61e0f3414d51ef9a5b40e WHIRLPOOL 8ee612d5327faf182e735caf5b05eb9aaf193e6cde5b55e93994455c4aeb792fd6fa12533d369b905388195e9f0d55ffd8e7044634f03750b9cf3e42011a198d
 AUX cvmfs-2.0.19-autotools.patch 10558 SHA256 bbb55c0aa6a09780fdf3b7aa23e4cccf345cead567adccf0893ef6d288dc8c57 SHA512 fc68a89ca546e6ffe0e8b67669e04a1ec2505af28b8d17e30e8c8c2865f9329a1b60b53febcd994e686d9dc4fbc180d4b06f76a6c79441105f1fd43bed1e0244 WHIRLPOOL 9d521b7ec4c05b279639fb7e07c2b2af89832c4204e4df87168fcda47b280ffdcafd8578569dfce00a70c2e3d69bdce0fb5e7b7e0dcf5b3e5c4c29f165b10c74
 AUX cvmfs-2.0.19-no-redhat-init.patch 1161 SHA256 4878fa936d836a1872a16e40ffc9594221f7e89f1067d982d4ebe80cc353bad2 SHA512 1273b00a5a5e3d83443f663df68e9f10c3398266ed84b1ad9e265f34cdb4f0290c44c3329aa8b0e642dee410ed6e045c5188b2243c97cfd9744c35b83c842142 WHIRLPOOL 97fbfe1a4376bcb7636041d68a6deec9a715ccb82bdfe4f89c76db7f19c8b3f1fe0f99604dafd5e4f8801b32bfb0acf019a488fa88b22cf7605b9da67682b8eb
 AUX cvmfs-2.0.19-openrc.patch 2908 SHA256 c8ba422e9afd4eb1b5cb95317c6fb7735393eeecfb8452d472f347cd57726b89 SHA512 dfa6bfca8b4099f247fdf2f260d3dcc395855d0ed58430044e54d916a688924c95280dea35768f5604608eaa9dc638813ef3f18d1e76177a20dd4d8a7a535b6b WHIRLPOOL fcd6397c1972ce3c17297d24cba58491618490d224131ffbe4b066df4f0369b7a0ec5e6ee358b9af9f461686f4cebf4338cd71e2700601a3fb2407c5d866bce3
 AUX cvmfs-2.0.19-spinlock.patch 613 SHA256 05ed924cdb812f11eb5508c3d14684d56cadc0d5bd12dc55e900f288f8cf9544 SHA512 09e600322d8996ab96b26ab04f1d6183cbcbd7f6458c6457ce2dc3dd48c4a93e134006eb56db38757d26252a3a8b863ae4e3ed92c382b7b5213e08bb0e6d15c7 WHIRLPOOL 4b1695393b85e0f803657db028041124fe69039e67dc49af4bc1e77f014680bf2374f108f786ec1154bf0b0f54367579e26e1ebaa6bc7bcc44cfb37305c4a6aa
+AUX cvmfs-2.1.10-no-config.patch 327 SHA256 a994212e59a22faabcbef81a0b5b11235c057dd132980513039272312b71bca1 SHA512 99642d6044f1f3cdfd3382441b0f0f7d1d61a356b0cde34fdd70bfb73e968221e011ef69211d15c862b003b7771d6a7e7bbb6e6cbe462362f21ef345476aafaa WHIRLPOOL 02281b828efb9a51ca824e4ed6764d1f0e1a511b35bda127c761b5283ac0491c7fb46826817e3c6d3c524ddd5cd2d3de022dd511d11e6af119880ec811869863
+AUX cvmfs-2.1.10-openrc.patch 1663 SHA256 fe7963d86f077320d5eacc0fd286666087bb0ca9fb09937c56bca08b53dbdfab SHA512 bba6927b93244ecf61760d41a53c82b8f286f0f8daf3e7d4677438eee9603a25a216fa4204e32d8cdc733ad37102f7d440afc6261737d490022fdc4abee04d32 WHIRLPOOL 550358e224eecfe6291a3361f35d96ea4b72b09e77b6c58926fc547ef2d85fd458737c4bb8c94b480658440eca27441821aca03dd57aa2faa8f3a355bf654c58
 AUX cvmfs.initd 4776 SHA256 e6086a1bf5f1e621208a29979005084e6d58edd3244cfc1c92f1d45e71b3481f SHA512 a6691d40200f3df180b6d55dc8000fb74d603970842a2f164375c66d17ce8c95025a381262146e5f533313efa7b34739de950ee0b92f44f6ea7ef88bc559622b WHIRLPOOL 0f774462b37f45d4de639f5feb7720596a65dfc27bd02d11497c054009ff9b9d2984bf8e44691e39a6176996ac84a86c5c838a287f376af6e7126214d35359dc
 AUX cvmfsd.confd 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
 AUX cvmfsd.initd 4566 SHA256 b5cae7c11bc6ef8f36ce49e9c845dc1ee670bbd6b7f9b5e38329b82ca6bb01f0 SHA512 c685bc3af8082b1caa34932c7a982599c29db6f25d43a4b6e96ea54f4791ad7c32e84f4582fba7df111bff4c1584f064e7e3b3bbe373d8dab6138dc5b32ec3a6 WHIRLPOOL 9ec37cf0307a76cffa02e8907db538bf2e50a119183935da2f72b4a2094ac0b400bc0011bc922de8dc7200fd709ed5c252e2294042f2ddfb0f31e3d7a51b3d2e
 DIST cvmfs-2.0.19.tar.gz 7740158 SHA256 a92ff675e16f4766d7108a2d34ccce324d83bdd720262b6574cc90a2510e580c SHA512 4456af5a883de199d8e6b6f5ba5fb25cd25c986677055a22fc1aa1d64e27fdd66ba5b406d2c4a6960af3866dbdf85b57f1ebc1a447dce6ebaca196a21aee95da WHIRLPOOL 621c59bdf52c963d528399a20af5c7c950afb300b0eaeb4dae5c7b3cc83436de897a184fffedd386921f5c84fb075f15dd42f820679d7a473ee6525b884b356f
+DIST cvmfs-2.1.10.tar.gz 11861170 SHA256 95e54a9085a1cdaba122de86e4e21c00ac7ce923e12451e9ee0ccfbfa9f8c3aa SHA512 2a1ba47be92ba72ca30cf20539acaec2ad1902be8957a7aa33738d00f68414a5d9e3110e68ff8c9b081c4249884ad0733eef7710af99e15c5897248a8611402c WHIRLPOOL 5cc184b5fe40df1a771eac694fcdb216fec792435499f460074a5e2c0869eb0f937cfa4c4de3a1adea613c038cb9fe95bfd8465a545f1f4c8bb5713bcfc79ad6
 EBUILD cvmfs-2.0.19.ebuild 3123 SHA256 34891cf2d9e699365bab520eeb16ced94a809d251c29c3c11cdbbdd87f79c325 SHA512 114d5b09ef45d64ceaf5a0fb3d6d5f4f2fc2077c34d1997dd9fcaa853b3ec57a20396c8505e314b32d60ee2b4cbd55b8de6622c09819d84be587a12f53588eb2 WHIRLPOOL 58391692f1fe66c380ca245f6d8be2bfb83650e156e2580e0cc4a809760a11d6a1ef8fa0e784b7de0a7dfe6c4fa6d58c41e06aa3378b6c051ee8493a44566315
-MISC ChangeLog 1208 SHA256 4e846d392aaa9ee3f81dcad07fcf578f09b444ba6cba015d6f7b8536d20f4d0d SHA512 6208cbda918dc7dcb7a90c024b2b03426d7259b11927db3348ff049809839ad154e68e0f8e8c08f16555dedc8e430d7f510bcd0275a750b9620da1d767786ad6 WHIRLPOOL 36deaa8ed269236bb8a1f2e53b7abd0b5f8dcdb0dadf89f14074999493b304510d0a4c1a8b3a9fa8df0c13c40ca80ac946f57aff5d16035d5ebedfb1075c8101
+EBUILD cvmfs-2.1.10.ebuild 1907 SHA256 6eef2b9584f439dcfd093e5b13e5edb0f06efdae141c288392c5c5466f0fce84 SHA512 04ae8b24c40c290227689b443f5be59486b9c0999303f753d7c1f358b75243eae29b2a12dab31038f63bca2e409b04ba5183cf6c64807341662c318a82f530c2 WHIRLPOOL f3690293c886aa5c51b721fe08916bc6f8c46d497b2dfba0fcc73d16a3325a9675c0c4bfb54e5d31be760f8250b07eae4b03750a6b54a1a0b55cb5febd9c2995
+MISC ChangeLog 1480 SHA256 2b01e3c4c7df4aface7011a73c6149055a39eb852bfd0644080f01e804458053 SHA512 e66c01b1758e004372746939ad8cfd19ca331e250d7e0031eef77809a3d07f666afb37dd90867dca749c71831e99bb50841f31c653fc0f0cd72bf249f48fd531 WHIRLPOOL 5a64f8632901d28e3edb2f1878b1c29823aa5e099eb819c24d70de2dff6cfd0a3ce5fc0c547092ff0c74f2d9ff19dd4ec70b6e6dff5d7e8033e569a07090faef
 MISC metadata.xml 962 SHA256 8e663c6e3488bdb8cf49d7a3f03549fe093597522e25dd61a4cdde390ccc0091 SHA512 ad7ae2a380fabb7a3d65d04318e084f2e19310e6a4c22abf2f23ecf90cffd8be762fc93e26e3f4d7ddd05a168baca4cf903d7bff7f87d0dbe7dfc5c57b303b9d WHIRLPOOL bfd28004471a97a1a708ad42b84bd0aad99a9eb94fb200dc39986d3eaacfccf767fda17712533a217e623031dca0f1fb2e5bf3ba2ced122d9014d7cd11c8f7fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlCP588ACgkQ1ycZbhPLE2D9lQCfUkFBvkjQh6D26IBGB3M5XFc+
-d+IAnjstIHOeti6HLJGKIOFKP8WnVPgW
-=18ay
+iEYEAREIAAYFAlG/ldMACgkQ1ycZbhPLE2DGGwCfSzOiNnzm3v7mbiooTfYo1Pva
+basAoIU4MmnkEEC+IR29hb6voyVTt5c4
+=aTmZ
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cvmfs/cvmfs-2.1.10.ebuild b/net-fs/cvmfs/cvmfs-2.1.10.ebuild
new file mode 100644
index 000000000000..50d651492d43
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.1.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.1.10.ebuild,v 1.1 2013/06/17 23:03:46 bicatali Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
+SRC_URI="https://ecsft.cern.ch/dist/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="+client debug doc server"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/openssl
+	net-dns/c-ares
+	net-misc/curl[adns]
+	sys-libs/zlib
+	client? (
+		dev-cpp/sparsehash
+		dev-libs/leveldb
+		sys-fs/fuse )
+	server? ( sys-libs/zlib )"
+
+RDEPEND="${CDEPEND}
+	client? ( net-fs/autofs )
+	server? ( www-servers/apache[ssl] )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-config.patch
+	"${FILESDIR}"/${P}-openrc.patch
+)
+
+src_prepare() {
+	sed -i -e 's/COPYING//' CMakeLists.txt || die
+	cp "${FILESDIR}"/Find*.cmake cmake/Modules/ || die
+	rm bootstrap.sh || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCARES_BUILTIN=OFF
+		-DSQLITE3_BUILTIN=OFF
+		-DLIBCURL_BUILTIN=OFF
+		-DZLIB_BUILTIN=OFF
+		-DSPARSEHASH_BUILTIN=OFF
+		-DLEVELDB_BUILTIN=OFF
+		$(cmake-utils_use debug BUILD_SERVER_DEBUG)
+		$(cmake-utils_use server BUILD_SERVER)
+		$(cmake-utils_use client BUILD_CVMFS)
+		$(cmake-utils_use client BUILD_LIBCVMFS)
+		$(cmake-utils_use client INSTALL_MOUNT_SCRIPTS)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cd doc
+		doxygen cvmfs.doxy || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml -r doc/html/*
+}
+
+pkg_config() {
+	if use client; then
+		einfo "Setting up CernVM-FS client"
+		cvmfs_config setup
+		einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local and run"
+		einfo "  ${EROOT%/}/usr/init.d/autofs restart"
+	fi
+}
diff --git a/net-fs/cvmfs/files/FindCARes.cmake b/net-fs/cvmfs/files/FindCARes.cmake
new file mode 100644
index 000000000000..1ed5b3291358
--- /dev/null
+++ b/net-fs/cvmfs/files/FindCARes.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+# - Find c-ares
+# Find the c-ares includes and library
+# This module defines
+#  CARES_INCLUDE_DIR, where to find ares.h, etc.
+#  CARES_LIBRARIES, the libraries needed to use c-ares.
+#  CARES_FOUND, If false, do not try to use c-ares.
+# also defined, but not for general use are
+#  CARES_LIBRARY, where to find the c-ares library.
+
+FIND_PATH(CARES_INCLUDE_DIR ares.h
+/usr/local/include
+/usr/include
+)
+
+SET(CARES_NAMES ${CARES_NAMES} cares)
+FIND_LIBRARY(CARES_LIBRARY
+  NAMES ${CARES_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
+    SET(CARES_LIBRARIES ${CARES_LIBRARY})
+    SET(CARES_FOUND "YES")
+ELSE (CARES_LIBRARY AND CARES_INCLUDE_DIR)
+  SET(CARES_FOUND "NO")
+ENDIF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
+
+
+IF (CARES_FOUND)
+   IF (NOT CARES_FIND_QUIETLY)
+      MESSAGE(STATUS "Found c-ares: ${CARES_LIBRARIES}")
+   ENDIF (NOT CARES_FIND_QUIETLY)
+ELSE (CARES_FOUND)
+   IF (CARES_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find c-ares library")
+   ENDIF (CARES_FIND_REQUIRED)
+ENDIF (CARES_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_CARES_INCLUDE_PATH ${CARES_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_CARES_LIB_PATH ${CARES_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  CARES_LIBRARY
+  CARES_INCLUDE_DIR
+  )
diff --git a/net-fs/cvmfs/files/Findleveldb.cmake b/net-fs/cvmfs/files/Findleveldb.cmake
new file mode 100644
index 000000000000..755db1160f9d
--- /dev/null
+++ b/net-fs/cvmfs/files/Findleveldb.cmake
@@ -0,0 +1,41 @@
+# Try to find leveldb
+# Once done, this will define
+#
+# LEVELDB_FOUND       - system has leveldb
+# LEVELDB_INCLUDE_DIR - the leveldb include directory
+# LEVELDB_LIB_DIR     - the leveldb library directory
+#
+# LEVELDB_DIR may be defined as a hint for where to look
+# LEVELDB_LIBRARIES   - the level db library name(s)
+
+if(LEVELDB_INCLUDE_DIR AND LEVELDB_LIBRARY)
+    set(LEVELDB_FOUND_QUIETLY TRUE)
+else(LEVELDB_INCLUDE_DIR AND LEVELDB_LIBRARY)
+  find_path(LEVELDB_INCLUDE_DIR leveldb/db.h
+    HINTS
+    ${LEVELDB_INCLUDE_DIR}
+    $ENV{LEVELDB_INCLUDE_DIR}
+    /usr
+    /usr/local
+    /opt/
+    PATH_SUFFIXES include/
+    PATHS /opt
+    )
+
+  find_library(LEVELDB_LIB leveldb
+    HINTS
+    ${LEVELDB_DIR}
+    $ENV{LEVELDB_DIR}
+    /usr
+    /usr/local
+    /opt/leveldb/
+    PATH_SUFFIXES lib
+    )
+
+
+  set(LEVELDB_LIBRARIES ${LEVELDB_LIB})
+
+  get_filename_component( LEVELDB_LIB_DIR ${LEVELDB_LIB} PATH )
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(leveldb DEFAULT_MSG LEVELDB_LIB_DIR LEVELDB_INCLUDE_DIR )
+endif(LEVELDB_INCLUDE_DIR AND LEVELDB_LIBRARY)
diff --git a/net-fs/cvmfs/files/cvmfs-2.1.10-no-config.patch b/net-fs/cvmfs/files/cvmfs-2.1.10-no-config.patch
new file mode 100644
index 000000000000..f6bbdd184673
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.1.10-no-config.patch
@@ -0,0 +1,11 @@
+--- cvmfs-2.1.10/cvmfs/tracer.cc.orig	2013-06-11 13:39:47.469323020 -0700
++++ cvmfs-2.1.10/cvmfs/tracer.cc	2013-06-11 13:40:04.361414919 -0700
+@@ -19,7 +19,7 @@
+  *       down on assertion.  This might be not desired behavior.
+  */
+ 
+-#include "config.h"
++#include "cvmfs_config.h"
+ #include "tracer.h"
+ 
+ #include <pthread.h>
diff --git a/net-fs/cvmfs/files/cvmfs-2.1.10-openrc.patch b/net-fs/cvmfs/files/cvmfs-2.1.10-openrc.patch
new file mode 100644
index 000000000000..eb5a3f4b08a4
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.1.10-openrc.patch
@@ -0,0 +1,55 @@
+simple patch to adapt cvmfs scripts for openrc
+bicatali@gentoo.org 06/2013
+
+--- cvmfs/cvmfs_config.orig	2013-06-17 15:42:57.011022876 -0700
++++ cvmfs/cvmfs_config	2013-06-17 15:46:22.395157110 -0700
+@@ -14,20 +14,23 @@
+   Linux )
+     if [ -x /sbin/service ]; then
+       service="/sbin/service"
+-    else
++    elif [ -x /usr/sbin/service ]; then
+       # Ubuntu
+       service="/usr/sbin/service"
++    elif [ -x /sbin/rc-service ]; then
++      # OpenRC
++      service="/sbin/rc-service"
+     fi
+     if [ -x /sbin/pidof ]; then
+       pidof="/sbin/pidof"
+     else
+-      # Ubuntu
++      # Ubuntu, Gentoo
+       pidof="/bin/pidof"
+     fi
+     if [ -x /sbin/fuser ]; then
+       fuser="/sbin/fuser"  # RHEL
+     else
+-      fuser="/bin/fuser"  # Ubuntu, SuSE
++      fuser="/bin/fuser"  # Ubuntu, SuSE, Gentoo
+     fi
+     if [ ! -x /usr/bin/attr ]; then
+       # Fedora
+--- cvmfs/cvmfs_server.orig	2013-06-17 15:42:51.426992247 -0700
++++ cvmfs/cvmfs_server	2013-06-17 15:44:02.092381590 -0700
+@@ -38,7 +38,7 @@
+ if which httpd2 >/dev/null 2>&1; then #SLES/OpenSuSE
+   APACHE_SERVICE="apache2"
+   APACHE_CONF=${APACHE_SERVICE}
+-elif which apache2 >/dev/null 2>&1; then # Debian based
++elif which apache2 >/dev/null 2>&1; then # Debian, Gentoo based
+   APACHE_SERVICE="apache2"
+   APACHE_CONF=${APACHE_SERVICE}
+ else
+@@ -49,8 +49,10 @@
+ # Find the service binary
+ if [ -x /sbin/service ]; then
+   SERVICE_BIN="/sbin/service"
+-else
++elif [ -x /usr/sbin/service ]; then
+   SERVICE_BIN="/usr/sbin/service" # Ubuntu
++elif [ -x /sbin/rc-service ]; then
++  SERVICE_BIN="/sbin/rc-service" # OpenRC
+ fi
+ [ -z "$SERVICE_BIN" ] && die "Could not locate 'service' utility"
+