commit: 0bf76b7ba9fdcae0455599ddb348b1e79b65b413
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 21 18:19:57 2017 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Wed Jun 21 18:21:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf76b7b
net-proxy/haproxy: Fix init script (openrc_default_stop -> default_stop) #620418
Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --force
.../files/{haproxy.initd-r3 => haproxy.initd-r4} | 4 +-
...roxy-1.6.11.ebuild => haproxy-1.6.11-r1.ebuild} | 2 +-
...roxy-1.6.12.ebuild => haproxy-1.6.12-r1.ebuild} | 2 +-
...roxy-1.6.13.ebuild => haproxy-1.6.13-r1.ebuild} | 2 +-
...oxy-1.7.6.ebuild => haproxy-1.6.9999-r1.ebuild} | 2 +-
net-proxy/haproxy/haproxy-1.6.9999.ebuild | 165 ---------------------
...aproxy-1.7.5.ebuild => haproxy-1.7.5-r1.ebuild} | 2 +-
...aproxy-1.7.6.ebuild => haproxy-1.7.6-r1.ebuild} | 2 +-
...oxy-1.7.6.ebuild => haproxy-1.7.9999-r1.ebuild} | 2 +-
net-proxy/haproxy/haproxy-1.7.9999.ebuild | 165 ---------------------
10 files changed, 9 insertions(+), 339 deletions(-)
diff --git a/net-proxy/haproxy/files/haproxy.initd-r3
b/net-proxy/haproxy/files/haproxy.initd-r4
similarity index 95%
rename from net-proxy/haproxy/files/haproxy.initd-r3
rename to net-proxy/haproxy/files/haproxy.initd-r4
index abba9f86534..c37719b1675 100644
--- a/net-proxy/haproxy/files/haproxy.initd-r3
+++ b/net-proxy/haproxy/files/haproxy.initd-r4
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
extra_commands="checkconfig"
@@ -66,7 +66,7 @@ stop() {
_t="$(mktemp)"
for _pid in $(cat ${pidfile}) ; do
echo "${_pid}" > "${_t}"
- pidfile="${_t}" openrc_default_stop
+ pidfile="${_t}" default_stop
done
rm -f "${_t}"
}
diff --git a/net-proxy/haproxy/haproxy-1.6.11.ebuild
b/net-proxy/haproxy/haproxy-1.6.11-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.6.11.ebuild
rename to net-proxy/haproxy/haproxy-1.6.11-r1.ebuild
index 39b23851f90..06254314e42 100644
--- a/net-proxy/haproxy/haproxy-1.6.11.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.11-r1.ebuild
@@ -108,7 +108,7 @@ src_install() {
dobin haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r4" $PN
doman doc/haproxy.1
diff --git a/net-proxy/haproxy/haproxy-1.6.12.ebuild
b/net-proxy/haproxy/haproxy-1.6.12-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.6.12.ebuild
rename to net-proxy/haproxy/haproxy-1.6.12-r1.ebuild
index e1c758115e5..11493f63057 100644
--- a/net-proxy/haproxy/haproxy-1.6.12.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.12-r1.ebuild
@@ -108,7 +108,7 @@ src_install() {
dobin haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r4" $PN
doman doc/haproxy.1
diff --git a/net-proxy/haproxy/haproxy-1.6.13.ebuild
b/net-proxy/haproxy/haproxy-1.6.13-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.6.13.ebuild
rename to net-proxy/haproxy/haproxy-1.6.13-r1.ebuild
index e1c758115e5..11493f63057 100644
--- a/net-proxy/haproxy/haproxy-1.6.13.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.13-r1.ebuild
@@ -108,7 +108,7 @@ src_install() {
dobin haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r4" $PN
doman doc/haproxy.1
diff --git a/net-proxy/haproxy/haproxy-1.7.6.ebuild
b/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
similarity index 99%
copy from net-proxy/haproxy/haproxy-1.7.6.ebuild
copy to net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
index c0a7cc341e6..dc6dcf334d8 100644
--- a/net-proxy/haproxy/haproxy-1.7.6.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
@@ -109,7 +109,7 @@ src_install() {
dobin haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r4" $PN
doman doc/haproxy.1
diff --git a/net-proxy/haproxy/haproxy-1.6.9999.ebuild
b/net-proxy/haproxy/haproxy-1.6.9999.ebuild
deleted file mode 100644
index 713e9e895bd..00000000000
--- a/net-proxy/haproxy/haproxy-1.6.9999.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu";
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range
1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range
1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools
vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- device-atlas? ( pcre )
- ?? ( slz zlib )"
-
-DEPEND="
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
- )
- slz? ( dev-libs/libslz:= )
- zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
- device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=(
"${FILESDIR}"/haproxy-1.7-contrib.patch )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
-
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
-}
-
-src_compile() {
- local -a args=(
- TARGET=linux2628
- USE_GETADDRINFO=1
- USE_TFO=1
- )
-
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE) )
- args+=( $(haproxy_use pcre-jit PCRE_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use device-atlas DEVICEATLAS) )
- args+=( $(haproxy_use wurfl WURFL) )
-
- # For now, until the strict-aliasing breakage will be fixed
- append-cflags -fno-strict-aliasing
-
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-
- if use tools ; then
- for contrib in ${CONTRIBS[@]} ; do
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}"
LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
- done
- fi
-}
-
-src_install() {
- dobin haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
-
- doman doc/haproxy.1
-
- dobin haproxy-systemd-wrapper
- systemd_dounit contrib/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
- has "iprange" "${CONTRIBS[@]}" && newbin
contrib/iprange/iprange haproxy_iprange
- has "ip6range" "${CONTRIBS[@]}" && newbin
contrib/ip6range/ip6range haproxy_ip6range
- has "spoa_example" "${CONTRIBS[@]}" && newbin
contrib/spoa_example/spoa haproxy_spoa_example
- has "spoa_example" "${CONTRIBS[@]}" && newdoc
contrib/spoa_example/README README.spoa_example
- has "tcploop" "${CONTRIBS[@]}" && newbin
contrib/tcploop/tcploop haproxy_tcploop
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc examples/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins examples/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you
start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and
group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\"
directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for
learning the configuration file's syntax."
- einfo "The documentation and sample configuration files
are installed here:"
- einfo " ${EROOT}usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.7.5.ebuild
b/net-proxy/haproxy/haproxy-1.7.5-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.7.5.ebuild
rename to net-proxy/haproxy/haproxy-1.7.5-r1.ebuild
index c0a7cc341e6..dc6dcf334d8 100644
--- a/net-proxy/haproxy/haproxy-1.7.5.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.5-r1.ebuild
@@ -109,7 +109,7 @@ src_install() {
dobin haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r4" $PN
doman doc/haproxy.1
diff --git a/net-proxy/haproxy/haproxy-1.7.6.ebuild
b/net-proxy/haproxy/haproxy-1.7.6-r1.ebuild
similarity index 99%
copy from net-proxy/haproxy/haproxy-1.7.6.ebuild
copy to net-proxy/haproxy/haproxy-1.7.6-r1.ebuild
index c0a7cc341e6..dc6dcf334d8 100644
--- a/net-proxy/haproxy/haproxy-1.7.6.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.6-r1.ebuild
@@ -109,7 +109,7 @@ src_install() {
dobin haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r4" $PN
doman doc/haproxy.1
diff --git a/net-proxy/haproxy/haproxy-1.7.6.ebuild
b/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.7.6.ebuild
rename to net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
index c0a7cc341e6..dc6dcf334d8 100644
--- a/net-proxy/haproxy/haproxy-1.7.6.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
@@ -109,7 +109,7 @@ src_install() {
dobin haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r4" $PN
doman doc/haproxy.1
diff --git a/net-proxy/haproxy/haproxy-1.7.9999.ebuild
b/net-proxy/haproxy/haproxy-1.7.9999.ebuild
deleted file mode 100644
index 713e9e895bd..00000000000
--- a/net-proxy/haproxy/haproxy-1.7.9999.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu";
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range
1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range
1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools
vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- device-atlas? ( pcre )
- ?? ( slz zlib )"
-
-DEPEND="
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
- )
- slz? ( dev-libs/libslz:= )
- zlib? ( sys-libs/zlib )
- lua? ( dev-lang/lua:5.3 )
- device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=(
"${FILESDIR}"/haproxy-1.7-contrib.patch )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
-
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
-}
-
-src_compile() {
- local -a args=(
- TARGET=linux2628
- USE_GETADDRINFO=1
- USE_TFO=1
- )
-
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE) )
- args+=( $(haproxy_use pcre-jit PCRE_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use device-atlas DEVICEATLAS) )
- args+=( $(haproxy_use wurfl WURFL) )
-
- # For now, until the strict-aliasing breakage will be fixed
- append-cflags -fno-strict-aliasing
-
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-
- if use tools ; then
- for contrib in ${CONTRIBS[@]} ; do
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}"
LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
- done
- fi
-}
-
-src_install() {
- dobin haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r3" $PN
-
- doman doc/haproxy.1
-
- dobin haproxy-systemd-wrapper
- systemd_dounit contrib/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
- has "iprange" "${CONTRIBS[@]}" && newbin
contrib/iprange/iprange haproxy_iprange
- has "ip6range" "${CONTRIBS[@]}" && newbin
contrib/ip6range/ip6range haproxy_ip6range
- has "spoa_example" "${CONTRIBS[@]}" && newbin
contrib/spoa_example/spoa haproxy_spoa_example
- has "spoa_example" "${CONTRIBS[@]}" && newdoc
contrib/spoa_example/README README.spoa_example
- has "tcploop" "${CONTRIBS[@]}" && newbin
contrib/tcploop/tcploop haproxy_tcploop
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc examples/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins examples/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you
start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and
group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\"
directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for
learning the configuration file's syntax."
- einfo "The documentation and sample configuration files
are installed here:"
- einfo " ${EROOT}usr/share/doc/${PF}"
- fi
- fi
-}
