17 Haziran Güncellemeleri
This commit is contained in:
1 parent
4665a3ea78
commit
b5175ab600
8 files changed
+299
-33
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
|
||||
@@ -1,18 +1,17 @@
|
||||
#!/usr/bin/env bash
|
||||
name='nss'
|
||||
release='1'
|
||||
version='3.87'
|
||||
release='2'
|
||||
version='3.90'
|
||||
_version='3_90'
|
||||
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")
|
||||
source=("https://archive.mozilla.org/pub/security/nss/releases/NSS_${_version}_RTM/src/nss-${version}.tar.gz" "nss-${version}-standalone-1.patch")
|
||||
depends=(nspr)
|
||||
makedepends=(gyp)
|
||||
md5sums=('9bfacbd8a080b0aa0a7672ca643c440b'
|
||||
'SKIP')
|
||||
md5sums=('d83c24d03fb4f9a7f688b5d7c6938972' 'SKIP')
|
||||
group=(dev.libs)
|
||||
uses=()
|
||||
arch=('x86_64')
|
||||
@@ -21,7 +20,7 @@ cd $name-$version/$name
|
||||
|
||||
prepare(){
|
||||
cd ..
|
||||
patch -Np1 -i ../nss-3.87-standalone-1.patch
|
||||
patch -Np1 -i ../nss-${version}-standalone-1.patch
|
||||
}
|
||||
|
||||
build(){
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
#!/usr/bin/env bash
|
||||
name='py3-pygments'
|
||||
release='1'
|
||||
version='2.14.0'
|
||||
release='2'
|
||||
version='2.15.1'
|
||||
url='https://pypi.org/project/Pygments'
|
||||
description='Pygments is a syntax highlighting package written in Python.'
|
||||
email='aliriza.keskin@pardus.org.tr'
|
||||
maintainer='aliriza'
|
||||
license=('GPLv3')
|
||||
source=('https://files.pythonhosted.org/packages/da/6a/c427c06913204e24de28de5300d3f0e809933f376e0b7df95194b2bb3f71/Pygments-2.14.0.tar.gz')
|
||||
source=("https://github.com/pygments/pygments/archive/refs/tags/${version}.tar.gz")
|
||||
depends=(python)
|
||||
makedepends=()
|
||||
md5sums=('447be4afb076c8325a7dc659aff5b931')
|
||||
md5sums=('8f3575093e63ffaf2c9b605e35f3286d')
|
||||
group=(dev.python)
|
||||
uses=()
|
||||
arch=('x86_64')
|
||||
|
||||
cd Pygments-$version
|
||||
cd pygments-$version
|
||||
|
||||
build(){
|
||||
python3 setup.py build
|
||||
python -m build --wheel --no-isolation
|
||||
}
|
||||
|
||||
package(){
|
||||
python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
|
||||
python -m installer --destdir="$DESTDIR" dist/*.whl
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
name='py3-setuptools'
|
||||
release='1'
|
||||
version='65.6.3'
|
||||
release='2'
|
||||
version='67.8.0'
|
||||
url='https://pypi.org/project/setuptools/'
|
||||
description='Easily download, build, install, upgrade, and uninstall Python packages'
|
||||
email='aliriza.keskin@pardus.org.tr'
|
||||
maintainer='aliriza'
|
||||
license=('GPLv3')
|
||||
source=("https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884bce3d4951e41e807fc35791c6b23d9a/setuptools-${version}.tar.gz")
|
||||
source=("https://github.com/pypa/setuptools/archive/refs/tags/v${version}.tar.gz")
|
||||
depends=(python)
|
||||
makedepends=( )
|
||||
md5sums=('1fd8bd04b0bed95ad6c81f03b1c080bc')
|
||||
md5sums=('4036ad7ba388ef0cf2b3a35dba79af62')
|
||||
uses=()
|
||||
group=(dev.python)
|
||||
arch=('x86_64')
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
name='py3-wheel'
|
||||
release='1'
|
||||
version='0.38.4'
|
||||
release='2'
|
||||
version='0.40.0'
|
||||
url='https://pypi.org/project/wheel/'
|
||||
description='A built-package format for Python'
|
||||
email='parduscix@yandex.ru'
|
||||
maintainer='sulincix'
|
||||
license=('GPLv3')
|
||||
source=("https://files.pythonhosted.org/packages/a2/b8/6a06ff0f13a00fc3c3e7d222a995526cbca26c1ad107691b6b1badbbabf1/wheel-$version.tar.gz")
|
||||
source=("https://github.com/pypa/wheel/archive/refs/tags/${version}.tar.gz")
|
||||
depends=(python)
|
||||
makedepends=()
|
||||
md5sums=('83bb4e7bd4d687d398733f341a64ab91')
|
||||
md5sums=('508c46d10686536a647a13937d53259f')
|
||||
group=(dev.python)
|
||||
uses=()
|
||||
arch=('x86_64')
|
||||
@@ -18,10 +18,11 @@ arch=('x86_64')
|
||||
cd wheel-$version
|
||||
|
||||
build(){
|
||||
python3 setup.py build
|
||||
python3 -m build --wheel --no-isolation
|
||||
|
||||
}
|
||||
|
||||
package(){
|
||||
python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
|
||||
python3 -m installer --destdir="$DESTDIR" dist/*.whl
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user