diff options
| -rw-r--r-- | openssl/Makefile | 2 | ||||
| -rw-r--r-- | openssl/openssl-0.9.8g.tar.gz | bin | 3354792 -> 0 bytes | |||
| -rw-r--r-- | openssl/openssl-SNAP-20080328.tar.gz | bin | 0 -> 3849282 bytes | |||
| -rwxr-xr-x | openssl/update-snapshot.sh | 27 | ||||
| -rw-r--r-- | rcynic/Makefile | 4 | ||||
| -rw-r--r-- | rpkid/rpki/sql.py | 13 |
6 files changed, 37 insertions, 9 deletions
diff --git a/openssl/Makefile b/openssl/Makefile index da27f7a3..9836299b 100644 --- a/openssl/Makefile +++ b/openssl/Makefile @@ -1,6 +1,6 @@ # $Id$ -VERSION = 0.9.8g +VERSION = SNAP-20080328 all: openssl-${VERSION}/Makefile cd openssl-${VERSION}; make $@ diff --git a/openssl/openssl-0.9.8g.tar.gz b/openssl/openssl-0.9.8g.tar.gz Binary files differdeleted file mode 100644 index 14ac1761..00000000 --- a/openssl/openssl-0.9.8g.tar.gz +++ /dev/null diff --git a/openssl/openssl-SNAP-20080328.tar.gz b/openssl/openssl-SNAP-20080328.tar.gz Binary files differnew file mode 100644 index 00000000..318877c3 --- /dev/null +++ b/openssl/openssl-SNAP-20080328.tar.gz diff --git a/openssl/update-snapshot.sh b/openssl/update-snapshot.sh new file mode 100755 index 00000000..74ae157d --- /dev/null +++ b/openssl/update-snapshot.sh @@ -0,0 +1,27 @@ +#!/bin/sh - +# $Id$ +# +# Fetch today's OpenSSL snapshot and do everything needed to make it +# the current code other than the svn commit. + +version="SNAP-$(date +%Y%m%d)" + +tarball="openssl-${version}.tar.gz" + +/usr/bin/fetch -m -p "ftp://ftp.openssl.org/snapshot/${tarball}" || exit + +/bin/rm -f openssl + +for i in *.tar.gz +do + if [ "$i" != "$tarball" ] + then + /bin/rm -rf "${i%.tar.gz}" + /usr/local/bin/svn rm "$i" + fi +done + +/usr/bin/awk -v version="$version" '/^VERSION = / {$NF = version} {print}' Makefile >Makefile.$$ && +/bin/mv Makefile.$$ Makefile + +/usr/local/bin/svn add "$tarball" diff --git a/rcynic/Makefile b/rcynic/Makefile index cfddd7ad..34dc882a 100644 --- a/rcynic/Makefile +++ b/rcynic/Makefile @@ -2,7 +2,9 @@ OPENSSL_DIR = ../openssl/openssl -CFLAGS = -g -I${OPENSSL_DIR}/include -Wall -Werror -Wshadow -Wmissing-prototypes -Wmissing-declarations +# Disable -Werror as long as we're using OpenSSL snapshots. + +CFLAGS = -g -I${OPENSSL_DIR}/include -Wall -Wshadow -Wmissing-prototypes -Wmissing-declarations LDFLAGS = -static # -H -Wl,-t diff --git a/rpkid/rpki/sql.py b/rpkid/rpki/sql.py index 1244a80f..ddddbe9f 100644 --- a/rpkid/rpki/sql.py +++ b/rpkid/rpki/sql.py @@ -14,18 +14,17 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -import MySQLdb, time +import MySQLdb, time, warnings, _mysql_exceptions import rpki.x509, rpki.resource_set, rpki.sundial -# Turn all MySQL warnings into exceptions, at least for now -# -import warnings, _mysql_exceptions -warnings.simplefilter("error", _mysql_exceptions.Warning) - -def connect(cfg): +def connect(cfg, throw_exception_on_warning = True): """Connect to a MySQL database using connection parameters from an rpki.config.parser object. """ + + if throw_exception_on_warning: + warnings.simplefilter("error", _mysql_exceptions.Warning) + return MySQLdb.connect(user = cfg.get("sql-username"), db = cfg.get("sql-database"), passwd = cfg.get("sql-password")) |