Added a patch to remove glibc specific calls. Thanks to Peter S. Mazinger <ps.m@gmx.net>; bug #67666. Fixed compilation on ppc-macos and LICENSE syntax.

4 files changed, 61 insertions, 39 deletions

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index e197bfa9ec5e..11cc30226a18 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/slang
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.37 2004/10/26 10:23:39 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.38 2004/11/06 07:59:52 usata Exp $
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  files/slang-1.4.9-fsuid.patch, files/slang-1.4.9.patch,
+  slang-1.4.9-r1.ebuild:
+  Added a patch to remove glibc specific calls. Thanks to Peter S. Mazinger
+  <ps.m@gmx.net>; bug #67666. Fixed compilation on ppc-macos and LICENSE
+  syntax.
 
   26 Oct 2004; Tom Martin <slarti@gentoo.org> slang-1.4.9-r1.ebuild:
   Stable on amd64.
diff --git a/sys-libs/slang/files/slang-1.4.9-fsuid.patch b/sys-libs/slang/files/slang-1.4.9-fsuid.patch
index 23c8e1fa66f1..c7c38c756e37 100644
--- a/sys-libs/slang/files/slang-1.4.9-fsuid.patch
+++ b/sys-libs/slang/files/slang-1.4.9-fsuid.patch
@@ -29,3 +29,38 @@
 +#endif
 +
  #endif				       /* _SLANG_INCLUDE_H_ */
+--- src/sltermin.c
++++ src/sltermin.c
+@@ -105,7 +105,32 @@
+     * I will also look into the use of setreuid, seteuid and setregid, setegid.
+     * FIXME: Priority=medium
+     */
++   /* If your system lacks setfsuid/getfsuid either write
++      equivalent support or dont use slang to build setuid/setgid
++      apps like Mutt */
++
++   if(setfsuid(getuid())==-1)
++   {
++       perror("setfsuid");
++       return NULL;
++   }
++   if(setfsgid(getgid())==-1)
++   {
++       perror("setfsgid");
++       return NULL;
++   }    
+    fp = fopen (file, "rb");
++   if(setfsuid(geteuid())==-1)
++   {
++       perror("setfsuid");
++       return NULL;
++   }
++   if(setfsgid(getegid())==-1)
++   {
++       perror("setfsgid");
++       return NULL;
++   }
++
+    if (fp == NULL) return NULL;
+ 
+    if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf))))
diff --git a/sys-libs/slang/files/slang-1.4.9.patch b/sys-libs/slang/files/slang-1.4.9.patch
index ea32f46be479..05da2f74664c 100644
--- a/sys-libs/slang/files/slang-1.4.9.patch
+++ b/sys-libs/slang/files/slang-1.4.9.patch
@@ -35,38 +35,14 @@
  }
  
  #ifdef VMS
---- src/sltermin.c
-+++ src/sltermin.c
-@@ -105,7 +105,32 @@
-     * I will also look into the use of setreuid, seteuid and setregid, setegid.
-     * FIXME: Priority=medium
-     */
-+   /* If your system lacks setfsuid/getfsuid either write
-+      equivalent support or dont use slang to build setuid/setgid
-+      apps like Mutt */
-+
-+   if(setfsuid(getuid())==-1)
-+   {
-+       perror("setfsuid");
-+       return NULL;
-+   }
-+   if(setfsgid(getgid())==-1)
-+   {
-+       perror("setfsgid");
-+       return NULL;
-+   }    
-    fp = fopen (file, "rb");
-+   if(setfsuid(geteuid())==-1)
-+   {
-+       perror("setfsuid");
-+       return NULL;
-+   }
-+   if(setfsgid(getegid())==-1)
-+   {
-+       perror("setfsgid");
-+       return NULL;
-+   }
-+
-    if (fp == NULL) return NULL;
+--- src/slmisc.c.mps	2003-03-23 08:06:40.000000000 +0100
++++ src/slmisc.c	2004-09-17 12:28:44.000000000 +0200
+@@ -565,7 +565,7 @@
+    return (int) SLatol (s);
+ }
  
-    if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf))))
+-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__)
+ extern int __libc_enable_secure;
+ # define HAVE___LIBC_ENABLE_SECURE 1
+ #endif
diff --git a/sys-libs/slang/slang-1.4.9-r1.ebuild b/sys-libs/slang/slang-1.4.9-r1.ebuild
index 999413dedc55..2e2c8342282b 100644
--- a/sys-libs/slang/slang-1.4.9-r1.ebuild
+++ b/sys-libs/slang/slang-1.4.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.9-r1.ebuild,v 1.15 2004/11/05 01:53:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.9-r1.ebuild,v 1.16 2004/11/06 07:59:52 usata Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="Console display library used by most text viewer"
 HOMEPAGE="http://space.mit.edu/~davis/slang/"
 SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${P}.tar.bz2"
 
-LICENSE="GPL-2 | Artistic"
+LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
 IUSE="cjk unicode"
@@ -23,7 +23,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}.patch
-	epatch ${FILESDIR}/${P}-fsuid.patch
+	use ppc-macos || epatch ${FILESDIR}/${P}-fsuid.patch
 	epatch ${FILESDIR}/${P}-autoconf.patch
 	if use unicode ; then
 		epatch ${FILESDIR}/slang-debian-utf8.patch
@@ -44,7 +44,11 @@ src_compile() {
 
 src_install() {
 	make install install-elf DESTDIR=${D} || die "make install failed"
-	chmod a+rx "${D}"/usr/$(get_libdir)/libslang.so.*
+	if use ppc-macos ; then
+		chmod a+rx "${D}"/usr/$(get_libdir)/libslang*dylib || die "chmod failed"
+	else
+		chmod a+rx "${D}"/usr/$(get_libdir)/libslang.so.* || die "chmod failed"
+	fi
 
 	if use unicode ; then
 		for i in ${D}/usr/$(get_libdir)/libslang-utf8* ; do