diff options
| author | Rob Austein <sra@hactrn.net> | 2015-07-21 16:49:47 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-07-21 16:49:47 +0000 |
| commit | 28f0a684e348c4d8e3e83827f4367aaa4f21522f (patch) | |
| tree | e38ebc9aa2355dfb946f62902a4bb8388051c5d0 | |
| parent | d9bd71463fc2d47503c3300b3a207a7b8124d8b6 (diff) | |
| parent | 64011cf6642dae30517ade092c5830bac81ebc8b (diff) | |
Merge FreeBSD ports and OpenSSL changes from last six months. Still
some merge conflicts in other parts of the tree to sort out.
svn path=/branches/tk705/; revision=6082
| -rw-r--r-- | buildtools/build-freebsd-ports.py | 3 | ||||
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-ca/Makefile | 6 | ||||
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-rp/Makefile | 2 | ||||
| -rw-r--r-- | openssl/Makefile.in | 2 | ||||
| -rw-r--r-- | openssl/openssl-1.0.1l.tar.gz | bin | 4429979 -> 0 bytes | |||
| -rw-r--r-- | openssl/openssl-1.0.2d.tar.gz | bin | 0 -> 5295447 bytes | |||
| -rwxr-xr-x | openssl/update-snapshot.sh | 4 |
7 files changed, 9 insertions, 8 deletions
diff --git a/buildtools/build-freebsd-ports.py b/buildtools/build-freebsd-ports.py index ab2f9be6..b4031302 100644 --- a/buildtools/build-freebsd-ports.py +++ b/buildtools/build-freebsd-ports.py @@ -122,7 +122,8 @@ for port in ("rpki-rp", "rpki-ca"): with open(fn, "w") as f: f.write(template % formatdict) - subprocess.check_call(("make", "makesum", "stage", "DISTDIR=" + args.portsdir), cwd = base) + subprocess.check_call(("make", "makesum", "stage", "DISTDIR=" + args.portsdir, "NO_DEPENDS=yes"), + cwd = base) with open(os.path.join(base, "pkg-plist"), "w") as f: usr_local = None diff --git a/buildtools/freebsd-skeleton/rpki-ca/Makefile b/buildtools/freebsd-skeleton/rpki-ca/Makefile index fbde22fe..c8ceaea1 100644 --- a/buildtools/freebsd-skeleton/rpki-ca/Makefile +++ b/buildtools/freebsd-skeleton/rpki-ca/Makefile @@ -8,9 +8,9 @@ MAINTAINER= sra@hactrn.net COMMENT= rpki.net RPKI CA tools WWW= http://rpki.net/ +USES= python:2.7+ GNU_CONFIGURE= yes NO_MTREE= yes -USE_PYTHON= 2.7+ USE_GNOME= libxml2 libxslt USE_MYSQL= server USE_APACHE_RUN= 22+ @@ -32,7 +32,7 @@ BUILD_DEPENDS+= makedepend>0:${PORTSDIR}/devel/makedepend RPKID_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb \ - ${PYTHON_PKGNAMEPREFIX}django>=1.3.7:${PORTSDIR}/www/py-django \ + ${PYTHON_PKGNAMEPREFIX}django14>=1.4:${PORTSDIR}/www/py-django14 \ ${PYTHON_PKGNAMEPREFIX}vobject>0:${PORTSDIR}/deskutils/py-vobject \ ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \ @@ -41,7 +41,7 @@ RPKID_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml BUILD_DEPENDS+= ${RPKID_DEPENDS} RUN_DEPENDS+= ${RPKID_DEPENDS} -RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_wsgi3>0:${PORTSDIR}/www/mod_wsgi3 +RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_wsgi4>0:${PORTSDIR}/www/mod_wsgi4 # Try to use system OpenSSL if we can. CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/buildtools/freebsd-skeleton/rpki-rp/Makefile b/buildtools/freebsd-skeleton/rpki-rp/Makefile index 0c1fdd91..e020eaf3 100644 --- a/buildtools/freebsd-skeleton/rpki-rp/Makefile +++ b/buildtools/freebsd-skeleton/rpki-rp/Makefile @@ -8,9 +8,9 @@ MAINTAINER= sra@hactrn.net COMMENT= rpki.net RPKI relying party tools WWW= http://rpki.net/ +USES= python:2.7+ GNU_CONFIGURE= yes NO_MTREE= yes -USE_PYTHON= 2.7+ USE_GNOME= libxml2 libxslt USE_APACHE_RUN= 22+ diff --git a/openssl/Makefile.in b/openssl/Makefile.in index 0fe9d454..cef8d434 100644 --- a/openssl/Makefile.in +++ b/openssl/Makefile.in @@ -1,6 +1,6 @@ # $Id$ -VERSION = 1.0.1l +VERSION = 1.0.2d OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ OPENSSL_BUILD_DIRECTORY = ${abs_builddir}/openssl diff --git a/openssl/openssl-1.0.1l.tar.gz b/openssl/openssl-1.0.1l.tar.gz Binary files differdeleted file mode 100644 index 448aaf41..00000000 --- a/openssl/openssl-1.0.1l.tar.gz +++ /dev/null diff --git a/openssl/openssl-1.0.2d.tar.gz b/openssl/openssl-1.0.2d.tar.gz Binary files differnew file mode 100644 index 00000000..ec5b1937 --- /dev/null +++ b/openssl/openssl-1.0.2d.tar.gz diff --git a/openssl/update-snapshot.sh b/openssl/update-snapshot.sh index eb8c45d8..1ff08bbb 100755 --- a/openssl/update-snapshot.sh +++ b/openssl/update-snapshot.sh @@ -6,7 +6,7 @@ #version="1.0.0-stable-SNAP-$(date +%Y%m%d)" -version="1.0.1l" +version="1.0.2d" tarball="openssl-${version}.tar.gz" @@ -15,7 +15,7 @@ case $version in *) directory=source;; esac -/usr/bin/fetch -m -p "ftp://ftp.openssl.org/${directory}/${tarball}" || exit +/bin/test -f "${tarball}" || /usr/bin/fetch -m -p "ftp://ftp.openssl.org/${directory}/${tarball}" || exit /bin/rm -f openssl |