From 30c2cb2c8971dc95b672303f9191d166d622fe47 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Nov 2022 03:19:10 +0000 Subject: gentoo auto-resync : 06:11:2022 - 03:19:10 --- net-dns/avahi/Manifest | 3 +- net-dns/avahi/avahi-0.8-r6.ebuild | 217 -------------------- net-dns/avahi/avahi-0.8-r7.ebuild | 218 +++++++++++++++++++++ .../avahi/files/avahi-0.8-strict-prototypes.patch | 38 ++++ 4 files changed, 258 insertions(+), 218 deletions(-) delete mode 100644 net-dns/avahi/avahi-0.8-r6.ebuild create mode 100644 net-dns/avahi/avahi-0.8-r7.ebuild create mode 100644 net-dns/avahi/files/avahi-0.8-strict-prototypes.patch (limited to 'net-dns/avahi') diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index a382d400a737..f5478559410f 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -4,7 +4,8 @@ AUX avahi-0.8-dependency-error.patch 572 BLAKE2B 2e0cf7d536239ec87302447968a32e9 AUX avahi-0.8-disable-avahi-ui-sharp.patch 1145 BLAKE2B e1f801a665bccd3416a033c07d14823f4aced024841e4d8207cb4fe4c52173e807db3a8c0fbb41795f2fb2e6cc1d939a3afff236bb67492d4c9ec82c4a5dafc9 SHA512 880ac2fc8b8c661e003c33a764b9edf5155dc27a2933699a6f1936b27da8a1454583abd4cff7b53b77b3ff600f24af721c6b2537586e55f4e3edd36517a832ba AUX avahi-0.8-null-pointer-crash.patch 3924 BLAKE2B 550f1b90e5975649bde275c9d310ee3c180ca686205bd75edddad962af4d0eaae39ff666f71a6f85b6d9c9c9e6bf5ff2360befc8ff3a7ba54e2483999c7d16ff SHA512 4b7440b3fc01b03da7bf8ff61f8569dbb058282be3c402d974f735a744ae9dcbf774a087384001b85b2ec1009d12cba1b24536f38cc9930b7fcb1902e2575872 AUX avahi-0.8-potentially-undefined-fix.patch 1385 BLAKE2B 2fdd4956f40ecb0e7cbfb6eaa8d5f78b1f333f40d9e9701a0556ca6df9823f1900788f73af8b93f667ebb78e45adf2eab036356d19d9b62d0ee3ea7ba12f3ecd SHA512 06b92657982f196b5f581869bb4562cf2e80d43d05ab06b61c82f6ca794a13fcda983a8027179bc8d46b82408b239af788711f203229cf290007f041988b853f +AUX avahi-0.8-strict-prototypes.patch 1397 BLAKE2B 31139f99225c36cf116b74f34abf693431efd9ea8ddc9de4aad1c198b008821cb2202ab5b5cdfa3003b897de1f370b7a137b06db793e3f48e32499e0b0f3a9c5 SHA512 266e25bf6271232f7785947642f64e0917675c05acecfa71db7df30e6054c99a138e1f11d4f6caceb6cff10db9095df838232b56c80394fb771599443ea7732c DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe EBUILD avahi-0.8-r5.ebuild 5323 BLAKE2B a9bed404ffc47969223ee6479653dc94eb1caaa3cf0f990c0a99f0002f91a65c4d3fcabd90caa7c990fafee655be9e1c4e8c220d70e2e995021d6f644c78a0ad SHA512 0f7e8c9cfe636dfa8ee2ab16e9364ed15c0b400af32019ce689205f86089655c5f88994249e5b1f54c7a1cd08a11bdf0ce6652fbd89edef814ad947d859ba52b -EBUILD avahi-0.8-r6.ebuild 5471 BLAKE2B 91ca8d4eba214d12e023f5b8e45bdde0fa2311a8635e0704f10ab231e102237d2074c7e734e2eef70a0bf45dd50639343a68f89d7e696b30e0a4dcacf85a733b SHA512 d8ba25dcf10af1fc4ef573c1d5fdfb1443e29a9384f62db97cd5be491e4f014213aace70757c4c0a9177a90ba1fa6be6341e53090d116d31d42e11b78dfb9783 +EBUILD avahi-0.8-r7.ebuild 5515 BLAKE2B 2025a4ab51ebe41071b6250e8c94070031c3a9b6b8a0d3dbe78387a935754c989a08b972a5b9b7741eb7c7c22999400b47ff5b957e51ad388502105c769db469 SHA512 97d1f018f733217d2f3a3d674d37c11d65c4523fb2c78aec5d1c927c4ee739151ada14794de7769541c636a5cd3c40f985d1a2d101b0a002197f6b213daa2b9d MISC metadata.xml 866 BLAKE2B 1bbb5863a98c0f5aa6b3b7337c7f8c3ae21b5701f780fb53fa036dde754582462f2bc09d3999bdda524616951c3dcef5153ed77a27ec0877673cab782f480691 SHA512 775872c0491b4b7c448a70336d112e2c7435baddc18c851bb93bd3e2aa0138290e9952b3cb2abff60df78d03c7aad23d4ee5d704ba6afe30f489b76e5ba2e132 diff --git a/net-dns/avahi/avahi-0.8-r6.ebuild b/net-dns/avahi/avahi-0.8-r6.ebuild deleted file mode 100644 index 73f14ba3bf3c..000000000000 --- a/net-dns/avahi/avahi-0.8-r6.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="gdbm" -inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd - -DESCRIPTION="System which facilitates service discovery on a local network" -HOMEPAGE="https://avahi.org/" -SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat mono nls python qt5 selinux systemd test" - -REQUIRED_USE=" - python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) - bookmarks? ( python ) - mono? ( dbus ) - howl-compat? ( dbus ) - mdnsresponder-compat? ( dbus ) - systemd? ( dbus ) -" - -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libdaemon - dev-libs/libevent:=[${MULTILIB_USEDEP}] - dev-libs/expat - dev-libs/glib:2[${MULTILIB_USEDEP}] - gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] ) - qt5? ( dev-qt/qtcore:5 ) - gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - kernel_linux? ( sys-libs/libcap ) - introspection? ( dev-libs/gobject-introspection:= ) - mono? ( dev-lang/mono ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] ) - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) - ') - ) -" -RDEPEND=" - acct-user/avahi - acct-group/avahi - acct-group/netdev - autoipd? ( - acct-user/avahi-autoipd - acct-group/avahi-autoipd - ) - ${DEPEND} - selinux? ( sec-policy/selinux-avahi ) -" -BDEPEND=" - dev-util/glib-utils - doc? ( app-doc/doxygen ) - app-doc/xmltoman - sys-devel/gettext - virtual/pkgconfig -" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) - -PATCHES=( - "${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062 - "${FILESDIR}/${P}-dependency-error.patch" - "${FILESDIR}/${P}-null-pointer-crash.patch" - "${FILESDIR}/${P}-potentially-undefined-fix.patch" -# These patches do not apply cleanly but may need to be re-instated. -# I'll leave them commented out for now. -# "${FILESDIR}/${PN}-0.7-qt5.patch" -# "${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch" -# "${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch" -# "${FILESDIR}/${PN}-0.7-python3.patch" -# "${FILESDIR}/${PN}-0.7-python3-unittest.patch" -# "${FILESDIR}/${PN}-0.7-python3-gdbm.patch" -) - -pkg_setup() { - use mono && mono-env_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - if ! use ipv6; then - sed -i \ - -e "s/use-ipv6=yes/use-ipv6=no/" \ - avahi-daemon/avahi-daemon.conf || die - fi - - sed -i \ - -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ - doxygen_to_devhelp.xsl || die - - eautoreconf - - # bundled manpages - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - --disable-gtk - --disable-monodoc - --disable-python-dbus - --disable-qt3 - --disable-qt4 - --disable-static - --enable-manpages - --enable-glib - --enable-gobject - --enable-xmltoman - --localstatedir="${EPREFIX}/var" - --with-distro=gentoo - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable dbus) - $(use_enable gdbm) - $(use_enable gtk gtk3) - $(use_enable howl-compat compat-howl) - $(use_enable mdnsresponder-compat compat-libdns_sd) - $(use_enable nls) - $(multilib_native_use_enable autoipd) - $(multilib_native_use_enable doc doxygen-doc) - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable mono) - $(multilib_native_use_enable python) - $(multilib_native_use_enable test tests) - ) - - if use python; then - myconf+=( - $(multilib_native_use_enable dbus python-dbus) - $(multilib_native_use_enable introspection pygobject) - ) - fi - - if use mono; then - myconf+=( $(multilib_native_use_enable doc monodoc) ) - fi - - if ! multilib_is_native_abi; then - myconf+=( - # used by daemons only - --disable-libdaemon - --with-xml=none - ) - fi - - myconf+=( $(multilib_native_use_enable qt5) ) - - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake - - multilib_is_native_abi && use doc && emake avahi.devhelp -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if ! use bookmarks || ! use python || ! use dbus; then - rm -f "${ED}"/usr/bin/avahi-bookmarks || die - fi - - # https://github.com/lathiat/avahi/issues/28 - use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h - - if multilib_is_native_abi && use doc; then - docinto html - dodoc -r doxygen/html/. - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp - fi - - # The build system creates an empty "/run" directory, so we clean it up here - rmdir "${ED}"/run || die -} - -multilib_src_install_all() { - use python && python_optimize - - if use autoipd; then - insinto /lib/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /lib/netifrc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - find "${ED}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - if use autoipd; then - elog - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" - elog - fi - - systemd_reenable avahi-daemon.service -} diff --git a/net-dns/avahi/avahi-0.8-r7.ebuild b/net-dns/avahi/avahi-0.8-r7.ebuild new file mode 100644 index 000000000000..ed36d9edfc0c --- /dev/null +++ b/net-dns/avahi/avahi-0.8-r7.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="gdbm" +inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd + +DESCRIPTION="System which facilitates service discovery on a local network" +HOMEPAGE="https://avahi.org/" +SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat mono nls python qt5 selinux systemd test" + +REQUIRED_USE=" + python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) + bookmarks? ( python ) + mono? ( dbus ) + howl-compat? ( dbus ) + mdnsresponder-compat? ( dbus ) + systemd? ( dbus ) +" + +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libdaemon + dev-libs/libevent:=[${MULTILIB_USEDEP}] + dev-libs/expat + dev-libs/glib:2[${MULTILIB_USEDEP}] + gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] ) + qt5? ( dev-qt/qtcore:5 ) + gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + kernel_linux? ( sys-libs/libcap ) + introspection? ( dev-libs/gobject-introspection:= ) + mono? ( dev-lang/mono ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] ) + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) + ') + ) +" +RDEPEND=" + acct-user/avahi + acct-group/avahi + acct-group/netdev + autoipd? ( + acct-user/avahi-autoipd + acct-group/avahi-autoipd + ) + ${DEPEND} + selinux? ( sec-policy/selinux-avahi ) +" +BDEPEND=" + dev-util/glib-utils + doc? ( app-doc/doxygen ) + app-doc/xmltoman + sys-devel/gettext + virtual/pkgconfig +" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) + +PATCHES=( + "${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062 + "${FILESDIR}/${P}-dependency-error.patch" + "${FILESDIR}/${P}-null-pointer-crash.patch" + "${FILESDIR}/${P}-potentially-undefined-fix.patch" + "${FILESDIR}/${P}-strict-prototypes.patch" +# These patches do not apply cleanly but may need to be re-instated. +# I'll leave them commented out for now. +# "${FILESDIR}/${PN}-0.7-qt5.patch" +# "${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch" +# "${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch" +# "${FILESDIR}/${PN}-0.7-python3.patch" +# "${FILESDIR}/${PN}-0.7-python3-unittest.patch" +# "${FILESDIR}/${PN}-0.7-python3-gdbm.patch" +) + +pkg_setup() { + use mono && mono-env_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use ipv6; then + sed -i \ + -e "s/use-ipv6=yes/use-ipv6=no/" \ + avahi-daemon/avahi-daemon.conf || die + fi + + sed -i \ + -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ + doxygen_to_devhelp.xsl || die + + eautoreconf + + # bundled manpages + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + --disable-gtk + --disable-monodoc + --disable-python-dbus + --disable-qt3 + --disable-qt4 + --disable-static + --enable-manpages + --enable-glib + --enable-gobject + --enable-xmltoman + --localstatedir="${EPREFIX}/var" + --with-distro=gentoo + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable dbus) + $(use_enable gdbm) + $(use_enable gtk gtk3) + $(use_enable howl-compat compat-howl) + $(use_enable mdnsresponder-compat compat-libdns_sd) + $(use_enable nls) + $(multilib_native_use_enable autoipd) + $(multilib_native_use_enable doc doxygen-doc) + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable mono) + $(multilib_native_use_enable python) + $(multilib_native_use_enable test tests) + ) + + if use python; then + myconf+=( + $(multilib_native_use_enable dbus python-dbus) + $(multilib_native_use_enable introspection pygobject) + ) + fi + + if use mono; then + myconf+=( $(multilib_native_use_enable doc monodoc) ) + fi + + if ! multilib_is_native_abi; then + myconf+=( + # used by daemons only + --disable-libdaemon + --with-xml=none + ) + fi + + myconf+=( $(multilib_native_use_enable qt5) ) + + econf "${myconf[@]}" +} + +multilib_src_compile() { + emake + + multilib_is_native_abi && use doc && emake avahi.devhelp +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if ! use bookmarks || ! use python || ! use dbus; then + rm -f "${ED}"/usr/bin/avahi-bookmarks || die + fi + + # https://github.com/lathiat/avahi/issues/28 + use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc + use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h + + if multilib_is_native_abi && use doc; then + docinto html + dodoc -r doxygen/html/. + insinto /usr/share/devhelp/books/avahi + doins avahi.devhelp + fi + + # The build system creates an empty "/run" directory, so we clean it up here + rmdir "${ED}"/run || die +} + +multilib_src_install_all() { + use python && python_optimize + + if use autoipd; then + insinto /lib/rcscripts/net + doins "${FILESDIR}"/autoipd.sh + + insinto /lib/netifrc/net + newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh + fi + + dodoc docs/{AUTHORS,NEWS,README,TODO} + + find "${ED}" -name '*.la' -type f -delete || die +} + +pkg_postinst() { + if use autoipd; then + elog + elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" + elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" + elog + fi + + systemd_reenable avahi-daemon.service +} diff --git a/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch b/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch new file mode 100644 index 000000000000..3954aa4357ae --- /dev/null +++ b/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch @@ -0,0 +1,38 @@ +https://github.com/lathiat/avahi/pull/405 + +From 54409e5af9c382117b67674756971f4f1bf646f8 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 5 Nov 2022 23:49:47 +0000 +Subject: [PATCH] configure.ac: fix -Wstrict-prototypes + +Fixes errors like: +``` +-ignoreme: warning: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] ++ignoreme: error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype] + void test_broken_ssp(c) + ^ +``` + +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -99,8 +99,7 @@ if test x"$enable_ssp" = x"yes"; then + LDFLAGS="$LDFLAGS -Wl,-z,defs" + cat confdefs.h > conftest.c + cat >>conftest.c <<_ACEOF +-void test_broken_ssp(c) +- const char *c; ++void test_broken_ssp(const char *c) + { + char arr[[123]], *p; /* beware of possible double-braces if copying this */ + for (p = arr; *c; ++p) { +@@ -300,7 +299,7 @@ AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd) + AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) + + test_gcc_flag() { +- AC_LANG_CONFTEST([int main() {}]) ++ AC_LANG_CONFTEST([int main(void) {}]) + $CC -c conftest.c $CFLAGS $@ > /dev/null 2> /dev/null + ret=$? + rm -f conftest.o + -- cgit v1.2.3