$ git diff --patch-with-stat --summary 1d3797c45d36ee6f00328fa7325b7863e36bb941..0b2292f570b103fd2faf9a1cb1a0a518256a4bfd

 .abf.yml         |  2 +-
 nss-539183.patch | 62 -------------------------------------------------
 nss.spec         | 70 +++++++++++++++++++++++---------------------------------
 3 files changed, 29 insertions(+), 105 deletions(-)
 delete mode 100644 nss-539183.patch

diff --git a/.abf.yml b/.abf.yml
index bfb7299..e312034 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -3,5 +3,5 @@ sources:
   blank-cert8.db: d272a7b58364862613d44261c5744f7a336bf177
   blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5
   blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50
-  nss-3.76.tar.gz: 8f5ef75def770148741bcc02d7ad83b2a763acb5
+  nss-3.80.tar.gz: dca79a894243d23dbdf49edd8cb5c65ee060ef4a
   verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5
diff --git a/nss-539183.patch b/nss-539183.patch
deleted file mode 100644
index eda3249..0000000
--- a/nss-539183.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- ./nss/cmd/httpserv/httpserv.c.539183	2016-05-21 18:31:39.879585420 -0700
-+++ ./nss/cmd/httpserv/httpserv.c	2016-05-21 18:37:22.374464057 -0700
-@@ -953,23 +953,23 @@
- getBoundListenSocket(unsigned short port)
- {
-     PRFileDesc *listen_sock;
-     int listenQueueDepth = 5 + (2 * maxThreads);
-     PRStatus prStatus;
-     PRNetAddr addr;
-     PRSocketOptionData opt;
- 
--    addr.inet.family = PR_AF_INET;
--    addr.inet.ip = PR_INADDR_ANY;
--    addr.inet.port = PR_htons(port);
-+    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
-+        errExit("PR_SetNetAddr");
-+    }
- 
--    listen_sock = PR_NewTCPSocket();
-+    listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
-     if (listen_sock == NULL) {
--        errExit("PR_NewTCPSocket");
-+        errExit("PR_OpenTCPSockett");
-     }
- 
-     opt.option = PR_SockOpt_Nonblocking;
-     opt.value.non_blocking = PR_FALSE;
-     prStatus = PR_SetSocketOption(listen_sock, &opt);
-     if (prStatus < 0) {
-         PR_Close(listen_sock);
-         errExit("PR_SetSocketOption(PR_SockOpt_Nonblocking)");
---- ./nss/cmd/selfserv/selfserv.c.539183	2016-05-21 18:31:39.882585367 -0700
-+++ ./nss/cmd/selfserv/selfserv.c	2016-05-21 18:41:43.092801174 -0700
-@@ -1711,23 +1711,23 @@
- getBoundListenSocket(unsigned short port)
- {
-     PRFileDesc *listen_sock;
-     int listenQueueDepth = 5 + (2 * maxThreads);
-     PRStatus prStatus;
-     PRNetAddr addr;
-     PRSocketOptionData opt;
- 
--    addr.inet.family = PR_AF_INET;
--    addr.inet.ip = PR_INADDR_ANY;
--    addr.inet.port = PR_htons(port);
-+    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
-+        errExit("PR_SetNetAddr");
-+    }
- 
--    listen_sock = PR_NewTCPSocket();
-+    listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
-     if (listen_sock == NULL) {
--        errExit("PR_NewTCPSocket");
-+        errExit("PR_OpenTCPSocket error");
-     }
- 
-     opt.option = PR_SockOpt_Nonblocking;
-     opt.value.non_blocking = PR_FALSE;
-     prStatus = PR_SetSocketOption(listen_sock, &opt);
-     if (prStatus < 0) {
-         PR_Close(listen_sock);
-         errExit("PR_SetSocketOption(PR_SockOpt_Nonblocking)");
diff --git a/nss.spec b/nss.spec
index a49fecc..33661e8 100644
--- a/nss.spec
+++ b/nss.spec
@@ -24,7 +24,7 @@
 Summary:	Network Security Services
 Name:		nss
 Epoch:		1
-Version:	3.76
+Version:	3.80
 Release:	1
 Group:		System/Libraries
 License:	MPL or GPLv2+ or LGPLv2+
@@ -59,7 +59,6 @@ Source101:	https://github.com/demoiselle/certificate/raw/master/impl/ca-icp-bras
 # From Fedora
 Patch0:		https://src.fedoraproject.org/rpms/nss/raw/master/f/add-relro-linker-option.patch
 Patch1:		https://src.fedoraproject.org/rpms/nss/raw/master/f/renegotiate-transitional.patch
-Patch2:		https://src.fedoraproject.org/rpms/nss/raw/master/f/nss-539183.patch
 Patch3:		https://src.fedoraproject.org/rpms/nss/raw/master/f/utilwrap-include-templates.patch
 Patch4:		https://src.fedoraproject.org/rpms/nss/raw/master/f/nss-skip-bltest-and-fipstest.patch
 Patch5:		https://src.fedoraproject.org/rpms/nss/raw/master/f/iquote.patch
@@ -68,7 +67,7 @@ Patch8:		https://src.fedoraproject.org/rpms/nss/raw/master/f/nss-skip-util-gtest
 
 BuildRequires:	rootcerts >= 1:20120218.00
 BuildRequires:	zip
-BuildRequires:	pkgconfig(nspr)
+BuildRequires:	pkgconfig(nspr) >= 4.34.0
 BuildRequires:	pkgconfig(sqlite3)
 BuildRequires:	pkgconfig(zlib)
 
@@ -179,7 +178,7 @@ rm nss/lib/sqlite/*.{c,h}
 %set_build_flags
 export CC=%{__cc}
 export BUILD_OPT=1
-export OPTIMIZER="%{optflags}"
+export OPTIMIZER="%{optflags} -O3"
 export XCFLAGS="%{optflags} -Wno-error"
 export ARCHFLAG="$LDFLAGS"
 export LIBDIR=%{_libdir}
@@ -302,24 +301,13 @@ cp -aL bin/* %{buildroot}%{_bindir}
 
 %if %{with lib}
 mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}/%{_lib}
 mkdir -p %{buildroot}%{_includedir}/nss
 
-cp -aL lib/libcrmf.a \
-            lib/libnss.a \
-            lib/libnssb.a \
-            lib/libnssckfw.a \
-            lib/libnssutil.a \
-            lib/libsmime.a \
-            lib/libssl.a \
-            %{buildroot}%{_libdir}
+cp -aL lib/libcrmf.a lib/libnss.a lib/libnssb.a lib/libnssckfw.a lib/libnssutil.a lib/libsmime.a lib/libssl.a %{buildroot}%{_libdir}
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libfreeblpriv3.so libnss3.so libnssutil3.so \
-            libssl3.so libsmime3.so libnssdbm3.so
-do
-  install -m 755 lib/$file %{buildroot}/%{_lib}
-  ln -sf ../../%{_lib}/$file %{buildroot}%{_libdir}/$file
+for file in libsoftokn3.so libfreebl3.so libfreeblpriv3.so libnss3.so libnssutil3.so libssl3.so libsmime3.so libnssdbm3.so; do
+  install -m 755 lib/$file %{buildroot}%{_libdir}
 done
 
 # Copy the include files we want
@@ -327,24 +315,23 @@ cp -aL ../public/nss/* %{buildroot}%{_includedir}/nss
 
 # Copy some freebl include files we also want
 for file in blapi.h alghmac.h cmac.h; do
-	pwd
-	install -p -m 644 ../private/nss/$file $RPM_BUILD_ROOT/%{_includedir}/nss
+    pwd
+    install -p -m 644 ../private/nss/$file %{buildroot}%{_includedir}/nss
 done
 
 # Copy the static freebl library
 for file in libfreebl.a; do
-	install -p -m 644 ../*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+    install -p -m 644 ../*.OBJ/lib/$file %{buildroot}%{_libdir}
 done
 
 
-ln -s %{_libdir}/pkcs11/p11-kit-trust.so %{buildroot}/%{_lib}/libnssckbi.so
+ln -s %{_libdir}/pkcs11/p11-kit-trust.so %{buildroot}/%{_libdir}/libnssckbi.so
 
 # These ghost files will be generated in the post step
 # Make sure chk files can be found in both places
 for file in libsoftokn3.chk libfreebl3.chk
 do
-  touch %{buildroot}/%{_lib}/$file
-  ln -s ../../%{_lib}/$file %{buildroot}%{_libdir}/$file
+  touch %{buildroot}/%{_libdir}/$file
 done
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
@@ -432,7 +419,7 @@ install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pki/nssdb/secmod.db
 
 %if %{build_empty}
 # install the empty libnssckbi.so library (use alternatives?)
-install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
+install -m0755 libnssckbi_empty.so %{buildroot}/%{_libdir}/libnssckbi_empty.so
 %endif
 
 %if %{with lib}
@@ -447,11 +434,11 @@ local f2 = "libfreebl" .. major .. ".chk"
 local f3 = "libfreeblpriv" .. major .. ".chk"
 
 -- check if we are 64bit
-	libcheck = posix.stat("/lib64")
+	libcheck = posix.stat("/usr/lib64")
 	if libcheck then
-		libpath = "/lib64"
+		libpath = "/usr/lib64"
 	else
-		libpath = "/lib"
+		libpath = "/usr/lib"
 	end
 
  -- list of files to iterate
@@ -549,25 +536,25 @@ end
 
 %if %with lib
 %files -n %{libfreebl}
-/%{_lib}/libfreebl%{major}.so
-/%{_lib}/libfreeblpriv%{major}.so
-/%{_lib}/libsoftokn%{major}.so
-/%{_lib}/libnssckbi.so
+%{_libdir}/libfreebl%{major}.so
+%{_libdir}/libfreeblpriv%{major}.so
+%{_libdir}/libsoftokn%{major}.so
+%{_libdir}/libnssckbi.so
 
 %defattr(0644,root,root,0755)
-%ghost /%{_lib}/libfreebl%{major}.chk
-%ghost /%{_lib}/libsoftokn%{major}.chk
-%ghost /%{_lib}/libfreeblpriv%{major}.chk
+%ghost %{_libdir}/libfreebl%{major}.chk
+%ghost %{_libdir}/libsoftokn%{major}.chk
+%ghost %{_libdir}/libfreeblpriv%{major}.chk
 
 %files -n %{libname}
-/%{_lib}/libnss%{major}.so
+%{_libdir}/libnss%{major}.so
 %if %{build_empty}
-/%{_lib}/libnssckbi_empty.so
+%{_libdir}/libnssckbi_empty.so
 %endif
-/%{_lib}/libnssutil%{major}.so
-/%{_lib}/libnssdbm%{major}.so
-/%{_lib}/libsmime%{major}.so
-/%{_lib}/libssl%{major}.so
+%{_libdir}/libnssutil%{major}.so
+%{_libdir}/libnssdbm%{major}.so
+%{_libdir}/libsmime%{major}.so
+%{_libdir}/libssl%{major}.so
 
 %files -n %{devname}
 %attr(0755,root,root) %{_bindir}/nss-config
@@ -589,4 +576,3 @@ end
 %{_libdir}/libssl.a
 %{_libdir}/libfreebl.a
 %endif
-