add linking fix

5 files changed, 28 insertions, 8 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index e2510ef262b1..4ac091836fc7 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.3 2003/08/14 15:28:31 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.4 2003/08/14 22:03:25 pebenito Exp $
+
+*libselinux-1.1-r1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.1-r1.ebuild,
+  libselinux-1.1.ebuild, files/libselinux-1.1-linkfix.diff:
+  Add fix for a random linking problem that causes libselinux to work
+  incorrectly.
 
 *libselinux-1.1 (14 Aug 2003)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 5f682c3a40d4..5f0dd0e08d32 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,8 +1,9 @@
 MD5 717f87e8763e0467b99cf5568fd27f91 libselinux-1.0.ebuild 746
 MD5 36bf0405b9d81999a4c53df2e5b6c748 metadata.xml 270
-MD5 2e717bb852ad6c933e7d3aed6ba9bddf ChangeLog 701
-MD5 e0d9d37f5ababe39e3a23546fa8ac54e libselinux-1.1.ebuild 748
+MD5 12ff4bcba69d24d762f7364466d5d9e0 ChangeLog 959
+MD5 75ee2f2b1f54b606e2c3504243bba749 libselinux-1.1-r1.ebuild 835
 MD5 fa6cb6d507ae7a7c1b4ccc7e673d37cc files/digest-libselinux-1.0 62
 MD5 0618c08091c01107cf53015a85ac3fcb files/libselinux-1.0-gentoo.diff 8902
-MD5 4276fc22ccd5de38cc3ce45f83343f68 files/digest-libselinux-1.1 62
 MD5 ee2480e816c5fb6bdc78e94cf0a4d1f5 files/libselinux-1.1-gentoo.diff 1242
+MD5 4276fc22ccd5de38cc3ce45f83343f68 files/digest-libselinux-1.1-r1 62
+MD5 9fbf39a4f64f805072e80f9a38d0c56f files/libselinux-1.1-linkfix.diff 430
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.1 b/sys-libs/libselinux/files/digest-libselinux-1.1-r1
index fa57db84994f..fa57db84994f 100644
--- a/sys-libs/libselinux/files/digest-libselinux-1.1
+++ b/sys-libs/libselinux/files/digest-libselinux-1.1-r1
diff --git a/sys-libs/libselinux/files/libselinux-1.1-linkfix.diff b/sys-libs/libselinux/files/libselinux-1.1-linkfix.diff
new file mode 100644
index 000000000000..85717b942032
--- /dev/null
+++ b/sys-libs/libselinux/files/libselinux-1.1-linkfix.diff
@@ -0,0 +1,12 @@
+diff -urN libselinux-1.1.orig/src/Makefile libselinux-1.1/src/Makefile
+--- libselinux-1.1.orig/src/Makefile	2003-08-14 16:34:07.000000000 -0500
++++ libselinux-1.1/src/Makefile	2003-08-14 16:35:14.000000000 -0500
+@@ -19,7 +19,7 @@
+ 	ranlib $@
+ 
+ $(LIBSO): $(OBJS)
+-	$(CC) $(LDFLAGS) -shared -o $@ $^ -lc -Wl,-soname,$(LIBSO) 
++	$(CC) $(LDFLAGS) -shared -o $@ $^ -lattr -lc -Wl,-soname,$(LIBSO) 
+ 	ln -sf $@ $(TARGET) 
+ 
+ %.o:  %.c
diff --git a/sys-libs/libselinux/libselinux-1.1.ebuild b/sys-libs/libselinux/libselinux-1.1-r1.ebuild
index cc06e23aefb2..c0fd80ffd549 100644
--- a/sys-libs/libselinux/libselinux-1.1.ebuild
+++ b/sys-libs/libselinux/libselinux-1.1-r1.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/sys-libs/libselinux/libselinux-1.1.ebuild,v 1.1 2003/08/14 15:28:31 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.1-r1.ebuild,v 1.1 2003/08/14 22:03:25 pebenito Exp $
 
 IUSE=""
 
@@ -12,7 +12,6 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/glibc
-	!sys-apps/selinux-small
 	sys-apps/attr"
 
 S=${WORKDIR}/${P}
@@ -22,14 +21,15 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-linkfix.diff
 }
 
 src_compile() {
 	cd ${S}/src
-	emake EXTRA_CFLAGS="${CFLAGS}"
+	emake EXTRA_CFLAGS="${CFLAGS}" || die "libselinux compile failed."
 
 	cd ${S}/utils
-	emake EXTRA_CFLAGS="${CFLAGS}"
+	emake EXTRA_CFLAGS="${CFLAGS}" || die "Utilities compile failed."
 }
 
 src_install() {