Commit e836709e authored by Luca Giambonini's avatar Luca Giambonini

nss 3.15.1 and nspr 4.10 update

parent eef9cf1c
......@@ -4,7 +4,7 @@
_pkgbasename=nspr
pkgname=lib32-$_pkgbasename
pkgver=4.9.5
pkgver=4.10
pkgrel=1
pkgdesc="Netscape Portable Runtime (32-bit)"
arch=('x86_64')
......@@ -13,45 +13,29 @@ license=('MPL' 'GPL')
depends=('lib32-glibc' $_pkgbasename=$pkgver)
makedepends=('zip' 'gcc-multilib')
options=(!emptydirs)
source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz
nspr.pc.in)
md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd'
'bce1611f3117b53fc904cab549c09967')
source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz)
md5sums=('f5466def95726b3c900d8a0227bdd034')
build() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"
unset CFLAGS
unset CXXFLAGS
./mozilla/nsprpub/configure \
./nspr/configure \
--prefix=/usr \
--libdir=/usr/lib32 \
--includedir=/usr/include/nspr \
--enable-optimize \
--disable-debug ${confflags}
--disable-debug \
--enable-32bit
make
NSPR_LIBS=`./config/nspr-config --libs`
NSPR_CFLAGS=`./config/nspr-config --cflags`
NSPR_VERSION=`./config/nspr-config --version`
install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib32," \
-e "s,%prefix%,/usr," \
-e "s,%exec_prefix%,/usr/bin," \
-e "s,%includedir%,/usr/include/nspr," \
-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${srcdir}/nspr.pc"
}
package() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -D "${srcdir}/nspr.pc" "${pkgdir}"/usr/lib32/pkgconfig/nspr.pc
chmod 644 "${pkgdir}/usr/lib32/pkgconfig/nspr.pc"
ln -sf nspr.pc "${pkgdir}/usr/lib32/pkgconfig/mozilla-nspr.pc"
chmod 644 ${pkgdir}/usr/lib32/*.a
chmod 644 "$pkgdir"/usr/lib32/*.a
ln -s nspr.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nspr.pc"
rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
"$pkgdir/usr/include/nspr/md"
rm -rf "${pkgdir}"/usr/{bin,share,include}
}
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%
Name: NSPR
Description: The Netscape Portable Runtime
Version: %NSPR_VERSION%
Libs: %FULL_NSPR_LIBS%
Cflags: %FULL_NSPR_CFLAGS%
......@@ -4,84 +4,75 @@
_pkgbasename=nss
pkgname=lib32-${_pkgbasename}
pkgver=3.14.3
pkgver=3.15.1
pkgrel=1
pkgdesc="Mozilla Network Security Services (32-bit)"
arch=('x86_64')
url="http://www.mozilla.org/projects/security/pki/nss/"
license=('MPL' 'GPL')
_nsprver=4.9.5
_nsprver=4.10
depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "${_pkgbasename}" 'lib32-zlib')
makedepends=('gcc-multilib' 'perl')
options=('!strip')
options=('!strip' '!makeflags')
source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
nss.pc.in
ssl-renegotiate-transitional.patch
add_spi+cacert_ca_certs.patch)
sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c'
sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0'
'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
'8a964a744ba098711b80c0d279a2993524e8eb92'
'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
build() {
cd "${srcdir}"/${_pkgbasename}-${pkgver}/mozilla
prepare() {
cd "${srcdir}"/${_pkgbasename}-${pkgver}/
# Add CAcert and spi-inc.org CA certificates.
# See http://wiki.cacert.org/NSSLib for how to generate
patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
# Adds transitional SSL renegotiate support - patch from Debian
patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
patch -Np3 -i "${srcdir}/ssl-renegotiate-transitional.patch"
# Respect LDFLAGS
sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-i security/coreconf/rules.mk
# see https://bugzilla.mozilla.org/show_bug.cgi?id=683266 - this step can be dropped now
# CaCert Wiki page should be updated to reflect these changes how to add the certificates
# for now the first patch should still do it
-i nss/coreconf/rules.mk
}
# Generate certdata.c from certdata.txt
#cd security/nss/lib/ckfw/builtins
#make generate
cd "${srcdir}"/${_pkgbasename}-${pkgver}
build(){
cd "${srcdir}"/${_pkgbasename}-${pkgver}/$_pkgbasename
export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
export BUILD_OPT=1
export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSS_USE_SYSTEM_SQLITE=1
export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
export NSS_ENABLE_ECC=1
export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
export NSPR_LIB_DIR="`nspr-config --libdir`"
export XCFLAGS="${CFLAGS}"
make -j 1 -C mozilla/security/coreconf
make -j 1 -C mozilla/security/dbm
make -j 1 -C mozilla/security/nss
make -C coreconf
make -C lib/dbm
make
}
package() {
cd "${srcdir}"/${_pkgbasename}-${pkgver}
install -m755 -d "${pkgdir}"/usr/lib32/pkgconfig
#install -m755 -d "${pkgdir}"/usr/bin
sed "${srcdir}"/nss.pc.in -e "s,%libdir%,/usr/lib32,g" \
-e "s,%prefix%,/usr,g" \
-e "s,%exec_prefix%,/usr/bin,g" \
-e "s,%includedir%,/usr/include/nss,g" \
-e "s,%NSPR_VERSION%,${_pkgver},g" \
-e "s,%NSS_VERSION%,${_pkgver},g" > \
"${pkgdir}"/usr/lib32/pkgconfig/nss.pc
ln -sf nss.pc "${pkgdir}"/usr/lib32/pkgconfig/mozilla-nss.pc
chmod 644 "${pkgdir}"/usr/lib32/pkgconfig/*.pc
NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}')
NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}')
sed $srcdir/nss.pc.in \
-e "s,%libdir%,/usr/lib32,g" \
-e "s,%prefix%,/usr,g" \
-e "s,%exec_prefix%,/usr/bin,g" \
-e "s,%includedir%,/usr/include/nss,g" \
-e "s,%NSPR_VERSION%,${_nsprver},g" \
-e "s,%NSS_VERSION%,${pkgver},g" \
> "$pkgdir/usr/lib32/pkgconfig/nss.pc"
ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
do
install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}"/usr/lib32/
done
install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}"/usr/lib32/
install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}"/usr/lib32/
cd "${srcdir}"/${_pkgbasename}-${pkgver}/dist/*.OBJ/lib
install -t "$pkgdir/usr/lib32" *.so
install -t "$pkgdir/usr/lib32" -m644 libcrmf.a *.chk
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment