userpriv fix

3 files changed, 56 insertions, 2 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index d33cf8f78e62..9bd6c6135496 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.13 2003/02/12 07:17:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.14 2003/03/16 15:13:49 liquidx Exp $
 
   31 Dec 2002; Martin Schlemmer <azarah@gentoo.org> svgalib-1.9.17-r1.ebuild :
   Ok, I should not be lazy, patch Makefile in svga_helper module, as my
@@ -18,6 +18,10 @@
 
 *svgalib-1.4.3-r4 (26 Dec 2002)
 
+  16 Mar 2003; Alastair Tse <liquidx@gentoo.org> svgalib-1.4.3-r4.ebuild,
+  files/svgalib-1.4.3-userpriv.patch:
+  fix userpriv problem with makefile
+
   26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> svgalib-1.4.3-r4.ebuild :
   Update r128 driver, bug #10987.
 
diff --git a/media-libs/svgalib/files/svgalib-1.4.3-userpriv.patch b/media-libs/svgalib/files/svgalib-1.4.3-userpriv.patch
new file mode 100644
index 000000000000..a20329957284
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.4.3-userpriv.patch
@@ -0,0 +1,42 @@
+diff -u -r svgalib-1.4.3old/demos/Makefile svgalib-1.4.3/demos/Makefile
+--- svgalib-1.4.3old/demos/Makefile	2000-08-06 11:30:21.000000000 +0100
++++ svgalib-1.4.3/demos/Makefile	2003-03-16 14:53:11.000000000 +0000
+@@ -44,21 +44,15 @@
+ 
+ .c:
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.c $(LIBS)
+-	chown 0 $*
+-	chmod 4755 $*
+ 
+ rwpage: rwpage.pp
+ 	$(PC) -Rintel rwpage.pp
+ 
+ testaccel: testaccel.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o testaccel testaccel.c $(LIBS) -lm
+-	chown 0 testaccel
+-	chmod 4755 testaccel
+ 
+ accel: accel.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o accel accel.c $(LIBS) -lm
+-	chown 0 accel
+-	chmod 4755 accel
+ 
+ clean:	cleanbin
+ 	rm -f .depend *.o *~ *.bak
+diff -u -r svgalib-1.4.3old/threeDKit/Makefile svgalib-1.4.3/threeDKit/Makefile
+--- svgalib-1.4.3old/threeDKit/Makefile	1998-04-15 19:50:24.000000000 +0100
++++ svgalib-1.4.3/threeDKit/Makefile	2003-03-16 14:53:58.000000000 +0000
+@@ -39,13 +39,9 @@
+ 
+ plane: planukit.o planinit.o $(OBJECTS) $(LVGADEP)
+ 	$(CC) $(LDFLAGS) -o plane planukit.o planinit.o $(OBJECTS) $(LIBS)
+-	chown root plane
+-	chmod u+s plane
+ 
+ wrapdemo: wrapdemo.o $(OBJECTS) $(LVGADEP)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o wrapdemo wrapdemo.c $(OBJECTS) $(LIBS)
+-	chown root wrapdemo
+-	chmod u+s wrapdemo
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c -o $*.o $<
diff --git a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
index 86ba56539807..92a854de7c52 100644
--- a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.3 2003/02/13 12:56:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.4 2003/03/16 15:13:49 liquidx Exp $
 
 IUSE=""
 
@@ -25,6 +25,7 @@ src_unpack() {
 	
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-userpriv.patch
 
 	# Update r128 driver, bug #10987.
 	cp -f ${DISTDIR}/r128.c ${S}/src
@@ -79,3 +80,10 @@ src_install() {
 	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
 }
 
+pkg_postinst() {
+    # we chown/chmod outside userpriv
+    for x in /usr/lib/svgalib/demos/* /usr/lib/svgalib/theeDKit/*; do
+       chown root ${x}
+       chmod u+s ${x}
+    done       
+}