public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/files/, sys-cluster/keepalived/
@ 2018-04-02 17:13 Alexys Jacob
  0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2018-04-02 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     f569763b63e3d0159bfb297d295d970e4a890d3c
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Feb 20 11:31:42 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 17:11:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f569763b

sys-cluster/keepalived: fix building with linux-headers-4.15

Closes: https://bugs.gentoo.org/648252
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...ived-fix-building-with-linux-headers-4.15.patch | 54 ++++++++++++++++++++++
 sys-cluster/keepalived/keepalived-1.4.2.ebuild     |  4 ++
 2 files changed, 58 insertions(+)

diff --git a/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch b/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch
new file mode 100644
index 00000000000..542b1554ac0
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch
@@ -0,0 +1,54 @@
+From 947248af144bcab6376ccddab8dc40f313b14281 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 9 Feb 2018 11:55:19 +0200
+Subject: [PATCH] Fix build with Linux kernel headers v4.15
+
+Linux kernel version 4.15 changed the libc/kernel headers suppression
+logic in a way that introduces collisions:
+
+In file included from ./../include/vrrp_ipaddress.h:32:0,
+                 from ./../include/vrrp_arp.h:31,
+                 from vrrp.c:29:
+/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: error: redeclaration of enumerator 'IPPROTO_IP'
+   IPPROTO_IP = 0,  /* Dummy protocol for TCP  */
+   ^
+/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: note: previous definition of 'IPPROTO_IP' was here
+     IPPROTO_IP = 0,    /* Dummy protocol for TCP.  */
+     ^~~~~~~~~~
+
+Include the libc netinet/in.h header first to suppress the kernel
+header.
+
+In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo
+definition.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ keepalived/include/vrrp_arp.h | 1 +
+ keepalived/vrrp/vrrp.c        | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h
+index c2b4e6b5..9dd68f63 100644
+--- a/keepalived/include/vrrp_arp.h
++++ b/keepalived/include/vrrp_arp.h
+@@ -24,6 +24,7 @@
+ #define _VRRP_ARP_H
+ 
+ /* system includes */
++#include <netinet/in.h>
+ #include <net/ethernet.h>
+ #include <net/if_arp.h>
+ 
+diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
+index 56395363..eaa9c567 100644
+--- a/keepalived/vrrp/vrrp.c
++++ b/keepalived/vrrp/vrrp.c
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ 
+ /* local include */
++#define _GNU_SOURCE
+ #include "vrrp_arp.h"
+ #include "vrrp_ndisc.h"
+ #include "vrrp_scheduler.h"

diff --git a/sys-cluster/keepalived/keepalived-1.4.2.ebuild b/sys-cluster/keepalived/keepalived-1.4.2.ebuild
index 9ec3a8f5d74..6b60cf23060 100644
--- a/sys-cluster/keepalived/keepalived-1.4.2.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.2.ebuild
@@ -30,6 +30,10 @@ DOCS=(
 	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-building-with-linux-headers-4.15.patch"
+)
+
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/files/, sys-cluster/keepalived/
@ 2018-09-28  7:55 Alexys Jacob
  0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2018-09-28  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     2c77e25783da444692e66820b72472c21bbeab32
Author:     Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Fri Sep 21 12:11:19 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Sep 28 07:55:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c77e257

sys-cluster/keepalived: bump to 2.0.7

Closes: https://bugs.gentoo.org/664268
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9934

 sys-cluster/keepalived/Manifest                    |  1 +
 sys-cluster/keepalived/files/keepalived.confd-r1   |  3 +
 sys-cluster/keepalived/files/keepalived.init-r1    | 21 +++++++
 sys-cluster/keepalived/files/keepalived.service    | 13 ++++
 .../keepalived/files/keepalived.service.conf       |  2 +
 sys-cluster/keepalived/keepalived-2.0.7.ebuild     | 72 ++++++++++++++++++++++
 6 files changed, 112 insertions(+)

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index ebad126b0b5..9981f580fe5 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -4,3 +4,4 @@ DIST keepalived-1.4.3.tar.gz 744680 BLAKE2B d9ea5ef277bb0d11c489bbc8770f46528f1d
 DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a76027a50868ade8ac31bc4dea22573a51489939bb29bc20c0eb912f78b1e57fbc6ac18e4b8e38d6493d271e135f8332f SHA512 0786ecbef6dd840c8852f619cad1ea6a9c98b86a6c26bc6b104b38825212af689fbeb45148404b94dc6e3cdf7626cb6b2c902685b03586d05177578dff957bd5
 DIST keepalived-2.0.4.tar.gz 845498 BLAKE2B f05b25b04e1dddbf5f6a90de6b4088b7fbd453f628130343f0688147ae40094e74a0892f3c30d91e41bad31c029692e7a1be6462d2906cdf53e4b82a98b4935c SHA512 b5df152b49a7b5187612b8719328c05fada57e8625c0e8053261c1d5f7afd09cc9b67200052d7a58ce596d1c718915109f5a9bf03520d80e0710157e938f72fb
 DIST keepalived-2.0.6.tar.gz 853859 BLAKE2B 19cfc81d22026e607b0780612b1040ab7e2f9857038a612298b8676814b9bd1b7a43de905c62e5b853174b0298f53787e7fb52a3d35163e33336aad3c0a01f0a SHA512 9e340825b443c02ba1afe27d9ad97afc34722d80a27fc9a5f934157ec04ff15cef0a82b68c8917712415dc7ef079e27af88ac29a372ef42c87fcc9f9b8ab751e
+DIST keepalived-2.0.7.tar.gz 873480 BLAKE2B dae0b5416aedf0526437ec1a282b59e93b3e368246f3640ddd7de835009a55562160b9eb9e40e4e9d3ead3ffd6a9806a1decbfbffe57f9a4bc2dfad623754daf SHA512 5ba269afb334d25c17305b7adbbf5ed1ebd62480106945d7d382aab99285691968e26e90a69507c2fed20d7a721dfce187fde803835213c3b915e06177268088

diff --git a/sys-cluster/keepalived/files/keepalived.confd-r1 b/sys-cluster/keepalived/files/keepalived.confd-r1
new file mode 100644
index 00000000000..5b273c19c6e
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.confd-r1
@@ -0,0 +1,3 @@
+# Keepalived options
+# Increase logging:
+#KEEPALIVED_OPTS="-D"

diff --git a/sys-cluster/keepalived/files/keepalived.init-r1 b/sys-cluster/keepalived/files/keepalived.init-r1
new file mode 100644
index 00000000000..98277b00bf5
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.init-r1
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use logger
+	# The interfaces do not actually need to exist to start, it handles them gracefully.
+	use net
+}
+
+command="/usr/sbin/keepalived"
+command_args="${KEEPALIVED_OPTS}"
+extra_started_commands="reload"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="/etc/keepalived/keepalived.conf"
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}

diff --git a/sys-cluster/keepalived/files/keepalived.service b/sys-cluster/keepalived/files/keepalived.service
new file mode 100644
index 00000000000..ec47a576b77
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=LVS and VRRP High Availability Monitor
+After=network-online.target syslog.target
+
+[Service]
+Type=forking
+PIDFile=/run/keepalived.pid
+KillMode=process
+ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

diff --git a/sys-cluster/keepalived/files/keepalived.service.conf b/sys-cluster/keepalived/files/keepalived.service.conf
new file mode 100644
index 00000000000..cb24394a6d0
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.service.conf
@@ -0,0 +1,2 @@
+[Service]
+#Environment="KEEPALIVED_OPTIONS=-D"

diff --git a/sys-cluster/keepalived/keepalived-2.0.7.ebuild b/sys-cluster/keepalived/keepalived-2.0.7.ebuild
new file mode 100644
index 00000000000..bdcb75a0c52
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="dbus debug ipv6 -json snmp"
+
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	dbus? ( sys-apps/dbus )
+	json? ( dev-libs/json-c:= )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	STRIP=/bin/true \
+	econf \
+		--with-kernel-dir=/usr \
+		--enable-sha1 \
+		--enable-vrrp \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-create-instance) \
+		$(use_enable debug) \
+		$(use_enable json) \
+		$(use_enable snmp)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+	use snmp && dodoc doc/KEEPALIVED-MIB.txt
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
+	# Clean up sysvinit files
+	rm -rv "${ED}"/etc/sysconfig || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/files/, sys-cluster/keepalived/
@ 2019-01-07 16:53 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2019-01-07 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     78694bbb35225a0e2e39d686456563d492bfe81c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 16:49:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan  7 16:52:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78694bbb

sys-cluster/keepalived: security cleanup

Bug: https://bugs.gentoo.org/670856
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-cluster/keepalived/Manifest                |  2 -
 sys-cluster/keepalived/files/keepalived.confd  |  6 ---
 sys-cluster/keepalived/files/keepalived.init   | 33 ------------
 sys-cluster/keepalived/keepalived-1.4.3.ebuild | 69 --------------------------
 sys-cluster/keepalived/keepalived-1.4.5.ebuild | 69 --------------------------
 5 files changed, 179 deletions(-)

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index c4b2e44ff8c..ba4b0cadf07 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,3 +1 @@
-DIST keepalived-1.4.3.tar.gz 744680 BLAKE2B d9ea5ef277bb0d11c489bbc8770f46528f1ddde14b2e8fb72fdccd543ff4583426aa2bb214e00e3964518e726377b049560ed35daf38f4cafcd4e7c43a13b78d SHA512 bbf734123edeee4c807788e8db626975d7b626003ce2a6b901fbac3b7985b11c222db78e2806a7e7211980a748a6a302847736b14f3f8ed32b7337dbde6f4eac
-DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a76027a50868ade8ac31bc4dea22573a51489939bb29bc20c0eb912f78b1e57fbc6ac18e4b8e38d6493d271e135f8332f SHA512 0786ecbef6dd840c8852f619cad1ea6a9c98b86a6c26bc6b104b38825212af689fbeb45148404b94dc6e3cdf7626cb6b2c902685b03586d05177578dff957bd5
 DIST keepalived-2.0.10.tar.gz 927631 BLAKE2B 0cb4c5c613ae2c58f993930c446cdcafdff8a049a9fb1e31f61d7afe2406b2dde2258d450913577ef8ee18d0171f57e4ad01727d9e0f489cfe25b35826770181 SHA512 e76562e5d9d9dc945f0c9702f5f3c6be6acd8c66a59aea1f8287810a2eeb4c65b6cb7e1cd84c1e478978f7db94dba7f8a918ca4847f90a6554b20d757addd2db

diff --git a/sys-cluster/keepalived/files/keepalived.confd b/sys-cluster/keepalived/files/keepalived.confd
deleted file mode 100644
index 5f56cb23b03..00000000000
--- a/sys-cluster/keepalived/files/keepalived.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Keepalived options
-# Increase logging:
-#KEEPALIVED_OPTS="-D"

diff --git a/sys-cluster/keepalived/files/keepalived.init b/sys-cluster/keepalived/files/keepalived.init
deleted file mode 100644
index c290c9dbc51..00000000000
--- a/sys-cluster/keepalived/files/keepalived.init
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use logger
-	# The interfaces do not actually need to exist to start, it handles them gracefully.
-	use net
-}
-
-command="/usr/sbin/keepalived"
-command_args="${KEEPALIVED_OPTS}"
-pidfile="/var/run/keepalived.pid"
-
-extra_commands="checkconfig reload"
-
-checkconfig() {
-	# keepalived has a config check command, but it does not work while the daemon is running!
-	if [ ! -e /etc/keepalived/keepalived.conf ] ; then
-		eerror "You need an /etc/keepalived/keepalived.conf file to run keepalived"
-		return 1
-	fi
-}
-
-start_pre() {
-	checkconfig || return 1
-}
-
-reload() {
-	ebegin "Reloading keepalived.conf"
-	start-stop-daemon --pidfile $pidfile --signal HUP
-	eend $?
-}

diff --git a/sys-cluster/keepalived/keepalived-1.4.3.ebuild b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
deleted file mode 100644
index bf0732de58b..00000000000
--- a/sys-cluster/keepalived/keepalived-1.4.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="dbus debug ipv6 -json snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	dbus? ( sys-apps/dbus )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable json) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}

diff --git a/sys-cluster/keepalived/keepalived-1.4.5.ebuild b/sys-cluster/keepalived/keepalived-1.4.5.ebuild
deleted file mode 100644
index 9ec3a8f5d74..00000000000
--- a/sys-cluster/keepalived/keepalived-1.4.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="dbus debug ipv6 -json snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	dbus? ( sys-apps/dbus )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable json) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/files/, sys-cluster/keepalived/
@ 2023-05-05  4:44 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-05-05  4:44 UTC (permalink / raw
  To: gentoo-commits

commit:     99c73595289f56a343b84158a639a8115aa84220
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu May  4 22:57:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 04:41:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c73595

sys-cluster/keepalived: add upstream libressl patch

This patch was accepted upstream and fixes the build with LibreSSL which
doesn't yet have the SSL_set0_wbio() function and this is solved by
adding a configure check.

Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/acassen/keepalived/pull/2124
Upstream-Commit: https://github.com/acassen/keepalived/commit/bbec15d4781670ac1be5e543cb04543f79200e69
Upstream-PR: https://github.com/acassen/keepalived/pull/2130
Upstream-Commit: https://github.com/acassen/keepalived/commit/5cb40301f5cd8fbedbb756cd3d838def7293e0bd
Upstream-Issue: https://github.com/libressl/portable/issues/838
Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/keepalived-2.2.7-libressl.patch          | 67 ++++++++++++++++++++++
 sys-cluster/keepalived/keepalived-2.2.7.ebuild     |  6 +-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/keepalived/files/keepalived-2.2.7-libressl.patch b/sys-cluster/keepalived/files/keepalived-2.2.7-libressl.patch
new file mode 100644
index 000000000000..e6d4df49a8cb
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-2.2.7-libressl.patch
@@ -0,0 +1,67 @@
+https://bugs.gentoo.org/903001
+https://github.com/acassen/keepalived/pull/2124
+https://github.com/acassen/keepalived/commit/bbec15d4781670ac1be5e543cb04543f79200e69
+https://github.com/acassen/keepalived/pull/2130
+https://github.com/acassen/keepalived/commit/5cb40301f5cd8fbedbb756cd3d838def7293e0bd
+
+From bbec15d4781670ac1be5e543cb04543f79200e69 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 12 Apr 2022 20:30:57 +0200
+Subject: [PATCH] fix build with libressl
+
+SSL_set0_rbio is provided by libressl since version 3.4.0 and
+https://github.com/libressl-portable/openbsd/commit/c99939f9665a9c3c648682b4987df46600b70efc
+but SSL_set0_wbio is not provided resulting in the following build
+failure:
+
+/nvmedata/autobuild/instance-9/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: check/libcheck.a(check_ssl.o): in function `ssl_connect':
+check_ssl.c:(.text+0x7da): undefined reference to `SSL_set0_wbio'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/76f72a3c7350ea265e2277c89d68e5256410e94c
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac                 | 2 +-
+ keepalived/check/check_ssl.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+From 5cb40301f5cd8fbedbb756cd3d838def7293e0bd Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Mon, 18 Apr 2022 09:52:47 +0100
+Subject: [PATCH] Check for both SSL_set0_rbio and SSL_set0_wbio
+
+This updates commit bbec15d - "fix build with libressl"
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ configure.ac                 | 2 +-
+ keepalived/check/check_ssl.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 350a9f4e..91f90afe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1327,7 +1327,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ AC_CHECK_FUNCS([SSL_CTX_set_verify_depth])
+ 
+ # SSL_set0_rbio(), SSL_set0_wbio() OPENSSL_init_crypto() and TLS_method() introduced OpenSSL v1.1.0
+-AC_CHECK_FUNCS([SSL_set0_rbio OPENSSL_init_crypto TLS_method])
++AC_CHECK_FUNCS([SSL_set0_rbio SSL_set0_wbio OPENSSL_init_crypto TLS_method])
+ 
+ # In OpenSSL v1.1.1 the call to SSL_CTX_new() fails if OPENSSL_init_crypto() has been called with
+ # OPENSSL_INIT_NO_LOAD_CONFIG. It does not fail in v1.1.0h and v1.1.1b.
+diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c
+index 0155fce5..1a5c2acb 100644
+--- a/keepalived/check/check_ssl.c
++++ b/keepalived/check/check_ssl.c
+@@ -234,7 +234,7 @@ ssl_connect(thread_ref_t thread, int new_req)
+ 		BIO_get_fd(req->bio, &bio_fd);
+ 		if (fcntl(bio_fd, F_SETFD, fcntl(bio_fd, F_GETFD) | FD_CLOEXEC) == -1)
+ 			log_message(LOG_INFO, "Setting CLOEXEC failed on ssl socket - errno %d", errno);
+-#ifdef HAVE_SSL_SET0_RBIO
++#if defined HAVE_SSL_SET0_RBIO && defined HAVE_SSL_SET0_WBIO
+ 		BIO_up_ref(req->bio);
+ 		SSL_set0_rbio(req->ssl, req->bio);
+ 		SSL_set0_wbio(req->ssl, req->bio);

diff --git a/sys-cluster/keepalived/keepalived-2.2.7.ebuild b/sys-cluster/keepalived/keepalived-2.2.7.ebuild
index ae169adf481b..4c9febd8522b 100644
--- a/sys-cluster/keepalived/keepalived-2.2.7.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,10 @@ DOCS=(
 	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
 )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libressl.patch #903001
+)
+
 src_prepare() {
 	default
 	eautoreconf


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-05  4:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-02 17:13 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/files/, sys-cluster/keepalived/ Alexys Jacob
  -- strict thread matches above, loose matches on Subject: below --
2018-09-28  7:55 Alexys Jacob
2019-01-07 16:53 Thomas Deutschmann
2023-05-05  4:44 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox