1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

devel/nspr, security/nss: drop version from SONAME

No other downstream appends synthetic library version, and doing so
causes underlinking due to fragile build system (see below). Not to
mention being unable to swap out bundled libs from upstream builds.

  $ cc -lplds4 -L/usr/local/lib
  /usr/lib/crt1.o: In function `_start1':
  crt1_c.c:(.text+0xa6): undefined reference to `main'
  /usr/local/lib/libplds4.so: undefined reference to `pthread_set_name_np'
  /usr/local/lib/libplds4.so: undefined reference to `pthread_create'
  /usr/local/lib/libplds4.so: undefined reference to `pthread_condattr_init'
  /usr/local/lib/libplds4.so: undefined reference to `pthread_setschedparam'
  /usr/local/lib/libplds4.so: undefined reference to `pthread_getschedparam'

PR:		213144
Exp-run by:	antoine
This commit is contained in:
Jan Beich 2016-10-09 12:10:02 +00:00
parent 1950eb3a9d
commit f5f47a5a4e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=423591
53 changed files with 62 additions and 109 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= rpm
PORTVERSION= 4.12.0.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= archivers
MASTER_SITES= http://rpm.org/releases/rpm-${PORTVERSION:R:R}.x/
PKGNAMESUFFIX= 4

View File

@ -3,7 +3,7 @@
PORTNAME= evolution-data-server
PORTVERSION= 3.18.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

View File

@ -3,7 +3,7 @@
PORTNAME= gnome-contacts
PORTVERSION= 3.18.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME

View File

@ -3,7 +3,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= APACHE/apr
DISTFILES= apr-${APR_VERSION}.tar.gz \

View File

@ -3,6 +3,7 @@
PORTNAME= apr
PORTVERSION= 2.0.${SNAPDATE}
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= LOCAL/ohauer
PKGNAMESUFFIX= 2

View File

@ -3,6 +3,7 @@
PORTNAME= nspr
DISTVERSION= 4.13
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
@ -31,11 +32,7 @@ post-build-TEST-on:
@${LN} -fs libmy.so.1 ${BUILD_WRKSRC}/pr/tests/dll/libmy.so
post-install:
@for file in ${STAGEDIR}${PREFIX}/lib/*.so*; do \
${STRIP_CMD} $$file; \
${CHMOD} ${LIBMODE} $$file; \
${LN} -fs $${file##*/} $${file%.*}; \
done
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
do-test-TEST-on:
${TEST_WRKSRC}/lib/tests/string

View File

@ -1,25 +0,0 @@
--- configure.orig 2015-10-16 13:22:19 UTC
+++ configure
@@ -6674,11 +6674,8 @@ tools are selected during the Xcode/Deve
$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
- MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- if test "$MOZ_OBJFORMAT" = "elf"; then
- DLL_SUFFIX=so
- else
- DLL_SUFFIX=so.1.0
+ if test -z "$MOZILLA_CLIENT"; then
+ DLL_SUFFIX=so.1
fi
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
@@ -8332,8 +8329,6 @@ $as_echo "$ac_cv_have_dash_pthreads" >&6
if test "$ac_cv_have_dash_pthread" = "yes"; then
_PTHREAD_LDFLAGS="-pthread"
- else
- _PTHREAD_LDFLAGS="-lc_r"
fi
;;
*-netbsd*)

View File

@ -80,14 +80,11 @@ include/nspr/prtrace.h
include/nspr/prtypes.h
include/nspr/prvrsion.h
include/nspr/prwin16.h
lib/libnspr4.a
lib/libnspr4.so
lib/libnspr4.so.1
lib/libplc4.a
lib/libplc4.so
lib/libplc4.so.1
lib/libplds4.a
lib/libplds4.so
lib/libplds4.so.1
@(,,444) lib/libnspr4.a
@(,,444) lib/libnspr4.so
@(,,444) lib/libplc4.a
@(,,444) lib/libplc4.so
@(,,444) lib/libplds4.a
@(,,444) lib/libplds4.so
libdata/pkgconfig/nspr.pc
share/aclocal/nspr.m4

View File

@ -2,7 +2,7 @@
PORTNAME= libreoffice
PORTVERSION= 5.0.6
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES+= editors
MAINTAINER= office@FreeBSD.org

View File

@ -2,7 +2,7 @@
PORTNAME= libreoffice
PORTVERSION= 4.3.7
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= editors
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
http://dev-www.libreoffice.org/extern/:ext \

View File

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \

View File

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \

View File

@ -3,6 +3,7 @@
PORTNAME= curl
PORTVERSION= 7.50.3
PORTREVISION= 1
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet

View File

@ -2,7 +2,7 @@
PORTNAME= 0ad
PORTVERSION= 0.0.20
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/zero-ad/releases \
http://releases.wildfiregames.com/

View File

@ -3,6 +3,7 @@
PORTNAME= oolite
PORTVERSION= 1.84
PORTREVISION= 1
CATEGORIES= games gnustep
MASTER_SITES= http://github.com/OoliteProject/oolite/releases/download/1.84/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= gnash
PORTVERSION= 0.8.10
PORTREVISION= 16
PORTREVISION= 17
CATEGORIES= graphics
MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/

View File

@ -2,6 +2,7 @@
PORTNAME= bitlbee
PORTVERSION= 3.4.2
PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://get.bitlbee.org/src/ \
LOCAL/brix

View File

@ -3,7 +3,7 @@
PORTNAME= spidermonkey17
DISTVERSION= 1.7.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= MOZILLA/js
DISTNAME= js-${DISTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= spidermonkey170
PORTVERSION= 17.0.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= MOZILLA/js
DISTNAME= mozjs${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= spidermonkey185
PORTVERSION= 1.8.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= MOZILLA/js
DISTNAME= js185-1.0.0

View File

@ -3,7 +3,7 @@
PORTNAME= spidermonkey24
PORTVERSION= 24.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= MOZILLA/js
#http://people.mozilla.org/~sstangl/

View File

@ -3,7 +3,7 @@
PORTNAME= evolution
PORTVERSION= 3.18.5.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

View File

@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 45.4.0
PORTREVISION= 1
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

View File

@ -2,7 +2,7 @@
PORTNAME= xiphos
PORTVERSION= 3.1.6
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= misc gnome
MASTER_SITES= SF/gnomesword/Xiphos/${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= gxine
PORTVERSION= 0.5.908
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME?= libpurple
PORTVERSION= 2.11.0
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= net-im
MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION}

View File

@ -3,6 +3,7 @@
PORTNAME= pidgin-sipe
PORTVERSION= 1.21.1
PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= SF/sipe/sipe/${DISTNAME}

View File

@ -3,6 +3,7 @@
PORTNAME= ring-gnome
PORTVERSION= 0.160516
PORTREVISION= 1
#DISTVERSIONPREFIX= v
CATEGORIES= net-im net-p2p

View File

@ -3,7 +3,7 @@
PORTNAME= corosync
PORTVERSION= 2.3.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://build.clusterlabs.org/corosync/releases/

View File

@ -3,6 +3,7 @@
PORTNAME= ldapsdk
PORTVERSION= 6.0.7
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= MOZILLA/directory/c-sdk/releases/v${PORTVERSION}/src

View File

@ -3,6 +3,7 @@
PORTNAME= libfprint
PORTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://people.freedesktop.org/~hadess/

View File

@ -3,6 +3,7 @@
PORTNAME= nss
PORTVERSION= 3.27.1
PORTREVISION= 1
#DISTVERSIONSUFFIX= -with-ckbi-1.98
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
@ -89,7 +90,7 @@ do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss
${FIND} ${DIST}/public/nss -type l \
-exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \;
${INSTALL_LIB} ${BINS}/lib/*.so.1 \
${INSTALL_LIB} ${BINS}/lib/*.so \
${STAGEDIR}${PREFIX}/lib/nss
${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
${STAGEDIR}${PREFIX}/lib/nss
@ -97,8 +98,6 @@ do-install:
${INSTALL_PROGRAM} ${BINS}/bin/${bin} \
${STAGEDIR}${PREFIX}/bin
.endfor
cd ${BINS}/lib && \
${TAR} -cf - *.so | ${TAR} --unlink -C ${STAGEDIR}${PREFIX}/lib/nss -xf -
${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig

View File

@ -30,25 +30,16 @@
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -70,15 +85,15 @@
@@ -46,7 +56,11 @@ else
DLL_SUFFIX = so.1.0
endif
ARCH = freebsd
-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
+ifndef MOZILLA_CLIENT
+DLL_SUFFIX = so.1
+endif
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX = so
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
else
-DLL_SUFFIX = so.1.0
+else
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
endif
-
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+endif
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif

View File

@ -1,12 +0,0 @@
--- coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007
+++ coreconf/rules.mk Fri Mar 23 10:15:46 2007
@@ -114,6 +114,9 @@
endif
ifdef SHARED_LIBRARY
$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
+ifndef MOZILLA_CLIENT
+ ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
+endif
ifdef MOZ_DEBUG_SYMBOLS
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)

View File

@ -123,21 +123,12 @@ include/nss/nss/utilparst.h
include/nss/nss/utilrename.h
lib/nss/libcrmf.a
lib/nss/libfreebl3.so
lib/nss/libfreebl3.so.1
lib/nss/libfreeblpriv3.so
lib/nss/libfreeblpriv3.so.1
lib/nss/libnss3.so
lib/nss/libnss3.so.1
lib/nss/libnssckbi.so
lib/nss/libnssckbi.so.1
lib/nss/libnssdbm3.so
lib/nss/libnssdbm3.so.1
lib/nss/libnssutil3.so
lib/nss/libnssutil3.so.1
lib/nss/libsmime3.so
lib/nss/libsmime3.so.1
lib/nss/libsoftokn3.so
lib/nss/libsoftokn3.so.1
lib/nss/libssl3.so
lib/nss/libssl3.so.1
libdata/pkgconfig/nss.pc

View File

@ -2,6 +2,7 @@
PORTNAME= nss_compat_ossl
PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= security devel
MASTER_SITES= http://rcritten.fedorapeople.org/

View File

@ -3,7 +3,7 @@
PORTNAME= pidgin
PORTVERSION= 3.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}-encrypt/Releases/${PORTVERSION}
PKGNAMESUFFIX= -encryption

View File

@ -3,7 +3,7 @@
PORTNAME= sssd
PORTVERSION= 1.11.7
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= https://fedorahosted.org/released/${PORTNAME}/ \
http://mirrors.rit.edu/zi/

View File

@ -3,7 +3,7 @@
PORTNAME= suricata
PORTVERSION= 3.1.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.openinfosecfoundation.org/download/

View File

@ -3,6 +3,7 @@
PORTNAME= xmlsec1
PORTVERSION= 1.2.22
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \
ftp://ftp.aleksey.com/pub/xmlsec/releases/ \

View File

@ -3,7 +3,7 @@
PORTNAME= cinnamon-settings-daemon
PORTVERSION= 2.4.3
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils gnome
DIST_SUBDIR= gnome3

View File

@ -3,7 +3,7 @@
PORTNAME= gnome-settings-daemon
PORTVERSION= 3.18.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

View File

@ -3,6 +3,7 @@
PORTNAME= mate-settings-daemon
PORTVERSION= 1.12.1
PORTREVISION= 1
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate

View File

@ -3,6 +3,7 @@
PORTNAME= pesign
PORTVERSION= 0.110
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= ports@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= chromium
PORTVERSION= 52.0.2743.116
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on

View File

@ -3,7 +3,7 @@
PORTNAME= elinks
DISTVERSION= 0.11.7
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= http://elinks.or.cz/download/

View File

@ -3,7 +3,7 @@
PORTNAME= epiphany
PORTVERSION= 3.16.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

View File

@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 45.4.0
DISTVERSIONSUFFIX=esr.source
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \

View File

@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 49.0
DISTVERSIONSUFFIX=.source
PORTREVISION= 7
PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

View File

@ -3,6 +3,7 @@
PORTNAME= gecko-mediaplayer
PORTVERSION= 1.0.9
PORTREVISION= 1
CATEGORIES= www multimedia gnome
MASTER_SITES= https://pkgs.rpmfusion.org/repo/pkgs/free/gecko-mediaplayer/gecko-mediaplayer-1.0.9.tar.gz/69b50ecbbbf34ca6d980a477345dbd40/

View File

@ -3,7 +3,7 @@
PORTNAME= libxul
DISTVERSION= 45.4.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source

View File

@ -4,6 +4,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.40
MOZILLA_VER= 43 # above + 3
PORTREVISION= 1
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

View File

@ -3,7 +3,7 @@
PORTNAME= gdm
PORTVERSION= 3.16.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3