diff options
Diffstat (limited to 'net-misc/kea')
-rw-r--r-- | net-misc/kea/Manifest | 12 | ||||
-rw-r--r-- | net-misc/kea/files/kea-confd | 4 | ||||
-rw-r--r-- | net-misc/kea/files/kea-confd-r1 | 10 | ||||
-rw-r--r-- | net-misc/kea/files/kea-initd-r1 (renamed from net-misc/kea/files/kea-initd) | 24 | ||||
-rw-r--r-- | net-misc/kea/kea-1.7.9.ebuild | 73 | ||||
-rw-r--r-- | net-misc/kea/kea-1.8.1.ebuild (renamed from net-misc/kea/kea-1.7.10.ebuild) | 9 | ||||
-rw-r--r-- | net-misc/kea/kea-9999.ebuild | 9 |
7 files changed, 38 insertions, 103 deletions
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index f842b0acf571..2a716bbc034e 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,8 +1,6 @@ -AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab -AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31 -DIST kea-1.7.10.tar.gz 7513433 BLAKE2B 7b7accccf1200c8673669d4db7ae5efa628a409661b3f82d6dc85c191578cb73fc85866307a1626a0c4a48f81df4f4ad3f5a2b9d8d5f682de2e8fc5750b56ff5 SHA512 b5f6c7c6538f767b604ff59e4cb8acb0a85bfa7611f9dbdc1b17cc70d483d6fcdc4978ccda8dd010623b2126d0b8ddf4275012f492b1c57f7b210bfd946e4a68 -DIST kea-1.7.9.tar.gz 7481156 BLAKE2B eef2561b79ad83c18d42a0d23e97fc27205190475c24bb871112050b5ec0a134c4c448c03c4f1b678aadf7d54c7f96481c43485187408f8bfebe6f2c6edbc832 SHA512 180e80dbf21789e9c18c69b9e03a2ad4519eb3386cf8c4221a283883eb8151443e888b6a95d1affb0790ef25d6174582448bf590eb2ddadb12b965cba7dc8717 -EBUILD kea-1.7.10.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb -EBUILD kea-1.7.9.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb -EBUILD kea-9999.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb +AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6 +AUX kea-initd-r1 1980 BLAKE2B 338cc159d54d62d3172fd8bba5213d82058bb90b90085be1d0e41a071966cdc76325ce881c075cfac04850c1adad8ea502c85873607fe7487168797a0658e184 SHA512 5685a83ac59f67f9832a270ab737672185200669b2b13f6c5df19a2285bd98ff89e44ac53097cd6f86858bd1f243f52ff3e2a4b334ab147d612cfa30d5ff34eb +DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f +EBUILD kea-1.8.1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3 +EBUILD kea-9999.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975 diff --git a/net-misc/kea/files/kea-confd b/net-misc/kea/files/kea-confd deleted file mode 100644 index 568468eb3a1d..000000000000 --- a/net-misc/kea/files/kea-confd +++ /dev/null @@ -1,4 +0,0 @@ -# Which services should be taken into account? -DHCP4="true" -DHCP6="false" -DDNS="false" diff --git a/net-misc/kea/files/kea-confd-r1 b/net-misc/kea/files/kea-confd-r1 new file mode 100644 index 000000000000..ef7b2f49dd9d --- /dev/null +++ b/net-misc/kea/files/kea-confd-r1 @@ -0,0 +1,10 @@ +# Which services should be taken into account? +DHCP4="true" +DHCP6="false" +DDNS="false" + +# Define your config files here. Otherwise we default to files in /etc/kea +# (see init script) +#DHCP4_CONFIG="/etc/kea/dhcp4.conf" +#DHCP6_CONFIG="/etc/kea/dhcp6.conf" +#DDNS_CONFIG="/etc/kea/ddns.conf" diff --git a/net-misc/kea/files/kea-initd b/net-misc/kea/files/kea-initd-r1 index 85fdd56b9ec2..57711b3c9d36 100644 --- a/net-misc/kea/files/kea-initd +++ b/net-misc/kea/files/kea-initd-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="kea dhcp services" @@ -7,7 +7,9 @@ description="kea dhcp services" dhcp4_command="/usr/sbin/kea-dhcp4" dhcp6_command="/usr/sbin/kea-dhcp6" ddns_command="/usr/sbin/kea-dhcp-ddns" -config_file="/etc/kea/kea.conf" +dhcp4_config="${DHCP4_CONFIG:-/etc/kea/dhcp4.conf}" +dhcp6_config="${DHCP6_CONFIG:-/etc/kea/dhcp6.conf}" +ddns_config="${DDNS_CONFIG:-/etc/kea/ddns.conf}" dhcp4_pidfile="/run/kea-dhcp4.pid" dhcp6_pidfile="/run/kea-dhcp6.pid" ddns_pidfile="/run/kea-ddns.pid" @@ -23,20 +25,20 @@ start_pre() { fi if ${DHCP4:-false} ; then - if ! ${dhcp4_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then - eerror "Error in config file." + if ! ${dhcp4_command} -t ${dhcp4_config} 1>/dev/null 2>/dev/null ; then + eerror "Error in config file ${dhcp4_config}" return 1 fi fi if ${DHCP6:-false} ; then - if ! ${dhcp6_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then - eerror "Error in config file." + if ! ${dhcp6_command} -t ${dhcp6_config} 1>/dev/null 2>/dev/null ; then + eerror "Error in config file ${dhcp6_config}" return 1 fi fi if ${DDNS:-false} ; then - if ! ${ddns_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then - eerror "Error in config file." + if ! ${ddns_command} -t ${ddns_config} 1>/dev/null 2>/dev/null ; then + eerror "Error in config file ${ddns_config}" return 1 fi fi @@ -46,17 +48,17 @@ start() { einfo "Starting kea dhcp services" if ${DHCP4:-false} ; then start-stop-daemon -m -b -p ${dhcp4_pidfile} \ - -x ${dhcp4_command} -- -c ${config_file} \ + -x ${dhcp4_command} -- -c ${dhcp4_config} \ || return 1 fi if ${DHCP6:-false} ; then start-stop-daemon -m -b -p ${dhcp6_pidfile} \ - -x ${dhcp6_command} -- -c ${config_file} \ + -x ${dhcp6_command} -- -c ${dhcp6_config} \ || return 1 fi if ${DDNS:-false} ; then start-stop-daemon -m -b -p ${ddns_pidfile} \ - -x ${ddns_command} -- -c ${config_file} \ + -x ${ddns_command} -- -c ${ddns_config} \ || return 1 fi } diff --git a/net-misc/kea/kea-1.7.9.ebuild b/net-misc/kea/kea-1.7.9.ebuild deleted file mode 100644 index 2f6a4dc21e8a..000000000000 --- a/net-misc/kea/kea-1.7.9.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="${PV//_p/-P}" -MY_PV="${MY_PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="http://www.isc.org/kea/" -if [[ ${PV} = 9999* ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" -else - SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz - ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -IUSE="mysql +openssl postgres samples" - -DEPEND=" - dev-libs/boost:= - dev-cpp/gtest - dev-libs/log4cplus - mysql? ( dev-db/mysql-connector-c ) - !openssl? ( dev-libs/botan:2= ) - openssl? ( dev-libs/openssl:0= ) - postgres? ( dev-db/postgresql:* ) -" -RDEPEND="${DEPEND} - acct-group/dhcp - acct-user/dhcp" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - [[ ${PV} = *9999 ]] && eautoreconf - # Brand the version with Gentoo - sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ - configure || die -} - -src_configure() { - local myeconfargs=( - --disable-static - --enable-perfdhcp - --localstatedir="${EPREFIX}/var" - --without-werror - $(use_with mysql) - $(use_with openssl) - $(use_with postgres pgsql) - $(use_enable samples install-configurations) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - newconfd "${FILESDIR}"/${PN}-confd ${PN} - newinitd "${FILESDIR}"/${PN}-initd ${PN} - keepdir /var/{lib,run}/${PN} /var/log - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} diff --git a/net-misc/kea/kea-1.7.10.ebuild b/net-misc/kea/kea-1.8.1.ebuild index 2f6a4dc21e8a..3e20776fe7e7 100644 --- a/net-misc/kea/kea-1.7.10.ebuild +++ b/net-misc/kea/kea-1.8.1.ebuild @@ -66,8 +66,9 @@ src_configure() { src_install() { default - newconfd "${FILESDIR}"/${PN}-confd ${PN} - newinitd "${FILESDIR}"/${PN}-initd ${PN} - keepdir /var/{lib,run}/${PN} /var/log - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} + newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} + keepdir /var/lib/${PN} /var/log + rm -rf "${ED}"/var/run || die + find "${ED}" -type f -name "*.la" -delete || die } diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 2f6a4dc21e8a..3e20776fe7e7 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -66,8 +66,9 @@ src_configure() { src_install() { default - newconfd "${FILESDIR}"/${PN}-confd ${PN} - newinitd "${FILESDIR}"/${PN}-initd ${PN} - keepdir /var/{lib,run}/${PN} /var/log - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} + newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} + keepdir /var/lib/${PN} /var/log + rm -rf "${ED}"/var/run || die + find "${ED}" -type f -name "*.la" -delete || die } |