rpms/libnss
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 3.55-1mamba;Thu Aug 06 2020]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-06 05:13:02 +01:00
parent 332d41dcbd
commit 16b329e967
2 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
libnss-3.27.1-standalone-1.patch → libnss-3.55-standalone-1.patch
View File

@ -1,16 +1,20 @@
Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> Submitted By: Xi Ruoyao <xry111_AT_mengyan1223_DOT_wang>
Date: 2015-11-10 Date: 2020-05-31
Initial Package Version: 3.21 Initial Package Version: 3.12.4
Upstream Status: Not applicable Upstream Status: Not applicable
Origin: Based on dj's original patch, rediffed and Origin: Self, rediffed for nss-3.53.
modified for 3.15 by Armin K.
<krejzi at email dot com>
Description: Adds auto-generated nss.pc and nss-config script, and Description: Adds auto-generated nss.pc and nss-config script, and
allows building without nspr in the source tree. allows building without nspr in the source tree.
For 3.40.1, Requires: updated to nspr >= 4.20.
For 3.46.1, Requires: updated to nspr >= 4.21.
For 3.48, Requires: updated to nspr >= 4.24.
For 3.51.1, Requires: updated to nspr >= 4.25.
For 3.54, Requires: updated to nspr >= 4.26.
For 3.55, Requires: updated to nspr >= 4.27.
diff -Naur nss-3.21.orig/nss/config/Makefile nss-3.21/nss/config/Makefile diff -Nuar nss-3.53.orig/nss/config/Makefile nss-3.53/nss/config/Makefile
--- nss-3.21.orig/nss/config/Makefile 1969-12-31 21:00:00.000000000 -0300 --- nss-3.53.orig/nss/config/Makefile 1970-01-01 08:00:00.000000000 +0800
+++ nss-3.21/nss/config/Makefile 2015-11-10 12:54:49.358835857 -0300 +++ nss-3.53/nss/config/Makefile 2020-05-31 13:48:14.423566855 +0800
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+CORE_DEPTH = .. +CORE_DEPTH = ..
+DEPTH = .. +DEPTH = ..
@ -52,9 +56,9 @@ diff -Naur nss-3.21.orig/nss/config/Makefile nss-3.21/nss/config/Makefile
+ +
+dummy: all export libs +dummy: all export libs
+ +
diff -Naur nss-3.21.orig/nss/config/nss-config.in nss-3.21/nss/config/nss-config.in diff -Nuar nss-3.53.orig/nss/config/nss-config.in nss-3.53/nss/config/nss-config.in
--- nss-3.21.orig/nss/config/nss-config.in 1969-12-31 21:00:00.000000000 -0300 --- nss-3.53.orig/nss/config/nss-config.in 1970-01-01 08:00:00.000000000 +0800
+++ nss-3.21/nss/config/nss-config.in 2015-11-10 12:54:49.359835835 -0300 +++ nss-3.53/nss/config/nss-config.in 2020-05-31 13:48:14.424566860 +0800
@@ -0,0 +1,153 @@ @@ -0,0 +1,153 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -209,9 +213,9 @@ diff -Naur nss-3.21.orig/nss/config/nss-config.in nss-3.21/nss/config/nss-config
+ echo $libdirs + echo $libdirs
+fi +fi
+ +
diff -Naur nss-3.21.orig/nss/config/nss.pc.in nss-3.21/nss/config/nss.pc.in diff -Nuar nss-3.53.orig/nss/config/nss.pc.in nss-3.53/nss/config/nss.pc.in
--- nss-3.21.orig/nss/config/nss.pc.in 1969-12-31 21:00:00.000000000 -0300 --- nss-3.53.orig/nss/config/nss.pc.in 1970-01-01 08:00:00.000000000 +0800
+++ nss-3.21/nss/config/nss.pc.in 2015-11-10 12:54:49.359835835 -0300 +++ nss-3.53/nss/config/nss.pc.in 2020-05-31 13:48:14.424566860 +0800
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+prefix=@prefix@ +prefix=@prefix@
+exec_prefix=@exec_prefix@ +exec_prefix=@exec_prefix@
@ -221,28 +225,44 @@ diff -Naur nss-3.21.orig/nss/config/nss.pc.in nss-3.21/nss/config/nss.pc.in
+Name: NSS +Name: NSS
+Description: Network Security Services +Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
+Requires: nspr >= 4.8 +Requires: nspr >= 4.27
+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ +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} +Cflags: -I${includedir}
+ +
diff -Naur nss-3.21.orig/nss/Makefile nss-3.21/nss/Makefile diff -Nuar nss-3.53.orig/nss/Makefile nss-3.53/nss/Makefile
--- nss-3.21.orig/nss/Makefile 2015-11-09 02:12:59.000000000 -0300 --- nss-3.53.orig/nss/Makefile 2020-05-30 04:34:42.000000000 +0800
+++ nss-3.21/nss/Makefile 2015-11-10 12:54:49.359835835 -0300 +++ nss-3.53/nss/Makefile 2020-05-31 13:48:51.500733022 +0800
@@ -46,7 +46,7 @@ @@ -4,6 +4,8 @@
# (7) Execute "local" rules. (OPTIONAL). # # 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: build_nspr all nss_build_all:
+nss_build_all: all - $(MAKE) build_nspr
$(MAKE) all
$(MAKE) latest
nss_clean_all: clobber_nspr clobber nss_clean_all:
- $(MAKE) clobber_nspr
$(MAKE) clobber
diff -Naur nss-3.21.orig/nss/manifest.mn nss-3.21/nss/manifest.mn NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
--- nss-3.21.orig/nss/manifest.mn 2015-11-09 02:12:59.000000000 -0300 diff -Nuar nss-3.53.orig/nss/manifest.mn nss-3.53/nss/manifest.mn
+++ nss-3.21/nss/manifest.mn 2015-11-10 12:59:22.439784449 -0300 --- nss-3.53.orig/nss/manifest.mn 2020-05-30 04:34:42.000000000 +0800
@@ -10,4 +10,4 @@ +++ nss-3.53/nss/manifest.mn 2020-05-31 13:48:30.652640413 +0800
@@ -10,7 +10,7 @@
RELEASE = nss RELEASE = nss
-DIRS = coreconf lib cmd external_tests -DIRS = coreconf lib cmd cpputil gtests
+DIRS = coreconf lib cmd external_tests config +DIRS = coreconf lib cmd cpputil gtests config
lib: coreconf
cmd: lib

15
libnss.spec
View File

@ -6,7 +6,7 @@
%define with_test 0 %define with_test 0
%define with_nsspem 0 %define with_nsspem 0
Name: libnss Name: libnss
Version: 3.52.1 Version: 3.55
Release: 1mamba Release: 1mamba
Summary: Network Security Services Summary: Network Security Services
Group: System/Libraries Group: System/Libraries
@ -32,7 +32,7 @@ Source9: setup-nsssysinit.sh
#%endif #%endif
Patch4: libnss-3.12.9-enable-pem.patch Patch4: libnss-3.12.9-enable-pem.patch
Patch10: libnss-3.15.1-opt_flags.patch Patch10: libnss-3.15.1-opt_flags.patch
Patch15: libnss-3.27.1-standalone-1.patch Patch15: libnss-3.55-standalone-1.patch
License: GPL, MPL 1.1, LGPL License: GPL, MPL 1.1, LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -97,6 +97,8 @@ Requires: sed
%description sysinit %description sysinit
Default Operating System module that manages applications loading NSS globally on the system. This module loads the system defined PKCS #11 modules for NSS and chains with other NSS modules to load any system or user configured modules. Default Operating System module that manages applications loading NSS globally on the system. This module loads the system defined PKCS #11 modules for NSS and chains with other NSS modules to load any system or user configured modules.
%debug_package
%prep %prep
%setup -q -n nss-%{version} %setup -q -n nss-%{version}
#-D -T #-D -T
@ -107,7 +109,7 @@ mv nss-pem-%{version}/nss/lib/ckfw/pem/ nss/lib/ckfw/
%patch4 -p3 %patch4 -p3
%endif %endif
%patch10 -p0 %patch10 -p0
#%patch15 -p1 %patch15 -p1
#%ifarch x86_64 #%ifarch x86_64
#sed -i "s|/lib,|/lib64,|" nss/config/Makefile #sed -i "s|/lib,|/lib64,|" nss/config/Makefile
@ -233,8 +235,8 @@ ln -s nss3 %{buildroot}%{_includedir}/nss
%{_libdir}/libfreebl3.chk %{_libdir}/libfreebl3.chk
%{_libdir}/libfreeblpriv3.chk %{_libdir}/libfreeblpriv3.chk
%{_libdir}/libfreeblpriv3.so %{_libdir}/libfreeblpriv3.so
%{_libdir}/libgtest1.so #%{_libdir}/libgtest1.so
%{_libdir}/libgtestutil.so #%{_libdir}/libgtestutil.so
%{_libdir}/libnss3.so %{_libdir}/libnss3.so
%{_libdir}/libnssckbi.so %{_libdir}/libnssckbi.so
%{_libdir}/libnssdbm3.so %{_libdir}/libnssdbm3.so
@ -277,6 +279,9 @@ ln -s nss3 %{buildroot}%{_includedir}/nss
%{_includedir}/nss3/* %{_includedir}/nss3/*
%changelog %changelog
* Thu Aug 06 2020 Automatic Build System <autodist@mambasoft.it> 3.55-1mamba
- automatic version update by autodist
* Wed May 20 2020 Automatic Build System <autodist@mambasoft.it> 3.52.1-1mamba * Wed May 20 2020 Automatic Build System <autodist@mambasoft.it> 3.52.1-1mamba
- automatic version update by autodist - automatic version update by autodist