Skip to Content.
Sympa Menu

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

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 (b4053c4cabf9e7496d128d867ac92db334fa50c2)
  • Date: Thu, 13 Nov 2008 15:48:52 -0600

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

crypto/nss/BUILD | 26 +--
crypto/nss/HISTORY | 7 +
crypto/nss/INSTALL | 44 +++---
crypto/nss/PRE_BUILD | 5
crypto/nss/mozilla-nss.pc | 11 -
crypto/nss/nss-3.12-config-1.patch | 246
+++++++++++++++++++++++++++++++++++++
libs/nspr/HISTORY | 5
libs/nspr/INSTALL | 4
libs/nspr/mozilla-nspr.pc | 10 -
libs/nspr/nspr.pc | 10 +
10 files changed, 306 insertions(+), 62 deletions(-)

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

nss: Spell overhauled so that it works as a shared library
more consistently.

commit 6aa86b91ff83c1bb66b06bfb17f9688ace20595c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

nspr: Install pc file nspr.pc vice mozilla-nspr.pc. This
is the desired upstream name.

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 7890063..6a30e08 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -1,30 +1,24 @@
export BUILD_OPT=1 &&
-export SOURCE_PREFIX=$(pwd) &&
export NSS_USE_SYSTEM_SQLITE=1 &&

-# use our CFLAGS and pre-installed NSPR headers
-#echo "OS_CFLAGS += $CFLAGS -I$INSTALL_ROOT/usr/include/nspr"
>>coreconf/Linux.mk &&
-# error in config.mk point one level too far
-#sedit 's|$(CORE_DEPTH)/\.\./dbm|$(CORE_DEPTH)/dbm|g' dbm/src/config.mk &&
-# also use pre-installed NSPR libraries: plc4, plds4
-#find nss/lib -name Makefile | while read __MAKEFILE; do
-# sedit 's#$(DIST)/lib/$(LIB_PREFIX)\(plc4\|plds4\)\.$(LIB_SUFFIX)#-l\1#g'
$__MAKEFILE
-#done &&
persistent_add MAKE_OPTS &&
if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]
then
MAKE_OPTS="USE_64=1"
fi &&

-echo "INCLUDES += -I${ROOT}/usr/include/nspr" >>
$SOURCE_DIRECTORY/mozilla/security/coreconf/headers.mk &&
+cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&

-make_single &&
+echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk &&

-cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
-make $MAKE_OPTS &&
+sed -e 's:$(DIST)/lib:/usr/lib/nspr:' -i location.mk &&

-cd $SOURCE_DIRECTORY/mozilla/security/dbm &&
-make $MAKE_OPTS &&
+make $MAKE_OPTS &&
+
+cd ../dbm &&
+
+make $MAKE_OPTS &&
+
+cd ../nss &&

-cd $SOURCE_DIRECTORY/mozilla/security/nss &&
make $MAKE_OPTS
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 5b67b90..45bbd9f 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,10 @@
+2008-11-12 George Sherwood <gsherwood AT sourcemage.org>
+ * BUILD: Rewrote to install better to be used as shared.
+ * INSTALL: Rewrote install to use nss as shared lib.
+ * PRE_BUILD: Added to apply lfs patch
+ * nss-3.12-config-1.patch: Patch to fix nss-config and nss.pc
+ * mozilla-nss.pc: Removed. Used upstream pc file.
+
2008-11-10 George Sherwood <gsherwood AT sourcemage.org>
* DEPENDS: depends sqlite
* BUILD: Added NSS_USE_SYSTEM_SQLITE=1
diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 65313db..b9307f7 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,24 +1,22 @@
-### cheating to get them all in one place
-cd $SOURCE_DIRECTORY/mozilla/security/nss &&
-make_normal &&
-make $MAKE_OPTS install &&
-
-# copy NSS configuration info
-install --mode=644 $SCRIPT_DIRECTORY/mozilla-nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig/ &&
-sedit "s/VERSION/$VERSION/" $INSTALL_ROOT/usr/lib/pkgconfig/mozilla-nss.pc
&&
-
-# copy header files
-install -d --mode=755 $INSTALL_ROOT/usr/include/nss &&
-find lib -type f -name '*.h' | while read __HEADER; do
- install --mode=644 $__HEADER $INSTALL_ROOT/usr/include/nss/
+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 */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 &&
-
-# there's going to be only one of these directories
-#cd $(find .. -maxdepth 1 -type d -name 'Linux*.OBJ' | head -n 1) &&
-cd $SOURCE_DIRECTORY/Linux*.OBJ &&
-
-# manually do the real install
-cd bin &&
-install --mode=755 * $INSTALL_ROOT/usr/bin/ &&
-cd ../lib &&
-install --mode=755 * $INSTALL_ROOT/usr/lib/
+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/PRE_BUILD b/crypto/nss/PRE_BUILD
new file mode 100755
index 0000000..b9db6e6
--- /dev/null
+++ b/crypto/nss/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
diff --git a/crypto/nss/mozilla-nss.pc b/crypto/nss/mozilla-nss.pc
deleted file mode 100644
index 265c1af..0000000
--- a/crypto/nss/mozilla-nss.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: NSS
-Description: Mozilla Network Security Services
-Version: VERSION
-Requires: mozilla-nspr >= 4.6.0
-Libs: -lnss3 -lsmime3 -lssl3 -lsoftokn3
-Cflags: -I${includedir}/nss
diff --git a/crypto/nss/nss-3.12-config-1.patch
b/crypto/nss/nss-3.12-config-1.patch
new file mode 100644
index 0000000..83c9af5
--- /dev/null
+++ b/crypto/nss/nss-3.12-config-1.patch
@@ -0,0 +1,246 @@
+diff -Naur nss-3.12-orig/mozilla/security/nss/cmd/manifest.mn
nss-3.12/mozilla/security/nss/cmd/manifest.mn
+--- nss-3.12-orig/mozilla/security/nss/cmd/manifest.mn 2007-01-25
13:04:56.000000000 -0600
++++ nss-3.12/mozilla/security/nss/cmd/manifest.mn 2008-11-10
21:50:42.000000000 -0600
+@@ -54,6 +54,7 @@
+ dbtest \
+ derdump \
+ digest \
++ disttools \
+ fipstest \
+ makepqg \
+ ocspclnt \
+diff -Naur nss-3.12-orig/mozilla/security/nss/cmd/disttools/Makefile
nss-3.12/mozilla/security/nss/cmd/disttools/Makefile
+--- nss-3.12-orig/mozilla/security/nss/cmd/disttools/Makefile 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12/mozilla/security/nss/cmd/disttools/Makefile 2008-11-10
22:19:41.000000000 -0600
+@@ -0,0 +1,66 @@
++#! gmake
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License
Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++# DJ Lucas <dj AT linuxfromscratch.org>
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++CORE_DEPTH = ../../..
++
++VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h |
\
++ cut -d\" -f2)
++NSS_VERSION_MAJOR = $(shell echo $(VERSION) | cut -d. -f1)
++NSS_VERSION_MINOR = $(shell echo $(VERSION) | cut -d. -f2)
++NSS_VERSION_PATCH = $(shell echo $(VERSION) | cut -d. -f3)
++
++
++all: export
++
++export:
++ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
++ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
++ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
++ nss-config.in > nss-config
++ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
++ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
++ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
++ nss.pc.in > nss.pc
++
++libs:
++ # Do Nothing
++ echo "Done."
++
++.phony: all export
++
+diff -Naur nss-3.12-orig/mozilla/security/nss/cmd/disttools/nss-config.in
nss-3.12/mozilla/security/nss/cmd/disttools/nss-config.in
+--- nss-3.12-orig/mozilla/security/nss/cmd/disttools/nss-config.in
1969-12-31 18:00:00.000000000 -0600
++++ nss-3.12/mozilla/security/nss/cmd/disttools/nss-config.in 2008-11-10
22:22:13.000000000 -0600
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=/usr
++
++major_version=@NSS_VERSION_MAJOR@
++minor_version=@NSS_VERSION_MINOR@
++patch_version=@NSS_VERSION_PATCH@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ ssl
++ smime
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nssutil=yes
++lib_nss=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=${prefix}
++fi
++if test -z "$includedir"; then
++ includedir=${prefix}/include/nss
++fi
++if test -z "$libdir"; then
++ libdir=${prefix}/lib/nss
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-Wl,-R$libdir -L$libdir"
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+diff -Naur nss-3.12-orig/mozilla/security/nss/cmd/disttools/nss.pc.in
nss-3.12/mozilla/security/nss/cmd/disttools/nss.pc.in
+--- nss-3.12-orig/mozilla/security/nss/cmd/disttools/nss.pc.in 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12/mozilla/security/nss/cmd/disttools/nss.pc.in 2008-11-10
22:06:55.000000000 -0600
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=/usr
++libdir=/usr/lib/nss
++includedir=/usr/include/nss
++
++Name: NSS
++Description: Mozilla Network Security Services
++Version: @NSS_VERSION_MAJOR@.@NSS_VERSION_MINOR@.@NSS_VERSION_PATCH@
++Requires: nspr >= 4.7.0
++Libs: -Wl,-R${libdir} -L${libdir} -lnss3 -lsmime3 -lnssutil3 -lssl3
-lsoftokn3
++Cflags: -I${includedir}/nss
++
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index ee2d2e1..79c7a4d 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,8 @@
+2008-11-13 George Sherwood <gsherwood AT sourcemage.org>
+ * INSTALL: Quit fighting upstream and name pc file nspr.pc
+ * mozilla-nspr.pc: Removed.
+ * nspr.pc: Added. More inline with upstream.
+
2008-11-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 4.7.3

diff --git a/libs/nspr/INSTALL b/libs/nspr/INSTALL
index 41c41c3..6f5e3e4 100755
--- a/libs/nspr/INSTALL
+++ b/libs/nspr/INSTALL
@@ -3,9 +3,9 @@ make install &&

# NSS configuration info
install --mode=755 config/nspr-config $INSTALL_ROOT/usr/bin
&&
-install --mode=644 $SCRIPT_DIRECTORY/mozilla-nspr.pc
$INSTALL_ROOT/usr/lib/pkgconfig/ &&
+install --mode=644 $SCRIPT_DIRECTORY/nspr.pc
$INSTALL_ROOT/usr/lib/pkgconfig/ &&
# setup pkg-config file to have the correct version number
-sedit "s/VERSION/$(config/nspr-config --version)/"
$INSTALL_ROOT/usr/lib/pkgconfig/mozilla-nspr.pc &&
+sedit "s/VERSION/$(config/nspr-config --version)/"
$INSTALL_ROOT/usr/lib/pkgconfig/nspr.pc &&

# manually do the real install, keeping in mind that most of these files are
symlinks
cd dist &&
diff --git a/libs/nspr/mozilla-nspr.pc b/libs/nspr/mozilla-nspr.pc
deleted file mode 100644
index 169111f..0000000
--- a/libs/nspr/mozilla-nspr.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: VERSION
-Libs: -lplds4 -lplc4 -lnspr4 -lpthread -ldl
-Cflags: -I${includedir}/nspr
diff --git a/libs/nspr/nspr.pc b/libs/nspr/nspr.pc
new file mode 100644
index 0000000..169111f
--- /dev/null
+++ b/libs/nspr/nspr.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: VERSION
+Libs: -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+Cflags: -I${includedir}/nspr




Archive powered by MHonArc 2.6.24.

Top of Page