diff options
Diffstat (limited to 'net-misc/minidlna')
| -rw-r--r-- | net-misc/minidlna/Manifest | 6 | ||||
| -rw-r--r-- | net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch | 28 | ||||
| -rw-r--r-- | net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch | 23 | ||||
| -rw-r--r-- | net-misc/minidlna/minidlna-1.3.1.ebuild (renamed from net-misc/minidlna/minidlna-1.3.0-r2.ebuild) | 34 |
4 files changed, 23 insertions, 68 deletions
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest index 4b956fdbf30d..1877d1b96f4e 100644 --- a/net-misc/minidlna/Manifest +++ b/net-misc/minidlna/Manifest @@ -1,9 +1,7 @@ AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336bb70ba3457b3b61790e1800d453168aaed981c15776fa92353149d17c6c5eeafb70033727fb0aa838e4422d SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2 -AUX minidlna-1.3.0-fd-leak.patch 1176 BLAKE2B 007c5ea969cc6b8a28353ef5a9bf8b653eb097ce2a3f25a3ed48fa36b88563b6bb6c538006ea738f90404a69a2a5b5d8b4f6f1a5b8c68ed8240fe16d6ecaf2e6 SHA512 a400df035c125179087daf57faa8f3ec282599b2f88f10003f41a8edbbaf7bedf0f7fe627392c0346a4ef8429e6d6c47a62ed8f9be26b1600f21a8d409643f16 -AUX minidlna-1.3.0-fno-common.patch 602 BLAKE2B dca6dff5dd0d2b7eafa5d58b8879d4f0f28ff8cbe7fe8d31d97a3078c5c6eecbf0462b10fb646f57ecc734e0102a9010f6f66142774f32d69d9b6a7c09b5d17c SHA512 a02c78cdac03884115f5fffc85cedf92c13687fad002a82c9497b63d394d53020bb4ab5e04e2d6a27b662b93153c6244576559a425ed67de849cecb7f7e5a9b8 -DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6 +DIST minidlna-1_3_1.tar.gz 299749 BLAKE2B 0c4e5b5dc8b4fb14609cc71eafb008dfab0ef81350ac5c7f1a83e65f54b1d87296b3f0a063dbda3bd642fc777c36a0f839d5426c03ae852b07827a2b7d38c765 SHA512 6e94f33070db04660b83285a13942173537866ab53f9375e3162131fd86948349991a6c60cb2800c46546d73e58222a008d4cee1914c826f3a2f450f1c95a0e5 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e -EBUILD minidlna-1.3.0-r2.ebuild 2095 BLAKE2B 5244e6d9dc8b817e4a719a44e40a308e1dfba8ea9f592eb074299d040944487875b3054d06e7803cf54c1e80b99c0c09046c760e86d28214eb984e32aa9926df SHA512 e03701ab0ea317fb88e8b52f452be01ceeb61b3282c2d6197b558d7a6b1980f7f025aa384a1129e61ff4ea3249c433ee2b950977a1a5411f70b6b535358ebc6d +EBUILD minidlna-1.3.1.ebuild 2186 BLAKE2B 0de953f06210e4b10a1baef86043ec3b63940c24e8e11684f05282098a302380224155c04f4cce5aa0ebe62a5d79c3bb930a9d60bc07c8980e6d195a99f4e8ca SHA512 5fbcb1b7cc213a9e7749cff4e7a40e09857461b8bb731cac3d877c58fb04273cb31bdc734a3a744c7350674e267c002f8d788d9d8727424c365b9642bf3ad201 MISC metadata.xml 513 BLAKE2B 6e851975b83efd7972d5d58c85093a36bf0f51845cb6ef1f7d7b37dab65dd913a5bbd6e5f163b2142eee11d6860b55e1bd346e23b5f4f427ca0812701149eede SHA512 99fe90016717a048a38feec908049f5f0c7b81045dc9e8953b204eb22e858f74b876fd5ae3765cbf88204f9f6ece87310dccb2123bdb1cc007e3c9049967a4e1 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 deleted file mode 100644 index eec2bcd020e7..000000000000 --- a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/files/minidlna-1.3.0-fno-common.patch b/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch deleted file mode 100644 index 50da196377f1..000000000000 --- a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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.3.0-r2.ebuild b/net-misc/minidlna/minidlna-1.3.1.ebuild index 37b1bb9ceac0..d1addd8794ad 100644 --- a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild +++ b/net-misc/minidlna/minidlna-1.3.1.ebuild @@ -1,44 +1,51 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd tmpfiles +inherit autotools systemd tmpfiles +MY_P=${P//./_} DESCRIPTION="DLNA/UPnP-AV compliant media server" HOMEPAGE="https://sourceforge.net/projects/minidlna/" +# https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz SRC_URI=" - https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz - mirror://gentoo/minidlna-gentoo-artwork.patch.xz" + https://github.com/mgorny/minidlna/archive/v${PV//./_}.tar.gz + -> ${MY_P}.tar.gz + mirror://gentoo/minidlna-gentoo-artwork.patch.xz +" +S=${WORKDIR}/${MY_P} LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="amd64 arm x86" IUSE="netgear readynas zeroconf" -RDEPEND=" - acct-group/minidlna - acct-user/minidlna +DEPEND=" dev-db/sqlite:3 media-libs/flac media-libs/libexif media-libs/libid3tag:= + media-libs/libjpeg-turbo:0= 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} + zeroconf? ( net-dns/avahi ) +" +RDEPEND=" + ${DEPEND} + acct-group/minidlna + acct-user/minidlna +" BDEPEND=" - virtual/pkgconfig" + virtual/pkgconfig +" CONFIG_CHECK="~INOTIFY_USER" PATCHES=( "${WORKDIR}"/minidlna-gentoo-artwork.patch - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-fd-leak.patch ) src_prepare() { @@ -47,6 +54,7 @@ src_prepare() { -i minidlna.conf || die default + eautoreconf } src_configure() { |