1 |
commit: 45282acdcd2bfdb74d8d74ebc712b4cddeadd2e9 |
2 |
Author: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 28 23:05:47 2018 +0000 |
4 |
Commit: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 28 23:09:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45282acd |
7 |
|
8 |
media-tv/plex-media-server: Stabilizing 1.10.1 and Fixing #644694. |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
media-tv/plex-media-server/Manifest | 1 - |
13 |
.../plex-media-server-1.10.0.ebuild | 135 --------------------- |
14 |
.../plex-media-server-1.10.1.ebuild | 9 +- |
15 |
3 files changed, 7 insertions(+), 138 deletions(-) |
16 |
|
17 |
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest |
18 |
index 940fda1f236..3731189161f 100644 |
19 |
--- a/media-tv/plex-media-server/Manifest |
20 |
+++ b/media-tv/plex-media-server/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST plexmediaserver_1.10.0.4523-648bc61d4_amd64.deb 108257188 BLAKE2B 7b8ab929ef059ba7f2c6aea061348216361f0fa5af19a5e70fed134760e615f2bd28133a37337660711b3de4af883aede52e63e1a585b6ab15ca93d6ec7e8251 SHA512 8b4111c73ad04e28a2b8040fbd60b8272e2556d4a492442c25fab2b681eb7dc1477e5ec30261884a622eb9c6ab99836318c97cbb726ac07c31495c450258c0cc |
23 |
DIST plexmediaserver_1.10.1.4602-f54242b6b_amd64.deb 108445778 BLAKE2B 8c71bbc7a90d5465aa23b4ddaddbec8ccc81f7e5f09e2e3b98a878c5375158381c5fc20fd6542a3a9e642007ab06045eb3afe210ef5f16a5f60f1d3abd8c3fe7 SHA512 16f3f28e1ba409b141c8f2f7ecb912bcf47485e68d8e813c4908465407d8e6e3c455e6358538445e06b73380f82c46a5b29e6d02d4b4576407dc8d7bc0644b38 |
24 |
|
25 |
diff --git a/media-tv/plex-media-server/plex-media-server-1.10.0.ebuild b/media-tv/plex-media-server/plex-media-server-1.10.0.ebuild |
26 |
deleted file mode 100644 |
27 |
index b5a991388dc..00000000000 |
28 |
--- a/media-tv/plex-media-server/plex-media-server-1.10.0.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,135 +0,0 @@ |
31 |
-# Copyright 1999-2018 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
- |
36 |
-PYTHON_COMPAT=( python2_7 ) |
37 |
-inherit eutils user systemd unpacker pax-utils python-single-r1 |
38 |
- |
39 |
-MINOR_VERSION="4523-648bc61d4" |
40 |
- |
41 |
-_APPNAME="plexmediaserver" |
42 |
-_USERNAME="plex" |
43 |
-_SHORTNAME="${_USERNAME}" |
44 |
-_FULL_VERSION="${PV}.${MINOR_VERSION}" |
45 |
- |
46 |
-URI="https://downloads.plex.tv/plex-media-server" |
47 |
- |
48 |
-DESCRIPTION="A free media library that is intended for use with a plex client." |
49 |
-HOMEPAGE="http://www.plex.tv/" |
50 |
-SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )" |
51 |
-SLOT="0" |
52 |
-LICENSE="Plex" |
53 |
-RESTRICT="bindist strip" |
54 |
-KEYWORDS="-* amd64" |
55 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
56 |
- |
57 |
-DEPEND=" |
58 |
- sys-apps/fix-gnustack |
59 |
- dev-python/virtualenv[${PYTHON_USEDEP}]" |
60 |
- |
61 |
-RDEPEND=" |
62 |
- net-dns/avahi |
63 |
- ${PYTHON_DEPS}" |
64 |
- |
65 |
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop" |
66 |
-QA_PREBUILT="*" |
67 |
-QA_MULTILIB_PATHS=( |
68 |
- "usr/lib/${_APPNAME}/.*" |
69 |
- "usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*" |
70 |
-) |
71 |
- |
72 |
-EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" ) |
73 |
-BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" ) |
74 |
- |
75 |
-S="${WORKDIR}" |
76 |
-PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" ) |
77 |
- |
78 |
-pkg_setup() { |
79 |
- enewgroup ${_USERNAME} |
80 |
- enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video" |
81 |
- python-single-r1_pkg_setup |
82 |
-} |
83 |
- |
84 |
-src_unpack() { |
85 |
- unpack_deb ${A} |
86 |
-} |
87 |
- |
88 |
-src_install() { |
89 |
- # Move the config to the correct place |
90 |
- local CONFIG_VANILLA="/etc/default/plexmediaserver" |
91 |
- local CONFIG_PATH="/etc/${_SHORTNAME}" |
92 |
- dodir "${CONFIG_PATH}" |
93 |
- insinto "${CONFIG_PATH}" |
94 |
- doins "${CONFIG_VANILLA#/}" |
95 |
- sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die |
96 |
- |
97 |
- # Remove Debian specific files |
98 |
- rm -rf "usr/share/doc" || die |
99 |
- |
100 |
- # Copy main files over to image and preserve permissions so it is portable |
101 |
- cp -rp usr/ "${ED}" || die |
102 |
- |
103 |
- # Make sure the logging directory is created |
104 |
- local LOGGING_DIR="/var/log/pms" |
105 |
- dodir "${LOGGING_DIR}" |
106 |
- chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die |
107 |
- |
108 |
- # Create default library folder with correct permissions |
109 |
- local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}" |
110 |
- dodir "${DEFAULT_LIBRARY_DIR}" |
111 |
- chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die |
112 |
- |
113 |
- # Install the OpenRC init/conf files |
114 |
- doinitd "${FILESDIR}/init.d/${PN}" |
115 |
- doconfd "${FILESDIR}/conf.d/${PN}" |
116 |
- |
117 |
- _handle_multilib |
118 |
- |
119 |
- # Install systemd service file |
120 |
- local INIT_NAME="${PN}.service" |
121 |
- local INIT="${FILESDIR}/systemd/${INIT_NAME}" |
122 |
- systemd_newunit "${INIT}" "${INIT_NAME}" |
123 |
- |
124 |
- _remove_execstack_markings |
125 |
- _add_pax_markings |
126 |
- |
127 |
- einfo "Configuring virtualenv" |
128 |
- virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die |
129 |
- pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die |
130 |
- find . -type f -exec sed -i -e "s#${D}##g" {} + || die |
131 |
- popd &>/dev/null || die |
132 |
-} |
133 |
- |
134 |
-pkg_postinst() { |
135 |
- einfo "" |
136 |
- elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings." |
137 |
- elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/" |
138 |
-} |
139 |
- |
140 |
-# Finds out where the library directory is for this system |
141 |
-# and handles ldflags as to not break library dependencies |
142 |
-# during rebuilds. |
143 |
-_handle_multilib() { |
144 |
- # Prevent revdep-rebuild, @preserved-rebuild breakage |
145 |
- cat > "${T}"/66plex <<-EOF || die |
146 |
- LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver" |
147 |
- EOF |
148 |
- |
149 |
- doenvd "${T}"/66plex |
150 |
-} |
151 |
- |
152 |
-# Remove execstack flags from some libraries/executables so that it works in hardened setups. |
153 |
-_remove_execstack_markings() { |
154 |
- for f in "${EXECSTACKED_BINS[@]}"; do |
155 |
- # Unquoting 'f' so that expansion works. |
156 |
- fix-gnustack -f ${f} > /dev/null |
157 |
- done |
158 |
-} |
159 |
- |
160 |
-# Add pax markings to some binaries so that they work on hardened setup. |
161 |
-_add_pax_markings() { |
162 |
- for f in "${BINS_TO_PAX_MARK[@]}"; do |
163 |
- pax-mark m "${f}" |
164 |
- done |
165 |
-} |
166 |
|
167 |
diff --git a/media-tv/plex-media-server/plex-media-server-1.10.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.10.1.ebuild |
168 |
index 760f6bd70b8..7941b222c81 100644 |
169 |
--- a/media-tv/plex-media-server/plex-media-server-1.10.1.ebuild |
170 |
+++ b/media-tv/plex-media-server/plex-media-server-1.10.1.ebuild |
171 |
@@ -21,7 +21,7 @@ SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64 |
172 |
SLOT="0" |
173 |
LICENSE="Plex" |
174 |
RESTRICT="bindist strip" |
175 |
-KEYWORDS="-* ~amd64" |
176 |
+KEYWORDS="-* amd64" |
177 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
178 |
|
179 |
DEPEND=" |
180 |
@@ -84,7 +84,8 @@ src_install() { |
181 |
doinitd "${FILESDIR}/init.d/${PN}" |
182 |
doconfd "${FILESDIR}/conf.d/${PN}" |
183 |
|
184 |
- _handle_multilib |
185 |
+ # Disabling due to Bug 644694 |
186 |
+ #_handle_multilib |
187 |
|
188 |
# Install systemd service file |
189 |
local INIT_NAME="${PN}.service" |
190 |
@@ -107,6 +108,10 @@ pkg_postinst() { |
191 |
elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/" |
192 |
} |
193 |
|
194 |
+# Bug 644694. We shouldn't register plex libraries in global |
195 |
+# library path since this will cause other packages on the system |
196 |
+# to break. |
197 |
+ |
198 |
# Finds out where the library directory is for this system |
199 |
# and handles ldflags as to not break library dependencies |
200 |
# during rebuilds. |