[arch-commits] Commit in nss/trunk (PKGBUILD nss-config.xml nss.pc.in)
Jan Steffens
heftig at archlinux.org
Sat Jun 25 22:32:21 UTC 2016
Date: Saturday, June 25, 2016 @ 22:32:21
Author: heftig
Revision: 270653
3.25-1
Added:
nss/trunk/nss-config.xml
Modified:
nss/trunk/PKGBUILD
nss/trunk/nss.pc.in
----------------+
PKGBUILD | 42 ++++++++++-------
nss-config.xml | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
nss.pc.in | 2
3 files changed, 159 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-06-25 17:43:20 UTC (rev 270652)
+++ PKGBUILD 2016-06-25 22:32:21 UTC (rev 270653)
@@ -3,28 +3,32 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
-pkgver=3.24
-pkgrel=2
-pkgdesc="Mozilla Network Security Services"
+pkgver=3.25
+pkgrel=1
+pkgdesc="Network Security Services"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/"
license=('MPL' 'GPL')
_nsprver=4.12
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
-makedepends=('perl' 'python2')
+makedepends=('perl' 'python2' 'xmlto' 'docbook-xsl')
options=('!strip' '!makeflags' 'staticlibs')
source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
- certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed'
+ certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml legacy-certs.patch)
+sha256sums=('5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359'
'2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
- 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+ 'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
+ '98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
'5f793af9c8558324e4188163862e0e70a5b069a44ad9e7817e0767093739f2a0')
prepare() {
mkdir certs
+ echo -n "$(date +"%e %B %Y")" >date.xml
+ echo -n "$pkgver" >version.xml
+
cd nss-$pkgver
# Still needed - Evolution (Camel) and Telepathy-Gabble (Wocky) use
@@ -41,6 +45,8 @@
build() {
+ xmlto man nss-config.xml
+
cd certs
python2 ../certdata2pem.py
@@ -56,17 +62,19 @@
export NSPR_LIB_DIR="`nspr-config --libdir`"
export XCFLAGS="${CFLAGS}"
- [ "$CARCH" = "x86_64" ] && export USE_64=1
+ [[ $CARCH == x86_64 ]] && export USE_64=1
make -C coreconf
make -C lib/dbm
make
+ make clean_docs build_docs
}
package_nss() {
cd nss-$pkgver
- install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
+ install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig,share/man/man1}
+
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}')
@@ -92,16 +100,18 @@
> "$pkgdir/usr/bin/nss-config"
chmod 755 "$pkgdir/usr/bin/nss-config"
- cd dist/*.OBJ/bin
- install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
+ install -t "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1 ../nss-config.1
+ cd dist
+ install -t "$pkgdir/usr/include/nss" -m644 public/nss/*.h
+
+ cd *.OBJ/bin
+ install -t "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver ssltap vfychain vfyserv
+
cd ../lib
install -t "$pkgdir/usr/lib" *.so
- install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk
+ install -t "$pkgdir/usr/lib" -m644 *.chk libcrmf.a
- cd ../../public/nss
- install -t "$pkgdir/usr/include/nss" -m644 *.h
-
rm "$pkgdir/usr/lib/libnssckbi.so"
ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
}
Added: nss-config.xml
===================================================================
--- nss-config.xml (rev 0)
+++ nss-config.xml 2016-06-25 22:32:21 UTC (rev 270653)
@@ -0,0 +1,132 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY date SYSTEM "date.xml">
+<!ENTITY version SYSTEM "version.xml">
+]>
+
+<refentry id="nss-config">
+
+ <refentryinfo>
+ <date>&date;</date>
+ <title>Network Security Services</title>
+ <productname>nss</productname>
+ <productnumber>&version;</productnumber>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>nss-config</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>nss-config</refname>
+ <refpurpose>Return meta information about nss libraries</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>nss-config</command>
+ <arg><option>--prefix</option></arg>
+ <arg><option>--exec-prefix</option></arg>
+ <arg><option>--includedir</option></arg>
+ <arg><option>--libs</option></arg>
+ <arg><option>--cflags</option></arg>
+ <arg><option>--libdir</option></arg>
+ <arg><option>--version</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<refsection id="description">
+ <title>Description</title>
+
+ <para><command>nss-config</command> is a shell scrip
+ tool which can be used to obtain gcc options for building client pacakges of nspt. </para>
+
+ </refsection>
+
+ <refsection>
+ <title>Options</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>--prefix</option></term>
+ <listitem><simpara>Returns the top level system directory under which the nss libraries are installed.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--exec-prefix</option></term>
+ <listitem><simpara>returns the top level system directory under which any nss binaries would be installed.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--includedir</option> <replaceable>count</replaceable></term>
+ <listitem><simpara>returns the path to the directory were the nss libraries are installed.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem><simpara>returns the upstream version of nss in the form major_version-minor_version-patch_version.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--libs</option></term>
+ <listitem><simpara>returns the compiler linking flags.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--cflags</option></term>
+ <listitem><simpara>returns the compiler include flags.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--libdir</option></term>
+ <listitem><simpara>returns the path to the directory were the nss libraries are installed.</simpara></listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsection>
+
+ <refsection>
+ <title>Examples</title>
+
+ <para>The following example will query for both include path and linkage flags:
+
+ <programlisting>
+ /usr/bin/nss-config --cflags --libs
+ </programlisting>
+
+ </para>
+
+
+ </refsection>
+
+ <refsection>
+ <title>Files</title>
+
+ <para><filename>/usr/bin/nss-config</filename></para>
+
+ </refsection>
+
+ <refsection>
+ <title>See also</title>
+ <para>pkg-config(1)</para>
+ </refsection>
+
+ <refsection id="authors">
+ <title>Authors</title>
+ <para>The nss liraries were written and maintained by developers with Netscape, Red Hat, Sun, Oracle, Mozilla, and Google.</para>
+ <para>
+ Authors: Elio Maldonado <emaldona at redhat.com>.
+ </para>
+ </refsection>
+
+<!-- don't change -->
+ <refsection id="license">
+ <title>LICENSE</title>
+ <para>Licensed under the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ </para>
+ </refsection>
+
+</refentry>
+
Modified: nss.pc.in
===================================================================
--- nss.pc.in 2016-06-25 17:43:20 UTC (rev 270652)
+++ nss.pc.in 2016-06-25 22:32:21 UTC (rev 270653)
@@ -7,5 +7,5 @@
Description: Network Security Services
Version: %NSS_VERSION%
Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
Cflags: -I${includedir}
More information about the arch-commits
mailing list