summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2012-09-18 05:42:51 +0000
committerMichael Weber <xmw@gentoo.org>2012-09-18 05:42:51 +0000
commit1ed56ffd6ba28e4a4e7c7c34ad888d70a6cce15b (patch)
treeed130c723d206feeff54178a6f828395a0d4a5d8 /net-misc/minidlna
parentRemoved old versions (diff)
downloadgentoo-2-1ed56ffd6ba28e4a4e7c7c34ad888d70a6cce15b.tar.gz
gentoo-2-1ed56ffd6ba28e4a4e7c7c34ad888d70a6cce15b.tar.bz2
gentoo-2-1ed56ffd6ba28e4a4e7c7c34ad888d70a6cce15b.zip
Correct permissions hack in pkg_setup if user exists but /var/lib/minidlna doesnt (bug 435204, thanks Ian Abbott)
(Portage version: 2.1.11.13/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/minidlna')
-rw-r--r--net-misc/minidlna/ChangeLog6
-rw-r--r--net-misc/minidlna/minidlna-1.0.25-r1.ebuild11
2 files changed, 12 insertions, 5 deletions
diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index e49565eebeff..97217fe39888 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/minidlna
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.22 2012/07/20 08:17:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.23 2012/09/18 05:42:51 xmw Exp $
+
+ 18 Sep 2012; Michael Weber <xmw@gentoo.org> minidlna-1.0.25-r1.ebuild:
+ Correct permissions hack in pkg_setup if user exists but /var/lib/minidlna
+ doesnt (bug 435204, thanks Ian Abbott)
20 Jul 2012; Michael Weber <xmw@gentoo.org> minidlna-1.0.25-r1.ebuild:
fix directory test, again
diff --git a/net-misc/minidlna/minidlna-1.0.25-r1.ebuild b/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
index 715dd30c2d70..9aa4b93abcff 100644
--- a/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.25-r1.ebuild,v 1.3 2012/07/20 08:17:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.25-r1.ebuild,v 1.4 2012/09/18 05:42:51 xmw Exp $
EAPI=4
@@ -31,9 +31,12 @@ pkg_setup() {
[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- if [ "${my_is_new}" == "yes" ] ; then
- chown ${PN}:${PN} /var/lib/${PN} || die
- chmod 0750 /var/lib/${PN} || die
+ 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
}