[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (4b7910d83a0cb5e0816f282905287e01f025a46d)

Vlad Glagolev scm at sourcemage.org
Tue Dec 13 06:12:14 EST 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 crypto/openssl/HISTORY                    |    4 ++++
 crypto/openssl/PRE_SUB_DEPENDS            |    4 ++++
 crypto/openssl/REPAIR^all^PRE_SUB_DEPENDS |    4 ++++
 crypto/openssl/SUB_DEPENDS                |    5 +++++
 libs/ldns/DEPENDS                         |   11 ++++++++---
 libs/ldns/HISTORY                         |    3 +++
 libs/pcre/DETAILS                         |    2 +-
 libs/pcre/HISTORY                         |    3 +++
 net/unbound/BUILD                         |    7 ++++++-
 net/unbound/CONFIGURE                     |    3 +++
 net/unbound/DEPENDS                       |   19 ++++++++++++++++++-
 net/unbound/DETAILS                       |    8 ++++----
 net/unbound/HISTORY                       |    9 ++++++++-
 net/unbound/INSTALL                       |    3 +++
 net/unbound/init.d/unbound                |    1 +
 python-pypi/fb-python/DETAILS             |    4 ++--
 python-pypi/fb-python/HISTORY             |    3 +++
 python-pypi/psycopg2/DETAILS              |    2 +-
 python-pypi/psycopg2/HISTORY              |    3 +++
 security/nmap/DETAILS                     |    4 ++--
 security/nmap/HISTORY                     |    3 +++
 21 files changed, 89 insertions(+), 16 deletions(-)

New commits:
commit 600367feb48c14de84c6ef55135f44ac3806f26e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    nmap: => 5.51.6

commit 23d6e69df21afc2beff2cd79148756223f369471
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pcre: => 8.21

commit 70d5893424f01fa32130b2b099ad42662c3826da
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    unbound: => 1.4.13

commit 9646c6f59801522a3f985aa987b594fb8ef55dcb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ldns: added openssl 1.0 opt dep

commit 52fec8ed94545e452e1dea3d40a11b9d8a375c10
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    psycopg2: => 2.4.3

commit 95bd280c90e294a279a25e707286bff430b7dc21
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openssl: added repair file for presubdep

commit b7fd9182b960c103e4fe530faef70209816efdd4
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openssl: added 1.0 branch subdep

commit 68f8a430b6b007b21e56afc26bb7497cbba59178
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    fb-python: => 0.6.4

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 197ac81..ec4a1b4 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2011-12-13 Vlad Glagolev <stealth at sourcemage.org>
+	* {PRE_}SUB_DEPENDS: added, to select 1.0 branch externally
+	* REPAIR^all^PRE_SUB_DEPENDS: added
+
 2011-09-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.0e, SECURITY_PATCH=13
 	  http://www.openssl.org/news/secadv_20110906.txt
diff --git a/crypto/openssl/PRE_SUB_DEPENDS b/crypto/openssl/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..81dce0a
--- /dev/null
+++ b/crypto/openssl/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+  1.0) [[ $OPENSSL_BRANCH == "1.0" ]];;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/crypto/openssl/REPAIR^all^PRE_SUB_DEPENDS b/crypto/openssl/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..81dce0a
--- /dev/null
+++ b/crypto/openssl/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+  1.0) [[ $OPENSSL_BRANCH == "1.0" ]];;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/crypto/openssl/SUB_DEPENDS b/crypto/openssl/SUB_DEPENDS
new file mode 100755
index 0000000..45221b3
--- /dev/null
+++ b/crypto/openssl/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+  1.0) message "OpenSSL 1.0 branch needed, forcing it." &&
+       OPENSSL_BRANCH="1.0";;
+   *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/ldns/DEPENDS b/libs/ldns/DEPENDS
index e88d53c..ce0aff0 100755
--- a/libs/ldns/DEPENDS
+++ b/libs/ldns/DEPENDS
@@ -2,10 +2,15 @@ depends make &&
 depends libtool &&
 depends openssl &&
 
+optional_depends -sub "1.0" openssl \
+                            "--enable-gost" \
+                            "--disable-gost" \
+                            "for GOST support" &&
+
 optional_depends -sub PYTHON swig \
-                 "--with-pyldns" \
-                 "--without-pyldns" \
-                 "to generate Python library" &&
+                             "--with-pyldns" \
+                             "--without-pyldns" \
+                             "to generate Python library" &&
 
 if is_depends_enabled $SPELL swig; then
   config_query_option LDNS_OPTS "Install ldnsx Python module?" y \
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index 5937f81..a2a263c 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,6 @@
+2011-12-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added optional dependency on openssl 1.0 for GOST support
+
 2011-10-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.6.11
 	* DEPENDS: added python optional dependency
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index b5b1978..4d44ac7 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pcre
-         VERSION=8.20
+         VERSION=8.21
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index fddbf35..f21e49d 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,6 @@
+2011-12-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: 8.21
+
 2011-10-22 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: 8.20
 
diff --git a/net/unbound/BUILD b/net/unbound/BUILD
index 3d2613a..46fbb38 100755
--- a/net/unbound/BUILD
+++ b/net/unbound/BUILD
@@ -1,2 +1,7 @@
-create_account unbound  &&
+create_account unbound &&
+
+OPTS="--with-pidfile=$INSTALL_ROOT/var/run/unbound/unbound.pid \
+      $UNBOUND_OPTS \
+      $OPTS" &&
+
 default_build
diff --git a/net/unbound/CONFIGURE b/net/unbound/CONFIGURE
new file mode 100755
index 0000000..cbaebd5
--- /dev/null
+++ b/net/unbound/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option UNBOUND_OPTS "Enable threading support?" y \
+                                 "--with-pthreads" \
+                                 "--without-pthreads"
diff --git a/net/unbound/DEPENDS b/net/unbound/DEPENDS
index a633aed..a5e5a4d 100755
--- a/net/unbound/DEPENDS
+++ b/net/unbound/DEPENDS
@@ -1,2 +1,19 @@
 depends expat &&
-depends ldns
+depends ldns &&
+depends openssl &&
+
+optional_depends -sub "1.0" openssl \
+                            "--enable-gost" \
+                            "--disable-gost" \
+                            "for GOST support" &&
+
+optional_depends -sub PYTHON swig \
+                             "--with-pyunbound" \
+                             "--without-pyunbound" \
+                             "to build PyUnbound" &&
+
+if is_depends_enabled $SPELL swig; then
+  config_query_option UNBOUND_OPTS "Install Python module?" y \
+                                   "--with-pythonmodule" \
+                                   "--without-pythonmodule"
+fi
diff --git a/net/unbound/DETAILS b/net/unbound/DETAILS
index a262433..9500951 100755
--- a/net/unbound/DETAILS
+++ b/net/unbound/DETAILS
@@ -1,14 +1,14 @@
            SPELL=unbound
-         VERSION=1.4.12
+         VERSION=1.4.13
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.unbound.net/downloads/$SOURCE
-     SOURCE_HASH=sha512:e492d857215b2c915ccf0492f0fdd11cdd616a0bf1f684ed4e64f7d060292618ace89a7cffe6c63c64d60f6b8cb8c4bdf07133563510d0877ff91fb56e878306
+     SOURCE_HASH=sha512:eb14f695eb917e9419d98b91058942732b15f4ace3529bf26fff8f8661858b9a19d621f07024f654260d6079a05e3c48a71d271096421365c29dc5a321e3ac17
         WEB_SITE=http://www.unbound.net/
          ENTERED=20110104
          LICENSE=BSD
-           SHORT="a validating, recursive, and caching DNS resolver"
+           SHORT="validating, recursive, and caching DNS resolver"
 cat << EOF
 Unbound is a validating, recursive, and caching DNS resolver.
 
diff --git a/net/unbound/HISTORY b/net/unbound/HISTORY
index dab2657..5a7feaf 100644
--- a/net/unbound/HISTORY
+++ b/net/unbound/HISTORY
@@ -1,3 +1,11 @@
+2011-12-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.4.13
+	* DEPENDS: added missing deps
+	* BUILD: corrected pidfile path, use UNBOUND_OPTS
+	* CONFIGURE: added, for pthreads option
+	* INSTALL: install rundir
+	* init.d/unbound: 755, added pidfile path
+
 2011-10-05 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: ldns is required now (since 1.4.12)
 
@@ -21,4 +29,3 @@
 
 2011-01-04 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS, BUILD, init.d/unbound: spell created, version 1.4.7
-
diff --git a/net/unbound/INSTALL b/net/unbound/INSTALL
new file mode 100755
index 0000000..a8e727d
--- /dev/null
+++ b/net/unbound/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+
+install -vm 700 -o unbound -g unbound -d "$INSTALL_ROOT/var/run/unbound"
diff --git a/net/unbound/init.d/unbound b/net/unbound/init.d/unbound
old mode 100644
new mode 100755
index 45290d7..ffbca28
--- a/net/unbound/init.d/unbound
+++ b/net/unbound/init.d/unbound
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 PROGRAM=/usr/sbin/unbound
+PIDFILE=/var/run/unbound/unbound.pid
 RUNLEVEL=3
 NEEDS="+remote_fs +network"
 
diff --git a/python-pypi/fb-python/DETAILS b/python-pypi/fb-python/DETAILS
index 2dfdc25..f3842d9 100755
--- a/python-pypi/fb-python/DETAILS
+++ b/python-pypi/fb-python/DETAILS
@@ -1,7 +1,7 @@
            SPELL=fb-python
           SPELLX=firebirdsql
-         VERSION=0.6.1
-     SOURCE_HASH=sha512:dea37507bdb4ebc704429c64f294324989179ed190014dd88fe7a64deea5af294597a802371104085778bfa1f57db85bbbfcdc9e942a3baad8f1361d1122a128
+         VERSION=0.6.4
+     SOURCE_HASH=sha512:c020ae1ed82a3990892c07dda4e3cbd70ec5e665b88394bf110f6214650d001a710becb9517c4979fc4a6adb46c94e3864e9fed260c8372c4e49903520e815fa
        SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_URL=http://pypi.python.org/packages/source/f/$SPELLX/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/fb-python/HISTORY b/python-pypi/fb-python/HISTORY
index b7de0da..1281198 100644
--- a/python-pypi/fb-python/HISTORY
+++ b/python-pypi/fb-python/HISTORY
@@ -1,3 +1,6 @@
+2011-12-11 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.4
+
 2011-11-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.6.1
 
diff --git a/python-pypi/psycopg2/DETAILS b/python-pypi/psycopg2/DETAILS
index 5f4739e..d8915b6 100755
--- a/python-pypi/psycopg2/DETAILS
+++ b/python-pypi/psycopg2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=psycopg2
-         VERSION=2.4.2
+         VERSION=2.4.3
           BRANCH=`echo $VERSION|cut -d . -f 1,2|tr . -`
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
diff --git a/python-pypi/psycopg2/HISTORY b/python-pypi/psycopg2/HISTORY
index 08a3f2a..966ff47 100644
--- a/python-pypi/psycopg2/HISTORY
+++ b/python-pypi/psycopg2/HISTORY
@@ -1,3 +1,6 @@
+2011-12-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.4.3
+
 2011-06-14 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.4.2
 
diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index 9d459a8..0d70703 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,5 +1,5 @@
            SPELL=nmap
-         VERSION=5.51.5
+         VERSION=5.51.6
           SOURCE=$SPELL-$VERSION.tar.bz2
 #         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
   SOURCE2_URL[1]=http://sectools.org/nmap/sigs/$SOURCE2
 #      SOURCE_GPG=nmap.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-     SOURCE_HASH=sha512:26f76de3ee0118a8314d50f44c4c9a9dbe3e53bff18549689880ad3c332a6fbb5b699c7d7d9c268e84c63edf900b3a9a81bf66074ba95840a89bfd0c32f8d0ae
+     SOURCE_HASH=sha512:4e20c22b0e9a72eab1cc0897b310a48977b9d16974f8ac23495e5624b6671d5c894bc2ee7846a71b198955588357d991d94df657e1cf66bd0bd0a7014b307457
         WEB_SITE=http://nmap.org/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 5137041..fbe32ca 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,6 @@
+2011-12-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 5.51.6
+
 2011-11-11 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.51.5
 


More information about the SM-Commit mailing list