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.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

6 files changed, 181 insertions, 18 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/Manifest b/net-libs/libpri/Manifest
index 953890fc1b82..945469928e54 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,17 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX libpri-1.4.12-multilib.patch 2592 RMD160 10309e09d30d930f74befc6308f515670196ad0b SHA1 baf9c25ec2d960b317f2d08c6e7b590631a33d59 SHA256 b2764a9905941fa186cec9da87dd31d75a881eb1588fbec71b1b7433581b56a7
-AUX libpri-1.4.12-respect-user-flags.patch 1694 RMD160 364cb3e1de959f3d38b707a38799f446632e66e3 SHA1 98cf49d5521e7353d8e81fe3876c4998d78f829e SHA256 a34e0fd4bef4e6fa28ef76f67edf83586197b8a41660b5594a2ab1a62f4ae9f0
-DIST libpri-1.4.12.tar.gz 339669 RMD160 0cfd14463c58c02e30c25e0a42ef2c7e07cd2164 SHA1 20db95cbc358ab5ca83f32f8275d59e60e03d7af SHA256 c0e170a742ed5d19515c99472fe79a467522355b3c24e4f7359d667b7d756e75
-EBUILD libpri-1.4.12-r1.ebuild 797 RMD160 b48b5592e78f9b3afd60e688a8788e02fe7b792d SHA1 6e697ad6a3db1d2fe6d3f214b42b81c15cb7a968 SHA256 c93ecb37ae9d9ab2da6d01ed1657d1dbfbde77aafc489af1660c6df747f504fa
-EBUILD libpri-1.4.12-r2.ebuild 807 RMD160 d061d10b368c58159a9ec6e6850e53c36249501c SHA1 f83c206d29de0f1d9196a4e70064ae9810f1db81 SHA256 7ff89b5bb4092316d9bd2a8f41db30abc1b6f0757a53352f60f2c173eac28ab8
-MISC ChangeLog 16520 RMD160 4497485470ea2258ffa4ce7505559f1a3ffd5329 SHA1 ab934ee01b04be482d74c6f8bc03694550c1c4c1 SHA256 e03c5b30bfa6c45dc292c9595c5f5e7590ce89f64c4bb4273dad4fd4f31bfbca
-MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk89Qt8ACgkQuUQtlDBCeQI9BgCePJ2TjkKGKZ5tAc21NWwzE5Sa
-3UEAoIdBhQK2TbIectPTD0b4G/9Og6/d
-=zUla
------END PGP SIGNATURE-----
+AUX libpri-1.4.12-multilib.patch 2592 SHA256 b2764a9905941fa186cec9da87dd31d75a881eb1588fbec71b1b7433581b56a7 SHA512 fc6fb3fec61b0c18b16f35d78065c9d17b2c579e2a7fc6d93df2b25937aa5b056016022e77a7001a12b38ca1d96b6700b72ac37ea52bdd32cf135d7ec7d8670a WHIRLPOOL 98afbccd65d6544986455e6e370401bd600b55e112ba89619c4eac75f228069ed1ab945d57868d187219317e5a9dcc0c05d308c91a591c8af65ba2d8057dcfce
+AUX libpri-1.4.12-respect-user-flags.patch 1694 SHA256 a34e0fd4bef4e6fa28ef76f67edf83586197b8a41660b5594a2ab1a62f4ae9f0 SHA512 bd72c53cdc575c74b07cc32d5f4f4cbf9b49e43a97b3a82a96c2fe85e4c2b4529eec27adf1d3f8af5fcc9ac16e3636af5256dd7461b2adec7c4e3db5fdee4ec6 WHIRLPOOL 526f672c038d0f004c6a2c8d4b7b8dbac15d276b0c95450f286a74f43eeb2ea5d3ce02677dc62668750e62f573350cda6ac48706cf4999a58f640773418ad0bc
+AUX libpri-1.4.13-multilib.patch 2541 SHA256 14f359eb86eb68520e7db538c7fa39d06dd0f3d9b448582f6b308bf80e362dc5 SHA512 7e6b43e64c5a4fd791090d3b20008a2bc1b9deeedf613ef6e72ec6b5dc105449705bedac5f4628d9d53963ae9649ad22480daa114de40f83854d045c2f3d9247 WHIRLPOOL ceea8f5530374c3926d0f449d9c3a24d87d4f5a9a819fb5aa9286243b2aaf480f9dd51d00f296d0847f96891d9ff220aacef19a2f1b33b6580c06d342e29e38b
+AUX libpri-1.4.13-no-static-lib.patch 1252 SHA256 1b347c12a39f94c9b9cb9a5f872ecc58be0a75d45ccacb7a78b351510ad13c02 SHA512 3d057a8bc1401e4580dcdbb401c697cc25117b8ab9fc4feedba39bd980dc9745423eae7cc75fe48c3684b07459d0f5de11717020d3e7726ca89de7c6a8a3861d WHIRLPOOL d8761d7cd90d323b115747b1dfed608272cea7d03ecb33a7943ec2763dad17022e9b8ddf43cc7e5fd4a9877b70f43523561402b82cd0df54bbe4dece3df3e078
+AUX libpri-1.4.13-respect-user-flags.patch 1354 SHA256 3975bd0f593a3468e4824aa56b8b23a11e612034144f8f13792439c036880f1d SHA512 6b6695a3e16de652c7dc05a1fa95948498d03901c6e106cbedddc2681b7b0a59d3567c5161539e397f3e1759be682537e57712e24b771a55c59f6bdec152440f WHIRLPOOL 73b8852329f0103d04b077dfe77f9a65c7a9e87bdb4fbbdea3e7289a45e27245d8800408c3a83e06feabb829f0f290d7b865dbdf07f62e3c9466c61ec6f71f0d
+DIST libpri-1.4.12.tar.gz 339669 SHA256 c0e170a742ed5d19515c99472fe79a467522355b3c24e4f7359d667b7d756e75
+DIST libpri-1.4.13.tar.gz 338432 SHA256 5c17611b7294c83f20fac5dc5cd9930de684a2f84627efb15ef6742b68df1ebf SHA512 5fbd408577bc92f2232c696f91691ec28e011b0918c7ff08212f352499f0af56e1b9a03ec738b13c28a4ff5e687eaf873472035ed1908cf43a844ffbf34dd636 WHIRLPOOL 37b7694dd012677e6ecea73a79bf75577fc6f368f9963e08a50e8d12a407a4b979ae56e1c92bb0df85efbec3cfaa2f033dac5eb1cd864bfe2e472bb22415abd8
+EBUILD libpri-1.4.12-r1.ebuild 797 SHA256 c93ecb37ae9d9ab2da6d01ed1657d1dbfbde77aafc489af1660c6df747f504fa SHA512 01c4d35cbf2a0dd4bcf699d577320fcb02d7f416cc95c7d26bd9a2eaa42a1285a246719958a537a527cb8fd0bf4e0680cef5edd8ffcb7e9e6a268e2d6c625974 WHIRLPOOL 6232566fbfeadc40a3bcc518edbadd04ebcf2fedc37a4362e92d2855ae61ef83c89b7198fc3392c7477a1e417867816c76254a1df03b821410f30d6febfc8a5e
+EBUILD libpri-1.4.12-r2.ebuild 807 SHA256 7ff89b5bb4092316d9bd2a8f41db30abc1b6f0757a53352f60f2c173eac28ab8 SHA512 dca6a77e4371142adf2a83fc3bc00a532fe735985eb277e942c7afae775758d6bdbb7ec6aa0476410ad73cd24f56a9125cc82dd24f9b8c4a827ab4f415b1bef7 WHIRLPOOL d78b733771879f8baf28aa439048c4cfd15eea3313cbc83c9380895603dbad7f09ca5238f338506582c2966a6ac03050190f2035b04fde6ab9d653675a2306b4
+EBUILD libpri-1.4.13.ebuild 789 SHA256 23660e3ae62efd58332d593ffbade82ecd5aa4386e3fcd3fa773365076c27340 SHA512 f119b43d6e4af13f30b70870dec92cb9e85f46c16549f18385fc7b12118e9f6f43ff16d0f1b1500e675c00281fdd01ee089f436af207b1be936060ce1b4344af WHIRLPOOL e0d0705095a9a3d251891af986d64673e994ed76b1e254290e4c1664fb89a93dc539cc38a15e99be742c38948d8b6c6be3f659aba5ee4a095f18460319705ab4
+MISC ChangeLog 17036 SHA256 6f334e693bf02d2404270120aa8d7af6ac9ba17ff2696b8ed737ec9e4ec6d3fa SHA512 defdcca7a221e64e1a9352b8bd7d3c03bdaee478d9e4be7163fdf883e53706d94421570ea680c22c8701b298f36dfcd6819f4fc93a653eba1a9a1aa53e0f7228 WHIRLPOOL d637987cdb15c212560216f61147bd0df9e2fe4d55310bde5e1fc83edc211f6b8da80f236f16505fe0ecd79b6cf481f998aec33869779fb18735baec36b93f07
+MISC metadata.xml 257 SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b SHA512 bd0b963a4eb04cfeecd66ee7924e03e626cea31e783b324dd20dd2fdf6b604ae941d947eeccc624b48b09f43ad47b38c180bf11d57f51ecd8ee20f930feb0a68 WHIRLPOOL f1f041949854b8664db24ab9533be66c034c82c3259e6efb122bf9c3d3abb99447dc18b9c4303790f16a43c3ff1feb9800480787a260a665c9fb19606bb6c8cd
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
+}