corrected error in handling of chuid-option for newer vdr-versions

(Portage version: 2.1_pre4-r1)

4 files changed, 37 insertions, 15 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index c60600ceb248..48393f497bda 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.38 2006/01/31 20:11:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.39 2006/01/31 21:17:01 zzam Exp $
+
+  31 Jan 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/gentoo-vdr-scripts-0.2.3-chuid-option.patch,
+  gentoo-vdr-scripts-0.2.3.ebuild:
+  corrected error in handling of chuid-option for newer vdr-versions
 
   31 Jan 2006; Matthias Schwarzott <zzam@gentoo.org>
   gentoo-vdr-scripts-0.2.3.ebuild:
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 6f36981768ff..99b704e0540c 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 480705fa4b2cbfe7c5814d30d15436ea ChangeLog 7606
 RMD160 eacd8eeb0f00bcc8aaa31d1d20b9b33161679e16 ChangeLog 7606
 SHA256 ea847e84ef4f18547e4f30495dc4c42cebdca94d6216007452052fd5edad8d65 ChangeLog 7606
@@ -31,15 +28,18 @@ SHA256 befa62dbd47f939be50f0469e075a468c0789c53381fc18b13236f2ecc81856f files/ge
 MD5 e9dbc6458b8d484c2eac1805d4ef0b3a files/gentoo-vdr-scripts-0.2.2-config-comment.patch 501
 RMD160 2220f5c7cbe7ee816b3efb6ec7a3102d0eaba664 files/gentoo-vdr-scripts-0.2.2-config-comment.patch 501
 SHA256 13bb7b5fce7b7609298ee25e9d63971a238941ffa0925156370bd38274540756 files/gentoo-vdr-scripts-0.2.2-config-comment.patch 501
+MD5 a413a4bc9431ba5a5880e1b12d54d0a4 files/gentoo-vdr-scripts-0.2.3-chuid-option.patch 509
+RMD160 258d377a09283ed1c160e58be261d58f490916b8 files/gentoo-vdr-scripts-0.2.3-chuid-option.patch 509
+SHA256 a18577e8b253ab81b85783a3cc051cb1b9350493f6e6f493d79034911a109c29 files/gentoo-vdr-scripts-0.2.3-chuid-option.patch 509
 MD5 d207ee6dbb8a33d2ef231bcde114b195 gentoo-vdr-scripts-0.2.1.ebuild 2640
 RMD160 e4fe99a3472a661da860a89bbbcbc67c3e6d5009 gentoo-vdr-scripts-0.2.1.ebuild 2640
 SHA256 5d45bc91ef77c05bbced572cf811e767a96d59491ce35501617b036d31436489 gentoo-vdr-scripts-0.2.1.ebuild 2640
 MD5 992fc1e208cf427e97d5d1ddf9268343 gentoo-vdr-scripts-0.2.2.ebuild 2717
 RMD160 3c238e9364435c6d6e13030819fb225e0a26076b gentoo-vdr-scripts-0.2.2.ebuild 2717
 SHA256 4da688356ae6e51908dfc1260c53148a94762ca1094436e8588491616cefcbd8 gentoo-vdr-scripts-0.2.2.ebuild 2717
-MD5 54392b157314ab34552456a086a61e9b gentoo-vdr-scripts-0.2.3.ebuild 2640
-RMD160 6fa502ee6a6197ae5f25975dfb744746c251bd28 gentoo-vdr-scripts-0.2.3.ebuild 2640
-SHA256 ca92452039a52a7882f2e6b7ded23e94cdd2aa555d2d37528175081c5200376e gentoo-vdr-scripts-0.2.3.ebuild 2640
+MD5 c8adf64e228f62dbc06dafe2d550f0bf gentoo-vdr-scripts-0.2.3.ebuild 2715
+RMD160 8b217ab3f7bb8369423394639891d22ff4ab367a gentoo-vdr-scripts-0.2.3.ebuild 2715
+SHA256 7d2580f48ca693cd73fafcd8038c7bbdeef23633d556e263ccf136e6cc375be5 gentoo-vdr-scripts-0.2.3.ebuild 2715
 MD5 1b50c10a7fd9a43654b499e2be7bdb20 gentoo-vdr-scripts-0.2.ebuild 2603
 RMD160 891c70a0cce485fc3be5131277be9ce56b914b5f gentoo-vdr-scripts-0.2.ebuild 2603
 SHA256 66422760021fd5aac6d361fdf44aa47dc88913f83ac59ee31686bf2ca5527c7c gentoo-vdr-scripts-0.2.ebuild 2603
@@ -52,10 +52,3 @@ SHA256 420b8bf78e363a73f6881c695c702cf8fc38b4e47e5a8bc4704f9a7f70bcc78c gentoo-v
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
 SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe metadata.xml 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD38R+ZfSl1Kp5KmoRAo5oAKCJJt44pBZ5l6df+3kWysb5KzeDtACg6XhK
-67L9OEMr276chJJsdgnbzEc=
-=LUgB
------END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.2.3-chuid-option.patch b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.2.3-chuid-option.patch
new file mode 100644
index 000000000000..8b3e5f451b62
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.2.3-chuid-option.patch
@@ -0,0 +1,19 @@
+--- gentoo-vdr-scripts-0.2.3/usr/lib/vdr/rcscript/pre-start-10-chuid.sh
++++ gentoo-vdr-scripts-0.2.3/usr/lib/vdr/rcscript/pre-start-10-chuid.sh
+@@ -2,14 +2,14 @@
+ addon_main() {
+ 	if [[ "${START_VDR_AS_ROOT}" == "YES" ]]; then
+ 		if [[ -n ${CAP_CHUID} ]]; then
+-			add_param "-u root"
++			add_param "-u" "root"
+ 		else
+ 			:
+ 			# vdr does nothing and stays root
+ 		fi
+ 	else
+ 		if [[ -n ${CAP_CHUID} ]]; then
+-			add_param "-u vdr"
++			add_param "-u" "vdr"
+ 		else
+ 			add_daemonctrl_param --chuid vdr
+ 		fi
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3.ebuild
index 07d7c414a3da..16abeaac4aa9 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3.ebuild,v 1.2 2006/01/31 20:11:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3.ebuild,v 1.3 2006/01/31 21:17:01 zzam Exp $
 
 inherit eutils
 
@@ -33,6 +33,11 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-chuid-option.patch
+}
+
 src_install() {
 	make install DESTDIR="${D}" || die "make install failed"
 	dodoc README TODO ChangeLog