* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/, net-misc/minidlna/files/
@ 2017-09-29 9:34 Michael Weber
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2017-09-29 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 2fbff0b9eec27b5a0b84d93ea87ea4541b9d44ac
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 09:34:13 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 09:34:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbff0b9
net-misc/minidlna: version bump w/ USE=avahi (bug 619322, thanks for the hint).
Package-Manager: Portage-2.3.10, Repoman-2.3.3
net-misc/minidlna/Manifest | 1 +
.../files/minidlna-1.2.1-buildsystem.patch | 20 +++++
net-misc/minidlna/minidlna-1.2.1.ebuild | 100 +++++++++++++++++++++
3 files changed, 121 insertions(+)
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 03aab3c3ce4..99f1253b455 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,2 +1,3 @@
DIST minidlna-1.1.5.tar.gz 488191 SHA256 8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa WHIRLPOOL 8ed8fd62fb063b042a234c8647fa05c65e4f1e331a66efae8f361002f5cedcd2706d777348332075e3263e0d8bbde7794dd84fc400dfe3a656e5d70952427669
+DIST minidlna-1.2.1.tar.gz 459549 SHA256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b WHIRLPOOL 9ecbe04b367af7b670a1e2be3effcb6666aae5fa9edabe340c05ddb55d894cdee137a783aec98dd8dadfcae4924a24ea408abb0409b4abedec1f6e53e3a998e3
DIST minidlna-gentoo-artwork.patch.xz 49372 SHA256 37ae7228b07b7c81c8962c5dc88a41ed1691bdf1b019b654a9fc93ac1da0c7ce SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e WHIRLPOOL e243b9b6a002af5e3ee1bb196239790ff86724624ebccb34c84ac072426341db6b5f44e455d13657d5284220fe2688ddf3a2ec0212a7b86525eb02a6c080af80
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
new file mode 100644
index 00000000000..10154dd5165
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
@@ -0,0 +1,20 @@
+--- minidlna-1.2.1/configure.ac
++++ minidlna-1.2.1/configure.ac
+@@ -477,6 +477,9 @@
+ AM_CONDITIONAL(NEED_VORBIS, true),
+ -logg)
+
++AC_ARG_ENABLE([avahi], AS_HELP_STRING([--enable-avahi], [Enable search for avahi]))
++
++AS_IF([test "x$enable_avahi" = "xyes"], [
+ AC_CHECK_LIB(avahi-client, avahi_threaded_poll_new,
+ [AC_CHECK_HEADERS([avahi-common/thread-watch.h],
+ AM_CONDITIONAL(HAVE_AVAHI, true)
+@@ -484,6 +487,7 @@
+ AM_CONDITIONAL(HAVE_AVAHI, false))],
+ AM_CONDITIONAL(HAVE_AVAHI, false),
+ -lavahi-client -lavahi-common)
++], [AM_CONDITIONAL(HAVE_AVAHI, false)])
+
+ ################################################################################################################
+ ### Header checks
diff --git a/net-misc/minidlna/minidlna-1.2.1.ebuild b/net-misc/minidlna/minidlna-1.2.1.ebuild
new file mode 100644
index 00000000000..6b5a1be8ebe
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="avahi netgear readynas"
+
+RDEPEND="dev-db/sqlite:3
+ media-libs/flac
+ media-libs/libexif
+ media-libs/libid3tag
+ media-libs/libogg
+ media-libs/libvorbis
+ virtual/ffmpeg
+ virtual/jpeg:0
+ avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=( "${WORKDIR}"/${PN}-gentoo-artwork.patch
+ "${FILESDIR}"/${P}-buildsystem.patch )
+
+pkg_setup() {
+ local my_is_new="yes"
+ [ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+ # created by above enewuser command w/ wrong group and permissions
+ chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+ chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+ # if user already exists, but /var/lib/minidlna is missing
+ # rely on ${D}/var/lib/minidlna created in src_install
+ fi
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+ -e "/db_dir/s:/var/cache/:/var/lib/:" \
+ -i ${PN}.conf || die
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-silent-rules \
+ --with-db-path=/var/lib/${PN} \
+ --with-log-path=/var/log/${PN} \
+ --enable-tivo \
+ $(use_enable avahi ) \
+ $(use_enable netgear) \
+ $(use_enable readynas)
+}
+
+src_install() {
+ default
+
+ #bug 536532
+ dosym /usr/sbin/${PN}d /usr/bin/${PN}
+
+ insinto /etc
+ doins ${PN}.conf
+
+ newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
+ systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
+ echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+ systemd_dotmpfilesd "${T}"/${PN}.conf
+
+ dodir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ fperms 0750 /var/{lib,log}/${PN}
+
+ dodoc AUTHORS NEWS README TODO
+ doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+ elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+ elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+ elog "cache is moved to /var/lib/minidlna."
+ elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/, net-misc/minidlna/files/
@ 2020-12-03 8:48 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-12-03 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 22914d46aa0c30f41cbcf2718882a9839f4bd9ff
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 3 08:39:49 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 08:48:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22914d46
net-misc/minidlna: Remove old
Bug: https://bugs.gentoo.org/757297
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-misc/minidlna/Manifest | 1 -
.../minidlna/files/minidlna-1.2.1-fno-common.patch | 45 --------
net-misc/minidlna/minidlna-1.2.1-r1.ebuild | 114 ---------------------
3 files changed, 160 deletions(-)
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index cea7e6981c0..444e64091e0 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,3 +1,2 @@
-DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
deleted file mode 100644
index 5cca89b52db..00000000000
--- a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/image_utils.c
-+++ b/image_utils.c
-@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf
- src->pub.bytes_in_buffer = bufsize;
- }
-
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- /* Don't exit on error like libjpeg likes to do */
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
---- a/metadata.c
-+++ b/metadata.c
-@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
- }
-
- /* For libjpeg error handling */
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
- {
---- a/tivo_utils.c
-+++ b/tivo_utils.c
-@@ -27,6 +27,7 @@
- #include <sqlite3.h>
- #include "tivo_utils.h"
-
-+struct sqlite3PrngType sqlite3Prng;
- /* This function based on byRequest */
- char *
- decodeString(char *string, int inplace)
---- a/tivo_utils.h
-+++ b/tivo_utils.h
-@@ -30,7 +30,9 @@ struct sqlite3PrngType {
- unsigned char isInit; /* True if initialized */
- unsigned char i, j; /* State variables */
- unsigned char s[256]; /* State variables */
--} sqlite3Prng;
-+};
-+
-+extern struct sqlite3PrngType sqlite3Prng;
-
- char *
- decodeString(char *string, int inplace);
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
deleted file mode 100644
index 9d6ba5c94f4..00000000000
--- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils linux-info systemd tmpfiles toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="https://sourceforge.net/projects/minidlna/"
-SRC_URI="
- https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz
- https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="elibc_musl netgear readynas zeroconf"
-
-RDEPEND="dev-db/sqlite:3
- media-libs/flac:=
- media-libs/libexif:=
- media-libs/libid3tag:=
- media-libs/libogg:=
- media-libs/libvorbis:=
- media-video/ffmpeg:0=
- virtual/jpeg:0=
- elibc_musl? ( sys-libs/queue-standalone )
- zeroconf? ( net-dns/avahi:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=(
- "${WORKDIR}"/minidlna-gentoo-artwork.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
- sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \
- -e "/db_dir/s:/var/cache/:/var/lib/:" \
- -i minidlna.conf || die
-
- default
-}
-
-src_configure() {
- local myconf=(
- --with-db-path=/var/lib/minidlna
- --with-log-path=/var/log/minidlna
- --enable-tivo
- $(use_enable netgear)
- $(use_enable readynas)
- )
- use zeroconf || myconf+=(
- ac_cv_lib_avahi_client_avahi_threaded_poll_new=no
- )
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- :
-}
-
-src_install() {
- default
-
- #bug 536532
- dosym ../sbin/minidlnad /usr/bin/minidlna
-
- insinto /etc
- doins minidlna.conf
-
- newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna
- newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna
- systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service
- newtmpfiles - minidlna.conf <<-EOF
- d /run/minidlna 0755 minidlna minidlna -
- EOF
-
- keepdir /var/{lib,log}/minidlna
-
- doman minidlnad.8 minidlna.conf.5
-}
-
-pkg_preinst() {
- local my_is_new=yes
- [[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no
-
- enewgroup minidlna
- enewuser minidlna -1 -1 /var/lib/minidlna minidlna
-
- fowners minidlna:minidlna /var/{lib,log}/minidlna
- fperms 0750 /var/{lib,log}/minidlna
-
- if [[ -d ${EROOT}/var/lib/minidlna && ${my_is_new} == yes ]]; then
- # created by above enewuser command w/ wrong group
- # and permissions
- chown minidlna:minidlna "${EROOT}"/var/lib/minidlna || die
- chmod 0750 "${EROOT}"/var/lib/minidlna || die
- # if user already exists, but /var/lib/minidlna is missing
- # rely on ${D}/var/lib/minidlna created in src_install
- fi
-}
-
-pkg_postinst() {
- elog "minidlna now runs as minidlna:minidlna (bug 426726),"
- elog "logfile is moved to /var/log/minidlna/minidlna.log,"
- elog "cache is moved to /var/lib/minidlna."
- elog "Please edit /etc/conf.d/minidlna and file ownerships to suit your needs."
-
- tmpfiles_process minidlna.conf
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/, net-misc/minidlna/files/
@ 2021-01-31 9:18 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-01-31 9:18 UTC (permalink / raw
To: gentoo-commits
commit: 2fe2484bb7f9de72413eb25deb02e4212d81c8d0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 09:14:14 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 09:16:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe2484b
net-misc/minidlna: Fix socket leak
Closes: https://bugs.gentoo.org/768030
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../minidlna/files/minidlna-1.3.0-fd-leak.patch | 28 ++++++++++++++++++++++
...idlna-1.3.0.ebuild => minidlna-1.3.0-r1.ebuild} | 5 ++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch b/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch
new file mode 100644
index 00000000000..eec2bcd020e
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch
@@ -0,0 +1,28 @@
+diff --git a/upnpevents.c b/upnpevents.c
+index 4de6ce8..1126fa7 100644
+--- a/upnpevents.c
++++ b/upnpevents.c
+@@ -290,18 +290,17 @@ upnp_event_create_notify(struct subscriber *sub)
+ addr.sin_family = AF_INET;
+ inet_aton(obj->addrstr, &addr.sin_addr);
+ addr.sin_port = htons(port);
+- DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_notify_connect",
++ DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_create_notify",
+ obj->addrstr, port, obj->path);
+ obj->state = EConnecting;
++ obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE,
++ .process = upnp_event_process_notify, .data = obj };
++ event_module.add(&obj->ev);
+ if(connect(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ if(errno != EINPROGRESS && errno != EWOULDBLOCK) {
+- DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_notify_connect", strerror(errno));
++ DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_create_notify", strerror(errno));
+ obj->state = EError;
+ }
+- } else {
+- obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE,
+- .process = upnp_event_process_notify, .data = obj };
+- event_module.add(&obj->ev);
+ }
+
+ return;
diff --git a/net-misc/minidlna/minidlna-1.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0-r1.ebuild
similarity index 94%
rename from net-misc/minidlna/minidlna-1.3.0.ebuild
rename to net-misc/minidlna/minidlna-1.3.0-r1.ebuild
index 06bcef995db..3acb5fe4950 100644
--- a/net-misc/minidlna/minidlna-1.3.0.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="DLNA/UPnP-AV compliant media server"
HOMEPAGE="https://sourceforge.net/projects/minidlna/"
SRC_URI="
https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz
- https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz"
+ mirror://gentoo/minidlna-gentoo-artwork.patch.xz"
LICENSE="BSD GPL-2"
SLOT="0"
@@ -38,6 +38,7 @@ CONFIG_CHECK="~INOTIFY_USER"
PATCHES=(
"${WORKDIR}"/minidlna-gentoo-artwork.patch
"${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-fd-leak.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-31 9:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-03 8:48 [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/, net-misc/minidlna/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-01-31 9:18 Michał Górny
2017-09-29 9:34 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox