summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2008-03-24 10:02:11 +0000
committerCharles Clément <caratorn@gmail.com>2008-03-24 10:02:11 +0000
commit5f8c21b67d3a87b52d7371678d11fae34be8a021 (patch)
tree0a1c5c4739701f370e413f3792919b0009fa297d /net-libs
parentremove siproxd-0.7.0 which has been added to portage by opfer (diff)
downloadvoip-5f8c21b67d3a87b52d7371678d11fae34be8a021.tar.gz
voip-5f8c21b67d3a87b52d7371678d11fae34be8a021.tar.bz2
voip-5f8c21b67d3a87b52d7371678d11fae34be8a021.zip
Fix Bug #205468
svn path=/trunk/; revision=678
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libpri/ChangeLog8
-rw-r--r--net-libs/libpri/Manifest8
-rw-r--r--net-libs/libpri/files/libpri-1.2.5-gcc42.patch11
-rw-r--r--net-libs/libpri/files/libpri-1.2.5-gentoo.diff27
-rw-r--r--net-libs/libpri/files/libpri-1.2.5-multilib.patch53
-rw-r--r--net-libs/libpri/libpri-1.2.5-r1.ebuild58
6 files changed, 164 insertions, 1 deletions
diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index ee8c8ce..d76beb8 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libpri-1.2.5-r1 (23 Mar 2008)
+
+ 23 Mar 2008; Charles Clément <caratorn@gmail.com>
+ +files/libpri-1.2.5-gcc42.patch, +files/libpri-1.2.5-gentoo.diff,
+ +files/libpri-1.2.5-multilib.patch, libpri-1.2.5-r1.ebuild:
+ Fix Bug #205468 thanks to Chi-Thanh Christopher Nguyen
+ <chithanh@cs.tu-berlin.de>
+
21 Mar 2008; Rambaldi <rambaldi@xs4all.nl>
+files/libpri-1.6.0_beta1-gentoo.diff, +libpri-1.6.0_beta1.ebuild:
new ebuild
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 20a8b72..9667592 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,13 +1,19 @@
+AUX libpri-1.2.5-gcc42.patch 292 RMD160 60c6926771a962af681b4aabb7992ee324ca13d6 SHA1 74f12b2cabed9fed73186a12a0b28d4987be2e90 SHA256 28cb8f9c5079632a51dac7ab5f0ac143a5e3513149aab869bcde256aa1c37401
+AUX libpri-1.2.5-gentoo.diff 1244 RMD160 38821ad5d9fc89ddf2d207ddd0e2d818b7174acb SHA1 9142d76c73d2e908437b69d22da5b40df6926457 SHA256 a8bd018ccbf6670dff74daa568bacc1c5772caafc2ef4e8779d9d89ba99bf098
+AUX libpri-1.2.5-multilib.patch 2703 RMD160 a390cd241bb7bea56a6f78c91415826f00ab3fc2 SHA1 371a859d75b759b995410af1c377a8d80dc0f45f SHA256 7e045f6499c54d0242b421e2d71f0ccb7a6b20c30a0f82dd7cf8281ac9dded89
AUX libpri-1.4.0-gentoo.diff 1832 RMD160 de0085863cbf7a6a806c28267c44a2d12b990d2f SHA1 cb6af07c0ea49a9cf4d4320968f002d868a3a631 SHA256 d03e1611ae4a835322ebb2c2ab320211ecdea860ef5bdd789ced0f6730c181bd
AUX libpri-1.4.1-gentoo.diff 1895 RMD160 34e45c6a8c10c7d5d160b65618634bfe4b715686 SHA1 c0c32f90408c2663a6f6f88452572f9857e277e8 SHA256 20e10cf8867892a4fd488afd8b5626377225ba26403935878473ca9b3d1af578
AUX libpri-1.4.3-gentoo.diff 1849 RMD160 2f00b1b475fe109adbc9aa4742b3207a9c724ba0 SHA1 2279a97660a5bd4659275832f61fa937eacc1234 SHA256 354994426d8f716341eb86fc278fdf554f9caef4d0f310b12261542c171bf5e9
AUX libpri-1.6.0_beta1-gentoo.diff 1849 RMD160 2f00b1b475fe109adbc9aa4742b3207a9c724ba0 SHA1 2279a97660a5bd4659275832f61fa937eacc1234 SHA256 354994426d8f716341eb86fc278fdf554f9caef4d0f310b12261542c171bf5e9
+DIST bristuff-0.3.0-PRE-1y-h.tar.gz 286224 RMD160 bf0b9fce76c68565837b56676262fdd055240653 SHA1 cefd78476b6e394672de27849ca4a02b81a7ef1d SHA256 5657e2a50cfe35a64d9aa8caea4c3306539ed81a4ac955a9792a5d58c471a03f
+DIST libpri-1.2.5.tar.gz 77446 RMD160 6069449a39493d789f764e106f5c136714dff1d6 SHA1 ece4973c2cce493ba99c503dc6b6638e6b1b780f SHA256 02ab16e9ba02f57f745e6f260e08b1bc2ff442329db5345e7f42d70ad9ab7904
DIST libpri-1.4.0.tar.gz 80021 RMD160 8ecffb051400dfb2d4f5fcd196ad60bfb2967113 SHA1 910bcada76e1fa8229fdf48abb8d6aa30d0d42d3 SHA256 9f4db10a105545e68cbe0620795d2e11278828fa281ad339eeb72087125eeaf9
DIST libpri-1.4.1.tar.gz 81178 RMD160 df42a8dc1b2d46e6f1a1db011c2c500c0ee66da2 SHA1 76284bcb68b57d972396115ba29d1e9d3aa88507 SHA256 2c8b33213d68a187fb25430c39d79db04bdfc08c769bdada97ab00f521e8ec84
DIST libpri-1.4.3.tar.gz 81741 RMD160 d9197b80e4100dbaf4e90e4e43558440703103cb SHA1 e56426b94dd66c5f8cd30be165196080b7275808 SHA256 aec293708e3f70e0dc6352ac33a6680249c0795a9eb8f31972a95d5e2f41bd69
DIST libpri-1.6.0-beta1.tar.gz 88417 RMD160 d210bad51cdefd78d7900ac84e9770450868d140 SHA1 b1816b9a2d88a5dfa727efdd04b18fff5371c906 SHA256 d42bd8c70a4f76cb2ec1795497976e4908a3ec39373570284b183344f4456265
+EBUILD libpri-1.2.5-r1.ebuild 1327 RMD160 ae5d3d8260c02c254ec4cd317b61e1ba9114d781 SHA1 1a063e31c26c4fe1e9f1bb10b49a1576ca39c6ed SHA256 de3ff058de9dc374215990d94260d07ac225aa1b8ac37bc9d56c5ec3af4c3e89
EBUILD libpri-1.4.0.ebuild 1325 RMD160 c7bff7c5403355d3d284d3621c049e3016b3ed53 SHA1 5f689c62132689a27ff6deb695af48b29d0e4f51 SHA256 b576b1d54dc4f4486969717f1002f0381a4e6ef5e88f306231c0833327ef018d
EBUILD libpri-1.4.1.ebuild 1325 RMD160 f4eded2a7b2dc8d0dd13bb68c650acae54890972 SHA1 fced843e2812e627c36fc5c2c4baeb3367d62d19 SHA256 e69942fc2927ebf8d4acb73764549b8d250fd865b754d65ac2b7c8a3987c6188
EBUILD libpri-1.4.3.ebuild 1226 RMD160 7d595a64b46f68eb6f8065e2821bc6d98f315129 SHA1 d9c780474a198554da4a28a610c4aa27c580b640 SHA256 88b52c517387bb3899a9fc52ffbc97592ab4d1fb12e6052153107e2a173dea24
EBUILD libpri-1.6.0_beta1.ebuild 623 RMD160 dd57bb92d3fb4a5635d5919556ab9e3110fc7752 SHA1 f9f7212c34c8dee5a5e9b0fe55a4e1d4c265438b SHA256 4f6c6c91091acca4a0d2e2606274c847e9840b96837b8a3060e60fc3a5e14664
-MISC ChangeLog 603 RMD160 e2f83afccc29dd17f15ae33dba4dd542baa30975 SHA1 cd1c12b08da7c098cd18c7eb2776f0366519f515 SHA256 b7f1b2ac0527aa40abe7a876069051bcda9fde658bb6cf65aaf67c0481ce700d
+MISC ChangeLog 905 RMD160 647ebbe0ba6b4cf8408a696adb289b4d0137e989 SHA1 d1db85b1dbab0db8d6214c62ce04a7df2cc9e967 SHA256 e7a464a8f0c5ff02a3da0a92cacbe0ca32dd54562070d6f8290fabd59f38b0ae
diff --git a/net-libs/libpri/files/libpri-1.2.5-gcc42.patch b/net-libs/libpri/files/libpri-1.2.5-gcc42.patch
new file mode 100644
index 0000000..a7b9b0e
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.2.5-gcc42.patch
@@ -0,0 +1,11 @@
+diff -u a/pri_internal.h b/pri_internal.h
+--- a/pri_internal.h 2005-11-29 19:39:18.000000000 +0100
++++ b/pri_internal.h 2008-01-18 16:12:05.200685051 +0100
+@@ -25,6 +25,7 @@
+ #ifndef _PRI_INTERNAL_H
+ #define _PRI_INTERNAL_H
+
++#include <stddef.h>
+ #include <sys/time.h>
+
+ struct pri_sched {
diff --git a/net-libs/libpri/files/libpri-1.2.5-gentoo.diff b/net-libs/libpri/files/libpri-1.2.5-gentoo.diff
new file mode 100644
index 0000000..1f0f1c2
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.2.5-gentoo.diff
@@ -0,0 +1,27 @@
+diff -Nura libpri-1.2.5/Makefile libpri-1.2.5-gentoo/Makefile
+--- libpri-1.2.5/Makefile 2006-12-30 16:16:17.000000000 -0300
++++ libpri-1.2.5-gentoo/Makefile 2007-07-12 14:58:49.094612157 -0300
+@@ -38,7 +38,7 @@
+ DYNAMIC_LIBRARY=libpri.so.1.0
+ STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
+ DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ SOFLAGS = -Wl,-hlibpri.so.1.0
+@@ -59,14 +59,6 @@
+ #INSTALL_PREFIX = /opt/asterisk # Uncomment out to install in standard Solaris location for 3rd party code
+ endif
+
+-#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
+-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+-endif
+-
+ all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+
+ update:
diff --git a/net-libs/libpri/files/libpri-1.2.5-multilib.patch b/net-libs/libpri/files/libpri-1.2.5-multilib.patch
new file mode 100644
index 0000000..b3654f2
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.2.5-multilib.patch
@@ -0,0 +1,53 @@
+diff -Nru libpri-1.2.5.orig/Makefile libpri-1.2.5/Makefile
+--- libpri-1.2.5.orig/Makefile 2007-08-06 22:04:41.000000000 +0200
++++ libpri-1.2.5/Makefile 2007-08-06 22:02:37.000000000 +0200
+@@ -41,6 +41,7 @@
+ CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ SOFLAGS = -Wl,-hlibpri.so.1.0
+ LDCONFIG = /sbin/ldconfig
+ ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
+@@ -73,28 +74,28 @@
+ fi
+
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
++ 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)$(INSTALL_BASE)/lib
+- if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; 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.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
++ 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)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
+- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
+- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
++ install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
++ ( cd $(LIBDIR) ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
++ install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+
+ uninstall:
+ @echo "Removing Libpri"
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1.0
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.a
++ rm -f $(LIBDIR)/libpri.so.1.0
++ rm -f $(LIBDIR)/libpri.so.1
++ 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/libpri-1.2.5-r1.ebuild b/net-libs/libpri/libpri-1.2.5-r1.ebuild
new file mode 100644
index 0000000..8f1ae78
--- /dev/null
+++ b/net-libs/libpri/libpri-1.2.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+IUSE="bri"
+
+MY_P="${P/_/-}"
+
+BRI_VERSION="0.3.0-PRE-1y-h"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://ftp.digium.com/pub/libpri/${MY_P}.tar.gz
+ bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+# bri? ( http://www.netdomination.org/pub/asterisk/libpri-${PV}-bristuff-${BRI_VERSION}.diff.gz )"
+
+S="${WORKDIR}/${MY_P}"
+
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+ unpack ${A}
+
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-1.2.5-gentoo.diff
+ epatch ${FILESDIR}/${P}-multilib.patch
+ epatch ${FILESDIR}/${P}-gcc42.patch
+
+ if use bri; then
+ einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
+
+ # fix a small clash in patches
+ sed -i -e "s:CFLAGS=:CFLAGS+=:" \
+ ${S_BRI}/patches/libpri.patch
+# ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+
+ epatch ${S_BRI}/patches/libpri.patch
+# epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+ fi
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ make INSTALL_PREFIX=${D} LIBDIR="${D}/usr/$(get_libdir)" install || die
+
+ dodoc ChangeLog README TODO LICENSE
+}