commit: 2171c8cfe78e3dee0a02a606ea1d3cf475d017e5
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 11:37:28 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 11:54:54 2022 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=2171c8cf
dev-libs/nspr: remove outdated
- and most likely security vulnerable versions,
- ::gentoo is at 4.33.
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/nspr/Manifest | 1 -
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 32 ------
.../nspr/files/nspr-4.21-ipv6-musl-support.patch | 53 ---------
dev-libs/nspr/files/nspr-4.23-prtime.patch | 26 -----
dev-libs/nspr/files/nspr-4.7.1-solaris.patch | 14 ---
.../files/nspr-4.8.4-darwin-install_name.patch | 25 -----
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 28 -----
dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 11 --
dev-libs/nspr/metadata.xml | 8 --
dev-libs/nspr/nspr-4.25.ebuild | 122 ---------------------
10 files changed, 320 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
deleted file mode 100644
index 131b1010..00000000
--- a/dev-libs/nspr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nspr-4.25.tar.gz 1079633 BLAKE2B
377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2
SHA512
b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
deleted file mode 100644
index 6ae04f40..00000000
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-* drop Solaris linker stuff
-
---- a/configure.in
-+++ b/configure.in
-@@ -1988,26 +1988,14 @@
- CPU_ARCH=`uname -p`
- MDCPUCFG_H=_solaris.cfg
- PR_MD_CSRCS=solaris.c
-- LD=/usr/ccs/bin/ld
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- RESOLVE_LINK_SYMBOLS=1
-- case "${OS_RELEASE}" in
-- 5.8|5.9)
-- ;;
-- *)
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
-- USE_B_DIRECT=1
-- ;;
-- esac
- if test -n "$GNU_CC"; then
- DSO_CFLAGS=-fPIC
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
- GCC_USE_GNU_LD=1
- fi
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir
$@),-z,combreloc,-z,defs,-z,ignore'
-- if test -n "$USE_B_DIRECT"; then
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
-- fi
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- else
- DSO_CFLAGS=-KPIC
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
deleted file mode 100644
index 2c8ebd4c..00000000
--- a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8c57451f44d7ceb37bfb4ae6e457fc70b1f58d0a Mon Sep 17 00:00:00 2001
-From: Moritz Kick <gen...@blackphoenix.de>
-Date: Wed, 20 Mar 2019 13:36:06 -0500
-Subject: [PATCH] Added IPv6 compatibility for musl libc
-
-Signed-off-by: Moritz Kick <gen...@blackphoenix.de>
-Signed-off-by: Jory Pratt <anar...@gentoo.org>
----
- pr/include/md/_linux.h | 13 +------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
-index 2370ab8..612184c 100644
---- a/pr/include/md/_linux.h
-+++ b/pr/include/md/_linux.h
-@@ -289,33 +289,22 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr,
PRInt32 nv)
- #endif /* __arm__ */
-
- #define USE_SETJMP
--#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID)
- #define _PR_POLL_AVAILABLE
--#endif
- #undef _PR_USE_POLL
- #define _PR_STAT_HAS_ONLY_ST_ATIME
- #if defined(__alpha) || defined(__ia64__)
- #define _PR_HAVE_LARGE_OFF_T
--#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
-- || defined(ANDROID)
--#define _PR_HAVE_OFF64_T
- #else
--#define _PR_NO_LARGE_FILES
-+#define _PR_HAVE_OFF64_T
- #endif
--#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
-- || defined(ANDROID)
- #define _PR_INET6
- #define _PR_HAVE_INET_NTOP
- #define _PR_HAVE_GETHOSTBYNAME2
- #define _PR_HAVE_GETADDRINFO
- #define _PR_INET6_PROBE
--#endif
- #ifndef ANDROID
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
--#endif
--/* Android has gethostbyname_r but not gethostbyaddr_r or gethostbyname2_r. */
--#if (__GLIBC__ >= 2) && defined(_PR_PTHREADS)
- #define _PR_HAVE_GETHOST_R
- #define _PR_HAVE_GETHOST_R_INT
- #endif
---
-2.21.0
-
diff --git a/dev-libs/nspr/files/nspr-4.23-prtime.patch
b/dev-libs/nspr/files/nspr-4.23-prtime.patch
deleted file mode 100644
index 087e4278..00000000
--- a/dev-libs/nspr/files/nspr-4.23-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/pr/src/misc/prtime.c
-+++ b/pr/src/misc/prtime.c
-@@ -1621,7 +1621,7 @@
- case TT_EET: zone_offset = 2 * 60; break;
- case TT_JST: zone_offset = 9 * 60; break;
- default:
-- PR_ASSERT (0);
-+ return PR_FAILURE;
- break;
- }
- }
-@@ -1677,11 +1677,12 @@
- struct tm localTime;
- time_t secs;
-
-- PR_ASSERT(result->tm_month > -1 &&
-+ if (!(result->tm_month > -1 &&
- result->tm_mday > 0 &&
- result->tm_hour > -1 &&
- result->tm_min > -1 &&
-- result->tm_sec > -1);
-+ result->tm_sec > -1))
-+ return PR_FAILURE;
-
- /*
- * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
deleted file mode 100644
index 1afab1dd..00000000
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Same magic as haubi did for glib compilation, which works again here
-resolving a linker problem on Solaris with GNU ld. Bug #222625
-
---- a/pr/src/Makefile.in
-+++ b/pr/src/Makefile.in
-@@ -95,7 +95,7 @@
- endif
-
- ifdef USE_PTHREADS
--OS_LIBS = -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc
-+OS_LIBS = -pthread ${LIBRT} -lsocket -lnsl -ldl -lc
- else
- ifdef LOCAL_THREADS_ONLY
- OS_LIBS = -lsocket -lnsl -ldl -lc
diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
deleted file mode 100644
index 4045e909..00000000
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't use @executable_path, it messed up linking against nspr from e.g.
-nss.
-
---- a/configure.in
-+++ b/configure.in
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
---- a/configure
-+++ b/configure
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
deleted file mode 100644
index 5d37018d..00000000
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use CFLAGS when linking. Some flags can add functionality to generated
-code that requires extra libs to be linked in (eg. libgomp when using
-autoparallelization). Other flags are required when building and linking
-(eg. -flto).
-
-https://bugs.gentoo.org/365975
-
---- a/config/autoconf.mk.in
-+++ b/config/autoconf.mk.in
-@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@
- DLLFLAGS = @DLLFLAGS@
- EXEFLAGS = @EXEFLAGS@
- OPTIMIZER = @OPTIMIZER@
-+LD_CFLAGS = @CFLAGS@
-
- PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
- PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
---- a/config/config.mk
-+++ b/config/config.mk
-@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER)
$(NOMD_OS_CFLAGS)\
- NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-
--LDFLAGS = $(OS_LDFLAGS)
-+LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS)
-
- # Enable profile-guided optimization
- ifdef MOZ_PROFILE_GENERATE
diff --git a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
deleted file mode 100644
index a22b0b93..00000000
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config/nspr-config.in
-+++ b/config/nspr-config.in
-@@ -126,7 +126,7 @@
- fi
-
- if test "$echo_libs" = "yes"; then
-- libdirs=-L$libdir
-+ libdirs=""
- if test -n "$lib_plds"; then
- libdirs="$libdirs -lplds${major_version}"
- fi
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
deleted file mode 100644
index d9b367ed..00000000
--- a/dev-libs/nspr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>mozi...@gentoo.org</email>
- <name>Gentoo Mozilla Team</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.25.ebuild b/dev-libs/nspr/nspr-4.25.ebuild
deleted file mode 100644
index c238ea28..00000000
--- a/dev-libs/nspr/nspr-4.25.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/";
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz";
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug elibc_musl"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.23-prtime.patch
- "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- "${FILESDIR}"/${PN}-4.10.6-solaris.patch
- "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
- "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
- # We do not need to pass -L$libdir via nspr-config --libs
- "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
- cd "${S}"/nspr || die
-
- default
-
- use elibc_musl && eapply
"${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
- # rename configure.in to configure.ac for new autotools compatibility
- if [[ -e "${S}"/nspr/configure.in ]] ; then
- einfo "Renaming configure.in to configure.ac"
- mv "${S}"/nspr/configure.{in,ac} || die
- else
- elog "configure.in rename logic can be removed from ebuild."
- fi
-
- # We must run eautoconf to regenerate configure
- eautoconf
-
- # make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- "${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
- # We use the standard BUILD_xxx but nspr uses HOST_xxx
- tc-export_build_env BUILD_CC
- export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS}
HOST_LDFLAGS=${BUILD_LDFLAGS}
- tc-export AR CC CXX RANLIB
- [[ ${CBUILD} != ${CHOST} ]] \
- && export CROSS_COMPILE=1 \
- || unset CROSS_COMPILE
-
- local myconf=(
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- $(use_enable debug)
- $(use_enable !debug optimize)
- )
-
- # The configure has some fancy --enable-{{n,x}32,64bit} switches
- # that trigger some code conditional to platform & arch. This really
- # matters for the few common arches (x86, ppc) but we pass a little
- # more of them to be future-proof.
-
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) myconf+=( --enable-n32 );;
- x32) myconf+=( --enable-x32 );;
- s390x|*64) myconf+=( --enable-64bit );;
- default) # no abi actually set, fall back to old check
- einfo "Running a short build test to determine
64bit'ness"
- echo > "${T}"/test.c || die
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o
"${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) myconf+=( --enable-x32 );;
- *64-bit*|*ppc64*|*x86_64*) myconf+=(
--enable-64bit );;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether your arch is
64bits or 32bits, disable distcc if you're using it, please";;
- esac ;;
- *) ;;
- esac
-
- # Ancient autoconf needs help finding the right tools.
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
- ac_cv_path_AR="${AR}" \
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- emake DESTDIR="${D}" install
-
- einfo "removing static libraries as upstream has requested!"
- rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static
libraries."
-
- # install nspr-config
- dobin config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die
-
- # This is used only to generate prerr.c and prerr.h at build time.
- # No other projects use it, and we don't want to depend on perl.
- # Talked to upstream and they agreed w/punting.
- rm "${ED}"/usr/bin/compile-et.pl || die
-}
