Commit a6dabef6 authored by Mike Hibler's avatar Mike Hibler

Changes for upcoming 7.3 server packages (for FreeBSD 11.3).

parent 1117eac4
......@@ -482,7 +482,7 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
pkg delete -f ipmitool
cd /usr/ports/misc/emulab-ipmitool-old
make clean all install package clean
env BATCH=1 make clean all install package clean
l. Save packages and update tarball and repo. On boss:
......
......@@ -27,14 +27,20 @@ WANT_PHP_MOD= yes
# PHP modules to build.
# XXX based on current boss install.
#
.if (${EMULAB_PORTVERSION} == "7.3")
USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt mysqli \
openssl pdo phar posix session simplexml sockets tokenizer \
xml xmlreader xmlrpc xmlwriter
.else
USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt mysql \
openssl pdo phar posix session simplexml sockets tokenizer \
xml xmlreader xmlrpc xmlwriter
.endif
#
# Various ports need to agree on what version of apache.
#
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2")
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2" || ${EMULAB_PORTVERSION} == "7.3")
www_apache24_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache24
.MAKEFLAGS+= WITH_SUEXEC=yes
......@@ -44,7 +50,7 @@ www_apache22_SET= SUEXEC
.MAKEFLAGS+= WITH_SUEXEC=yes
.endif
.if (${EMULAB_PORTVERSION} != "7.1" && ${EMULAB_PORTVERSION} != "7.2")
.if (${EMULAB_PORTVERSION} != "7.1" && ${EMULAB_PORTVERSION} != "7.2" && ${EMULAB_PORTVERSION} != "7.3")
#
# Use the base version of openssl
#
......@@ -87,8 +93,11 @@ RUN_DEPENDS+= \
# Emulab-hacked versions of standard ports
#
RUN_DEPENDS+= \
${LOCALBASE}/libexec/tftpd:${PORTSDIR}/misc/emulab-tftp-hpa \
${LOCALBASE}/libexec/tftpd:${PORTSDIR}/misc/emulab-tftp-hpa
.if (${EMULAB_PORTVERSION} != "7.3")
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/misc/emulab-py-m2crypto
.endif
# apps
RUN_DEPENDS+= \
......@@ -151,12 +160,13 @@ RUN_DEPENDS+= \
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb \
${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography \
${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
# apache related ports
RUN_DEPENDS+= \
${LOCALBASE}/${APACHEMODDIR}/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/${APACHEMODDIR}/libphp5.so:${PORTSDIR}/www/mod_php$(PHP_VER) \
${LOCALBASE}/${APACHEMODDIR}/libphp$(PHP_MAJ).so:${PORTSDIR}/www/mod_php$(PHP_VER) \
${LOCALBASE}/${APACHEMODDIR}/mod_fcgid.so:${PORTSDIR}/www/mod_fcgid
# Port versions of current or former "core" utilties
......@@ -188,4 +198,4 @@ vars:
@echo "APACHE_PORT/VERSION=${APACHE_PORT}/${APACHE_VERSION}"
@echo "USE_APACHE/USE_APACHE_BUILD/USE_APACHE_RUN=${USE_APACHE}/${USE_APACHE_BUILD}/${USE_APACHE_RUN}"
@echo "USE_PHP=${USE_PHP}"
@echo "TCL_VER/TK_VER=${TCL_VER}/${TK_VER}"
@echo "USES=${USES}"
......@@ -12,10 +12,14 @@ OSARCH != /usr/bin/uname -m
EMULAB_PORTVERSION= UNSUPPORTED
.if ${OSMAJOR} >= 11
. if ${OSMINOR} >= 2
EMULAB_PORTVERSION= 7.2
. if ${OSMINOR} >= 3
EMULAB_PORTVERSION= 7.3
. else
. if ${OSMINOR} >= 2
EMULAB_PORTVERSION= 7.2
. else
EMULAB_PORTVERSION= 7.1
. endif
. endif
.else
. if ${OSMAJOR} >= 10
......@@ -37,7 +41,18 @@ EMULAB_PORTVERSION= 6.1
# Select PHP and Apache versions
# Fix up some port diffs
#
PHP_MAJ=5
PHP_VER=56
.if (${EMULAB_PORTVERSION} == "7.3")
DEFAULT_VERSIONS= perl5=5.28 python=2.7 tcltk=8.6 php=7.2 mysql=5.7 apache=2.4
APACHE_PORT=www/apache24
APACHEMODDIR=libexec/apache24
MYSQL_VER=57
SWIG_VER=3.0
SWIG_PORT=devel/swig30
PHP_MAJ=7
PHP_VER=72
.else
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2")
DEFAULT_VERSIONS= perl5=5.26 python=2.7 tcltk=8.6 php=5.6 mysql=5.7 apache=2.4
APACHE_PORT=www/apache24
......@@ -63,3 +78,4 @@ SWIG_VER=2.0
SWIG_PORT=devel/swig20
.endif
.endif
.endif
......@@ -80,7 +80,7 @@ RUN_DEPENDS+= \
xterm:${PORTSDIR}/x11/xterm \
zsh:${PORTSDIR}/shells/zsh
.if (${PORTVERSION} == "7.1" || ${PORTVERSION} == "7.2")
.if (${PORTVERSION} == "7.1" || ${PORTVERSION} == "7.2" || ${PORTVERSION} == "7.3")
RUN_DEPENDS+= \
vim:${PORTSDIR}/editors/vim-console
.else
......
......@@ -21,16 +21,15 @@ WANT_PHP_MOD= yes
#
# PHP modules to build.
# XXX based on current ops install.
#
USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt mysql \
USE_PHP= bz2 ctype curl dom filter gd hash iconv json mcrypt \
openssl pdo phar posix session simplexml sockets tokenizer \
xml xmlreader xmlrpc xmlwriter
#
# Various ports need to agree on what version of apache.
#
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2")
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2" || ${EMULAB_PORTVERSION} == "7.3")
www_apache24_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache24
.MAKEFLAGS+= WITH_SUEXEC=yes
......@@ -40,15 +39,21 @@ www_apache22_SET= SUEXEC
.MAKEFLAGS+= WITH_SUEXEC=yes
.endif
.if (${EMULAB_PORTVERSION} != "7.1" && ${EMULAB_PORTVERSION} != "7.2" && ${EMULAB_PORTVERSION} != "7.3")
#
# Use the base version of openssl
#
.MAKEFLAGS+= WITH_OPENSSL_BASE=yes
.endif
#
# This prevents any ports from trying to configure interactively.
#
BATCH= yes
.MAKEFLAGS+= -DBATCH
.MAKEFLAGS+= BATCH=yes
LIB_DEPENDS= \
libmhash.so:${PORTSDIR}/security/mhash \
libmysqlclient.so:${PORTSDIR}/databases/mysql${MYSQL_VER}-client \
libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c \
libpubsub.so:${PORTSDIR}/misc/emulab-pubsub
......@@ -58,8 +63,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
#
# Emulab-hacked versions of standard ports
#
.if (${EMULAB_PORTVERSION} != "7.3")
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/misc/emulab-py-m2crypto
.endif
# compensate for incomplete dependencies (boehm-gc via git)
RUN_DEPENDS+= \
......@@ -76,8 +83,7 @@ RUN_DEPENDS+= \
rsync:${PORTSDIR}/net/rsync \
sudo:${PORTSDIR}/security/sudo \
wget:${PORTSDIR}/ftp/wget \
${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
# perl packages
# XXX all the versions listed here are ones that are known to work
......@@ -101,14 +107,13 @@ RUN_DEPENDS+= \
# python packages
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb \
${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
# apache related ports
RUN_DEPENDS+= \
${LOCALBASE}/${APACHEMODDIR}/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/${APACHEMODDIR}/libphp5.so:${PORTSDIR}/www/mod_php$(PHP_VER)
${LOCALBASE}/${APACHEMODDIR}/libphp$(PHP_MAJ).so:${PORTSDIR}/www/mod_php$(PHP_VER)
# PHP packages
RUN_DEPENDS+= \
......@@ -119,12 +124,6 @@ RUN_DEPENDS+= \
bash:${PORTSDIR}/shells/bash \
zsh:${PORTSDIR}/shells/zsh
#.if ${OSMAJOR} >= 10
## include GCC for now to build Emulab SW (nsverify)
#RUN_DEPENDS+= \
# ${LOCALBASE}/bin/gcc46:${PORTSDIR}/lang/gcc46
#.endif
# For reasons lost in the mists of time, we install this
RUN_DEPENDS+= \
${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/xorg-libraries
......
......@@ -22,7 +22,7 @@ WANT_PHP_MOD= yes
#
# Various ports need to agree on what version of apache.
#
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2")
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2" || ${EMULAB_PORTVERSION} == "7.3")
www_apache24_SET= SUEXEC
.MAKEFLAGS+= APACHE_PORT=www/apache24
.MAKEFLAGS+= WITH_SUEXEC=yes
......@@ -32,7 +32,7 @@ www_apache22_SET= SUEXEC
.MAKEFLAGS+= WITH_SUEXEC=yes
.endif
.if (${EMULAB_PORTVERSION} != "7.1" && ${EMULAB_PORTVERSION} != "7.2")
.if (${EMULAB_PORTVERSION} != "7.1" && ${EMULAB_PORTVERSION} != "7.2" && ${EMULAB_PORTVERSION} != "7.3")
#
# Use the base version of openssl
#
......@@ -44,7 +44,7 @@ www_apache22_SET= SUEXEC
# net-snmp port, ask silly questions without this option.
#
BATCH= yes
.MAKEFLAGS+= -DBATCH
.MAKEFLAGS+= BATCH=yes
LIB_DEPENDS= \
libabac.so:${PORTSDIR}/misc/abac \
......
......@@ -7,7 +7,7 @@
PORTSDIR=${PORTSDIR:-/usr/ports}
PORTSUBDIR=misc
SRCDIR=`dirname $0`
PORTS="abac emulab-boss emulab-extras emulab-fs emulab-genilib emulab-ops emulab-protogeni emulab-pubsub emulab-py-m2crypto emulab-tftp-hpa emulab-tipserv emulab-ipmitool-old libtelnet otcl xerces-c2 p5-IO-EventMux p5-IO-EventMux-Socket-MsgHdr p5-Privileges-Drop p5-RPC-Async"
PORTS="abac emulab-boss emulab-extras emulab-fs emulab-genilib emulab-ops emulab-protogeni emulab-pubsub emulab-tftp-hpa emulab-tipserv emulab-ipmitool-old libtelnet otcl xerces-c2 p5-IO-EventMux p5-IO-EventMux-Socket-MsgHdr p5-Privileges-Drop p5-RPC-Async"
echo "Copying ports ..."
for PORT in $PORTS
......
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