0108-libnss-revert-to-3.48-due-to-compiler-issues.patch 5.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145
  1. diff --git a/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch b/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch
  2. new file mode 100644
  3. index 0000000000..95e7b2bb56
  4. --- /dev/null
  5. +++ b/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch
  6. @@ -0,0 +1,26 @@
  7. +From 2e1b003600156e4adcb88998eabf18addee45be1 Mon Sep 17 00:00:00 2001
  8. +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
  9. +Date: Sun, 8 Dec 2019 11:57:45 +0100
  10. +Subject: [PATCH] Bug 1602288 - Fix build failure due to missing posix signal.h
  11. +
  12. +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
  13. +---
  14. + nss/coreconf/Linux.mk | 2 +-
  15. + 1 file changed, 1 insertion(+), 1 deletion(-)
  16. +
  17. +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
  18. +index d07f8a3c5..854d3ca96 100644
  19. +--- a/nss/coreconf/Linux.mk
  20. ++++ b/nss/coreconf/Linux.mk
  21. +@@ -21,7 +21,7 @@ ifeq ($(USE_PTHREADS),1)
  22. + endif
  23. +
  24. + DEFAULT_COMPILER = gcc
  25. +-DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE
  26. ++DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE
  27. +
  28. + ifeq ($(OS_TARGET),Android)
  29. + ifndef ANDROID_NDK
  30. +--
  31. +2.20.1
  32. +
  33. diff --git a/package/libnss/0002-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch b/package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch
  34. similarity index 100%
  35. rename from package/libnss/0002-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch
  36. rename to package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch
  37. diff --git a/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
  38. new file mode 100644
  39. index 0000000000..631d97d11f
  40. --- /dev/null
  41. +++ b/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
  42. @@ -0,0 +1,29 @@
  43. +From 1ba8516045bc8a13fd72e1a85206a04b29d96758 Mon Sep 17 00:00:00 2001
  44. +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
  45. +Date: Thu, 12 Dec 2019 12:57:29 +0100
  46. +Subject: [PATCH] Bug 1603398 - Fix nsinstall.c build failure on RHEL 7
  47. +
  48. +In Linux.mk -DLINUX and -Dlinux must be passed to DEFINES, not
  49. +OS_CFLAGS.
  50. +
  51. +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
  52. +---
  53. + nss/coreconf/Linux.mk | 2 +-
  54. + 1 file changed, 1 insertion(+), 1 deletion(-)
  55. +
  56. +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
  57. +index d07f8a3c5..4b45a6054 100644
  58. +--- a/nss/coreconf/Linux.mk
  59. ++++ b/nss/coreconf/Linux.mk
  60. +@@ -132,7 +132,7 @@ endif
  61. +
  62. + OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DHAVE_STRERROR
  63. + ifeq ($(KERNEL),Linux)
  64. +- OS_CFLAGS += -DLINUX -Dlinux
  65. ++ DEFINES += -DLINUX -Dlinux
  66. + endif
  67. + OS_LIBS = $(OS_PTHREAD) -ldl -lc
  68. +
  69. +--
  70. +2.20.1
  71. +
  72. diff --git a/package/libnss/0005-Bug-1606119-Fix-PPC-HW-Crypto-build-failure.patch b/package/libnss/0005-Bug-1606119-Fix-PPC-HW-Crypto-build-failure.patch
  73. new file mode 100644
  74. index 0000000000..03ca25edf7
  75. --- /dev/null
  76. +++ b/package/libnss/0005-Bug-1606119-Fix-PPC-HW-Crypto-build-failure.patch
  77. @@ -0,0 +1,36 @@
  78. +From ebf185f8e48b5aec622dc949cef1b19b0a7669ef Mon Sep 17 00:00:00 2001
  79. +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
  80. +Date: Wed, 1 Jan 2020 12:54:45 +0100
  81. +Subject: [PATCH] Bug 1606119 - Fix PPC HW Crypto build failure
  82. +
  83. +All Altivec *_be() functions are supported from gcc version 8.x not 5.x
  84. +so modify gcc version check that at the moment cause build failure due
  85. +to missing Altivec *_be() functions.
  86. +
  87. +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
  88. +Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=1606119
  89. +---
  90. + nss/lib/freebl/gcm.h | 4 ++--
  91. + 1 file changed, 2 insertions(+), 2 deletions(-)
  92. +
  93. +diff --git a/nss/lib/freebl/gcm.h b/nss/lib/freebl/gcm.h
  94. +index 571b9ec55..aa4dee824 100644
  95. +--- a/nss/lib/freebl/gcm.h
  96. ++++ b/nss/lib/freebl/gcm.h
  97. +@@ -41,11 +41,11 @@
  98. + #endif
  99. +
  100. + /*
  101. +- * PPC CRYPTO requires at least gcc 5 or clang. The LE check is purely
  102. ++ * PPC CRYPTO requires at least gcc 8 or clang. The LE check is purely
  103. + * because it's only been tested on LE. If you're interested in BE,
  104. + * please send a patch.
  105. + */
  106. +-#if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 5)) && \
  107. ++#if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 8)) && \
  108. + defined(IS_LITTLE_ENDIAN)
  109. + #define USE_PPC_CRYPTO
  110. + #endif
  111. +--
  112. +2.20.1
  113. +
  114. diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash
  115. index d87ad8e3ab..b53fc6d5f0 100644
  116. --- a/package/libnss/libnss.hash
  117. +++ b/package/libnss/libnss.hash
  118. @@ -1,4 +1,4 @@
  119. # From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_48_RTM/src/SHA256SUMS
  120. -sha256 6738094dc4fd63061118a122bf3999a64fe8c7117fc52f6e81c2279181bde71d nss-3.49.tar.gz
  121. +sha256 3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac nss-3.48.tar.gz
  122. # Locally calculated
  123. sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING
  124. diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
  125. index 61950ade25..68389d46fc 100644
  126. --- a/package/libnss/libnss.mk
  127. +++ b/package/libnss/libnss.mk
  128. @@ -4,7 +4,7 @@
  129. #
  130. ################################################################################
  131. -LIBNSS_VERSION = 3.49
  132. +LIBNSS_VERSION = 3.48
  133. LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
  134. LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
  135. LIBNSS_DISTDIR = dist
  136. @@ -68,7 +68,7 @@ define LIBNSS_BUILD_CMDS
  137. SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
  138. DIST=$(@D)/$(LIBNSS_DISTDIR) \
  139. CHECKLOC= \
  140. - $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX"
  141. + $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS)"
  142. endef
  143. define LIBNSS_INSTALL_STAGING_CMDS