[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kdemultimedia/devel kdemultimedia.diff, NONE, 1.1 kdemultimedia.spec, 1.67, 1.68



Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2286

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia.diff 
Log Message:
. apply patch to check return value


kdemultimedia.diff:
 cddaslave.c       |    3 +++
 libwm/cddaslave.c |    3 +++
 2 files changed, 6 insertions(+)

--- NEW FILE kdemultimedia.diff ---
Index: kscd/cddaslave.c
===================================================================
--- kscd/cddaslave.c	(revision 549101)
+++ kscd/cddaslave.c	(working copy)
@@ -418,7 +418,10 @@ main(argc, argv)
 	 * superuser access.
 	 */
 	nice(-14);
+	setgid(getgid());
 	setuid(getuid());
+	if (getuid() != geteuid())
+		return 255;
 
 	FD_ZERO(&dummyfd);
 	FD_ZERO(&readfd);
Index: kscd/libwm/cddaslave.c
===================================================================
--- kscd/libwm/cddaslave.c	(revision 549101)
+++ kscd/libwm/cddaslave.c	(working copy)
@@ -489,7 +489,10 @@ int main(int argc, char **argv)
    * superuser access.
    */
   nice(-14);
+  setgid(getgid());
   setuid(getuid());
+  if (geteuid() != getuid())
+    return 255;
 
   FD_ZERO(&dummyfd);
   FD_ZERO(&readfd);


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdemultimedia.spec	26 Jun 2006 13:10:36 -0000	1.67
+++ kdemultimedia.spec	26 Jun 2006 14:57:48 -0000	1.68
@@ -12,7 +12,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 4
+Release: 5
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -27,6 +27,9 @@
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch4: kdemultimedia-3.5.3-examples.patch
 
+# upstream patches
+Patch100: kdemultimedia.diff
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: kdebase >= 6:%{version}
@@ -83,6 +86,9 @@
 %patch3 -p1 -b .xdg
 %patch4 -p1 -b .examples
 
+# upstream patches
+%patch100 -p0 -b .setuid-check
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -187,6 +193,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Jun 26 2006 Than Ngo <than redhat com> 6:3.5.3-5
+- apply patch to check return value
+
 * Mon Jun 26 2006 Than Ngo <than redhat com> 6:3.5.3-4
 - fix #196605, BR: cdparanoia
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]