[SM-Commit] GIT changes to stable-0.43 grimoire by Arwed von Merkatz (f2f68855b3d1952eb331710dd742df62509bbacc)

Arwed von Merkatz scm at sourcemage.org
Mon Apr 19 14:42:03 EDT 2010


GIT changes to stable-0.43 grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 VERSION                  |    2 +-
 crypto/nss/BUILD         |    2 +-
 crypto/nss/HISTORY       |    4 ++++
 devel/phppgadmin/DETAILS |    6 +++---
 devel/phppgadmin/HISTORY |    3 +++
 shell-term-fm/mc/DETAILS |    6 +++---
 shell-term-fm/mc/HISTORY |    3 +++
 7 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit f2f68855b3d1952eb331710dd742df62509bbacc
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    VERSION: 0.43-2

commit f49ddd78fe5cfefec32d205648b8c701d7e0e3c4
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    nss: fixed BUILD to work for DEFAULT branch, bug 15680
    (cherry picked from commit 3a07b7dc32d74968b78155c033ade805aefae601)

commit ec70edcaf33f2de16d3df3173f0d117d4e63ef6e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    mc: => 4.7.0.4
    (cherry picked from commit e3a9f9515bacfa6c6f0cabce3ecfca3d43690f37)

commit 5aaf20675824d923511246aaafa8fb7558a80e7a
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    phppgadmin 4.2.3, SECURITY_PATCH=2, #15681
    (cherry picked from commit 6220ff3c65f49d4efd1db5da046db33a9fc017ab)

diff --git a/VERSION b/VERSION
index 940e9bb..8beff11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.43-1
+0.43-2
diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index d037513..7a287c0 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -13,7 +13,7 @@ cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
 
 echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk &&
 
-if [[ $NSS_BRANCH != 3.12 ]]; then
+if [[ $NSS_BRANCH == 3.11 ]]; then
   sedit 's:$(DIST)/lib:/usr/lib/nspr:' location.mk
 fi &&
 
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index fefab15..cfdd68e 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2010-04-19 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* BUILD: fixed location.mk sedit to only apply to 3.11, not DEFAULT
+	  branch, fixes bug #15680
+
 2010-03-26 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, PRE_BUILD, BUILD, INSTALL: used official nss tarball
 
diff --git a/devel/phppgadmin/DETAILS b/devel/phppgadmin/DETAILS
index 1fb6df0..de57453 100755
--- a/devel/phppgadmin/DETAILS
+++ b/devel/phppgadmin/DETAILS
@@ -1,7 +1,7 @@
            SPELL=phppgadmin
-         VERSION=4.2.1
-     SOURCE_HASH=sha512:1c449f6e6daea30ff434fabd59109b3f6eabcd53ab7dc8bee197a25374c26d93b892c5400786ac1b01866a0a368a63c0ad485d55d72302350ab90b93d8efd58b
-  SECURITY_PATCH=1
+         VERSION=4.2.3
+     SOURCE_HASH=sha512:b40c968d427d9510d0e6d5e5d7994298d615351cc30a72d50b5f49420f2fedb5ddb754801377ea4a7a955fe2401086fb0a4236f464b3346f6f3f1373f8848ddb
+  SECURITY_PATCH=2
           SOURCE=phpPgAdmin-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpPgAdmin-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/phppgadmin/HISTORY b/devel/phppgadmin/HISTORY
index fd133e5..6cc207a 100644
--- a/devel/phppgadmin/HISTORY
+++ b/devel/phppgadmin/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.2.3, SECURITY_PATCH=2, #15681
+
 2008-08-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.2.1
 
diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index 4df19f5..1c5898e 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,14 +1,14 @@
            SPELL=mc
-         VERSION=4.7.0.3
+         VERSION=4.7.0.4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.midnight-commander.org/downloads/$SOURCE
         WEB_SITE=http://www.midnight-commander.org/
          ENTERED=20010922
-     SOURCE_HASH=sha512:0de07260059f61c9715c55c7ef232c775425baee2f090c4c7f70429ef181367b112cbea783f1a2a2db9b7233d3252a03bf39a3b1cc34b0a3462d24898f5768fc
+     SOURCE_HASH=sha512:7971c7f74c491fcf69c69d3e1deebb6865ce2c4ea8ba51bb62e98b3f0806a861676b0dc2b351ec97a0981f0e40ebcde1fe3b471bd79b5ad081b4f4ea9ea4c4b1
       LICENSE[0]=GPL
         KEYWORDS="console"
-           SHORT="GNU Midnight Commander is a Unix file manager and shell"
+           SHORT="Unix file manager and shell"
 cat << EOF
 The GNU Midnight Commander is a Unix file manager and shell, useful to
 novice and guru alikes. Being a console application, it emulates look
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index cb62ac3..d595b25 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 4.7.0.4; corrected desc
+
 2010-02-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.7.0.3
 



More information about the SM-Commit mailing list