From fe1e3bbca60a6b4b9a1889f5252e02c27b459f63 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 14 Jan 2024 07:13:52 +0000 Subject: gentoo auto-resync : 14:01:2024 - 07:13:52 --- app-misc/ebusd/Manifest | 11 +++ app-misc/ebusd/ebusd-23.3.ebuild | 100 +++++++++++++++++++++++++ app-misc/ebusd/files/ebusd-23.3-cxxflags.patch | 28 +++++++ app-misc/ebusd/files/ebusd-23.3-docs.patch | 27 +++++++ app-misc/ebusd/files/ebusd-23.3-gcc13.patch | 60 +++++++++++++++ app-misc/ebusd/files/ebusd-23.3-gentoo.patch | 13 ++++ app-misc/ebusd/files/ebusd-23.3-htmlpath.patch | 20 +++++ app-misc/ebusd/files/ebusd.confd | 5 ++ app-misc/ebusd/files/ebusd.initd | 20 +++++ app-misc/ebusd/files/ebusd.service | 13 ++++ app-misc/ebusd/metadata.xml | 22 ++++++ 11 files changed, 319 insertions(+) create mode 100644 app-misc/ebusd/Manifest create mode 100644 app-misc/ebusd/ebusd-23.3.ebuild create mode 100644 app-misc/ebusd/files/ebusd-23.3-cxxflags.patch create mode 100644 app-misc/ebusd/files/ebusd-23.3-docs.patch create mode 100644 app-misc/ebusd/files/ebusd-23.3-gcc13.patch create mode 100644 app-misc/ebusd/files/ebusd-23.3-gentoo.patch create mode 100644 app-misc/ebusd/files/ebusd-23.3-htmlpath.patch create mode 100644 app-misc/ebusd/files/ebusd.confd create mode 100644 app-misc/ebusd/files/ebusd.initd create mode 100644 app-misc/ebusd/files/ebusd.service create mode 100644 app-misc/ebusd/metadata.xml (limited to 'app-misc/ebusd') diff --git a/app-misc/ebusd/Manifest b/app-misc/ebusd/Manifest new file mode 100644 index 000000000000..23d27c989465 --- /dev/null +++ b/app-misc/ebusd/Manifest @@ -0,0 +1,11 @@ +AUX ebusd-23.3-cxxflags.patch 851 BLAKE2B f185992011ff7058d346e01580382ed0ba9e9c95ac6d01ae35a7c185cb0e58e74c9af65559098d0202f32b09326fcd1c613bba7d682e6fca744fb37dc6b36b3d SHA512 fcb8a7561784793529bea87545a39101107a9fbd4f3ac51f749a18259003daa1de11d21a37f503300de9fbb8136bfaa4de15ceaa67cfd09f5511962cb58574b4 +AUX ebusd-23.3-docs.patch 1246 BLAKE2B 36911064e6f6e8fbbec068ae392f9e5902f6aaac9c9d1a63231df1caa7f1b0b444f895ca8e59a65486c8ff76922677df31605ab3368560ddaa5d49bb261b9732 SHA512 1dcafaf09a840a4843a476351e2e0902baf2aaa05812f8453960cd7e67176971aac76906ce35037a2a22ca5901d0d74c2df08785b771d3edffb0b157959c8f1c +AUX ebusd-23.3-gcc13.patch 1678 BLAKE2B 6eaff01ff919c9b8db4f522fcc9ad226648cf18f19aa1ee230709f8aa9744c51ddb03f1c3171cdca5aec4b321058056b853b2ec269df88bc9b5f430a51afa8c0 SHA512 b7ed196c2543fe55ac926283f51061e184ceb57a21be02aac589b9beaf20372a8341b7cb237cca788d5ee6179459107e1732d1f26382f7cf18baee9438c4246b +AUX ebusd-23.3-gentoo.patch 1048 BLAKE2B eb46d46aa473fc36b3e7e7ec7b61131659f1c99f53fc5511a15baf91a4a7ac4f1686c4a1e88abaa832c4ab8bffd029457284d4fdf64a843f08b19a8f065a9636 SHA512 f242ddbbe06e14ae88072331a17776a78110d0b74bb21b74e1b21c51ec5c6325687d86cba8e1e7e7dc2961b08fbc98dc8f640bb84a77020ebe48506d93616c0b +AUX ebusd-23.3-htmlpath.patch 1006 BLAKE2B fdbc318454ee743eb2343caa0f16cf21f868ac60a634c2e8acc5dd4a3a4aa9eae0c04d11b803cca6987306412f2807f31a3032cc5db45fe3e6de0b4f89d92a39 SHA512 eaf5f423ee04e3d58f6d927c7b7d6316ac93594b0ff2dbb7ab17406a1c10d1b8ac07e582692c983fe4c360c65d57bf67d5f095d3e8f32df7ae1a764b3dff1086 +AUX ebusd.confd 193 BLAKE2B a5560507305e5afecc9b127ede67592ff7d3a1751ba27f3a3c43664fe30f2e7946b0bfa059b918865ee4244d2a89f3d7c5e0227f177a48dca98bff1666bd9c6d SHA512 ed2d38d4b3ff39fd5954dc7ac4d5e724c80b26f6c85a48b6a2ddbdea029f01b5e6b19909c7925e5ec879453204e28e40917c15b07e798bbc60950467314cd8f3 +AUX ebusd.initd 552 BLAKE2B b5e4c7ad3e76a9269949b01b7084f58dd4bfbaac56e485f3b7d5c423922abfe9b42480f9111035ed2b783cc151a5c6bca19d2c1f32b20c7ae041096f1e39c0e1 SHA512 0bbd80708dd7b28146e8db07a96bef8c8a2914befcf4f80ca4d60a3c315b26de582ddda6748b355e36d56d0dddd5fb8468cdb2c7ffa50370206d96762276802f +AUX ebusd.service 198 BLAKE2B 9835106d02844b11d22c0c76ac5f4a42763717e0870fb474a848ea2ef06d9eff93a054d1fbeed14c8935d67c32e49a4532a086c0bf45d0e929e2910686ec80f8 SHA512 29d05089e5b737e64b8adbcefacd1b68bc58c404cfeca63fee43521767ac039586e7288a49e159c38e9c9aa339aa9a90a7327db4018668fb854a002988c27abd +DIST ebusd-23.3.tar.gz 583788 BLAKE2B c61bf76e0c451672432689aeaf10b317adb52729ea0872cb01dca22e1f7ac12091d287dd082b87361ce37846b1d74c869588964f3dc71e82ffd00c4555e27150 SHA512 acf155d36e99db1c9c2ff04eabbfddba8493f2566b6691f609c86af0e42e3cb0594618fd51e874e475cfc7b9c742d1e010099f38e19c21f52c953ebcfb0f2ea2 +EBUILD ebusd-23.3.ebuild 1895 BLAKE2B 9ca5c29e8e9bb41a3fd654fca3bbb8aa1232686e3fb570c95c048dfb1a8ab14e5e38d8a38666f6f17f946bfb51e0e3a055205b0ee8fac0ae6b7f753031c4df01 SHA512 c75a308d5b5031a9597aa5ace17ffa695e3280ca89aa36b66d2ec453d212d306da0bd6c5d547f523cd16ee69e82d750586aa2629aa3e5794f50440a06172967c +MISC metadata.xml 815 BLAKE2B d6c87cb6506a61d1b502ab233fcb9cb878e4e315d1cd2a09ecf36121de19a06d9aee77925b19d6fc24ed274ac220c22a011dec01704f61676583697647506417 SHA512 cdcbc39babc7f6dd6a5f3f1ca713a54b44e80cf0a57eb9bdb4f6989c7425fe30eee73dd8e893f7d82e681e32e03a4089e94630ebe77686c6a0bb056e6c92c7a4 diff --git a/app-misc/ebusd/ebusd-23.3.ebuild b/app-misc/ebusd/ebusd-23.3.ebuild new file mode 100644 index 000000000000..eb2fca01442b --- /dev/null +++ b/app-misc/ebusd/ebusd-23.3.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="Daemon for communication with eBUS heating systems" +HOMEPAGE=" + https://ebusd.de + https://github.com/john30/ebusd +" +SRC_URI="https://github.com/john30/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+contrib doc knx mqtt +ssl test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/openssl:0= + mqtt? ( app-misc/mosquitto ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen + media-gfx/graphviz + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-23.3-cxxflags.patch" + "${FILESDIR}/${PN}-23.3-docs.patch" + "${FILESDIR}/${PN}-23.3-gcc13.patch" + "${FILESDIR}/${PN}-23.3-gentoo.patch" + "${FILESDIR}/${PN}-23.3-htmlpath.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # KNXd is currently not packaged in Gentoo + local myeconfargs=( + $(use_with contrib) + $(use_with doc docs) + $(use_with knx) + $(use_with mqtt) + $(use_with ssl) + + --localstatedir="${EPREFIX}/var" + --without-knxd + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use test; then + pushd src/lib/ebus/test || die + emake + popd || die + + if use contrib; then + pushd src/lib/ebus/contrib/test || die + emake + popd || die + fi + fi +} + +src_test() { + pushd src/lib/ebus/test || die + ./test_filereader >/dev/null && \ + ./test_data >/dev/null && \ + ./test_message >/dev/null && \ + ./test_symbol >/dev/null && \ + einfo "standard: OK!" || die + popd || die + + if use contrib; then + pushd src/lib/ebus/contrib/test || die + ./test_contrib >/dev/null && einfo "contrib: OK!" || die + popd || die + fi +} + +src_install() { + default + use doc && dodoc -r docs/html + newinitd "${FILESDIR}"/ebusd.initd ebusd + newconfd "${FILESDIR}"/ebusd.confd ebusd + systemd_dounit "${FILESDIR}"/ebusd.service +} diff --git a/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch b/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch new file mode 100644 index 000000000000..97b843d05ea2 --- /dev/null +++ b/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch @@ -0,0 +1,28 @@ +From 6c2d102544f45856fb14484a3fc763822ff03376 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Sat, 13 Jan 2024 21:33:28 +0100 +Subject: [PATCH] configure.ac: quote CXXFLAGS + +CXXCLAGS needs to be quote, as otherwise the test could fail on some +CXXFLAGS like '-mfpmath=sse,387' + +test: syntax error: `-mfpmath=sse,387' unexpected + +Signed-off-by: Conrad Kostecki +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 90368e04..0469eb20 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build]) + AC_CONFIG_MACRO_DIR([m4]) + AC_GNU_SOURCE + +-if test -z $CXXFLAGS; then ++if test -z "${CXXFLAGS}"; then + CXXFLAGS="-fpic -Wall -Wno-unused-function -Wextra -g -O2" + fi + AC_PROG_CXX([g++-6 g++-5 g++-4.9 g++-4.8 g++]) diff --git a/app-misc/ebusd/files/ebusd-23.3-docs.patch b/app-misc/ebusd/files/ebusd-23.3-docs.patch new file mode 100644 index 000000000000..d8014fe53cd5 --- /dev/null +++ b/app-misc/ebusd/files/ebusd-23.3-docs.patch @@ -0,0 +1,27 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -47,6 +47,13 @@ + if test "x$with_contrib" != "xno"; then + AC_DEFINE_UNQUOTED(HAVE_CONTRIB, [1], [Defined if contributed sources are enabled.]) + fi ++AC_ARG_WITH(docs, AS_HELP_STRING([--without-docs], [disable generation of docs]), [], [with_docs=yes]) ++if test "x$with_docs" != "xno"; then ++ AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], []) ++ if test -z "$HAVE_DOXYGEN"; then ++ AC_MSG_WARN([Doxygen not found - continuing without Doxygen support.]) ++ fi ++fi + AC_ARG_WITH(ebusfeed, AS_HELP_STRING([--with-ebusfeed], [enable inclusion of ebusfeed tool]), [with_ebusfeed=yes], []) + AM_CONDITIONAL([WITH_EBUSFEED], [test "x$with_ebusfeed" == "xyes"]) + AC_ARG_WITH(mqtt, AS_HELP_STRING([--without-mqtt], [disable support for MQTT handling]), [], [with_mqtt=yes]) +@@ -156,10 +163,6 @@ + else + AC_DEFINE(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (date +p%Y%m%d)])]", [The revision of the package.]) + fi +-AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], []) +-if test -z "$HAVE_DOXYGEN"; then +- AC_MSG_WARN([Doxygen not found - continuing without Doxygen support.]) +-fi + + AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$HAVE_DOXYGEN"]) + AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/Doxyfile])]) diff --git a/app-misc/ebusd/files/ebusd-23.3-gcc13.patch b/app-misc/ebusd/files/ebusd-23.3-gcc13.patch new file mode 100644 index 000000000000..fcdff55e714e --- /dev/null +++ b/app-misc/ebusd/files/ebusd-23.3-gcc13.patch @@ -0,0 +1,60 @@ +From 3384f3780087bd6b94d46bf18cdad18201ad516c Mon Sep 17 00:00:00 2001 +From: John +Date: Sat, 30 Dec 2023 17:38:19 +0100 +Subject: [PATCH] add missed includes as reported by gcc13 + +--- + src/ebusd/mqttclient.h | 1 + + src/ebusd/mqttclient_mosquitto.h | 1 + + src/lib/ebus/device.h | 1 + + src/lib/ebus/transport.h | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/src/ebusd/mqttclient.h b/src/ebusd/mqttclient.h +index 5309d31a..965647ba 100755 +--- a/src/ebusd/mqttclient.h ++++ b/src/ebusd/mqttclient.h +@@ -19,6 +19,7 @@ + #ifndef EBUSD_MQTTCLIENT_H_ + #define EBUSD_MQTTCLIENT_H_ + ++#include + #include + #include + #include +diff --git a/src/ebusd/mqttclient_mosquitto.h b/src/ebusd/mqttclient_mosquitto.h +index d749b60b..e08ca5eb 100755 +--- a/src/ebusd/mqttclient_mosquitto.h ++++ b/src/ebusd/mqttclient_mosquitto.h +@@ -21,6 +21,7 @@ + + #include "ebusd/mqttclient.h" + #include ++#include + #include + #include + #include +diff --git a/src/lib/ebus/device.h b/src/lib/ebus/device.h +index d4224017..8da116a7 100755 +--- a/src/lib/ebus/device.h ++++ b/src/lib/ebus/device.h +@@ -19,6 +19,7 @@ + #ifndef LIB_EBUS_DEVICE_H_ + #define LIB_EBUS_DEVICE_H_ + ++#include + #include + #include "lib/ebus/result.h" + #include "lib/ebus/transport.h" +diff --git a/src/lib/ebus/transport.h b/src/lib/ebus/transport.h +index ec4c2319..ba3a8324 100755 +--- a/src/lib/ebus/transport.h ++++ b/src/lib/ebus/transport.h +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + #include "lib/ebus/result.h" + #include "lib/ebus/symbol.h" diff --git a/app-misc/ebusd/files/ebusd-23.3-gentoo.patch b/app-misc/ebusd/files/ebusd-23.3-gentoo.patch new file mode 100644 index 000000000000..9c5e518e269c --- /dev/null +++ b/app-misc/ebusd/files/ebusd-23.3-gentoo.patch @@ -0,0 +1,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -145,8 +145,8 @@ + src/lib/knx/Makefile + ])]) + +-AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, "${localstatedir}/run/${PACKAGE_NAME}.pid", [The path and name of the PID file.]) +-AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, "${localstatedir}/log/${PACKAGE_NAME}.log", [The path and name of the log file.]) ++AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, "${localstatedir}/run/${PACKAGE_NAME}/${PACKAGE_NAME}.pid", [The path and name of the PID file.]) ++AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, "${localstatedir}/log/${PACKAGE_NAME}/${PACKAGE_NAME}.log", [The path and name of the log file.]) + AC_DEFINE(SCAN_VERSION, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\.[0-9]*\).*#\1#' -e 's#\.\([0-9]\)$#0\1#' -e 's#\.##' VERSION])]", [The version of the package formatted for the scan result.]) + AC_DEFINE(PACKAGE_VERSION_MAJOR, [m4_esyscmd_s([sed -e 's#^\([0-9]*\)\..*$#\1#' VERSION])], [The major version of the package.]) + AC_DEFINE(PACKAGE_VERSION_MINOR, [m4_esyscmd_s([sed -e 's#^.*\.\([0-9]*\)$#\1#' VERSION])], [The minor version of the package.]) diff --git a/app-misc/ebusd/files/ebusd-23.3-htmlpath.patch b/app-misc/ebusd/files/ebusd-23.3-htmlpath.patch new file mode 100644 index 000000000000..abd2e87e5c93 --- /dev/null +++ b/app-misc/ebusd/files/ebusd-23.3-htmlpath.patch @@ -0,0 +1,20 @@ +--- a/src/ebusd/main_args.cpp ++++ b/src/ebusd/main_args.cpp +@@ -79,7 +79,7 @@ + .port = 8888, + .localOnly = false, + .httpPort = 0, +- .htmlPath = "/var/" PACKAGE "/html", ++ .htmlPath = "/var/lib" PACKAGE "/html", + .updateCheck = true, + + .logFile = PACKAGE_LOGFILE, +@@ -199,7 +199,7 @@ + {"port", 'p', "PORT", 0, "Listen for command line connections on PORT [8888]"}, + {"localhost", O_LOCAL, nullptr, 0, "Listen for command line connections on 127.0.0.1 interface only"}, + {"httpport", O_HTTPPT, "PORT", 0, "Listen for HTTP connections on PORT, 0 to disable [0]"}, +- {"htmlpath", O_HTMLPA, "PATH", 0, "Path for HTML files served by HTTP port [/var/ebusd/html]"}, ++ {"htmlpath", O_HTMLPA, "PATH", 0, "Path for HTML files served by HTTP port [/var/lib/ebusd/html]"}, + {"updatecheck", O_UPDCHK, "MODE", 0, "Set automatic update check to MODE (on|off) [on]"}, + + {nullptr, 0, nullptr, 0, "Log options:"}, diff --git a/app-misc/ebusd/files/ebusd.confd b/app-misc/ebusd/files/ebusd.confd new file mode 100644 index 000000000000..2abae6bece1c --- /dev/null +++ b/app-misc/ebusd/files/ebusd.confd @@ -0,0 +1,5 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Options to pass to ebusd (run "ebusd --help" for more info) +EBUSD_OPTS="--scanconfig" diff --git a/app-misc/ebusd/files/ebusd.initd b/app-misc/ebusd/files/ebusd.initd new file mode 100644 index 000000000000..e0ef5fca9623 --- /dev/null +++ b/app-misc/ebusd/files/ebusd.initd @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2024 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/ebusd" +command_args="${EBUSD_OPTS}" +ebusd_path="/var/lib/ebusd" +html_path="${ebusd_path}/html" +logfile_path="/var/log/ebusd" +logfile="${pidfile_path}/ebusd.log" +name="eBUS daemon" +pidfile_path="/run/ebusd" +pidfile="${pidfile_path}/ebusd.pid" + +start_pre() { + checkpath -d -q "${ebusd_path}" "${html_path}" + checkpath -d -q "${logfile_path}" + checkpath -d -q "${pidfile_path}" + checkpath -f -q "${logfile}" +} diff --git a/app-misc/ebusd/files/ebusd.service b/app-misc/ebusd/files/ebusd.service new file mode 100644 index 000000000000..b66f443524a8 --- /dev/null +++ b/app-misc/ebusd/files/ebusd.service @@ -0,0 +1,13 @@ +[Unit] +Description=eBUS daemon +After=network-online.target + +[Service] +Type=forking +User=ebusd +Group=ebusd +ExecStart=/usr/bin/ebusd ${EBUSD_OPTS} +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/app-misc/ebusd/metadata.xml b/app-misc/ebusd/metadata.xml new file mode 100644 index 000000000000..8ea2abcad648 --- /dev/null +++ b/app-misc/ebusd/metadata.xml @@ -0,0 +1,22 @@ + + + + + conikost@gentoo.org + Conrad Kostecki + + + Ebusd is a daemon for handling communication with eBUS devices + connected to a 2-wire bus system. The "energy bus" is used by + numerous heating systems. + + + Compile and install additional user contribued plugins. + Enable support for connecting to KNX. + Enable support for connecting to MQTT. + + + https://github.com/john30/ebusd/issues + john30/ebusd + + -- cgit v1.2.3