Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cffa5b03873240d906fc55389cc20d5f4e0a1f9c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cffa5b03873240d906fc55389cc20d5f4e0a1f9c)
  • Date: Sun, 22 Mar 2015 14:44:45 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/nss/DETAILS | 4 ++++
crypto/nss/HISTORY | 3 +++
crypto/nss/PREPARE | 4 ++--
crypto/nss/PRE_BUILD | 4 +++-
crypto/nss/PRE_SUB_DEPENDS | 1 +
crypto/nss/SUB_DEPENDS | 3 +++
devel/cmake/DETAILS | 2 +-
devel/cmake/HISTORY | 3 +++
http/firefox/DEPENDS | 2 +-
http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 3 +++
net/iperf/DETAILS | 8 ++++----
net/iperf/HISTORY | 3 +++
13 files changed, 34 insertions(+), 12 deletions(-)

New commits:
commit cffa5b03873240d906fc55389cc20d5f4e0a1f9c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/firefox: version 36.0.4

commit b09a757460a08b10869bac9bd34ddc43c862398e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/nss: version 3.18

commit dd8664df500d36f638c21213e7fc2a3b3f888819
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/iperf3: version 3.0.11

commit 0b0439c058b70ae9c1d2a5cfb978c73e9addbee0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/cmake: fix WEB_SITE

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index d92cfa6..42cc23e 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -19,6 +19,10 @@ case $NSS_BRANCH in

SOURCE_HASH=sha512:dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89
SECURITY_PATCH=2
;;
+ 3.18)
+ VERSION=3.18
+
SOURCE_HASH=sha512:b9ba1feed47ea6e650a3b746691134907cd7682748aed0d65ab5d15cbf07ab00010caabc0375f5d2d88d47277d002cddc299a57053e954e191205070b3a8297b
+ ;;
esac
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index c38af97..530ab08 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2015-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: version
3.18
+
2015-02-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.17.4

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 2c11df7..d2de368 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 &&
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 3.18 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
- NSS_BRANCH=3.17
+ NSS_BRANCH=3.18
fi
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 3c7394d..088795d 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $NSS_BRANCH == "3.17" ]]; then
+if [[ $NSS_BRANCH == "3.18" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
+elif [[ $NSS_BRANCH == "3.17" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH == "3.16" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index 1354df844..322b8f6 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -3,6 +3,7 @@ case $THIS_SUB_DEPENDS in
3.15.x) if [ $NSS_BRANCH == "3.15" ]; then return 0; fi;;
3.16.x) if [ $NSS_BRANCH == "3.16" ]; then return 0; fi;;
3.17.x) if [ $NSS_BRANCH == "3.17" ]; then return 0; fi;;
+ 3.18.x) if [ $NSS_BRANCH == "3.18" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index e72e2ba..c68dd33 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -11,6 +11,9 @@ case $THIS_SUB_DEPENDS in
3.17.x) message "${MESSAGE_COLOR}3.17.x release needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_BRANCH="3.17"
;;
+ 3.18.x) message "${MESSAGE_COLOR}3.18.x release needed, forcing
it.${DEFAULT_COLOR}" &&
+ NSS_BRANCH="3.18"
+ ;;
PEM) message "${MESSAGE_COLOR}nss with PEM support needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_PEM="y"
;;
diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index ec162cb..8283d73 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.cmake.org/files/$VX/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=BSD
- WEB_SITE=http://www.cmake.org/HTML/index.html
+ WEB_SITE=http://www.cmake.org
ENTERED=20020429
KEYWORDS="devel"
SHORT="Cross-platform make system"
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index d67d570..25f0b24 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2015-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix WEB_SITE
+
2015-03-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2.1

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 236c12c..f532998 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -23,7 +23,7 @@ depends -sub APNG libpng '--enable-system-png'
&&
depends librsvg2 '--enable-svg' &&

depends nspr '--with-system-nspr' &&
-depends -sub "3.17.x" nss '--with-system-nss' &&
+depends -sub "3.18.x" nss '--with-system-nss' &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 6892cfd..2e18d49 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox
- VERSION=36.0.1
+ VERSION=36.0.4
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:163cb97cd126c3a3da7197c74f3f1409ef77d2ceb799f5c02b431cfa99b474645825e4794450be86c5b584a9c869663a55a1355ca0243f9264327b6709abb5ed
+
SOURCE_HASH=sha512:3539f1f609318bb7000d8f15d5309064523d838ec894865cfd5aedc7fe6a9695a3d68f33e58c1a559ed8cf8b024bb2f7ced84b640c8a89ad0751d925136a2443

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
- SECURITY_PATCH=80
+ SECURITY_PATCH=81
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index c8486b9..3566943 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2015-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 36.0.4, SECURITY_PATCH++
+
2015-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: only disable tests if pgo is not enabled
* mozconfig: remove --disable-tests, pgo requires it
diff --git a/net/iperf/DETAILS b/net/iperf/DETAILS
index dc91d7f..24446be 100755
--- a/net/iperf/DETAILS
+++ b/net/iperf/DETAILS
@@ -1,10 +1,10 @@
SPELL=iperf
- VERSION=2.0.5
+ VERSION=3.0.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f
- WEB_SITE=http://iperf.sourceforge.net/
+ SOURCE_URL[0]=https://github.com/esnet/iperf/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:292b826099a1fc813f2fbe4506f8bd8b3b2e4dde04e33a097cce966d7502b3c521a29b9ba74e55fe38406fdb85090695f59febbf4ca31bb1ffc801b3b7615d19
+ WEB_SITE=https://github.com/esnet/iperf
ENTERED=20060309
LICENSE[0]=BSD
KEYWORDS="net"
diff --git a/net/iperf/HISTORY b/net/iperf/HISTORY
index 436a93f..418a0e1 100644
--- a/net/iperf/HISTORY
+++ b/net/iperf/HISTORY
@@ -1,3 +1,6 @@
+2015-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.0.11
+
2010-10-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.5; fixed website, source urls, descs




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cffa5b03873240d906fc55389cc20d5f4e0a1f9c), Florian Franzmann, 03/22/2015

Archive powered by MHonArc 2.6.24.

Top of Page