Commit 87170cfa authored by Mike Hibler's avatar Mike Hibler

Emulab server ports changes for 2018Q2 ports + FreeBSD 11.1.

parent 284eaa38
...@@ -97,7 +97,7 @@ with 2015Q3 and I have updated through 2016Q2. ...@@ -97,7 +97,7 @@ with 2015Q3 and I have updated through 2016Q2.
# for 10.2 # for 10.2
DEFAULT_VERSIONS=perl5=5.20 python=2.7 php=5.6 mysql=5.5 apache=2.2 tcltk=8.6 DEFAULT_VERSIONS=perl5=5.20 python=2.7 php=5.6 mysql=5.5 apache=2.2 tcltk=8.6
# for 10.3 # for 10.3 and beyond
DEFAULT_VERSIONS=perl5=5.24 python=2.7 php=5.6 mysql=5.7 apache=2.2 tcltk=8.6 DEFAULT_VERSIONS=perl5=5.24 python=2.7 php=5.6 mysql=5.7 apache=2.2 tcltk=8.6
DEFAULT_VERSIONS+=ssl=base DEFAULT_VERSIONS+=ssl=base
...@@ -436,8 +436,8 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use ...@@ -436,8 +436,8 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
DOCS DOCS
- in editors/emacs, "make config" and deselect: - in editors/emacs, "make config" and deselect:
DBUS DBUS
GIF, MAGICK, PNG, SVG, TIFF, XPM,
GCONF, GSETTINGS, M17N, OTF, SCROLLBARS, XFT, XIM, GCONF, GSETTINGS, M17N, OTF, SCROLLBARS, XFT, XIM,
GIF, MAGICK, PNG, SVG, TIFF, XPM,
OSS, OSS,
GTK2 GTK2
and select: and select:
...@@ -472,7 +472,7 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use ...@@ -472,7 +472,7 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
pkg delete -f ipmitool pkg delete -f ipmitool
cd /usr/ports/misc/emulab-ipmitool-old cd /usr/ports/misc/emulab-ipmitool-old
make clean all install make clean all install clean
make package make package
l. Save packages and update tarball and repo. On boss: l. Save packages and update tarball and repo. On boss:
......
...@@ -3,19 +3,20 @@ ...@@ -3,19 +3,20 @@
PORTNAME= abac PORTNAME= abac
PORTVERSION= 0.1.9 PORTVERSION= 0.1.9
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= http://mirror.deterlab.net/share/images/abac/ \ MASTER_SITES= http://mirror.deterlab.net/share/images/various/abac/ \
http://www.emulab.net/downloads/ http://www.emulab.net/downloads/
MAINTAINER= testbed-ops@flux.utah.edu MAINTAINER= testbed-ops@flux.utah.edu
COMMENT= "Attribute-Based Access Control library, as adopted by GENI" COMMENT= "Attribute-Based Access Control library, as adopted by GENI"
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
BINARY_ALIAS= swig=swig3.0
USE_AUTOTOOLS= autoconf USE_AUTOTOOLS= autoconf
USES= gettext gmake libtool perl5 python USES= gettext gmake libtool perl5 python
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib
BUILD_DEPENDS= swig2.0:${PORTSDIR}/devel/swig20 \ BUILD_DEPENDS= swig3.0:${PORTSDIR}/devel/swig30 \
xmlsec1:${PORTSDIR}/security/xmlsec1 xmlsec1:${PORTSDIR}/security/xmlsec1
.include <bsd.port.mk> .include <bsd.port.mk>
...@@ -34,14 +34,22 @@ USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt mysql \ ...@@ -34,14 +34,22 @@ USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt mysql \
# #
# Various ports need to agree on what version of apache. # Various ports need to agree on what version of apache.
# #
.if ${EMULAB_PORTVERSION} == "7.1"
www_apache24_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache24
.MAKEFLAGS+= WITH_SUEXEC=yes
.else
www_apache22_SET= SUEXEC www_apache22_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache22 .MAKEFLAGS+= APACHE_PORT=www/apache22
.MAKEFLAGS+= WITH_SUEXEC=yes .MAKEFLAGS+= WITH_SUEXEC=yes
.endif
.if ${EMULAB_PORTVERSION} != "7.1"
# #
# Use the base version of openssl # Use the base version of openssl
# #
.MAKEFLAGS+= WITH_OPENSSL_BASE=yes .MAKEFLAGS+= WITH_OPENSSL_BASE=yes
.endif
# #
# This prevents any ports from trying to configure interactively. # This prevents any ports from trying to configure interactively.
...@@ -98,7 +106,7 @@ RUN_DEPENDS+= \ ...@@ -98,7 +106,7 @@ RUN_DEPENDS+= \
rpm:${PORTSDIR}/archivers/rpm4 \ rpm:${PORTSDIR}/archivers/rpm4 \
rrdtool:${PORTSDIR}/databases/rrdtool \ rrdtool:${PORTSDIR}/databases/rrdtool \
rsync:${PORTSDIR}/net/rsync \ rsync:${PORTSDIR}/net/rsync \
swig2.0:${PORTSDIR}/devel/swig20 \ swig${SWIG_VER}:${PORTSDIR}/${SWIG_PORT} \
sudo:${PORTSDIR}/security/sudo \ sudo:${PORTSDIR}/security/sudo \
medusa:${PORTSDIR}/security/medusa \ medusa:${PORTSDIR}/security/medusa \
wget:${PORTSDIR}/ftp/wget \ wget:${PORTSDIR}/ftp/wget \
...@@ -147,8 +155,8 @@ RUN_DEPENDS+= \ ...@@ -147,8 +155,8 @@ RUN_DEPENDS+= \
# apache related ports # apache related ports
RUN_DEPENDS+= \ RUN_DEPENDS+= \
${LOCALBASE}/libexec/apache22/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/${APACHEMODDIR}/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/libexec/apache22/mod_fcgid.so:${PORTSDIR}/www/mod_fcgid ${LOCALBASE}/${APACHEMODDIR}/mod_fcgid.so:${PORTSDIR}/www/mod_fcgid
# Port versions of current or former "core" utilties # Port versions of current or former "core" utilties
RUN_DEPENDS+= \ RUN_DEPENDS+= \
...@@ -180,4 +188,3 @@ vars: ...@@ -180,4 +188,3 @@ vars:
@echo "USE_APACHE/USE_APACHE_BUILD/USE_APACHE_RUN=${USE_APACHE}/${USE_APACHE_BUILD}/${USE_APACHE_RUN}" @echo "USE_APACHE/USE_APACHE_BUILD/USE_APACHE_RUN=${USE_APACHE}/${USE_APACHE_BUILD}/${USE_APACHE_RUN}"
@echo "USE_PHP=${USE_PHP}" @echo "USE_PHP=${USE_PHP}"
@echo "TCL_VER/TK_VER=${TCL_VER}/${TK_VER}" @echo "TCL_VER/TK_VER=${TCL_VER}/${TK_VER}"
...@@ -34,20 +34,27 @@ EMULAB_PORTVERSION= 6.1 ...@@ -34,20 +34,27 @@ EMULAB_PORTVERSION= 6.1
# Fix up some port diffs # Fix up some port diffs
# #
.if ${EMULAB_PORTVERSION} == "7.1" .if ${EMULAB_PORTVERSION} == "7.1"
DEFAULT_VERSIONS= perl5=5.24 python=2.7 tcltk=8.6 php=5.6 mysql=5.7 apache=2.2 DEFAULT_VERSIONS= perl5=5.26 python=2.7 tcltk=8.6 php=5.6 mysql=5.7 apache=2.4
APACHE_PORT=www/apache22 APACHE_PORT=www/apache24
APACHEMODDIR=libexec/apache24
MYSQL_VER=57 MYSQL_VER=57
SWIG_VER=3.0
SWIG_PORT=devel/swig30
.else .else
. if ${EMULAB_PORTVERSION} == "6.3" . if ${EMULAB_PORTVERSION} == "6.3"
DEFAULT_VERSIONS= perl5=5.24 python=2.7 tcltk=8.6 php=5.6 mysql=5.7 apache=2.2 DEFAULT_VERSIONS= perl5=5.24 python=2.7 tcltk=8.6 php=5.6 mysql=5.7 apache=2.2
APACHE_PORT=www/apache22 APACHE_PORT=www/apache22
APACHEMODDIR=libexec/apache22
MYSQL_VER=57 MYSQL_VER=57
. else . else
. if ${EMULAB_PORTVERSION} != "UNSUPPORTED" . if ${EMULAB_PORTVERSION} != "UNSUPPORTED"
DEFAULT_VERSIONS= perl5=5.20 python=2.7 tcltk=8.6 php=5.6 mysql=5.5 apache=2.2 DEFAULT_VERSIONS= perl5=5.20 python=2.7 tcltk=8.6 php=5.6 mysql=5.5 apache=2.2
APACHE_PORT=www/apache22 APACHE_PORT=www/apache22
APACHEMODDIR=libexec/apache22
MYSQL_VER=55 MYSQL_VER=55
. endif . endif
. endif . endif
SWIG_VER=2.0
SWIG_PORT=devel/swig20
.endif .endif
.endif .endif
...@@ -76,11 +76,18 @@ RUN_DEPENDS+= \ ...@@ -76,11 +76,18 @@ RUN_DEPENDS+= \
rsync:${PORTSDIR}/net/rsync \ rsync:${PORTSDIR}/net/rsync \
sudo:${PORTSDIR}/security/sudo \ sudo:${PORTSDIR}/security/sudo \
ttcp:${PORTSDIR}/benchmarks/ttcp \ ttcp:${PORTSDIR}/benchmarks/ttcp \
vim:${PORTSDIR}/editors/vim-lite \
xauth:${PORTSDIR}/x11/xauth \ xauth:${PORTSDIR}/x11/xauth \
xterm:${PORTSDIR}/x11/xterm \ xterm:${PORTSDIR}/x11/xterm \
zsh:${PORTSDIR}/shells/zsh zsh:${PORTSDIR}/shells/zsh
.if ${PORTVERSION} == "7.1"
RUN_DEPENDS+= \
vim:${PORTSDIR}/editors/vim-console
.else
RUN_DEPENDS+= \
vim:${PORTSDIR}/editors/vim-lite
.endif
RUN_DEPENDS+= \ RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}subversion>0:${PORTSDIR}/devel/py-subversion ${PYTHON_PKGNAMEPREFIX}subversion>0:${PORTSDIR}/devel/py-subversion
......
...@@ -30,9 +30,15 @@ USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt mysql \ ...@@ -30,9 +30,15 @@ USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt mysql \
# #
# Various ports need to agree on what version of apache. # Various ports need to agree on what version of apache.
# #
.if ${EMULAB_PORTVERSION} == "7.1"
www_apache24_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache24
.MAKEFLAGS+= WITH_SUEXEC=yes
.else
www_apache22_SET= SUEXEC www_apache22_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache22 .MAKEFLAGS+= APACHE_PORT=www/apache22
.MAKEFLAGS+= WITH_SUEXEC=yes .MAKEFLAGS+= WITH_SUEXEC=yes
.endif
# #
# This prevents any ports from trying to configure interactively. # This prevents any ports from trying to configure interactively.
...@@ -101,8 +107,8 @@ RUN_DEPENDS+= \ ...@@ -101,8 +107,8 @@ RUN_DEPENDS+= \
# apache related ports # apache related ports
RUN_DEPENDS+= \ RUN_DEPENDS+= \
${LOCALBASE}/libexec/apache22/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \ ${LOCALBASE}/${APACHEMODDIR}/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/libexec/apache22/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
# PHP packages # PHP packages
RUN_DEPENDS+= \ RUN_DEPENDS+= \
......
...@@ -22,14 +22,22 @@ WANT_PHP_MOD= yes ...@@ -22,14 +22,22 @@ WANT_PHP_MOD= yes
# #
# Various ports need to agree on what version of apache. # Various ports need to agree on what version of apache.
# #
.if ${EMULAB_PORTVERSION} == "7.1"
www_apache24_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache24
.MAKEFLAGS+= WITH_SUEXEC=yes
.else
www_apache22_SET= SUEXEC www_apache22_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache22 .MAKEFLAGS+= APACHE_PORT=www/apache22
.MAKEFLAGS+= WITH_SUEXEC=yes .MAKEFLAGS+= WITH_SUEXEC=yes
.endif
.if ${EMULAB_PORTVERSION} != "7.1"
# #
# Use the base version of openssl # Use the base version of openssl
# #
.MAKEFLAGS+= WITH_OPENSSL_BASE=yes .MAKEFLAGS+= WITH_OPENSSL_BASE=yes
.endif
# #
# This prevents any ports from trying to run interactively - some, like the # This prevents any ports from trying to run interactively - some, like the
...@@ -65,8 +73,8 @@ RUN_DEPENDS+= \ ...@@ -65,8 +73,8 @@ RUN_DEPENDS+= \
# apache related ports # apache related ports
RUN_DEPENDS+= \ RUN_DEPENDS+= \
${LOCALBASE}/libexec/apache22/mod_wsgi.so:${PORTSDIR}/www/mod_wsgi4 \ ${LOCALBASE}/${APACHEMODDIR}/mod_wsgi.so:${PORTSDIR}/www/mod_wsgi4 \
${LOCALBASE}/libexec/apache22/mod_fcgid.so:${PORTSDIR}/www/mod_fcgid \ ${LOCALBASE}/${APACHEMODDIR}/mod_fcgid.so:${PORTSDIR}/www/mod_fcgid \
p5-FCGI>=0.74:${PORTSDIR}/www/p5-FCGI p5-FCGI>=0.74:${PORTSDIR}/www/p5-FCGI
USE_PERL5= yes USE_PERL5= yes
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
PORTNAME= pubsub PORTNAME= pubsub
PORTVERSION= 0.99 PORTVERSION= 0.99
PORTREVISION= 11 PORTREVISION= 12
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= http://www.emulab.net/distributions/ MASTER_SITES= http://www.emulab.net/distributions/
DISTFILES= ${PORTNAME}-${PORTVERSION}_${PORTREVISION}.tar.gz DISTFILES= ${PORTNAME}-${PORTVERSION}_${PORTREVISION}.tar.gz
...@@ -12,7 +12,8 @@ MAINTAINER= testbed-ops@flux.utah.edu ...@@ -12,7 +12,8 @@ MAINTAINER= testbed-ops@flux.utah.edu
COMMENT= "Simple publish subscribe system for Emulab" COMMENT= "Simple publish subscribe system for Emulab"
USE_AUTOTOOLS= autoconf USE_AUTOTOOLS= autoconf
USES= gmake libtool:build,keepla GNU_CONFIGURE= yes
USES= autoreconf gmake libtool:build,keepla
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
CONFLICTS= pubsub-elvincompat-[0-9]* CONFLICTS= pubsub-elvincompat-[0-9]*
......
...@@ -16,3 +16,5 @@ SHA256 (pubsub-0.99_10.tar.gz) = 36890b0b777f9b5216371f7c60561d227c54d7204712ceb ...@@ -16,3 +16,5 @@ SHA256 (pubsub-0.99_10.tar.gz) = 36890b0b777f9b5216371f7c60561d227c54d7204712ceb
SIZE (pubsub-0.99_10.tar.gz) = 111168 SIZE (pubsub-0.99_10.tar.gz) = 111168
SHA256 (pubsub-0.99_11.tar.gz) = 78d3708e925f5f55fa8b8ed625a47cf2fa1c80a65186d76cd866e36ba4f28eee SHA256 (pubsub-0.99_11.tar.gz) = 78d3708e925f5f55fa8b8ed625a47cf2fa1c80a65186d76cd866e36ba4f28eee
SIZE (pubsub-0.99_11.tar.gz) = 112308 SIZE (pubsub-0.99_11.tar.gz) = 112308
SHA256 (pubsub-0.99_12.tar.gz) = e1e0b564154304f83fa63dd6477c181b727e03fc03f3ae6e2c453f806f062254
SIZE (pubsub-0.99_12.tar.gz) = 112121
...@@ -5,21 +5,25 @@ ...@@ -5,21 +5,25 @@
# $FreeBSD: ports/security/py-m2crypto/Makefile,v 1.21 2009/01/27 10:20:52 mnag Exp $ # $FreeBSD: ports/security/py-m2crypto/Makefile,v 1.21 2009/01/27 10:20:52 mnag Exp $
# #
# Our extra patch
EXTRA_PATCHES= $(FILESDIR)/emulab-patch-SSL-Connection
# Make sure we pick up all the standard port patches too # Make sure we pick up all the standard port patches too
PATCHDIR= $(PORTSDIR)/security/py-m2crypto/files PATCHDIR= $(PORTSDIR)/security/py-m2crypto/files
PKGORIGIN= misc/emulab-py-m2crypto PKGORIGIN= misc/emulab-py-m2crypto
.include "../../security/py-m2crypto/Makefile" .include "../../security/py-m2crypto/Makefile"
# Our extra patch
.if ${PORTVERSION} == "0.29.0"
EXTRA_PATCHES= $(FILESDIR)/emulab-patch-SSL-Connection-29
.else
EXTRA_PATCHES= $(FILESDIR)/emulab-patch-SSL-Connection
.endif
.if ${PORTVERSION} == "0.25.1" .if ${PORTVERSION} == "0.25.1"
# Missing dependency for 0.25 # Missing dependency for 0.25
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>0:${PORTSDIR}/devel/py-typing RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>0:${PORTSDIR}/devel/py-typing
.endif .endif
.if (${PORTVERSION} == "0.25.1" || ${PORTVERSION} == "0.26.0" || ${PORTVERSION} == "0.26.4") .if (${PORTVERSION} == "0.25.1" || ${PORTVERSION} == "0.26.0" || ${PORTVERSION} == "0.26.4" || ${PORTVERSION} == "0.29.0")
# Fix bug in 0.25.1 and 0.26 # Fix bug in 0.25.1 and 0.26
EXTRA_PATCHES+= $(FILESDIR)/emulab-patch-httpslib EXTRA_PATCHES+= $(FILESDIR)/emulab-patch-httpslib
.endif .endif
...@@ -10,3 +10,5 @@ SHA256 (M2Crypto-0.26.0.tar.gz) = 05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185 ...@@ -10,3 +10,5 @@ SHA256 (M2Crypto-0.26.0.tar.gz) = 05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185
SIZE (M2Crypto-0.26.0.tar.gz) = 305914 SIZE (M2Crypto-0.26.0.tar.gz) = 305914
SHA256 (M2Crypto-0.26.4.tar.gz) = 5cae7acc0b34821f8c0ddf6665e482893fe1f198ad6379e61ffa9d8e65f5c199 SHA256 (M2Crypto-0.26.4.tar.gz) = 5cae7acc0b34821f8c0ddf6665e482893fe1f198ad6379e61ffa9d8e65f5c199
SIZE (M2Crypto-0.26.4.tar.gz) = 1116587 SIZE (M2Crypto-0.26.4.tar.gz) = 1116587
SHA256 (M2Crypto-0.29.0.tar.gz) = a0fea2c5ab913e42864d1ccbaee5878c23886368b606e923609fda4ce37d26c0
SIZE (M2Crypto-0.29.0.tar.gz) = 1269694
--- M2Crypto/SSL/Connection.py.orig 2018-02-22 15:43:29.000000000 -0700
+++ M2Crypto/SSL/Connection.py 2018-04-04 15:57:44.341502000 -0600
@@ -32,11 +32,15 @@
# type: (*Any, **Any) -> int
return 1
+def _clientPostConnectionCheck(*args, **kw):
+ # type: (*Any, **Any) -> int
+ return 1
+
class Connection:
"""An SSL connection."""
- clientPostConnectionCheck = Checker.Checker()
+ clientPostConnectionCheck = _clientPostConnectionCheck
serverPostConnectionCheck = _serverPostConnectionCheck
m2_bio_free = m2.bio_free
...@@ -18,6 +18,8 @@ USES+= tk ...@@ -18,6 +18,8 @@ USES+= tk
USE_XORG= xext USE_XORG= xext
USE_AUTOTOOLS= autoconf USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USES+= autoreconf
USE_LDCONFIG= yes USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes MAKE_JOBS_UNSAFE=yes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment