* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpri/, net-libs/libpri/files/, profiles/
@ 2024-01-05 5:14 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2024-01-05 5:14 UTC (permalink / raw
To: gentoo-commits
commit: c929eca080cee2c639e36f178c9f93c101444e09
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Thu Jan 4 18:23:04 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 05:12:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c929eca0
Revert "net-libs/libpri: treeclean"
This reverts commit f63bbe0e048e4d66750b67b20508441f3504f026.
Removal date was not yet met & there are plans to possibly resurrect dahdi,
per the bug.
Bug: https://bugs.gentoo.org/914477
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libpri/Manifest | 1 +
net-libs/libpri/files/libpri-1.4.13-multilib.patch | 51 +++++++++++++++++++++
.../libpri/files/libpri-1.4.13-no-static-lib.patch | 35 ++++++++++++++
.../files/libpri-1.6.0-respect-user-flags.patch | 53 ++++++++++++++++++++++
net-libs/libpri/libpri-1.6.0.ebuild | 33 ++++++++++++++
net-libs/libpri/metadata.xml | 12 +++++
profiles/package.mask | 1 +
7 files changed, 186 insertions(+)
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
new file mode 100644
index 000000000000..40c6ba6c7b40
--- /dev/null
+++ b/net-libs/libpri/Manifest
@@ -0,0 +1 @@
+DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
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.6.0-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch
new file mode 100644
index 000000000000..1928e5d871fb
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch
@@ -0,0 +1,53 @@
+diff -uNr libpri-1.6.0.ORIG/Makefile libpri-1.6.0/Makefile
+--- libpri-1.6.0.ORIG/Makefile 2017-09-19 10:37:05.176546588 +0100
++++ libpri-1.6.0/Makefile 2017-09-19 10:37:41.029544605 +0100
+@@ -24,10 +24,6 @@
+ # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING
+ #ALERTING=-DALERTING_NO_PROGRESS
+
+-CC=gcc
+-GREP=grep
+-AWK=awk
+-
+ OSARCH=$(shell uname -s)
+ PROC?=$(shell uname -m)
+
+@@ -68,7 +64,7 @@
+ $(STATIC_OBJS)
+ CFLAGS ?= -g
+ CFLAGS += $(CPPFLAGS)
+-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
+@@ -108,17 +104,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)
+@@ -197,7 +188,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.6.0.ebuild b/net-libs/libpri/libpri-1.6.0.ebuild
new file mode 100644
index 000000000000..aff3b4dccc25
--- /dev/null
+++ b/net-libs/libpri/libpri-1.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.13-multilib.patch"
+ "${FILESDIR}/${PN}-1.6.0-respect-user-flags.patch"
+ "${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
+)
+
+src_compile() {
+ tc-export CC
+ default
+}
+src_install() {
+ emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+ dodoc ChangeLog README TODO
+}
diff --git a/net-libs/libpri/metadata.xml b/net-libs/libpri/metadata.xml
new file mode 100644
index 000000000000..6aebbc46f559
--- /dev/null
+++ b/net-libs/libpri/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 30552bdf7fb3..74e963e5e316 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -562,6 +562,7 @@ media-video/subtitleripper
# downstream. Has no active maintainer in Gentoo. If you use DAHDI and have
# some ideas how to help, please see bug #914477.
# Removal on 2024-03-01.
+net-libs/libpri
net-misc/dahdi
net-misc/dahdi-tools
net-misc/openr2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-05 5:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-05 5:14 [gentoo-commits] repo/gentoo:master commit in: net-libs/libpri/, net-libs/libpri/files/, profiles/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox