nss begin
This commit is contained in:
aliriza committed
1 parent
227a1523ab
commit
8431c6695d
4 files changed
+403
No files matched your search
@@ -0,0 +1,266 @@
|
|||||||
|
Submitted By: Xi Ruoyao <xry111_AT_mengyan1223_DOT_wang>
|
||||||
|
Date: 2020-08-22
|
||||||
|
Initial Package Version: 3.12.4
|
||||||
|
Upstream Status: Not applicable
|
||||||
|
Origin: Self, adjusted for nss-3.56.
|
||||||
|
Description: Adds auto-generated nss.pc and nss-config script, and
|
||||||
|
allows building without nspr in the source tree.
|
||||||
|
Minimum NSPR version is now read out from package,
|
||||||
|
instead of hardcoded value in the patch.
|
||||||
|
|
||||||
|
diff --color -uNar nss-3.55.orig/nss/config/Makefile nss-3.55/nss/config/Makefile
|
||||||
|
--- nss-3.55.orig/nss/config/Makefile 1970-01-01 08:00:00.000000000 +0800
|
||||||
|
+++ nss-3.55/nss/config/Makefile 2020-07-25 19:34:36.272982957 +0800
|
||||||
|
@@ -0,0 +1,42 @@
|
||||||
|
+CORE_DEPTH = ..
|
||||||
|
+DEPTH = ..
|
||||||
|
+
|
||||||
|
+include $(CORE_DEPTH)/coreconf/config.mk
|
||||||
|
+
|
||||||
|
+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||||
|
+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||||
|
+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||||
|
+NSS_NSPR_MINIMUM = `head -n1 ../automation/release/nspr-version.txt`
|
||||||
|
+PREFIX = /usr
|
||||||
|
+
|
||||||
|
+all: export libs
|
||||||
|
+
|
||||||
|
+export:
|
||||||
|
+ # Create the nss.pc file
|
||||||
|
+ mkdir -p $(DIST)/lib/pkgconfig
|
||||||
|
+ sed -e "s,@prefix@,$(PREFIX)," \
|
||||||
|
+ -e "s,@exec_prefix@,\$${prefix}," \
|
||||||
|
+ -e "s,@libdir@,\$${prefix}/lib," \
|
||||||
|
+ -e "s,@includedir@,\$${prefix}/include/nss," \
|
||||||
|
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
|
||||||
|
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
|
||||||
|
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
|
||||||
|
+ -e "s,@NSS_NSPR_MINIMUM@,$(NSS_NSPR_MINIMUM)," \
|
||||||
|
+ nss.pc.in > nss.pc
|
||||||
|
+ chmod 0644 nss.pc
|
||||||
|
+ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
|
||||||
|
+
|
||||||
|
+ # Create the nss-config script
|
||||||
|
+ mkdir -p $(DIST)/bin
|
||||||
|
+ sed -e "s,@prefix@,$(PREFIX)," \
|
||||||
|
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
|
||||||
|
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
|
||||||
|
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
|
||||||
|
+ nss-config.in > nss-config
|
||||||
|
+ chmod 0755 nss-config
|
||||||
|
+ ln -sf ../../../nss/config/nss-config $(DIST)/bin
|
||||||
|
+
|
||||||
|
+libs:
|
||||||
|
+
|
||||||
|
+dummy: all export libs
|
||||||
|
+
|
||||||
|
diff --color -uNar nss-3.55.orig/nss/config/nss-config.in nss-3.55/nss/config/nss-config.in
|
||||||
|
--- nss-3.55.orig/nss/config/nss-config.in 1970-01-01 08:00:00.000000000 +0800
|
||||||
|
+++ nss-3.55/nss/config/nss-config.in 2020-07-25 19:32:37.239032214 +0800
|
||||||
|
@@ -0,0 +1,153 @@
|
||||||
|
+#!/bin/sh
|
||||||
|
+
|
||||||
|
+prefix=@prefix@
|
||||||
|
+
|
||||||
|
+major_version=@NSS_MAJOR_VERSION@
|
||||||
|
+minor_version=@NSS_MINOR_VERSION@
|
||||||
|
+patch_version=@NSS_PATCH_VERSION@
|
||||||
|
+
|
||||||
|
+usage()
|
||||||
|
+{
|
||||||
|
+ cat <<EOF
|
||||||
|
+Usage: nss-config [OPTIONS] [LIBRARIES]
|
||||||
|
+Options:
|
||||||
|
+ [--prefix[=DIR]]
|
||||||
|
+ [--exec-prefix[=DIR]]
|
||||||
|
+ [--includedir[=DIR]]
|
||||||
|
+ [--libdir[=DIR]]
|
||||||
|
+ [--version]
|
||||||
|
+ [--libs]
|
||||||
|
+ [--cflags]
|
||||||
|
+Dynamic Libraries:
|
||||||
|
+ nss
|
||||||
|
+ nssutil
|
||||||
|
+ smime
|
||||||
|
+ ssl
|
||||||
|
+ softokn
|
||||||
|
+EOF
|
||||||
|
+ exit $1
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+if test $# -eq 0; then
|
||||||
|
+ usage 1 1>&2
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+lib_nss=yes
|
||||||
|
+lib_nssutil=yes
|
||||||
|
+lib_smime=yes
|
||||||
|
+lib_ssl=yes
|
||||||
|
+lib_softokn=yes
|
||||||
|
+
|
||||||
|
+while test $# -gt 0; do
|
||||||
|
+ case "$1" in
|
||||||
|
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
|
||||||
|
+ *) optarg= ;;
|
||||||
|
+ esac
|
||||||
|
+
|
||||||
|
+ case $1 in
|
||||||
|
+ --prefix=*)
|
||||||
|
+ prefix=$optarg
|
||||||
|
+ ;;
|
||||||
|
+ --prefix)
|
||||||
|
+ echo_prefix=yes
|
||||||
|
+ ;;
|
||||||
|
+ --exec-prefix=*)
|
||||||
|
+ exec_prefix=$optarg
|
||||||
|
+ ;;
|
||||||
|
+ --exec-prefix)
|
||||||
|
+ echo_exec_prefix=yes
|
||||||
|
+ ;;
|
||||||
|
+ --includedir=*)
|
||||||
|
+ includedir=$optarg
|
||||||
|
+ ;;
|
||||||
|
+ --includedir)
|
||||||
|
+ echo_includedir=yes
|
||||||
|
+ ;;
|
||||||
|
+ --libdir=*)
|
||||||
|
+ libdir=$optarg
|
||||||
|
+ ;;
|
||||||
|
+ --libdir)
|
||||||
|
+ echo_libdir=yes
|
||||||
|
+ ;;
|
||||||
|
+ --version)
|
||||||
|
+ echo ${major_version}.${minor_version}.${patch_version}
|
||||||
|
+ ;;
|
||||||
|
+ --cflags)
|
||||||
|
+ echo_cflags=yes
|
||||||
|
+ ;;
|
||||||
|
+ --libs)
|
||||||
|
+ echo_libs=yes
|
||||||
|
+ ;;
|
||||||
|
+ nss)
|
||||||
|
+ lib_nss=yes
|
||||||
|
+ ;;
|
||||||
|
+ nssutil)
|
||||||
|
+ lib_nssutil=yes
|
||||||
|
+ ;;
|
||||||
|
+ smime)
|
||||||
|
+ lib_smime=yes
|
||||||
|
+ ;;
|
||||||
|
+ ssl)
|
||||||
|
+ lib_ssl=yes
|
||||||
|
+ ;;
|
||||||
|
+ softokn)
|
||||||
|
+ lib_softokn=yes
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ usage 1 1>&2
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ shift
|
||||||
|
+done
|
||||||
|
+
|
||||||
|
+# Set variables that may be dependent upon other variables
|
||||||
|
+if test -z "$exec_prefix"; then
|
||||||
|
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
|
||||||
|
+fi
|
||||||
|
+if test -z "$includedir"; then
|
||||||
|
+ includedir=`pkg-config --variable=includedir nss`
|
||||||
|
+fi
|
||||||
|
+if test -z "$libdir"; then
|
||||||
|
+ libdir=`pkg-config --variable=libdir nss`
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test "$echo_prefix" = "yes"; then
|
||||||
|
+ echo $prefix
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test "$echo_exec_prefix" = "yes"; then
|
||||||
|
+ echo $exec_prefix
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test "$echo_includedir" = "yes"; then
|
||||||
|
+ echo $includedir
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test "$echo_libdir" = "yes"; then
|
||||||
|
+ echo $libdir
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test "$echo_cflags" = "yes"; then
|
||||||
|
+ echo -I$includedir
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test "$echo_libs" = "yes"; then
|
||||||
|
+ libdirs="-L$libdir"
|
||||||
|
+ if test -n "$lib_nss"; then
|
||||||
|
+ libdirs="$libdirs -lnss${major_version}"
|
||||||
|
+ fi
|
||||||
|
+ if test -n "$lib_nssutil"; then
|
||||||
|
+ libdirs="$libdirs -lnssutil${major_version}"
|
||||||
|
+ fi
|
||||||
|
+ if test -n "$lib_smime"; then
|
||||||
|
+ libdirs="$libdirs -lsmime${major_version}"
|
||||||
|
+ fi
|
||||||
|
+ if test -n "$lib_ssl"; then
|
||||||
|
+ libdirs="$libdirs -lssl${major_version}"
|
||||||
|
+ fi
|
||||||
|
+ if test -n "$lib_softokn"; then
|
||||||
|
+ libdirs="$libdirs -lsoftokn${major_version}"
|
||||||
|
+ fi
|
||||||
|
+ echo $libdirs
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
diff --color -uNar nss-3.55.orig/nss/config/nss.pc.in nss-3.55/nss/config/nss.pc.in
|
||||||
|
--- nss-3.55.orig/nss/config/nss.pc.in 1970-01-01 08:00:00.000000000 +0800
|
||||||
|
+++ nss-3.55/nss/config/nss.pc.in 2020-07-25 19:33:05.958889937 +0800
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
+libdir=@libdir@
|
||||||
|
+includedir=@includedir@
|
||||||
|
+
|
||||||
|
+Name: NSS
|
||||||
|
+Description: Network Security Services
|
||||||
|
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
|
||||||
|
+Requires: nspr >= @NSS_NSPR_MINIMUM@
|
||||||
|
+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
|
||||||
|
+Cflags: -I${includedir}
|
||||||
|
+
|
||||||
|
diff --color -uNar nss-3.55.orig/nss/Makefile nss-3.55/nss/Makefile
|
||||||
|
--- nss-3.55.orig/nss/Makefile 2020-07-24 23:10:32.000000000 +0800
|
||||||
|
+++ nss-3.55/nss/Makefile 2020-07-25 19:32:37.239032214 +0800
|
||||||
|
@@ -4,6 +4,8 @@
|
||||||
|
# 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/.
|
||||||
|
|
||||||
|
+default: nss_build_all
|
||||||
|
+
|
||||||
|
#######################################################################
|
||||||
|
# (1) Include initial platform-independent assignments (MANDATORY). #
|
||||||
|
#######################################################################
|
||||||
|
@@ -48,12 +50,10 @@
|
||||||
|
#######################################################################
|
||||||
|
|
||||||
|
nss_build_all:
|
||||||
|
- $(MAKE) build_nspr
|
||||||
|
$(MAKE) all
|
||||||
|
$(MAKE) latest
|
||||||
|
|
||||||
|
nss_clean_all:
|
||||||
|
- $(MAKE) clobber_nspr
|
||||||
|
$(MAKE) clobber
|
||||||
|
|
||||||
|
NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
|
||||||
|
diff --color -uNar nss-3.55.orig/nss/manifest.mn nss-3.55/nss/manifest.mn
|
||||||
|
--- nss-3.55.orig/nss/manifest.mn 2020-07-24 23:10:32.000000000 +0800
|
||||||
|
+++ nss-3.55/nss/manifest.mn 2020-07-25 19:32:37.240032237 +0800
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
RELEASE = nss
|
||||||
|
|
||||||
|
-DIRS = coreconf lib cmd cpputil gtests
|
||||||
|
+DIRS = coreconf lib cmd cpputil gtests config
|
||||||
|
|
||||||
|
lib: coreconf
|
||||||
|
cmd: lib
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
name='nss'
|
||||||
|
release='1'
|
||||||
|
version='3.87'
|
||||||
|
url='https://archive.mozilla.org/pub/security/nss/releases/'
|
||||||
|
description='Network Security Service libraries'
|
||||||
|
email='aliriza.keskin@pardus.org.tr'
|
||||||
|
maintainer='aliriza'
|
||||||
|
license=('GPLv3')
|
||||||
|
source=("https://archive.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/nss-3.87.tar.gz"
|
||||||
|
"nss-3.87-standalone-1.patch")
|
||||||
|
depends=(nspr)
|
||||||
|
makedepends=(gyp)
|
||||||
|
md5sums=('9bfacbd8a080b0aa0a7672ca643c440b'
|
||||||
|
'SKIP')
|
||||||
|
group=()
|
||||||
|
uses=()
|
||||||
|
arch=('x86_64')
|
||||||
|
|
||||||
|
cd $name-$version/$name
|
||||||
|
|
||||||
|
prepare(){
|
||||||
|
cd ..
|
||||||
|
patch -Np1 -i ../nss-3.87-standalone-1.patch
|
||||||
|
}
|
||||||
|
|
||||||
|
build(){
|
||||||
|
./build.sh \
|
||||||
|
--target x64 \
|
||||||
|
--opt \
|
||||||
|
--enable-libpkix \
|
||||||
|
--system-sqlite \
|
||||||
|
--system-nspr \
|
||||||
|
--disable-tests
|
||||||
|
}
|
||||||
|
|
||||||
|
package(){
|
||||||
|
local nsprver="$(pkg-config --modversion nspr)"
|
||||||
|
local libdir=/usr/lib
|
||||||
|
|
||||||
|
sed nss/pkg/pkg-config/nss.pc.in \
|
||||||
|
-e "s,%libdir%,$libdir,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" |
|
||||||
|
install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc"
|
||||||
|
|
||||||
|
ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc"
|
||||||
|
|
||||||
|
install -Dt "$pkgdir$libdir" dist/Release/lib/*.so
|
||||||
|
|
||||||
|
local vmajor vminor vpatch
|
||||||
|
{ read vmajor; read vminor; read vpatch; } \
|
||||||
|
< <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h)
|
||||||
|
|
||||||
|
sed nss/pkg/pkg-config/nss-config.in \
|
||||||
|
-e "s,@libdir@,$libdir,g" \
|
||||||
|
-e "s,@prefix@,/usr/bin,g" \
|
||||||
|
-e "s,@exec_prefix@,/usr/bin,g" \
|
||||||
|
-e "s,@includedir@,/usr/include/nss,g" \
|
||||||
|
-e "s,@MOD_MAJOR_VERSION@,$vmajor,g" \
|
||||||
|
-e "s,@MOD_MINOR_VERSION@,$vminor,g" \
|
||||||
|
-e "s,@MOD_PATCH_VERSION@,$vpatch,g" |
|
||||||
|
install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
|
||||||
|
|
||||||
|
install -Dt "$pkgdir/usr/bin" \
|
||||||
|
dist/Release/bin/{*util,shlibsign,signtool,signver,ssltap}
|
||||||
|
|
||||||
|
install -Dt "$pkgdir/usr/include/nss" -m644 dist/public/nss/*.h
|
||||||
|
|
||||||
|
install -Dt "$pkgdir/usr/share/man/man1" -m644 \
|
||||||
|
nss/doc/nroff/{*util,signtool,signver,ssltap}.1
|
||||||
|
|
||||||
|
# Replace built-in trust with p11-kit connection
|
||||||
|
ln -s pkcs11/p11-kit-trust.so "$pkgdir$libdir/p11-kit-trust.so"
|
||||||
|
ln -sf p11-kit-trust.so "$pkgdir$libdir/libnssckbi.so"
|
||||||
|
install -Dm644 ca-bundle.trust.p11-kit \
|
||||||
|
"$pkgdir/usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit"
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
name='py3-six'
|
||||||
|
release='1'
|
||||||
|
version='1.16.0'
|
||||||
|
url='https://salsa.debian.org/python-team/packages/six'
|
||||||
|
description='Python 2 and 3 compatibility library'
|
||||||
|
email='aliriza.keskin@pardus.org.tr'
|
||||||
|
maintainer='aliriza'
|
||||||
|
license=('GPLv3')
|
||||||
|
source=("https://salsa.debian.org/python-team/packages/six/-/archive/debian/$version-5/six-debian-$version-5.tar.gz")
|
||||||
|
depends=(python)
|
||||||
|
makedepends=()
|
||||||
|
md5sums=('bc3e3ae290356f4f6623ce03c9499956')
|
||||||
|
group=(dev.python)
|
||||||
|
uses=()
|
||||||
|
arch=('x86_64')
|
||||||
|
|
||||||
|
cd six-debian-$version-5
|
||||||
|
|
||||||
|
build(){
|
||||||
|
python setup.py build
|
||||||
|
}
|
||||||
|
|
||||||
|
package(){
|
||||||
|
python setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
name='gyp'
|
||||||
|
release='1'
|
||||||
|
version='20220404'
|
||||||
|
url='https://salsa.debian.org/python-team/packages/gyp'
|
||||||
|
description='GYP (Generate Your Projects) meta-build system'
|
||||||
|
email='aliriza.keskin@pardus.org.tr'
|
||||||
|
maintainer='aliriza'
|
||||||
|
license=('GPLv3')
|
||||||
|
source=('https://salsa.debian.org/python-team/packages/gyp/-/archive/debian/0.1+20220404git9ecf45e-2/gyp-debian-0.1+20220404git9ecf45e-2.tar.gz')
|
||||||
|
depends=(py3-six)
|
||||||
|
makedepends=()
|
||||||
|
md5sums=('07aa8e6d6fdfd2791d3963bcc6c57288')
|
||||||
|
group=(dev.util)
|
||||||
|
uses=()
|
||||||
|
arch=('x86_64')
|
||||||
|
|
||||||
|
cd $name-debian-0.1+20220404git9ecf45e-2
|
||||||
|
|
||||||
|
build(){
|
||||||
|
python setup.py build
|
||||||
|
}
|
||||||
|
|
||||||
|
package(){
|
||||||
|
python setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
|
||||||
|
}
|
||||||
|
|
||||||
Reference in new issue
Block a user