Version bump, much of the patching rebased by Oliver Jaksch. Closes bug #321625.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 105 insertions, 0 deletions

diff --git a/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch b/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch
new file mode 100644
index 000000000000..b95b9702d9f8
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch
@@ -0,0 +1,52 @@
+diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
+--- libpri-1.4.11.ORIG/Makefile	2009-03-10 18:08:07.000000000 +0000
++++ libpri-1.4.11/Makefile	2009-03-10 18:11:24.000000000 +0000
+@@ -86,7 +86,7 @@
+ CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+-libdir?=$(INSTALL_BASE)/lib
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
+ LDCONFIG = /sbin/ldconfig
+ ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX XGNUX))
+@@ -135,27 +135,27 @@
+ 	fi
+ 
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+-	mkdir -p $(INSTALL_PREFIX)$(libdir)
++	mkdir -p $(LIBDIR)
+ 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ ifneq (${OSARCH},SunOS)
+ 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+-	#if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
+-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
++	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
++	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
++	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
++	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
+ else
+ 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+-	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
+-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+-	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
++	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
++	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+ 
+ uninstall:
+ 	@echo "Removing Libpri"
+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
++	rm -f $(LIBDIR)/libpri.so.$(SONAME)
++	rm -f $(LIBDIR)/libpri.so
++	rm -f $(LIBDIR)/libpri.a
+ 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+ 
+ pritest: pritest.o
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch
new file mode 100644
index 000000000000..b6a4db487747
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch
@@ -0,0 +1,29 @@
+diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
+--- libpri-1.4.11.ORIG/Makefile	2009-03-10 17:43:45.000000000 +0000
++++ libpri-1.4.11/Makefile	2009-03-10 17:44:00.000000000 +0000
+@@ -83,7 +83,7 @@
+ 	rose_qsig_mwi.lo \
+ 	rose_qsig_name.lo \
+ 	version.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ libdir?=$(INSTALL_BASE)/lib
+@@ -108,16 +108,7 @@
+ export PRIVERSION
+ 
+ PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
+-
+-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+-#This works for even old (2.96) versions of gcc and provides a small boost either way.
+-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+-ifeq ($(PROC),sparc64)
+-PROC=ultrasparc
+-LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+-else
+ LIBPRI_OPT = -O2
+-endif
+ 
+ ifeq ($(CPUARCH),i686)
+ CFLAGS += -m32
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch
new file mode 100644
index 000000000000..778496faef2b
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch
@@ -0,0 +1,12 @@
+diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
+--- libpri-1.4.11.ORIG/Makefile	2009-12-08 22:55:12.729738494 +0000
++++ libpri-1.4.11/Makefile	2009-12-08 22:55:58.645775496 +0000
+@@ -186,7 +186,7 @@
+ 	ranlib $(STATIC_LIBRARY)
+ 
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+-	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++	$(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
+ 	ln -sf libpri.so.$(SONAME) libpri.so
+ 
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch b/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch
new file mode 100644
index 000000000000..c0e2d9893b35
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch
@@ -0,0 +1,12 @@
+diff -uNr libpri-1.4.11.1.ORIG//Makefile libpri-1.4.11.1/Makefile
+--- libpri-1.4.11.1.ORIG//Makefile	2010-06-07 10:59:44.000000000 +0100
++++ libpri-1.4.11.1/Makefile	2010-06-07 10:59:52.000000000 +0100
+@@ -83,7 +83,7 @@
+ 	rose_qsig_mwi.lo \
+ 	rose_qsig_name.lo \
+ 	version.lo
+-CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib