1 |
commit: 19f170afad196e74b2eff334a68f59144c71eb33 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 6 13:19:55 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 6 13:19:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f170af |
7 |
|
8 |
net-misc/minidlna: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
net-misc/minidlna/Manifest | 1 - |
13 |
.../minidlna/files/minidlna-1.3.0-fd-leak.patch | 28 ------ |
14 |
.../minidlna/files/minidlna-1.3.0-fno-common.patch | 23 ----- |
15 |
net-misc/minidlna/minidlna-1.3.0-r2.ebuild | 102 --------------------- |
16 |
4 files changed, 154 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest |
19 |
index 17670f3ba3c8..24bdf5cb0ea0 100644 |
20 |
--- a/net-misc/minidlna/Manifest |
21 |
+++ b/net-misc/minidlna/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6 |
24 |
DIST minidlna-1_3_1.tar.gz 299749 BLAKE2B 0c4e5b5dc8b4fb14609cc71eafb008dfab0ef81350ac5c7f1a83e65f54b1d87296b3f0a063dbda3bd642fc777c36a0f839d5426c03ae852b07827a2b7d38c765 SHA512 6e94f33070db04660b83285a13942173537866ab53f9375e3162131fd86948349991a6c60cb2800c46546d73e58222a008d4cee1914c826f3a2f450f1c95a0e5 |
25 |
DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index eec2bcd020e7..000000000000 |
30 |
--- a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch |
31 |
+++ /dev/null |
32 |
@@ -1,28 +0,0 @@ |
33 |
-diff --git a/upnpevents.c b/upnpevents.c |
34 |
-index 4de6ce8..1126fa7 100644 |
35 |
---- a/upnpevents.c |
36 |
-+++ b/upnpevents.c |
37 |
-@@ -290,18 +290,17 @@ upnp_event_create_notify(struct subscriber *sub) |
38 |
- addr.sin_family = AF_INET; |
39 |
- inet_aton(obj->addrstr, &addr.sin_addr); |
40 |
- addr.sin_port = htons(port); |
41 |
-- DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_notify_connect", |
42 |
-+ DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_create_notify", |
43 |
- obj->addrstr, port, obj->path); |
44 |
- obj->state = EConnecting; |
45 |
-+ obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE, |
46 |
-+ .process = upnp_event_process_notify, .data = obj }; |
47 |
-+ event_module.add(&obj->ev); |
48 |
- if(connect(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { |
49 |
- if(errno != EINPROGRESS && errno != EWOULDBLOCK) { |
50 |
-- DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_notify_connect", strerror(errno)); |
51 |
-+ DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_create_notify", strerror(errno)); |
52 |
- obj->state = EError; |
53 |
- } |
54 |
-- } else { |
55 |
-- obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE, |
56 |
-- .process = upnp_event_process_notify, .data = obj }; |
57 |
-- event_module.add(&obj->ev); |
58 |
- } |
59 |
- |
60 |
- return; |
61 |
|
62 |
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 |
63 |
deleted file mode 100644 |
64 |
index 50da196377f1..000000000000 |
65 |
--- a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch |
66 |
+++ /dev/null |
67 |
@@ -1,23 +0,0 @@ |
68 |
---- a/tivo_utils.c |
69 |
-+++ b/tivo_utils.c |
70 |
-@@ -27,6 +27,7 @@ |
71 |
- #include <sqlite3.h> |
72 |
- #include "tivo_utils.h" |
73 |
- |
74 |
-+struct sqlite3PrngType sqlite3Prng; |
75 |
- /* This function based on byRequest */ |
76 |
- char * |
77 |
- decodeString(char *string, int inplace) |
78 |
---- a/tivo_utils.h |
79 |
-+++ b/tivo_utils.h |
80 |
-@@ -30,7 +30,9 @@ struct sqlite3PrngType { |
81 |
- unsigned char isInit; /* True if initialized */ |
82 |
- unsigned char i, j; /* State variables */ |
83 |
- unsigned char s[256]; /* State variables */ |
84 |
--} sqlite3Prng; |
85 |
-+}; |
86 |
-+ |
87 |
-+extern struct sqlite3PrngType sqlite3Prng; |
88 |
- |
89 |
- char * |
90 |
- decodeString(char *string, int inplace); |
91 |
|
92 |
diff --git a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild b/net-misc/minidlna/minidlna-1.3.0-r2.ebuild |
93 |
deleted file mode 100644 |
94 |
index 37b1bb9ceac0..000000000000 |
95 |
--- a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild |
96 |
+++ /dev/null |
97 |
@@ -1,102 +0,0 @@ |
98 |
-# Copyright 1999-2022 Gentoo Authors |
99 |
-# Distributed under the terms of the GNU General Public License v2 |
100 |
- |
101 |
-EAPI=7 |
102 |
- |
103 |
-inherit systemd tmpfiles |
104 |
- |
105 |
-DESCRIPTION="DLNA/UPnP-AV compliant media server" |
106 |
-HOMEPAGE="https://sourceforge.net/projects/minidlna/" |
107 |
-SRC_URI=" |
108 |
- https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz |
109 |
- mirror://gentoo/minidlna-gentoo-artwork.patch.xz" |
110 |
- |
111 |
-LICENSE="BSD GPL-2" |
112 |
-SLOT="0" |
113 |
-KEYWORDS="amd64 arm x86" |
114 |
-IUSE="netgear readynas zeroconf" |
115 |
- |
116 |
-RDEPEND=" |
117 |
- acct-group/minidlna |
118 |
- acct-user/minidlna |
119 |
- dev-db/sqlite:3 |
120 |
- media-libs/flac |
121 |
- media-libs/libexif |
122 |
- media-libs/libid3tag:= |
123 |
- media-libs/libogg |
124 |
- media-libs/libvorbis |
125 |
- media-video/ffmpeg:0= |
126 |
- virtual/jpeg:0= |
127 |
- elibc_musl? ( sys-libs/queue-standalone ) |
128 |
- zeroconf? ( net-dns/avahi )" |
129 |
-DEPEND=${RDEPEND} |
130 |
-BDEPEND=" |
131 |
- virtual/pkgconfig" |
132 |
- |
133 |
-CONFIG_CHECK="~INOTIFY_USER" |
134 |
- |
135 |
-PATCHES=( |
136 |
- "${WORKDIR}"/minidlna-gentoo-artwork.patch |
137 |
- "${FILESDIR}"/${P}-fno-common.patch |
138 |
- "${FILESDIR}"/${P}-fd-leak.patch |
139 |
-) |
140 |
- |
141 |
-src_prepare() { |
142 |
- sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \ |
143 |
- -e "/db_dir/s:/var/cache/:/var/lib/:" \ |
144 |
- -i minidlna.conf || die |
145 |
- |
146 |
- default |
147 |
-} |
148 |
- |
149 |
-src_configure() { |
150 |
- local myconf=( |
151 |
- --with-db-path=/var/lib/minidlna |
152 |
- --with-log-path=/var/log/minidlna |
153 |
- --enable-tivo |
154 |
- $(use_enable netgear) |
155 |
- $(use_enable readynas) |
156 |
- ) |
157 |
- use zeroconf || myconf+=( |
158 |
- ac_cv_lib_avahi_client_avahi_threaded_poll_new=no |
159 |
- ) |
160 |
- |
161 |
- econf "${myconf[@]}" |
162 |
-} |
163 |
- |
164 |
-src_test() { |
165 |
- : |
166 |
-} |
167 |
- |
168 |
-src_install() { |
169 |
- default |
170 |
- |
171 |
- #bug 536532 |
172 |
- dosym ../sbin/minidlnad /usr/bin/minidlna |
173 |
- |
174 |
- insinto /etc |
175 |
- doins minidlna.conf |
176 |
- |
177 |
- newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna |
178 |
- newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna |
179 |
- systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service |
180 |
- newtmpfiles - minidlna.conf <<-EOF |
181 |
- d /run/minidlna 0755 minidlna minidlna - |
182 |
- EOF |
183 |
- |
184 |
- keepdir /var/{lib,log}/minidlna |
185 |
- |
186 |
- doman minidlnad.8 minidlna.conf.5 |
187 |
-} |
188 |
- |
189 |
-pkg_preinst() { |
190 |
- local my_is_new=yes |
191 |
- [[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no |
192 |
- |
193 |
- fowners minidlna:minidlna /var/{lib,log}/minidlna |
194 |
- fperms 0750 /var/{lib,log}/minidlna |
195 |
-} |
196 |
- |
197 |
-pkg_postinst() { |
198 |
- tmpfiles_process minidlna.conf |
199 |
-} |