From d51353747e6207cbfd1bb2dcf1cb8b28d991c824 Mon Sep 17 00:00:00 2001 From: Anton Schubert Date: Sat, 12 Feb 2022 20:32:20 +0100 Subject: [PATCH] media-sound/shairport-sync: fix user install Package-Manager: Portage-3.0.30, Repoman-3.0.3 --- media-sound/shairport-sync/Manifest | 5 +++-- .../shairport-sync-skip-creating-users.patch | 19 +++++++++++++++++++ ....ebuild => shairport-sync-3.3.8-r1.ebuild} | 16 +++++++--------- .../shairport-sync/shairport-sync-9999.ebuild | 18 ++++++++++-------- 4 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 media-sound/shairport-sync/files/shairport-sync-skip-creating-users.patch rename media-sound/shairport-sync/{shairport-sync-3.3.8.ebuild => shairport-sync-3.3.8-r1.ebuild} (85%) diff --git a/media-sound/shairport-sync/Manifest b/media-sound/shairport-sync/Manifest index 5245e8a..fdd9aed 100644 --- a/media-sound/shairport-sync/Manifest +++ b/media-sound/shairport-sync/Manifest @@ -1,4 +1,5 @@ +AUX shairport-sync-skip-creating-users.patch 1062 BLAKE2B d2921d612de921b4ef26a1e2d62f70968ef9b8213266a5baee25a308f32bf5c554bce22f151d8af22d7afcdd390f33d79a878853e1ccf51937b823f17084abc0 SHA512 a00a146b02054df2a5e1c615e406eb4b49fc17c30bea91e63e50b0d8d0fdd250d909a441b550cc7ed1d22bbd9723143f878f0341b2b489fa3956c019717ac040 DIST 3.3.8.tar.gz 425524 BLAKE2B adaaef3a65d3ffccda2ba3ed324312fe5e95db00f2ae2c67afd49a43e6e5c8517d7eeb751f0b663a1e75a470f1cfcd9547e26bd11fa095565ba048d98465dcd8 SHA512 fc3b625f3ad04352feb89111499f3aa6e862e80d1d12bdfe544d5a4e4c9a3b380e523f637fe675c68180f3ee465b09088c9f4f630729c7384bafefc6e7f8fbf8 -EBUILD shairport-sync-3.3.8.ebuild 1131 BLAKE2B d37fd244ee90948e9b3fac4d52facbe9814e428174bbfe0a4e98528d86c7b5e14364eb8f42fcc0d2a0f1deba3ab386468d23dc6686b1d9a4cb20a050d0472e12 SHA512 55a7a42b0e29d826da4f9e6818eacb760b7df4add9a6ef09b781eda2a6937cd5dbdb787397c2b4a01f8e37e1ea79d88237752fa973991a4b67db5a197daf09c6 -EBUILD shairport-sync-9999.ebuild 1369 BLAKE2B e915a1767b31b791a6ccdc89f355e6e72c6f09ab8fea955cf561f5c1a934ca163a3e79ffa688364669e46c035655eb821fed17b6392a536469cf7e8431b587fe SHA512 c0766ba3b3d0a2c1d10df30f6eca1079f11426f387fbae64d71da2b62584664fa6efc36841f63f5013d572c3caeeda79030f9fbb86b45b3b73c87d76e374083b +EBUILD shairport-sync-3.3.8-r1.ebuild 1118 BLAKE2B 0dcda9bfbe08e2d92957a0bbfa39105ef566125e0cd130b17bdc49807ea5fc46ee09748f0fc2f4fc9d38bf39348dabfd9a00ba9ab78238c38e9915f892579a75 SHA512 0b2dcbbb963e0865ab43d252493afeded42407a169b903b8341564a236cb8a71ccbc2ea34b5e41fadd6cdce0157d6da09d34e9b82ceabdfda5506014f96de063 +EBUILD shairport-sync-9999.ebuild 1416 BLAKE2B d2dc57dd0f998351bffe0911c6077ccbbb8094c3996c65c456ba0ab10bc580b94b09c5b7faa22363b173952d1f67147752a461a9170f6a126002dec905eca4b9 SHA512 b4ef530ca663c419574c9b2af934b4e1a4330ce499ced33aa4961c3ef82647ff3f2067b85d83ae38d21f536a6d3d12c1a317545d95cb15c1431c43fd6edd7e07 MISC metadata.xml 461 BLAKE2B d42cdf983fb2246ba1bb65d27b8923e7d06424e90779fb70054be4ff9a2c9228de2fa470d11559c80ceb8a88736c696879dcea58ed524ee471c22ffc0de9ee52 SHA512 f403de22d7b722d4051319c6fdf03a22802f7b01e5d47738a2be401ec74764d02eed83dad44d9688ef97cf58da767c86963cbaa62365e01e6b8f45c2fe5b902b diff --git a/media-sound/shairport-sync/files/shairport-sync-skip-creating-users.patch b/media-sound/shairport-sync/files/shairport-sync-skip-creating-users.patch new file mode 100644 index 0000000..fa1ced6 --- /dev/null +++ b/media-sound/shairport-sync/files/shairport-sync-skip-creating-users.patch @@ -0,0 +1,19 @@ +diff --git a/Makefile.am b/Makefile.am +index c8d53440..a88a09a6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -227,14 +227,10 @@ endif + endif + endif + if INSTALL_SYSTEMV +- getent group shairport-sync &>/dev/null || groupadd -r shairport-sync >/dev/null +- getent passwd shairport-sync &> /dev/null || useradd -r -M -g shairport-sync -s /usr/bin/nologin -G audio shairport-sync >/dev/null + [ -e $(DESTDIR)$(sysconfdir)/init.d ] || mkdir -p $(DESTDIR)$(sysconfdir)/init.d + [ -e $(DESTDIR)$(sysconfdir)/init.d/shairport-sync ] || cp scripts/shairport-sync $(DESTDIR)$(sysconfdir)/init.d/ + endif + if INSTALL_SYSTEMD +- getent group shairport-sync &>/dev/null || groupadd -r shairport-sync >/dev/null +- getent passwd shairport-sync &> /dev/null || useradd -r -M -g shairport-sync -s /usr/bin/nologin -G audio shairport-sync >/dev/null + [ -e $(DESTDIR)$(systemdsystemunitdir) ] || mkdir -p $(DESTDIR)$(systemdsystemunitdir) + [ -e $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service ] || cp scripts/shairport-sync.service $(DESTDIR)$(systemdsystemunitdir) + endif diff --git a/media-sound/shairport-sync/shairport-sync-3.3.8.ebuild b/media-sound/shairport-sync/shairport-sync-3.3.8-r1.ebuild similarity index 85% rename from media-sound/shairport-sync/shairport-sync-3.3.8.ebuild rename to media-sound/shairport-sync/shairport-sync-3.3.8-r1.ebuild index 7d910c9..237a209 100644 --- a/media-sound/shairport-sync/shairport-sync-3.3.8.ebuild +++ b/media-sound/shairport-sync/shairport-sync-3.3.8-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit autotools user +inherit autotools DESCRIPTION="Emulates an AirPort Express to stream music from i-devices" HOMEPAGE="https://github.com/mikebrady/shairport-sync" @@ -23,14 +23,12 @@ DEPEND="dev-libs/openssl ao? ( media-libs/libao ) soxr? ( media-libs/soxr ) pulseaudio? ( media-sound/pulseaudio )" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewuser shairport-sync -1 -1 -1 audio -} +RDEPEND="${DEPEND} + acct-group/shairport-sync + acct-user/shairport-sync" src_prepare() { - eapply_user + default eautoreconf } diff --git a/media-sound/shairport-sync/shairport-sync-9999.ebuild b/media-sound/shairport-sync/shairport-sync-9999.ebuild index d749211..a333755 100644 --- a/media-sound/shairport-sync/shairport-sync-9999.ebuild +++ b/media-sound/shairport-sync/shairport-sync-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit autotools user git-r3 +inherit autotools git-r3 DESCRIPTION="Emulates an AirPort Express to stream music from i-devices" HOMEPAGE="https://github.com/mikebrady/shairport-sync" @@ -30,14 +30,16 @@ DEPEND="dev-libs/openssl soxr? ( media-libs/soxr ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + acct-group/shairport-sync + acct-user/shairport-sync" -pkg_setup() { - enewuser shairport-sync -1 -1 -1 audio -} +PATCHES=( + "${FILESDIR}/${PN}-skip-creating-users.patch" +) src_prepare() { - eapply_user + default eautoreconf }