Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (472e8fa73e57ed06884bbe829b27abc23602c53d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (472e8fa73e57ed06884bbe829b27abc23602c53d)
  • Date: Fri, 10 Nov 2006 12:13:12 -0600

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

crypto/nss/BUILD | 23 +++++++++++++++--------
crypto/nss/DETAILS | 15 ++++-----------
crypto/nss/HISTORY | 6 ++++++
crypto/nss/INSTALL | 6 ++++--
crypto/nss/PRE_BUILD | 6 ------
crypto/nss/dbm-NSS_3_10_RTM-snap.tar.bz2.sig | 0
crypto/nss/mozilla-nss.pc | 2 +-
crypto/nss/nss-3.10-snap.tar.bz2.sig | 0
dev/null |binary
9 files changed, 30 insertions(+), 28 deletions(-)

New commits:
commit 472e8fa73e57ed06884bbe829b27abc23602c53d
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

nss 3.11.3
need some testing and should go to stable-rc (security fix, probably
together with nspr)

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 77d502a..3179de0 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -2,14 +2,21 @@ export BUILD_OPT=1 &&
export SOURCE_PREFIX=$(pwd) &&

# use our CFLAGS and pre-installed NSPR headers
-echo "OS_CFLAGS += $CFLAGS -I$INSTALL_ROOT/usr/include/nspr"
>>coreconf/Linux.mk &&
+#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 &&
+#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 &&
+#find nss/lib -name Makefile | while read __MAKEFILE; do
+# sedit 's#$(DIST)/lib/$(LIB_PREFIX)\(plc4\|plds4\)\.$(LIB_SUFFIX)#-l\1#g'
$__MAKEFILE
+#done &&

-cd nss &&
-make_single &&
-make build_coreconf build_dbm all
+echo "INCLUDES += -I${ROOT}/usr/include/nspr" >>
$SOURCE_DIRECTORY/mozilla/security/coreconf/headers.mk &&
+
+cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
+make &&
+
+cd $SOURCE_DIRECTORY/mozilla/security/dbm &&
+make &&
+
+cd $SOURCE_DIRECTORY/mozilla/security/nss &&
+make
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 5bdb35d..b8733c9 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,18 +1,11 @@
SPELL=nss
- VERSION=3.10
- CVS_TAG=NSS_${VERSION//./_}_RTM
- DBM_VERSION=$CVS_TAG
- SOURCE=$SPELL-$VERSION-snap.tar.bz2
- SOURCE2=dbm-$DBM_VERSION-snap.tar.bz2
+ VERSION=3.11.3
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/security:$CVS_TAG
- SOURCE_URL[0]=http://download.sourcemage.org/mirror/$SOURCE
-#
SOURCE2_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/dbm:$CVS_TAG
- SOURCE2_URL[0]=http://download.sourcemage.org/mirror/$SOURCE2
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_3_RTM/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/security/pki/nss/
ENTERED=20030919
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
- SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:5fc9753dd468f7e608887e854a7dfbeba6b6c2f424b339c0d8c088893485ad3b8b88d7a264f4fa969a5aa5e906d2b786dd31a4316a672be2f420bbab3a96f9e8
LICENSE[0]=MPL
LICENSE[1]=GPL
LICENSE[2]=LGPL
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index aa2fd27..55d5ef8 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+2006-11-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.11.3, removed SOURCE2 (dbm is included)
+ * BUILD: adapted to new version
+ * INSTALL, mozilla-nss.pc: 3.10 -> VERSION
+ * PRE_BUILD: removed
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 4529cbc..0b8ed1d 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,10 +1,11 @@
### cheating to get them all in one place
-cd $SOURCE_DIRECTORY/nss &&
+cd $SOURCE_DIRECTORY/mozilla/security/nss &&
make_normal &&
make 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 &&
@@ -13,7 +14,8 @@ find lib -type f -name '*.h' | while rea
done &&

# there's going to be only one of these directories
-cd $(find .. -maxdepth 1 -type d -name 'Linux*.OBJ' | head -n 1) &&
+#cd $(find .. -maxdepth 1 -type d -name 'Linux*.OBJ' | head -n 1) &&
+cd $SOURCE_DIRECTORY/Linux*.OBJ &&

# manually do the real install
cd bin &&
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
deleted file mode 100755
index d967fd6..0000000
--- a/crypto/nss/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-mk_source_dir &&
-unpack_file &&
-cd $SOURCE_DIRECTORY &&
-unpack_file 2 &&
-cp -rf dbm-$DBM_VERSION/* dbm/ &&
-rm -rf dbm-$DBM_VERSION/
diff --git a/crypto/nss/dbm-NSS_3_10_RTM-snap.tar.bz2.sig
b/crypto/nss/dbm-NSS_3_10_RTM-snap.tar.bz2.sig
deleted file mode 100644
index 5ff234f..0000000
Binary files a/crypto/nss/dbm-NSS_3_10_RTM-snap.tar.bz2.sig and /dev/null
differ
diff --git a/crypto/nss/mozilla-nss.pc b/crypto/nss/mozilla-nss.pc
index e470200..265c1af 100644
--- a/crypto/nss/mozilla-nss.pc
+++ b/crypto/nss/mozilla-nss.pc
@@ -5,7 +5,7 @@ includedir=/usr/include

Name: NSS
Description: Mozilla Network Security Services
-Version: 3.10
+Version: VERSION
Requires: mozilla-nspr >= 4.6.0
Libs: -lnss3 -lsmime3 -lssl3 -lsoftokn3
Cflags: -I${includedir}/nss
diff --git a/crypto/nss/nss-3.10-snap.tar.bz2.sig
b/crypto/nss/nss-3.10-snap.tar.bz2.sig
deleted file mode 100644
index 44e7b8b..0000000
Binary files a/crypto/nss/nss-3.10-snap.tar.bz2.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (472e8fa73e57ed06884bbe829b27abc23602c53d), Ladislav Hagara, 11/10/2006

Archive powered by MHonArc 2.6.24.

Top of Page