Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (f54dc001d4d7a36a41d9b7710eedaf3655333651)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (f54dc001d4d7a36a41d9b7710eedaf3655333651)
  • Date: Sun, 16 Nov 2008 12:05:22 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

crypto/nss/HISTORY | 5 +++++
crypto/nss/INSTALL | 16 +++-------------
crypto/nss/nss-3.12-config-1.patch | 4 ++--
3 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit f54dc001d4d7a36a41d9b7710eedaf3655333651
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

nss: Returned nss libs to /usr/lib vice /usr/lib/nss
fixes problems with certs

diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 957edac..26825e4 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2008-11-16 George Sherwood <gsherwood AT sourcemage.org>
+ * INSTALL: installing libs to /usr/lib/nss was causing cert
+ problems. Returned them to /usr/lib
+ * nss-3.12-config-1.patch: Moved nss libs to /usr/lib
+
2008-11-15 George Sherwood <gsherwood AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: Added sub depends on 3.12.x branch

diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index b9307f7..e1721e0 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,22 +1,12 @@
cd $SOURCE_DIRECTORY/mozilla/dist &&
install -v -d -m755 $INSTALL_ROOT/usr/lib/nss &&
install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
-install -v -m755 */lib/*.so $INSTALL_ROOT/usr/lib/nss &&
-install -v -m755 */lib/*.chk $INSTALL_ROOT/usr/lib/nss &&
-install -v -m755 */lib/*.a $INSTALL_ROOT/usr/lib/nss &&
+install -v -m755 */lib/*.so $INSTALL_ROOT/usr/lib &&
+install -v -m755 */lib/*.chk $INSTALL_ROOT/usr/lib &&
+install -v -m755 */lib/*.a $INSTALL_ROOT/usr/lib &&
install -v -m755 */bin/* $INSTALL_ROOT/usr/bin &&
install -v -m644 private/nss/*.h $INSTALL_ROOT/usr/include/nss &&
install -v -m644 public/nss/*.h $INSTALL_ROOT/usr/include/nss &&
install -v -m644 public/dbm/*.h $INSTALL_ROOT/usr/include/nss/ &&
-if [[ "$NSS_BRANCH" == "3.11" ]]; then
- NSS_LIB_VER=11
-else
- NSS_LIB_VER=12
-fi &&
-for file in $INSTALL_ROOT/usr/lib/nss/*.so
-do
- mv -v "${file}" "${file}."$NSS_LIB_VER"" &&
- ln -v -s "${file}."$NSS_LIB_VER"" "${file}"
-done &&
install -v -m755 ../security/nss/cmd/disttools/nss-config
$INSTALL_ROOT/usr/bin &&
install -v -m644 ../security/nss/cmd/disttools/nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig
diff --git a/crypto/nss/nss-3.12-config-1.patch
b/crypto/nss/nss-3.12-config-1.patch
index f6ad6b0..723477b 100644
--- a/crypto/nss/nss-3.12-config-1.patch
+++ b/crypto/nss/nss-3.12-config-1.patch
@@ -185,7 +185,7 @@ diff -Naur
nss-3.12-orig/mozilla/security/nss/cmd/disttools/nss-config.in nss-3.
+ includedir=${prefix}/include/nss
+fi
+if test -z "$libdir"; then
-+ libdir=${prefix}/lib/nss
++ libdir=${prefix}/lib
+fi
+
+if test "$echo_prefix" = "yes"; then
@@ -234,7 +234,7 @@ diff -Naur
nss-3.12-orig/mozilla/security/nss/cmd/disttools/nss.pc.in nss-3.12/m
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
-+libdir=/usr/lib/nss
++libdir=/usr/lib
+includedir=/usr/include
+
+Name: NSS



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (f54dc001d4d7a36a41d9b7710eedaf3655333651), George Sherwood, 11/16/2008

Archive powered by MHonArc 2.6.24.

Top of Page