Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11047151
D2008.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D2008.diff
View Options
diff --git a/abi_used_libs32 b/abi_used_libs32
--- a/abi_used_libs32
+++ b/abi_used_libs32
@@ -7,4 +7,3 @@
libpthread.so.0
libsqlite3.so.0
libstdc++.so.6
-libz.so.1
diff --git a/files/nss-3.34.1-standalone-1.patch b/files/nss-3.35-standalone-1.patch
rename from files/nss-3.34.1-standalone-1.patch
rename to files/nss-3.35-standalone-1.patch
--- a/files/nss-3.34.1-standalone-1.patch
+++ b/files/nss-3.35-standalone-1.patch
@@ -5,6 +5,7 @@
Origin: Self, rediffed for nss-3.28.
Description: Adds auto-generated nss.pc and nss-config script, and
allows building without nspr in the source tree.
+ For 3.35, Requires: updated to nspr >= 4.18.
diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
--- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600
@@ -231,7 +232,7 @@
+Name: NSS
+Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.10
++Requires: nspr >= 4.18
+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 --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : libnss
-version : 3.34.1
-release : 21
+version : 3.36.1
+release : 23
source :
- - https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_34_1_RTM/src/nss-3.34.1.tar.gz : a3c15d367caf784f33d96dbafbdffc16a8e42fb8c8aedfce97bf92a9f918dda0
+ - https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_36_1_RTM/src/nss-3.36.1.tar.gz : 6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff
license :
- GPL-2.0
- LGPL-2.1
@@ -18,14 +18,14 @@
- pkgconfig32(sqlite3)
- pkgconfig32(zlib)
patterns :
- - 32bit-devel:
+ - 32bit-devel :
- /usr/lib32/nss/lib*.a
- /usr/lib32/*.a
- - devel:
+ - devel :
- /usr/lib64/nss/lib*.a
- /usr/lib64/*.a
setup : |
- %patch -p1 < $pkgfiles/nss-3.34.1-standalone-1.patch
+ %patch -p1 < $pkgfiles/nss-3.35-standalone-1.patch
build : |
export BUILD_OPT=1
export NSPR_INCLUDE_DIR="/usr/include/nspr"
@@ -36,9 +36,7 @@
export USE_64=1
fi
- pushd nss
- make nss_build_all -j1
- popd
+ make nss_build_all -C nss -j1
install : |
if [[ -z "${EMUL32BUILD}" ]]; then
mkdir -p $installdir/usr/bin
@@ -48,15 +46,9 @@
fi
# Headers
- install -d -m00755 $installdir/usr/include/nss
- for f in dist/public/nss/*.h dist/private/nss/*.h; do
- install -m00644 ${f} $installdir/usr/include/nss
- done
+ install -D -m00644 dist/{public,private}/nss/*.h -t $installdir/usr/include/nss
- install -d -m00755 $installdir/%libdir%/nss
- for f in *.a *.chk *.so; do
- install dist/Linux*/lib/${f} $installdir/%libdir%/nss
- done
+ install -D -m00644 dist/Linux*/lib/*.{a,chk,so} -t $installdir%libdir%/nss
# Install nss.pc
install -D -m00644 dist/Linux*/lib/pkgconfig/nss.pc $installdir/%libdir%/pkgconfig/nss.pc
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -48,7 +48,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="21">libnss</Dependency>
+ <Dependency release="23">libnss</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/</Path>
@@ -62,8 +62,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="21">libnss-devel</Dependency>
- <Dependency release="21">libnss-32bit</Dependency>
+ <Dependency release="23">libnss-devel</Dependency>
+ <Dependency release="23">libnss-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/*.a</Path>
@@ -78,7 +78,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="21">libnss</Dependency>
+ <Dependency release="23">libnss</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -88,12 +88,12 @@
</Files>
</Package>
<History>
- <Update release="21">
- <Date>2017-12-13</Date>
- <Version>3.34.1</Version>
+ <Update release="23">
+ <Date>2018-04-12</Date>
+ <Version>3.36.1</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Aug 11, 2:53 PM (3 h, 8 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5802626
Default Alt Text
D2008.diff (4 KB)
Attached To
Mode
D2008: Update libnss to 3.36.1
Attached
Detach File
Event Timeline
Log In to Comment