From e660fe12946bfa241d169ebb2467939907de75d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 20 Jan 2023 06:00:45 +0000 Subject: gentoo auto-resync : 20:01:2023 - 06:00:45 --- net-misc/Manifest.gz | Bin 54423 -> 54415 bytes net-misc/dhcp/Manifest | 2 + net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild | 293 ++++++++++++++++++++++++++++++ net-misc/dhcp/files/dhcp.tmpfiles | 2 + net-misc/gerbera/Manifest | 8 +- net-misc/gerbera/gerbera-1.12.0.ebuild | 91 ---------- net-misc/gerbera/gerbera-1.12.1.ebuild | 90 +++++++++ net-misc/gerbera/gerbera-9999.ebuild | 7 +- net-misc/gerbera/metadata.xml | 1 - net-misc/miniupnpd/Manifest | 3 + net-misc/miniupnpd/miniupnpd-2.3.2.ebuild | 108 +++++++++++ 11 files changed, 505 insertions(+), 100 deletions(-) create mode 100644 net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild create mode 100644 net-misc/dhcp/files/dhcp.tmpfiles delete mode 100644 net-misc/gerbera/gerbera-1.12.0.ebuild create mode 100644 net-misc/gerbera/gerbera-1.12.1.ebuild create mode 100644 net-misc/miniupnpd/miniupnpd-2.3.2.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 7b2e69fe8b9f..1c157d3d2615 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 01eba4dea675..d8ddfb12f669 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -9,6 +9,7 @@ AUX dhcp-4.4.3-iproute2-path.patch 451 BLAKE2B dcb948428326f7ca198061b1956f25981 AUX dhcp-4.4.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d882404753cc5d8ea6a342cc47bfa795a91712e83cdeee2899a63619f48566ced2edce6e24ae382e2954950cd3be534abb75dad6 SHA512 c8e48bc405d75281790c44c48d89c27b9ec7dd7273c41cacdc0e5e3b08648ae0eda1bd9b308a19667f11703b4bb25fc94911036bcca11f1197f87ec265b0c35a AUX dhcp-4.4.3-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310ff5e40b3872bdcb17de45f7fb023d3d08b2433b25a362f13da89c0b818d88bb5f2d9737b3a00528c581a297f65f5 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7 AUX dhcp-4.4.3-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47 +AUX dhcp.tmpfiles 75 BLAKE2B 5985efbb3c21c86cef4bc8796b54274df5db96a62e2cb7a50891a381ae63750d007b7fc730cfbc33c455776d565eda1b7cac7dc648e652c7659c1f36271ecbdf SHA512 c47c3bc0e17a7fc645d72fc7500459fa742e579b9fb1cdeac2e553146845bc26abfbdb80c63a2a1d1c56c2cfccc4a5790706a4e739265f63a7b4604a089100f4 AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d AUX dhcpd.init5 2882 BLAKE2B 9ce56c4aef62641508b8f4d366672725dd277c18846f9a001de8d244ca03720aba2c52ca7bd34ac63b08db082489d915c23bd1c685c37699034373bde1a7c37f SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1 AUX dhcpd.tmpfiles 75 BLAKE2B 8e4ddbccb162c620df175dbb39621659f9905c54ba2dc46d3863438e030dee3a04bb4b528bb7ee91a1cb47564081e48ac6937a6aee4ea026adcdb1887e643152 SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb @@ -22,5 +23,6 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154 +EBUILD dhcp-4.4.3_p1-r1.ebuild 8482 BLAKE2B 818afd1c976e22e71028532d2bac0a3d9242940c26d279da807d371ccc088fde86543d6705fa902720926c65a675eb42a048dc9e72c7024e2234bb04998534fe SHA512 8e15b5f3edf32473c9b6af4fff308c653e055f2fa7de7c6ce59fa76edbf12fedff1e4cd06b80a4e2cb50ddcd71a814fbc291794b039f86096b00eeffbafe43b0 EBUILD dhcp-4.4.3_p1.ebuild 8562 BLAKE2B 9020b201427b8e5db434d2733c0902fad0acf5016b789655b50f9a96837fcbd82200bcf06193d61db351e845dbc04a4f5bf7f8ed710abba9d370fb7e72415d92 SHA512 865b48f2aa8643c20c9a970940cba5f978d3fd9d6e7a68982ec8284e7c1ee7fb0bc9f6cefaf9aba2c950035b7ca52a13a8ec86b6f0e897337751cbc4ec5e68ca MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild new file mode 100644 index 000000000000..f2efd63970a9 --- /dev/null +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs flag-o-matic tmpfiles + +MY_PV="${PV//_alpha/a}" +MY_PV="${MY_PV//_beta/b}" +MY_PV="${MY_PV//_rc/rc}" +MY_PV="${MY_PV//_p/-P}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" +HOMEPAGE="https://www.isc.org/dhcp" +SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" + +BDEPEND=" + acct-group/dhcp + acct-user/dhcp" + +DEPEND=" + client? ( + kernel_linux? ( + ipv6? ( sys-apps/iproute2 ) + sys-apps/net-tools + ) + ) + ldap? ( + net-nds/openldap:= + ssl? ( dev-libs/openssl:= ) + )" +RDEPEND=" + ${BDEPEND} + ${DEPEND} + selinux? ( sec-policy/selinux-dhcp ) + vim-syntax? ( app-vim/dhcpd-syntax )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + # handle local bind hell + cd "${S}"/bind + unpack ./bind.tar.gz +} + +PATCHES=( + # Gentoo patches - these will probably never be accepted upstream + # Fix some permission issues + "${FILESDIR}/${PN}-4.4.3-fix-perms.patch" + + # Enable dhclient to equery NTP servers + "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch" + "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch" + + # Enable dhclient to get extra configuration from stdin + "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch" + # bug #265531 + "${FILESDIR}/${PN}-4.4.3-nogateway.patch" + # bug #296921 + "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch" + # bug #437108 + "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch" + # bug #480636 + "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch" + # bug #471142 + "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch" + # bug #559832 + "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch" + + # Possible upstream candidates +) + +src_prepare() { + default + + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || die + + # Change the hook script locations of the scripts + sed -i \ + -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ + -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \ + client/scripts/* || die + + # No need for the linux script to force bash #158540 + sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die + + # Quiet the freebsd logger a little + sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die + + # Remove these options from the sample config + sed -i -r \ + -e "/(script|host-name|domain-name) /d" \ + client/dhclient.conf.example || die + + if use client && ! use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ + Makefile.in || die + elif ! use client && use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\::' \ + Makefile.in || die + fi + + # Only install different man pages if we don't have en + if [[ " ${LINGUAS} " != *" en "* ]]; then + # Install Japanese man pages + if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then + einfo "Installing Japanese documention" + cp doc/ja_JP.eucJP/dhclient* client || die + cp doc/ja_JP.eucJP/dhcp* common || die + fi + fi + # Now remove the non-english docs so there are no errors later + rm -r doc/ja_JP.eucJP || die + + # make the bind build work - do NOT make "binddir" local! + binddir="${S}/bind" + cd "${binddir}" || die + cat <<-EOF > bindvar.tmp + binddir=${binddir} + GMAKE=${MAKE:-gmake} + EOF + eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch + # Only use the relevant subdirs now that ISC + #removed the lib/export structure in bind. + sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \ + -i bind-*/lib/Makefile.in || die +} + +src_configure() { + # bind defaults to stupid `/usr/bin/ar` + tc-export AR BUILD_CC + export ac_cv_path_AR=${AR} + + # this is tested for by the bind build system, and can cause trouble + # when cross-building; since dhcp itself doesn't make use of libcap, + # simply disable it. + export ac_cv_lib_cap_cap_set_proc=no + + # Use FHS sane paths ... some of these have configure options, + # but not all, so just do it all here. + local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" + cat <<-EOF >> includes/site.h + #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" + #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" + #define _PATH_DHCPD_DB "${l}/dhcpd.leases" + #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" + #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" + #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" + #define _PATH_DHCPD_PID "${r}/dhcpd.pid" + #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" + #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" + #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" + #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" + #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" + EOF + + # Breaks with -O3 because of reliance on undefined behaviour + # bug #787935 + append-flags -fno-strict-aliasing + + # bug #720806, bug #801592 + if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then + append-libs -latomic + fi + + local myeconfargs=( + --enable-paranoia + --enable-early-chroot + --sysconfdir=${e} + --with-randomdev=/dev/random + $(use_enable ipv6 dhcpv6) + $(use_with ldap) + $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) + LIBS="${LIBS}" + ) + econf "${myeconfargs[@]}" + + # configure local bind cruft. symtable option requires + # perl and we don't want to require that. bug #383837. + cd bind/bind-*/ || die + local el + eval econf \ + $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ + --with-randomdev=/dev/random \ + --disable-symtable \ + --without-make-clean +} + +src_compile() { + # Build local bind cruft first + emake -C bind/bind-*/lib install + # then build standard dhcp code + emake AR="$(tc-getAR)" +} + +src_install() { + default + + dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} + docinto html + dodoc doc/References.html + newtmpfiles "${FILESDIR}"/dhcp.tmpfiles dhcp.conf + + if [[ -e client/dhclient ]] ; then + # Move the client to / + dodir /sbin + mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die + + exeinto /sbin + if use kernel_linux ; then + newexe "${S}"/client/scripts/linux dhclient-script + else + newexe "${S}"/client/scripts/freebsd dhclient-script + fi + fi + + if [[ -e server/dhcpd ]] ; then + if use ldap ; then + insinto /etc/openldap/schema + doins contrib/ldap/dhcp.* + dosbin contrib/ldap/dhcpd-conf-to-ldap + fi + + newinitd "${FILESDIR}"/dhcpd.init5 dhcpd + newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay + newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 + newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 + + systemd_dounit "${FILESDIR}"/dhcpd4.service + systemd_dounit "${FILESDIR}"/dhcpd6.service + systemd_dounit "${FILESDIR}"/dhcrelay4.service + systemd_dounit "${FILESDIR}"/dhcrelay6.service + systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf + systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf + + sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 + fi + + # the default config files aren't terribly useful #384087 + local f + for f in "${ED}"/etc/dhcp/*.conf.example ; do + mv "${f}" "${f%.example}" || die + done + sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die +} + +pkg_preinst() { + # Keep the user files over the sample ones. The + # hashing is to ignore the crappy defaults #384087. + local f h + for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do + h=${f#*:} + f="/etc/dhcp/${f%:*}.conf" + if [ -e "${EROOT}"${f} ] ; then + case $(md5sum "${EROOT}"${f}) in + ${h}*) ;; + *) cp -p "${EROOT}"${f} "${ED}"${f};; + esac + fi + done +} + +pkg_postinst() { + tmpfiles_process dhcp.conf + + if use client ; then + ewarn "The client and relay functionality will be removed in the next release!" + ewarn "Upstream have decided to discontinue this functionality." + fi + + if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then + ewarn + ewarn "WARNING: The dhcp init script has been renamed to dhcpd" + ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" + ewarn "and dhcp should be removed from the default runlevel" + ewarn + fi +} diff --git a/net-misc/dhcp/files/dhcp.tmpfiles b/net-misc/dhcp/files/dhcp.tmpfiles new file mode 100644 index 000000000000..c5b18352eda4 --- /dev/null +++ b/net-misc/dhcp/files/dhcp.tmpfiles @@ -0,0 +1,2 @@ +d /var/lib/dhcp 0750 dhcp dhcp +f /var/lib/dhcp/dhcpd.leases 0640 dhcp dhcp diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 093d5257cecf..df723c0886b3 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1,7 +1,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417 -DIST gerbera-1.12.0.tar.gz 4363130 BLAKE2B c9db8418fecaa7d58046f61b52148eb2e3fe168414d78909517aad22ddf68cb19c658ec25e8a2c5e1764aa457d8f3cbb676e2a50f4bd610dfc275f576ec70881 SHA512 0dd051058638dc5c3a834f92e6733a3e3f2833c73dd8184f4878d6dd1f3b9e5dabba5d62c13fc9a0e2424b8efb5501dab9acbb8befa1bdfbf178894a6c70bc16 -EBUILD gerbera-1.12.0.ebuild 2246 BLAKE2B 82a7c6db7620676ec379ec8dc6b3409f321ea3d707548858619b039b303b8ad96f5da0f677295e04a39b8681da3079d1b3ec14f1b395e9cc433e5a176998ce66 SHA512 d637d7cc9866fcdbb1b9d703ad224969dc5a30d96b7976c902544bbbee6be7caea3be0631a0bff5024131ac1f237d47e3b0e2f0b9f0f1fee87bc50baf0006c67 -EBUILD gerbera-9999.ebuild 2246 BLAKE2B 82a7c6db7620676ec379ec8dc6b3409f321ea3d707548858619b039b303b8ad96f5da0f677295e04a39b8681da3079d1b3ec14f1b395e9cc433e5a176998ce66 SHA512 d637d7cc9866fcdbb1b9d703ad224969dc5a30d96b7976c902544bbbee6be7caea3be0631a0bff5024131ac1f237d47e3b0e2f0b9f0f1fee87bc50baf0006c67 -MISC metadata.xml 1205 BLAKE2B f0fbdc991782018368d65f2d5475ede1a1a0cb2a8a16de4e7c4ed7586057cac18a2d6fe9bb405c8267337e453b26c69e69042dac3bfd5ef858f23fa7c468ef2c SHA512 a231be2b6829fb2f59fa3e66c830a16358782c915e806bfbee919a6f7ebdf9d33d53aa6860814ba5a5c7251ce2562f313af592ab5fcda701a7673b334627b1a0 +DIST gerbera-1.12.1.tar.gz 4368573 BLAKE2B 870b1296b89d51086048c5c5a52109f336facbf0bce02313487cb5c80ca4bb9a5590f64683f5ac92a3c3026ef9c3e22275a38fdc52fd8cbe887ec6f3c7b38ab9 SHA512 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2 +EBUILD gerbera-1.12.1.ebuild 2193 BLAKE2B 0d79dfc11b45a87690d6f6131495a01f30fcfe3e7831030b0ea38fe2b5cc579b9232589ae6c5c4ec0b8de5950e629795ae7839018fdd5fc2daab9dbc1b8df620 SHA512 9c0fbd791f6b5b490cbe47217c8b30df29e1ac09683a5f66557c3b8c93e77fb20e01f2498ee715ef70647101e3e81ebf3f85507d498af325820cd7fb6a5ad5fa +EBUILD gerbera-9999.ebuild 2193 BLAKE2B 0d79dfc11b45a87690d6f6131495a01f30fcfe3e7831030b0ea38fe2b5cc579b9232589ae6c5c4ec0b8de5950e629795ae7839018fdd5fc2daab9dbc1b8df620 SHA512 9c0fbd791f6b5b490cbe47217c8b30df29e1ac09683a5f66557c3b8c93e77fb20e01f2498ee715ef70647101e3e81ebf3f85507d498af325820cd7fb6a5ad5fa +MISC metadata.xml 1153 BLAKE2B 160ec07f27637335374b7c1232c65942d661b66ab89f9e145ffcbadd510ea454a52cef9ab8e544ed46c0c11f56f69b1c659b4f604b0c65ada19f66f1d857586e SHA512 95da4ff4383a5fa1467ea5674c38cb6c8b7939fa01e7a66bac42bb2e3d21dfc020c2585bc6e81af602a227c978e3fe1dc3950ef962b17cbbc11a0cea0413d9b3 diff --git a/net-misc/gerbera/gerbera-1.12.0.ebuild b/net-misc/gerbera/gerbera-1.12.0.ebuild deleted file mode 100644 index 86e41fa7ab04..000000000000 --- a/net-misc/gerbera/gerbera-1.12.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake linux-info - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P}" -fi - -DESCRIPTION="UPnP Media Server" -HOMEPAGE="https://gerbera.io" - -LICENSE="GPL-2" -SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" - -RDEPEND=" - acct-user/gerbera - dev-db/sqlite - dev-libs/libebml:= - dev-libs/libfmt:= - dev-libs/pugixml - dev-libs/spdlog:= - >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( media-video/ffmpeg:= ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - javascript? ( dev-lang/duktape:= ) - lastfm? ( media-libs/lastfmlib ) - magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska:= ) - mysql? ( dev-db/mysql-connector-c ) - taglib? ( media-libs/taglib ) -" - -DEPEND="${RDEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -src_configure() { - local mycmakeargs=( - -DWITH_AVCODEC=$(usex ffmpeg) - -DWITH_CURL=$(usex curl) - -DWITH_DEBUG=$(usex debug) - -DWITH_EXIF=$(usex exif) - -DWITH_EXIV2=$(usex exiv2) - -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) - -DWITH_INOTIFY=1 - -DWITH_JS=$(usex javascript) - -DWITH_LASTFM=$(usex lastfm) - -DWITH_MAGIC=$(usex magic) - -DWITH_MATROSKA=$(usex matroska) - -DWITH_MYSQL=$(usex mysql) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TAGLIB=$(usex taglib) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} - newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} - - insinto /etc/${PN} - newins "${FILESDIR}"/${PN}-1.3.0.config config.xml - fperms 0640 /etc/${PN}/config.xml - fowners root:gerbera /etc/${PN}/config.xml -} - -pkg_postinst() { - if use mysql; then - elog "Gerbera has been built with MySQL support and needs" - elog "to be configured before being started. By default" - elog "SQLite will be used." - fi -} diff --git a/net-misc/gerbera/gerbera-1.12.1.ebuild b/net-misc/gerbera/gerbera-1.12.1.ebuild new file mode 100644 index 000000000000..00f14f51b749 --- /dev/null +++ b/net-misc/gerbera/gerbera-1.12.1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake linux-info + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${P}" +fi + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" + +RDEPEND=" + acct-user/gerbera + dev-db/sqlite + dev-libs/libebml:= + dev-libs/libfmt:= + dev-libs/pugixml + dev-libs/spdlog:= + >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2 ) + ffmpeg? ( media-video/ffmpeg:= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + javascript? ( dev-lang/duktape:= ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) +" + +DEPEND="${RDEPEND}" + +CONFIG_CHECK="~INOTIFY_USER" + +src_configure() { + local mycmakeargs=( + -DWITH_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) + -DWITH_INOTIFY=1 + -DWITH_JS=$(usex javascript) + -DWITH_LASTFM=NO + -DWITH_MAGIC=$(usex magic) + -DWITH_MATROSKA=$(usex matroska) + -DWITH_MYSQL=$(usex mysql) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TAGLIB=$(usex taglib) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} + newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} + + insinto /etc/${PN} + newins "${FILESDIR}"/${PN}-1.3.0.config config.xml + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + if use mysql; then + elog "Gerbera has been built with MySQL support and needs" + elog "to be configured before being started. By default" + elog "SQLite will be used." + fi +} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 86e41fa7ab04..00f14f51b749 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.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 @@ -19,7 +19,7 @@ HOMEPAGE="https://gerbera.io" LICENSE="GPL-2" SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" RDEPEND=" acct-user/gerbera @@ -38,7 +38,6 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) javascript? ( dev-lang/duktape:= ) - lastfm? ( media-libs/lastfmlib ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska:= ) mysql? ( dev-db/mysql-connector-c ) @@ -59,7 +58,7 @@ src_configure() { -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) -DWITH_INOTIFY=1 -DWITH_JS=$(usex javascript) - -DWITH_LASTFM=$(usex lastfm) + -DWITH_LASTFM=NO -DWITH_MAGIC=$(usex magic) -DWITH_MATROSKA=$(usex matroska) -DWITH_MYSQL=$(usex mysql) diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml index 46cb19df5ff3..6463221bb5fe 100644 --- a/net-misc/gerbera/metadata.xml +++ b/net-misc/gerbera/metadata.xml @@ -14,7 +14,6 @@ Support HTTP media sources (e.g. internet radio) Use media-gfx/exiv2 to extract EXIF information Enable video thumbnail support with media-video/ffmpegthumbnailer - Enable last.fm support Use dev-db/mysql as backend rather than SQLite3 Use media-libs/taglib for reading files' metadata diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index 230d3d69bc08..22dbfb42d79d 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -2,5 +2,8 @@ AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20c AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856 DIST miniupnpd-2.3.1.tar.gz 258050 BLAKE2B c11e3ecb3f1c6b97dfa1acfbc5f844f0bbdaea65fc91be9aec41e9e152900c6998c0fc132ad4faa07cf0cd7c8e433610a8a34ecab7c409f96a9990b6c17ff1ea SHA512 2b854bb75aad7f5b2ad28eeacb3afc2102edecffe50b293bc798b5ae66a9f3eb80df2e27fa14b9f5f232f78831308a5c0d6c7464697dde1770d60a75d98155f7 DIST miniupnpd-2.3.1.tar.gz.sig 543 BLAKE2B 7211174bf1fa2244fafa1df63c3f872a8c557845840fa83f7cdc6264f6692fa5b4919d8c086e78253451497d55fca22300894a8d0e0bde58dbf8baaa6d8e4a26 SHA512 c661f8e028f0a3d96cc943dacd85414570473cd6805c2215531d14f355da2cee3695083807c91218eabbb9d40efed3c8f1c0178cff9461bf92202b4a948088c7 +DIST miniupnpd-2.3.2.tar.gz 259686 BLAKE2B fe451773be25fd7f5941f89b35a4c94f0bebd5ece93d3b3c526c3c0e1c436773a2c403eb407cde397565ef4ec8f50441a64890bb89a56a9006a6c4556e707cef SHA512 f0956b8f2e52fc9257f6512d780d17c920f6635afaeee604056f3b2afccbfda3f5e65d95d16f1d883bd9e7f4e372856cae620fabcf79c7c87e3f56bbcc089acc +DIST miniupnpd-2.3.2.tar.gz.sig 543 BLAKE2B 8c571eb454f6f31757b699c8a06e0b5ade575e058356aad7cdf727caf8f7a6563e98dde31d242cb1fadf136cf2c7bebbc32483c154f2538c1414f04299f40e38 SHA512 2a90aef1c1ca6210ddf5e29d75b0b0dc5daca949732b54a9bcd8230ecd8a4c3d5175b6561a68e180caa70547bcbd533994cad08c21630dd294190d0843cb2f8f EBUILD miniupnpd-2.3.1.ebuild 2369 BLAKE2B 659831e2b43aacc6617f4dbcf3470fd3c1b207b0e5d500bad5652cdbaa948d1f039d68ed729ee7c0c8611c0bd81b17da0fb8ee781821594519e4f4af107128e2 SHA512 f531e27530ffa29cc82b5c36669a294fc14345e5ac5040b2d585d4e6eb0ed5514605fe2542bd3d9327f37d50d1d0fdd69e75b4042970ddbf7e943d2d399db4cf +EBUILD miniupnpd-2.3.2.ebuild 2369 BLAKE2B 4b344617ba59e7026254763dcaf0e12f5fce66bc24caccd8d07779cf4c302f054eaf44845142fee695abeae5b2c4e51aca6d1cd0a26c32ef9aff5da0f337df37 SHA512 0a92aaf374102cf34d289618537867452741a5ae8750a247eecdc62b223ab5ae3b33253cc84c3a35d644cc7402d83122ba61981c690f8e2ea7b75f3cee8fe26c MISC metadata.xml 985 BLAKE2B 4df9a4cf573d7aa45b80bc5062682325c3e063fd4b6147164dcc2a4e1b859def25df4541e1859c8843153c9de3a74557a3b66c94b69a65a94162752e177a907e SHA512 2068b103e2804c899ab17f63ae0aaf46442252067d6a8c12e7cc94c0b8760f5d764cf4124be78079236611cd05d7c5016b1b08499d1c265c561193344dfdeba6 diff --git a/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild new file mode 100644 index 000000000000..0bed1072de26 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.3.2.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs verify-sig + +DESCRIPTION="MiniUPnP IGD Daemon" +HOMEPAGE=" + http://miniupnp.free.fr/ + https://miniupnp.tuxfamily.org/ + https://github.com/miniupnp/miniupnp/ +" +SRC_URI=" + https://miniupnp.tuxfamily.org/files/${P}.tar.gz + verify-sig? ( + https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig + ) +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" + +RDEPEND=" + dev-libs/gmp:0= + sys-apps/util-linux:= + dev-libs/openssl:0= + !nftables? ( + >=net-firewall/iptables-1.4.6:0=[ipv6(+)?] + net-libs/libnfnetlink:= + net-libs/libmnl:= + ) + nftables? ( + net-firewall/nftables + net-libs/libnftnl:= + net-libs/libmnl:= + ) +" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" +BDEPEND=" + sys-apps/lsb-release + verify-sig? ( sec-keys/openpgp-keys-miniupnp ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc + +src_prepare() { + default + + # fails without a default route + sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die +} + +src_configure() { + local opts=( + --vendorcfg + $(usex igd2 '--igd2' '') + $(usex ipv6 '--ipv6' '') + $(usex leasefile '--leasefile' '') + $(usex portinuse '--portinuse' '') + $(usex pcp-peer '--pcp-peer' '') + $(usex strict '--strict' '') + --firewall=$(usex nftables nftables iptables) + ) + + # custom script + ./configure "${opts[@]}" || die + # prevent gzipping manpage + sed -i -e '/gzip/d' Makefile || die +} + +src_compile() { + # By default, it builds a bunch of unittests that are missing wrapper + # scripts in the tarball + emake CC="$(tc-getCC)" STRIP=true miniupnpd +} + +src_test() { + emake CC="$(tc-getCC)" check +} + +src_install() { + emake PREFIX="${ED}" STRIP=true install + + local confd_seds=() + if use nftables; then + confd_seds+=( -e 's/^iptables_scripts=/#&/' ) + else + confd_seds+=( -e 's/^nftables_scripts=/#&/' ) + fi + if ! use ipv6 || use nftables; then + confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) + fi + + newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} + newconfd - ${PN} < <(sed "${confd_seds[@]}" \ + "${FILESDIR}"/${PN}-conf.d-r2 || die) +} + +pkg_postinst() { + elog "Please correct the external interface in the top of the two" + elog "scripts in /etc/miniupnpd and edit the config file in there too" +} -- cgit v1.2.3