Version bump. All patches rediffed by Oliver Jaksch. Fixes, among other things, outbound BRI call failure on HA8, HB8 & B410P adapters and multi-channel RESTART requests. Removal of unused static library & test utilities (and thus DAHDI dependency) by me. Closes bug #437798.

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 169 insertions, 1 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index a6ef19dbf1d9..3b365d66e86f 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-libs/libpri
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.97 2012/02/16 17:54:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.98 2012/10/27 12:25:52 chainsaw Exp $
+
+*libpri-1.4.13 (27 Oct 2012)
+
+  27 Oct 2012; Tony Vroon <chainsaw@gentoo.org> +libpri-1.4.13.ebuild,
+  +files/libpri-1.4.13-multilib.patch,
+  +files/libpri-1.4.13-no-static-lib.patch,
+  +files/libpri-1.4.13-respect-user-flags.patch:
+  Version bump. All patches rediffed by Oliver Jaksch. Fixes, among other
+  things, outbound BRI call failure on HA8, HB8 & B410P adapters and
+  multi-channel RESTART requests. Removal of unused static library & test
+  utilities (and thus DAHDI dependency) by me. Closes bug #437798.
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> libpri-1.4.12-r2.ebuild:
   x86 stable wrt bug #400443
diff --git a/net-libs/libpri/files/libpri-1.4.13-multilib.patch b/net-libs/libpri/files/libpri-1.4.13-multilib.patch
new file mode 100644
index 000000000000..22eec7e50059
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.13-multilib.patch
@@ -0,0 +1,51 @@
+--- libpri-1.4.13/Makefile.orig	2012-09-26 17:46:23.000000000 +0200
++++ libpri-1.4.13/Makefile	2012-10-10 08:04:44.000000000 +0200
+@@ -71,7 +71,7 @@
+ CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+-libdir?=$(INSTALL_BASE)/lib
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ ifneq ($(findstring Darwin,$(OSARCH)),)
+   SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+@@ -145,27 +145,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 $(DYNAMIC_LIBRARY) 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 $(DYNAMIC_LIBRARY) 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)/$(STATIC_LIBRARY)
+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
+-	rm -f $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY)
++	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 $(STATIC_LIBRARY)
diff --git a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch
new file mode 100644
index 000000000000..963e730c6fda
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch
@@ -0,0 +1,35 @@
+diff -uNr libpri-1.4.13.ORIG/Makefile libpri-1.4.13/Makefile
+--- libpri-1.4.13.ORIG/Makefile	2012-10-27 13:22:57.902838938 +0100
++++ libpri-1.4.13/Makefile	2012-10-27 13:23:36.746837229 +0100
+@@ -120,7 +120,7 @@
+ SOFLAGS += -m32
+ endif
+ 
+-all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) $(UTILITIES)
++all: $(DYNAMIC_LIBRARY)
+ 
+ update:
+ 	@if [ -d .svn ]; then \
+@@ -139,7 +139,7 @@
+ 		echo "Not under version control";  \
+ 	fi
+ 
+-install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
++install: $(DYNAMIC_LIBRARY)
+ 	mkdir -p $(LIBDIR)
+ 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ ifneq (${OSARCH},SunOS)
+@@ -147,13 +147,11 @@
+ 	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 $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
+ 	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
+-	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+ 
+ uninstall:
diff --git a/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
new file mode 100644
index 000000000000..f10303d80590
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
@@ -0,0 +1,41 @@
+--- libpri-1.4.13/Makefile.orig	2012-09-26 17:46:23.000000000 +0200
++++ libpri-1.4.13/Makefile	2012-10-10 08:11:24.000000000 +0200
+@@ -67,7 +67,7 @@
+ DYNAMIC_OBJS= \
+ 	$(STATIC_OBJS)
+ CFLAGS ?= -g
+-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+@@ -107,17 +107,12 @@
+ #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
+-  ifneq ($(CODE_COVERAGE),)
++ifneq ($(CODE_COVERAGE),)
+     LIBPRI_OPT=
+     COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
+     COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+-  else
+-    LIBPRI_OPT=-O2
+-  endif
++else
++    LIBPRI_OPT=
+ endif
+ 
+ ifeq ($(CPUARCH),i686)
+@@ -196,7 +191,7 @@
+ 	ranlib $(STATIC_LIBRARY)
+ 
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+-	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++	$(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
+ 	ln -sf $(DYNAMIC_LIBRARY) libpri.so
+ 
diff --git a/net-libs/libpri/libpri-1.4.13.ebuild b/net-libs/libpri/libpri-1.4.13.ebuild
new file mode 100644
index 000000000000..da4141e7527c
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.13.ebuild,v 1.1 2012/10/27 12:25:52 chainsaw Exp $
+
+EAPI="4"
+
+inherit base
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
+	"${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
+	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
+)
+
+src_install() {
+	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+	dodoc ChangeLog README TODO
+}