Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*/*: sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2016-02-27 14:57:37 +01:00
parent 9ed2b5bc71
commit 21e40d43e3
204 changed files with 1985 additions and 1351 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audio/mp3guessenc/Makefile
View file

@ -2,13 +2,16 @@
# $FreeBSD$
PORTNAME= mp3guessenc
PORTVERSION= 0.26.0
PORTVERSION= 0.26.1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/\.[0-9]*$//}
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Utility for guessing which encoder was used to encode an mp3 file
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
PLIST_FILES= bin/mp3guessenc
SRC= decode.c mp3guessenc.c bit_utils.c tags.c

4
audio/mp3guessenc/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mp3guessenc-0.26.0.tar.gz) = b97f67dc90ad44637079b23e45f076536c2ebaa4bc8305c94a8deb0a6e41a244
SIZE (mp3guessenc-0.26.0.tar.gz) = 87509
SHA256 (mp3guessenc-0.26.1.tar.gz) = 6ddc4f80df0a9b10701a3982fe1f61c3f8625fe8b82dbf7bacfaebff51c2504a
SIZE (mp3guessenc-0.26.1.tar.gz) = 107317

6
benchmarks/unixbench/Makefile
View file

@ -8,7 +8,7 @@ CATEGORIES= benchmarks
MASTER_SITES= http://ftp.osuosl.org/pub/nslu2/sources/ \
http://www.tux.org/pub/tux/niemi/unixbench/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= luca.pizzamiglio@gmail.com
COMMENT= BYTE magazine's Public Domain benchmark for UNIX
USES= shebangfix tar:tgz
@ -41,10 +41,6 @@ do-install:
${INSTALL_PROGRAM} $${f} ${STAGEDIR}${PREFIX}/lib/unixbench/pgms/ ;; \
esac ; \
done
${MKDIR} ${STAGEDIR}${PREFIX}/lib/unixbench/results
# for f in ${WRKSRC}/results/* ; do \
# ${INSTALL_DATA} $${f} ${STAGEDIR}${PREFIX}/lib/unixbench/results/ ; \
# done
-${MKDIR} ${STAGEDIR}${PREFIX}/lib/unixbench/testdir
for f in ${WRKSRC}/testdir/* ; do \
${INSTALL_DATA} $${f} ${STAGEDIR}${PREFIX}/lib/unixbench/testdir/ ; \

1
benchmarks/unixbench/pkg-plist
View file

@ -40,4 +40,3 @@ lib/unixbench/pgms/whetstone-double
lib/unixbench/testdir/cctest.c
lib/unixbench/testdir/dc.dat
lib/unixbench/testdir/sort.src
@dir lib/unixbench/results

1
biology/Makefile
View file

@ -94,6 +94,7 @@
SUBDIR += treepuzzle
SUBDIR += treeviewx
SUBDIR += ugene
SUBDIR += vcftools
SUBDIR += velvet
SUBDIR += wise
SUBDIR += xmolwt

54
biology/phyml/Makefile
View file

@ -2,31 +2,59 @@
# $FreeBSD$
PORTNAME= phyml
PORTVERSION= 20121109
DISTVERSIONPREFIX= v
DISTVERSION= 3.2.0
PORTEPOCH= 1
CATEGORIES= biology
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-20120412
DIST_SUBDIR= ${PORTNAME}
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ${PORTVERSION}.patch
PATCH_DIST_STRIP= -p4
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple, fast, and accurate algorithm to estimate large phylogenies
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
PATCH_WRKSRC= ${WRKSRC}/src
USE_GITHUB= yes
GH_ACCOUNT= stephaneguindon
USES= autoreconf
USES= autoreconf libtool pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-beagle
PLIST_FILES= bin/phyml
PORTDOCS= *
PORTEXAMPLES= *
PLIST_FILES= bin/phyml${BIN_SUFFIX}
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_RADIO= MPI
OPTIONS_RADIO_MPI= MPICH2 OPENMPI
MPICH2_LIB_DEPENDS= libmpich.so:${PORTSDIR}/net/mpich2
MPICH2_MAKE_ARGS= CC="${LOCALBASE}/bin/mpicc"
OPENMPI_LIB_DEPENDS= libmpi.so:${PORTSDIR}/net/openmpi
OPENMPI_MAKE_ARGS= CC="${LOCALBASE}/mpi/openmpi/bin/mpicc"
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMPICH2} || ${PORT_OPTIONS:MOPENMPI}
CONFIGURE_ARGS+= --enable-mpi
BIN_SUFFIX= -mpi
.else
CONFIGURE_ARGS+= --disable-mpi
BIN_SUFFIX= # none
.endif
post-patch:
@${REINPLACE_CMD} -e \
'/^AC_INIT/s|,esyscmd.*,|,[${PORTVERSION}],| ; \
s|-O2 -msse|$${CFLAGS}|' ${WRKSRC}/configure.ac
's|-O2 .* $${ARCH_flag}|$${CFLAGS}|' ${WRKSRC}/configure.ac
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.pdf \
${STAGEDIR}${DOCSDIR})
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
${STAGEDIR}${EXAMPLESDIR})
.include <bsd.port.mk>

6
biology/phyml/distinfo
View file

@ -1,4 +1,2 @@
SHA256 (phyml/phyml-20120412.tar.gz) = a43e51534a1ae2d1ee4c94ced3a1855813ff4872a6c9c2b83b369ddb71198417
SIZE (phyml/phyml-20120412.tar.gz) = 4089133
SHA256 (phyml/20121109.patch) = 3aa8bebd0ff78a553795ddda512ef1c7542d1e3c90c1da61c7125c304f6caa2c
SIZE (phyml/20121109.patch) = 11016
SHA256 (stephaneguindon-phyml-v3.2.0_GH0.tar.gz) = 9fec8fc26e69cad8d58bf2c9433b531754e4f026dc3464d07958b6c824783fde
SIZE (stephaneguindon-phyml-v3.2.0_GH0.tar.gz) = 1239843

36
biology/phyml/pkg-descr
View file

@ -1,18 +1,20 @@
PhyML is a software that estimates maximum likelihood phylogenies from
alignments of nucleotide or amino acid sequences. It provides a wide range of
options that were designed to facilitate standard phylogenetic analyses. The
main strengths of PhyML lies in the large number of substitution models coupled
to various options to search the space of phylogenetic tree topologies, going
from very fast and efficient methods to slower but generally more accurate
approaches. It also implements two methods to evaluate branch supports in a
sound statistical framework (the non-parametric bootstrap and the approximate
likelihood ratio test). PhyML was designed to process moderate to large data
sets. In theory, alignments with up to 4,000 sequences 2,000,000 character-long
can analyzed. In practice however, the amount of memory required to process a
data set is proportional of the product of the number of sequences by their
length. Hence, a large number of sequences can only be processed provided that
they are short. Also, PhyML can handle long sequences provided that they are
not numerous. With most standard personal computers, the "comfort zone" for
PhyML generally lies around 3 to 500 sequences less than 2,000 character long.
PhyML is a software that estimates maximum likelihood phylogenies from
alignments of nucleotide or amino acid sequences. It provides a wide
range of options that were designed to facilitate standard phylogenetic
analyses. The main strengths of PhyML lies in the large number of
substitution models coupled to various options to search the space of
phylogenetic tree topologies, going from very fast and efficient methods
to slower but generally more accurate approaches. It also implements two
methods to evaluate branch supports in a sound statistical framework
(the non-parametric bootstrap and the approximate likelihood ratio
test). PhyML was designed to process moderate to large data sets. In
theory, alignments with up to 4,000 sequences 2,000,000 character-long
can analyzed. In practice however, the amount of memory required to
process a data set is proportional of the product of the number of
sequences by their length. Hence, a large number of sequences can only
be processed provided that they are short. Also, PhyML can handle long
sequences provided that they are not numerous. With most standard
personal computers, the "comfort zone" for PhyML generally lies around 3
to 500 sequences less than 2,000 character long.
WWW: http://code.google.com/p/phyml/
WWW: https://github.com/stephaneguindon/phyml/

23
biology/vcftools/Makefile Normal file
View file

@ -0,0 +1,23 @@
# Created by: Jason Bacon <bacon4000@gmail.com>
# $FreeBSD$
PORTNAME= vcftools
PORTVERSION= 0.1.14
DISTVERSIONPREFIX= v
CATEGORIES= biology
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= bacon4000@gmail.com
COMMENT= Tools for working with VCF genomics files
LICENSE= LGPL3
USES= autoreconf gmake perl5 pkgconfig
GNU_CONFIGURE= yes
# No zlib.pc on 9.x
CONFIGURE_ENV= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
USE_GITHUB= yes
.include <bsd.port.mk>

2
biology/vcftools/distinfo Normal file
View file

@ -0,0 +1,2 @@
SHA256 (vcftools_0.1.14_GH0.tar.gz) = ba440584645e9901c1eeb6b769ccd828591f0575c73349072cde3efa77da6fdf
SIZE (vcftools_0.1.14_GH0.tar.gz) = 241228

4
biology/vcftools/pkg-descr Normal file
View file

@ -0,0 +1,4 @@
A set of tools written in Perl and C++ for working with VCF files, such as
those generated by the 1000 Genomes Project.
WWW: https://github.com/vcftools/vcftools

29
biology/vcftools/pkg-plist Normal file
View file

@ -0,0 +1,29 @@
bin/fill-aa
bin/fill-an-ac
bin/fill-fs
bin/fill-ref-md5
bin/vcf-annotate
bin/vcf-compare
bin/vcf-concat
bin/vcf-consensus
bin/vcf-contrast
bin/vcf-convert
bin/vcf-fix-newlines
bin/vcf-fix-ploidy
bin/vcf-indel-stats
bin/vcf-isec
bin/vcf-merge
bin/vcf-phased-join
bin/vcf-query
bin/vcf-shuffle-cols
bin/vcf-sort
bin/vcf-stats
bin/vcf-subset
bin/vcf-to-tab
bin/vcf-tstv
bin/vcf-validator
bin/vcftools
%%SITE_PERL%%/FaSlice.pm
%%SITE_PERL%%/Vcf.pm
%%SITE_PERL%%/VcfStats.pm
man/man1/vcftools.1.gz

7
converters/p5-JSON-XS/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= JSON-XS
PORTVERSION= 3.01
PORTREVISION= 2
PORTVERSION= 3.02
CATEGORIES= converters perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@ -21,6 +20,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
post-patch:
# This dependency does nothing and is safe to remove
@${REINPLACE_CMD} -e '/use Canary::Stability/d' ${WRKSRC}/Makefile.PL
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/JSON/XS/XS.so

4
converters/p5-JSON-XS/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (JSON-XS-3.01.tar.gz) = 4e8df3256a5aa9ed304ce1bbcd9140737deef31ba847bff9f4c15480c88c71ab
SIZE (JSON-XS-3.01.tar.gz) = 78245
SHA256 (JSON-XS-3.02.tar.gz) = 5f6a5944887d75f1d34440a2d9e69ef12e23f434af23acb143fb0241f40b02be
SIZE (JSON-XS-3.02.tar.gz) = 82712

30
databases/mongodb32/Makefile
View file

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= mongodb32
PORTVERSION= 3.2.1
PORTVERSION= 3.2.3
DISTVERSIONPREFIX= r
PORTREVISION= 1
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/ \
@ -18,19 +17,25 @@ COMMENT= Distributed document-oriented "NoSQL" database
LICENSE= AGPLv3 APACHE20
LICENSE_COMB= multi
# Bugs when compiled with < Clang 3.7
# - https://jira.mongodb.org/browse/SERVER-21217
# - https://jira.mongodb.org/browse/SERVER-22740
BUILD_DEPENDS= ${LOCALBASE}/bin/clang37:${PORTSDIR}/lang/clang37
LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \
libsnappy.so:${PORTSDIR}/archivers/snappy
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml \
${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:${PORTSDIR}/databases/pymongo
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than i386 and amd64"
CPP= ${LOCALBASE}/bin/clang-cpp37
CC= ${LOCALBASE}/bin/clang37
CXX= ${LOCALBASE}/bin/clang++37
CHOSEN_COMPILER_TYPE= clang
OPTIONS_DEFINE= SASL SSL WIREDTIGER
OPTIONS_DEFAULT= SSL WIREDTIGER
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)"
# Only supported on 64-bit
OPTIONS_EXCLUDE_i386= WIREDTIGER
OPTIONS_DEFINE= SASL SSL
OPTIONS_DEFAULT= SASL SSL
SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
SASL_MAKE_ARGS= --use-sasl-client
@ -38,14 +43,9 @@ SASL_MAKE_ARGS= --use-sasl-client
SSL_USE= openssl=yes
SSL_MAKE_ARGS= --ssl
WIREDTIGER_DESC= WiredTiger database engine support
WIREDTIGER_VARS= wiredtiger_build=on
WIREDTIGER_VARS_OFF= wiredtiger_build=off
USES= cpe execinfo python:build scons
MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
--wiredtiger=${WIREDTIGER_BUILD} \
--use-system-pcre --use-system-snappy \
--release
@ -59,10 +59,6 @@ TEST_TARGET= unittests
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
WIREDTIGER_BUILD= off
.endif
.if ${OSVERSION} < 1000000
# Cannot be built
IGNORE= unsupported on FreeBSD 9 or older

4
databases/mongodb32/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mongodb-src-r3.2.1.tar.gz) = 50431a3ba5ab68bd0bed4a157a8528ca27753a63cf101f13135255e4e9d42f15
SIZE (mongodb-src-r3.2.1.tar.gz) = 26397562
SHA256 (mongodb-src-r3.2.3.tar.gz) = 82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa
SIZE (mongodb-src-r3.2.3.tar.gz) = 29607224

2
databases/p5-Mango/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Mango
PORTVERSION= 1.25
PORTVERSION= 1.26
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ODC

4
databases/p5-Mango/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (Mango-1.25.tar.gz) = f7b7777cf0f061f908a0c93bd5f43a16172b204d3fac0cb3b7857a71d4c0b673
SIZE (Mango-1.25.tar.gz) = 49066
SHA256 (Mango-1.26.tar.gz) = 09e90c3c4456a1554c53fc801385be147c8a2a0d1f5cfc17b41f989a06a58b9d
SIZE (Mango-1.26.tar.gz) = 50195

2
databases/tarantool/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tarantool
PORTVERSION= 1.6.8.371
PORTVERSION= 1.6.8.529
CATEGORIES= databases
MASTER_SITES= http://tarantool.org/dist/1.6/

4
databases/tarantool/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (tarantool-1.6.8.371.tar.gz) = 73ffe8d960e2a17528d5743aaf273dc0f33f27714f9e2a24bb5c8133b092131c
SIZE (tarantool-1.6.8.371.tar.gz) = 4894701
SHA256 (tarantool-1.6.8.529.tar.gz) = 433693396b5cebd1468f10ccfa64f0ade23e6ebfb94105717dc357fda327a062
SIZE (tarantool-1.6.8.529.tar.gz) = 3955265

51
databases/tarantool/files/patch-extra_dist_CMakeLists.txt
View file

@ -1,51 +0,0 @@
--- extra/dist/CMakeLists.txt.orig 2016-01-20 16:22:43 UTC
+++ extra/dist/CMakeLists.txt
@@ -5,7 +5,11 @@ include(systemd)
#
# Default path to data in default/tarantool
-set(TARANTOOL_DATADIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/tarantool")
+if (TARGET_OS_FREEBSD)
+ set(TARANTOOL_DATADIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/db/tarantool")
+else()
+ set(TARANTOOL_DATADIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/tarantool")
+endif()
message (STATUS "tarantoolctl datadir: ${TARANTOOL_DATADIR}")
set(TARANTOOL_LOGDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/tarantool")
message (STATUS "tarantoolctl logdir: ${TARANTOOL_LOGDIR}")
@@ -13,7 +17,9 @@ set(TARANTOOL_RUNDIR "${CMAKE_INSTALL_FU
message (STATUS "tarantoolctl rundir: ${TARANTOOL_RUNDIR}")
# config file for tarantoolctl
-if (NOT IS_DIRECTORY "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig")
+if (TARGET_OS_FREEBSD)
+ set(SYSCONFIG_DEFAULT "tarantool/default")
+elseif (NOT IS_DIRECTORY "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig")
# Debian/Ubuntu/etc.
set(SYSCONFIG_DEFAULT "default")
else()
@@ -58,6 +64,7 @@ install(DIRECTORY DESTINATION ${TARANTOO
install(DIRECTORY DESTINATION ${TARANTOOL_LOGDIR})
install(DIRECTORY DESTINATION ${TARANTOOL_RUNDIR})
+if (NOT TARGET_OS_FREEBSD)
# logrotate files
configure_file(tarantool.logrotate.in tarantool.logrotate @ONLY)
install (FILES ${PROJECT_BINARY_DIR}/extra/dist/tarantool.logrotate
@@ -67,6 +74,7 @@ install (FILES ${PROJECT_BINARY_DIR}/ext
OWNER_READ OWNER_WRITE
GROUP_READ
WORLD_READ)
+endif()
# man page for tarantoolctl
pod2man (
@@ -106,6 +114,8 @@ if (WITH_SYSTEMD)
GROUP_READ GROUP_READ
WORLD_READ WORLD_READ)
+elseif(TARGET_OS_FREEBSD)
+ message (STATUS "Skip installing init.d scripts on FreeBSD")
else() # sysvinit
message (STATUS "Using scripts for sysvinit")
install (FILES tarantool.init DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d/

4
databases/tarantool/pkg-plist
View file

@ -11,7 +11,9 @@ include/tarantool/lualib.h
include/tarantool/module.h
man/man1/tarantool.1.gz
man/man1/tarantoolctl.1.gz
@dir %%ETCDIR%%/instances.enabled
@dir %%DATADIR%%
@dir %%ETCDIR%%/instances.available
@dir lib/tarantool
@dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_DATADIR%%
@dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_LOGDIR%%
@dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_RUNDIR%%

2
devel/Makefile
View file

@ -4588,6 +4588,7 @@
SUBDIR += qscintilla2-designerplugin
SUBDIR += qscintilla2-designerplugin-qt5
SUBDIR += qscintilla2-qt5
SUBDIR += qt-maybe
SUBDIR += qt4
SUBDIR += qt4-assistant
SUBDIR += qt4-assistant-adp
@ -5368,6 +5369,7 @@
SUBDIR += xwpe
SUBDIR += xxgdb
SUBDIR += xxl
SUBDIR += yaggo
SUBDIR += yajl
SUBDIR += yajl-tcl
SUBDIR += yaml-cpp

4
devel/bmake/Makefile
View file

@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= bmake
PORTVERSION= 20151022
PORTVERSION= 20160220
CATEGORIES= devel
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/ \
http://www.gtlib.cc.gatech.edu/pub/NetBSD/misc/sjg/ \
ftp://ftp.uk.netbsd.org/pub/NetBSD/misc/sjg/ \
ftp://ftp.de.netbsd.org/pub/NetBSD/misc/sjg/
DISTFILES= bmake-${PORTVERSION}.tar.gz mk-${PORTVERSION}.tar.gz
DISTFILES= bmake-${PORTVERSION}.tar.gz mk-20151111.tar.gz
MAINTAINER= trociny@FreeBSD.org
COMMENT= Portable version of NetBSD 'make' utility

8
devel/bmake/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (bmake-20151022.tar.gz) = 9183a78ea10303141158aa99f62493823e5ee3598e512cbc6d35c98e4031b366
SIZE (bmake-20151022.tar.gz) = 534269
SHA256 (mk-20151022.tar.gz) = 2cb3654b3fe582d9254c5227608427209b9aaf360fd23654b3f4cae58e3fdce8
SIZE (mk-20151022.tar.gz) = 87745
SHA256 (bmake-20160220.tar.gz) = df874ff0976a161d2b94476299cae4d13f69ad2d238c10582378e41dcfd5ccdd
SIZE (bmake-20160220.tar.gz) = 537825
SHA256 (mk-20151111.tar.gz) = beebba89da0ba068c904599d3358e6f08c35418b13300fac787c11774a525bc1
SIZE (mk-20151111.tar.gz) = 88106

87
devel/bmake/files/patch-var.c
View file

@ -1,87 +0,0 @@
------------------------------------------------------------------------
r250164 | sjg | 2013-05-02 02:58:39 +0300 (Thu, 02 May 2013) | 8 lines
Local hack to allow smooth transition for ports.
bsd.port.mk can set .MAKE.FreeBSD_UL=yes
to cause :L and :U to have their old behavior.
This should be reverted when 8.3 is EOL.
PR: 173299
Reviewed by: obrien
--- var.c.orig 2013-03-04 03:01:57.000000000 +0200
+++ var.c 2013-05-04 10:28:21.832274582 +0300
@@ -140,6 +140,17 @@ __RCSID("$NetBSD: var.c,v 1.173 2013/02/
#include "job.h"
/*
+ * XXX transition hack for FreeBSD ports.
+ * bsd.port.mk can set .MAKE.FreeBSD_UL=yes
+ * to cause us to treat :[LU] as aliases for :t[lu]
+ * To be reverted when ports converts to :t[lu] (when 8.3 is EOL)
+ */
+#define MAKE_FREEBSD_UL ".MAKE.FreeBSD_UL"
+#ifdef MAKE_FREEBSD_UL
+static int FreeBSD_UL = FALSE;
+#endif
+
+/*
* This lets us tell if we have replaced the original environ
* (which we cannot free).
*/
@@ -965,6 +976,11 @@ Var_Set(const char *name, const char *va
setenv(MAKE_LEVEL_SAFE, tmp, 1);
#endif
}
+#ifdef MAKE_FREEBSD_UL
+ if (strcmp(MAKE_FREEBSD_UL, name) == 0) {
+ FreeBSD_UL = getBoolean(MAKE_FREEBSD_UL, FALSE);
+ }
+#endif
out:
@@ -2660,8 +2676,24 @@ ApplyModifiers(char *nstr, const char *t
free(loop.str);
break;
}
- case 'D':
case 'U':
+#ifdef MAKE_FREEBSD_UL
+ if (FreeBSD_UL) {
+ int nc = tstr[1];
+
+ /* we have to be careful, since :U is used internally */
+ if (nc == ':' || nc == endc) {
+ char *dp = bmake_strdup(nstr);
+ for (newStr = dp; *dp; dp++)
+ *dp = toupper((unsigned char)*dp);
+ cp = tstr + 1;
+ termc = *cp;
+ break; /* yes inside the conditional */
+ }
+ /* FALLTHROUGH */
+ }
+#endif
+ case 'D':
{
Buffer buf; /* Buffer for patterns */
int wantit; /* want data in buffer */
@@ -2721,6 +2753,17 @@ ApplyModifiers(char *nstr, const char *t
break;
}
case 'L':
+#ifdef MAKE_FREEBSD_UL
+ if (FreeBSD_UL) {
+ char *dp = bmake_strdup(nstr);
+ for (newStr = dp; *dp; dp++)
+ *dp = tolower((unsigned char)*dp);
+ cp = tstr + 1;
+ termc = *cp;
+ break;
+ }
+ /* FALLTHROUGH */
+#endif
{
if ((v->flags & VAR_JUNK) != 0)
v->flags |= VAR_KEEP;

2
devel/elixir-apex/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= apex
PORTVERSION= 0.3.7
PORTVERSION= 0.4.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
PKGNAMEPREFIX= elixir-

4
devel/elixir-apex/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (BjRo-apex-v0.3.7_GH0.tar.gz) = 4bae948da061e9b94e9fcae7ef85b96534508c7357778c90d33c0bcf406f5712
SIZE (BjRo-apex-v0.3.7_GH0.tar.gz) = 5995
SHA256 (BjRo-apex-v0.4.0_GH0.tar.gz) = 9f9577ffde0f8ffa68d05a2628517b37bfdcdb68191b70df17ff3588adbf173f
SIZE (BjRo-apex-v0.4.0_GH0.tar.gz) = 6062

1
devel/elixir-apex/pkg-plist
View file

@ -10,6 +10,7 @@ lib/elixir/lib/apex/ebin/Elixir.Apex.Format.HashSet.beam
lib/elixir/lib/apex/ebin/Elixir.Apex.Format.Integer.beam
lib/elixir/lib/apex/ebin/Elixir.Apex.Format.List.beam
lib/elixir/lib/apex/ebin/Elixir.Apex.Format.Map.beam
lib/elixir/lib/apex/ebin/Elixir.Apex.Format.MapSet.beam
lib/elixir/lib/apex/ebin/Elixir.Apex.Format.PID.beam
lib/elixir/lib/apex/ebin/Elixir.Apex.Format.Range.beam
lib/elixir/lib/apex/ebin/Elixir.Apex.Format.Reference.beam

2
devel/elixir-exrm/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= exrm
DISTVERSION= 1.0.0-rc8
DISTVERSION= 1.0.0
CATEGORIES= devel
PKGNAMEPREFIX= elixir-

4
devel/elixir-exrm/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (bitwalker-exrm-1.0.0-rc8_GH0.tar.gz) = 3d2cb0e596b562b1696cfa2c8bdfc69926327fb2d286f80390d27e3905ec6be0
SIZE (bitwalker-exrm-1.0.0-rc8_GH0.tar.gz) = 55804
SHA256 (bitwalker-exrm-1.0.0_GH0.tar.gz) = 313e015bc5b5e4bc16ecd98fcb84e038fefec0767621941a334da24463c48f64
SIZE (bitwalker-exrm-1.0.0_GH0.tar.gz) = 56169

10
devel/openocd/Makefile
View file

@ -20,7 +20,7 @@ BROKEN_FreeBSD_9= libusb does not install pkgconfig files
OPTIONS_DEFINE= DOC JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
ARMJTAGEW BUSPIRATE TIICDI STLINK OSBDM OPENDOUS SYSFSGPIO RMTBITBANG \
MINIDRIVER
MINIDRIVER CMSISDAP
OPTIONS_DEFAULT=DOC JIMTCL PARPORT DUMMY FT2232 FTDI USBBLASTER EP93XX \
AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK ARMJTAGEW \
BUSPIRATE STLINK OSBDM OPENDOUS RMTBITBANG
@ -52,6 +52,7 @@ OPENDOUS= Support EStick/OpenDous Programmer
SYSFSGPIO= Support Programming via sysfs GPIOs
RMTBITBANG_DESC=Support Remote-Bitbang Driver
MINIDRIVER_DESC=Dummy minidriver only (will exclude others!)
CMSISDAP_DESC=Support for CMSIS-DAP Compliant Debugger
USES= gmake libtool pkgconfig tar:bzip2
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
@ -276,6 +277,13 @@ CONFIGURE_ARGS+= --enable-minidriver-dummy
CONFIGURE_ARGS+= --disable-minidriver-dummy
.endif
.if ${PORT_OPTIONS:MCMSISDAP}
CONFIGURE_ARGS+= --enable-cmsis-dap
LIB_DEPENDS+= libhidapi.so:${PORTSDIR}/comms/hidapi
.else
CONFIGURE_ARGS+= --disable-cmsis-dap
.endif
.if defined(WITH_LIBFTDI)
LIB_DEPENDS+= libftdi.so:${PORTSDIR}/devel/libftdi
.endif

2
devel/p5-Want/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Want
PORTVERSION= 0.26
PORTVERSION= 0.29
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ROBIN

4
devel/p5-Want/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (Want-0.26.tar.gz) = 4951675e13de2b0b9792be2827b8ef46ef25a0b9a2d3e9132143444dac28e17c
SIZE (Want-0.26.tar.gz) = 19866
SHA256 (Want-0.29.tar.gz) = b4e4740b8d4cb783591273c636bd68304892e28d89e88abf9273b1de17f552f7
SIZE (Want-0.29.tar.gz) = 20928

27
devel/qt-maybe/Makefile Normal file
View file

@ -0,0 +1,27 @@
# Created by: Pawel Pekala <pawel@FreeBSD.org>
# $FreeBSD$
PORTNAME= qt-maybe
PORTVERSION= 0.0.20151227
CATEGORIES= devel
MAINTAINER= pawel@FreeBSD.org
COMMENT= Implementation of sum/option types using QVariant
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= robertknight
GH_TAGNAME= 52b21af
USE_QT5= core
NO_BUILD= yes
PLIST_FILES= include/Either.h include/Maybe.h
do-install:
(cd ${WRKSRC} && ${INSTALL_DATA} Either.h Maybe.h \
${STAGEDIR}${PREFIX}/include)
.include <bsd.port.mk>

2
devel/qt-maybe/distinfo Normal file
View file

@ -0,0 +1,2 @@
SHA256 (robertknight-qt-maybe-0.0.20151227-52b21af_GH0.tar.gz) = d7ede0224f16920c2892d26a59b47651c787f5adf6b618f50bf44b5e93227b69
SIZE (robertknight-qt-maybe-0.0.20151227-52b21af_GH0.tar.gz) = 4688

5
devel/qt-maybe/pkg-descr Normal file
View file

@ -0,0 +1,5 @@
A set of simple(ish) C++ templates which implement sum and option types.
They serve a similar purpose to boost::variant and boost::optional but
are implemented on top of Qt's QVariant container.
WWW: https://github.com/robertknight/qt-maybe

9
devel/relx/Makefile
View file

@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= relx
PORTVERSION= 3.17.0
PORTVERSION= 3.18.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
MASTER_SITES+= LOCAL/olgeni:deps \
http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
https://s3.amazonaws.com/s3.hex.pm/tarballs/:hex
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
relx-cache-10.tar.gz:deps
relx-cache-11.tar.gz:deps
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
relx-cache-10.tar.gz
relx-cache-11.tar.gz
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Sane, simple release creation for Erlang
@ -30,7 +30,7 @@ GH_ACCOUNT= erlware
REBAR_DEPS= bbmustache-1.0.4 \
cf-0.2.1 \
erlware_commons-0.18.0 \
erlware_commons-0.19.0 \
getopt-0.8.2 \
providers-1.6.0
@ -43,7 +43,6 @@ DISTFILES+= ${_dep}.tar:hex
# providing both before building.
post-extract:
@${LN} -s cache ${WRKDIR}/.cache
.for _dep in ${REBAR_DEPS}
@${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
@${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\

12
devel/relx/distinfo
View file

@ -1,13 +1,13 @@
SHA256 (erlware-relx-v3.17.0_GH0.tar.gz) = 8dd6a36c60f35366ca72390afc97cb61bbd8cc96db2cc47637d2d08ab572a7b3
SIZE (erlware-relx-v3.17.0_GH0.tar.gz) = 599628
SHA256 (relx-cache-10.tar.gz) = 477271e412921766adb56c70d49dfb9b6009eafd8b80a358ae5c172834d79bf3
SIZE (relx-cache-10.tar.gz) = 417321
SHA256 (erlware-relx-v3.18.0_GH0.tar.gz) = 45114b0b60b57bc1fec48ce90bbb2bdf7fb082b28eed639f6e71ed09b2d49e7a
SIZE (erlware-relx-v3.18.0_GH0.tar.gz) = 599623
SHA256 (relx-cache-11.tar.gz) = 0010614baf93b0d81f809060dd4dac132a773d35cbcd7b0a87d3745bf2e6ff0b
SIZE (relx-cache-11.tar.gz) = 596560
SHA256 (bbmustache-1.0.4.tar) = 03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12
SIZE (bbmustache-1.0.4.tar) = 20480
SHA256 (cf-0.2.1.tar) = baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5
SIZE (cf-0.2.1.tar) = 10240
SHA256 (erlware_commons-0.18.0.tar) = e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49
SIZE (erlware_commons-0.18.0.tar) = 61440
SHA256 (erlware_commons-0.19.0.tar) = 5bbff9402cd9e973af81745a8a40177d245b55b4c239f80a236949b856f2dabd
SIZE (erlware_commons-0.19.0.tar) = 61440
SHA256 (getopt-0.8.2.tar) = 736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7
SIZE (getopt-0.8.2.tar) = 20480
SHA256 (providers-1.6.0.tar) = 0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f

14
devel/valgrind-devel/Makefile
View file

@ -2,19 +2,19 @@
# $FreeBSD$
PORTNAME= valgrind
PORTVERSION= 3.10.0.20150126
PORTVERSION= 3.10.1.20160113
DISTVERSIONPREFIX= freebsd-
PORTREVISION= 1
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/
PKGNAMESUFFIX= -devel
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bdrewery@FreeBSD.org
COMMENT= Memory debugging and profiling tool
BB_COMMIT= 963c4a777573
BB_COMMIT= ce1acb28953f
BB_ACCOUNT= stass
BB_PROJECT= valgrind-freebsd
@ -47,6 +47,12 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in
EXTRA_PATCHES= \
${FILESDIR}/accept4_syscall.patch:-p1 \
${FILESDIR}/jail_syscalls.patch:-p1 \
${FILESDIR}/kldload_syscalls.patch:-p1 \
${FILESDIR}/missing_fcntls.patch:-p1
PORTDOCS= html
WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}

4
devel/valgrind-devel/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (valgrind-freebsd-3.10.0.20150126.tar.gz) = 22086b8d36056dbcf0f95b4737e03a206058e4fa97e097a34f4275ded6849103
SIZE (valgrind-freebsd-3.10.0.20150126.tar.gz) = 12185205
SHA256 (valgrind-freebsd-3.10.1.20160113.tar.gz) = b580fcacf06befce33a4ba4badaa346b5e57c25774f62af38488dec6ad01eb8c
SIZE (valgrind-freebsd-3.10.1.20160113.tar.gz) = 12084614

56
devel/valgrind-devel/files/accept4_syscall.patch Normal file
View file

@ -0,0 +1,56 @@
# HG changeset patch
# User Bitbucket <noreply@bitbucket.org>
# Date 0 0
# Node ID af5523fe25247f537884116bd37e8ce171ba837e
# Parent ce1acb28953fd6928ccb8f9511e374eab66e8625
# Parent 22cf2727f838e9f5efaeba377341c3807d74dbdb
Merge preview of source (22cf2727f838e9f5efaeba377341c3807d74dbdb) to destination (ce1acb28953fd6928ccb8f9511e374eab66e8625).
diff -r ce1acb28953fd6928ccb8f9511e374eab66e8625 -r af5523fe25247f537884116bd37e8ce171ba837e coregrind/m_syswrap/syswrap-freebsd.c
--- a/coregrind/m_syswrap/syswrap-freebsd.c
+++ b/coregrind/m_syswrap/syswrap-freebsd.c
@@ -480,6 +480,23 @@
SET_STATUS_from_SysRes(r);
}
+PRE(sys_accept4)
+{
+ *flags |= SfMayBlock;
+ PRINT("sys_accept4 ( %ld, %#lx, %ld, %ld)",ARG1,ARG2,ARG3,ARG4);
+ PRE_REG_READ4(long, "accept4",
+ int, s, struct sockaddr *, addr, int, *addrlen, int, flags);
+ ML_(generic_PRE_sys_accept)(tid, ARG1,ARG2,ARG3);
+}
+POST(sys_accept4)
+{
+ SysRes r;
+ vg_assert(SUCCESS);
+ r = ML_(generic_POST_sys_accept)(tid, VG_(mk_SysRes_Success)(RES),
+ ARG1,ARG2,ARG3);
+ SET_STATUS_from_SysRes(r);
+}
+
PRE(sys_sendto)
{
*flags |= SfMayBlock;
@@ -4307,7 +4324,8 @@
BSDXY(__NR___semctl, sys___semctl), // 510
BSDXY(__NR_shmctl, sys_shmctl), // 512
-
+
+ BSDXY(__NR_accept4, sys_accept4), //541
BSDXY(__NR_pipe2, sys_pipe2), // 542
BSDX_(__NR_fake_sigreturn, sys_fake_sigreturn), // 1000, fake sigreturn
diff -r ce1acb28953fd6928ccb8f9511e374eab66e8625 -r af5523fe25247f537884116bd37e8ce171ba837e include/vki/vki-scnums-freebsd.h
--- a/include/vki/vki-scnums-freebsd.h
+++ b/include/vki/vki-scnums-freebsd.h
@@ -407,6 +407,7 @@
#define __NR_posix_openpt 504
#define __NR___semctl 510
#define __NR_shmctl 512
+#define __NR_accept4 541
#define __NR_pipe2 542
#define __NR_fake_sigreturn 1000

87
devel/valgrind-devel/files/jail_syscalls.patch Normal file
View file

@ -0,0 +1,87 @@
# HG changeset patch
# User Bitbucket <noreply@bitbucket.org>
# Date 0 0
# Node ID 90c6097540f35e312d34340b916296130003c851
# Parent ce1acb28953fd6928ccb8f9511e374eab66e8625
# Parent 5662e704b72c7ebb116f8478a4ff3847acc72fc6
Merge preview of source (5662e704b72c7ebb116f8478a4ff3847acc72fc6) to destination (ce1acb28953fd6928ccb8f9511e374eab66e8625).
diff -r ce1acb28953fd6928ccb8f9511e374eab66e8625 -r 90c6097540f35e312d34340b916296130003c851 coregrind/m_syswrap/syswrap-freebsd.c
--- a/coregrind/m_syswrap/syswrap-freebsd.c
+++ b/coregrind/m_syswrap/syswrap-freebsd.c
@@ -3670,6 +3670,42 @@
POST_MEM_WRITE( ARG5, ARG4 );
}
+PRE(sys_jail_get)
+{
+
+ PRINT("sys_jail_get ( %#lx, %lu, %ld )", ARG1, ARG2, ARG3);
+ PRE_REG_READ3(int, "jail_get", struct vki_iovec *, iov, unsigned int,
+ niov, int, flags);
+ PRE_MEM_WRITE("jail_get", ARG1, ARG2 * sizeof(struct vki_iovec));
+}
+
+POST(sys_jail_get)
+{
+ vg_assert(SUCCESS);
+ if (RES != -1)
+ POST_MEM_WRITE(ARG1, ARG2);
+}
+
+PRE(sys_jail_set)
+{
+ PRINT("sys_jail_set ( %#lx, %lu, %ld )", ARG1, ARG2, ARG3);
+ PRE_REG_READ3(int, "jail_set", struct vki_iovec *, iov, unsigned int,
+ niov, int, flags);
+ PRE_MEM_WRITE("jail_set", ARG1, ARG2 * sizeof(struct vki_iovec));
+}
+
+PRE(sys_jail_attach)
+{
+ PRINT("sys_jail_attach ( %ld )", ARG1);
+ PRE_REG_READ1(int, "jail_attach", int, jid);
+}
+
+PRE(sys_jail_remove)
+{
+ PRINT("sys_jail_remove ( %ld )", ARG1);
+ PRE_REG_READ1(int, "jail_remove", int, jid);
+}
+
#undef PRE
#undef POST
@@ -4219,7 +4255,7 @@
BSDXY(__NR__umtx_lock, sys__umtx_lock), // 434
BSDXY(__NR__umtx_unlock, sys__umtx_unlock), // 435
- // jail_attach 436
+ BSDX_(__NR_jail_attach, sys_jail_attach), // 436
// extattr_list_fd 437
// extattr_list_file 438
// extattr_list_link 439
@@ -4303,6 +4339,10 @@
BSDX_(__NR_symlinkat, sys_symlinkat), // 502
BSDX_(__NR_unlinkat, sys_unlinkat), // 503
+ BSDXY(__NR_jail_get, sys_jail_get), // 506
+ BSDX_(__NR_jail_set, sys_jail_set), // 507
+ BSDX_(__NR_jail_remove, sys_jail_remove), // 508
+
// posix_openpt 504
BSDXY(__NR___semctl, sys___semctl), // 510
diff -r ce1acb28953fd6928ccb8f9511e374eab66e8625 -r 90c6097540f35e312d34340b916296130003c851 include/vki/vki-scnums-freebsd.h
--- a/include/vki/vki-scnums-freebsd.h
+++ b/include/vki/vki-scnums-freebsd.h
@@ -405,6 +405,9 @@
#define __NR_symlinkat 502
#define __NR_unlinkat 503
#define __NR_posix_openpt 504
+#define __NR_jail_get 506
+#define __NR_jail_set 507
+#define __NR_jail_remove 508
#define __NR___semctl 510
#define __NR_shmctl 512
#define __NR_pipe2 542

127
devel/valgrind-devel/files/kldload_syscalls.patch Normal file
View file

@ -0,0 +1,127 @@
# HG changeset patch
# User Bitbucket <noreply@bitbucket.org>
# Date 0 0
# Node ID 7ecd33d57049211e1084fc5e8bf588da49088d75
# Parent ce1acb28953fd6928ccb8f9511e374eab66e8625
# Parent 79bf8f58bec842a1aa94f4fff2e4884a6bb5378b
Merge preview of source (79bf8f58bec842a1aa94f4fff2e4884a6bb5378b) to destination (ce1acb28953fd6928ccb8f9511e374eab66e8625).
diff -r ce1acb28953fd6928ccb8f9511e374eab66e8625 -r 7ecd33d57049211e1084fc5e8bf588da49088d75 coregrind/m_syswrap/syswrap-freebsd.c
--- a/coregrind/m_syswrap/syswrap-freebsd.c
+++ b/coregrind/m_syswrap/syswrap-freebsd.c
@@ -1246,6 +1246,52 @@
POST_MEM_WRITE( ARG2, sizeof(struct vki_statfs6) );
}
+/* ---------------------------------------------------------------------
+ kld* wrappers
+ ------------------------------------------------------------------ */
+
+PRE(sys_kldload)
+{
+ PRINT("sys_kldload ( %#lx(%s) )", ARG1, (char *)ARG1);
+ PRE_REG_READ1(int, "kldload", const char *, "file");
+
+ PRE_MEM_RASCIIZ( "kldload(file)", ARG1 );
+}
+
+PRE(sys_kldunload)
+{
+ PRINT("sys_kldunload ( %ld )", ARG1);
+ PRE_REG_READ1(int, "kldunload", int, "fileid");
+}
+
+PRE(sys_kldfind)
+{
+ PRINT("sys_kldfind ( %#lx(%s) )", ARG1, (char *)ARG1);
+ PRE_REG_READ1(int, "kldfind", const char *, "file");
+
+ PRE_MEM_RASCIIZ( "kldfind(file)", ARG1 );
+}
+
+PRE(sys_kldnext)
+{
+ PRINT("sys_kldnext ( %ld )", ARG1);
+ PRE_REG_READ1(int, "kldnext", int, "fileid");
+}
+
+PRE(sys_kldsym)
+{
+ PRINT("sys_kldsym ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3 );
+ PRE_REG_READ3(int, "kldsym", int, "fileid", int, "command", void*, "data");
+ PRE_MEM_READ( "kldsym(data)", ARG3, sizeof(struct vki_kld_sym_lookup) );
+ struct vki_kld_sym_lookup *kslp = (struct vki_kld_sym_lookup *)ARG3;
+ PRE_MEM_RASCIIZ( "kldsym(data.symname)", (Addr)kslp->symname );
+}
+POST(sys_kldsym)
+{
+ struct vki_kld_sym_lookup *kslp = (struct vki_kld_sym_lookup *)ARG3;
+ POST_MEM_WRITE( (Addr)&kslp->symvalue, sizeof(kslp->symvalue) );
+ POST_MEM_WRITE( (Addr)&kslp->symsize, sizeof(kslp->symsize) );
+}
#if 0
/* ---------------------------------------------------------------------
@@ -3389,14 +3435,14 @@
moans--;
VG_(message)(Vg_UserMsg,
"Warning: noted but unhandled ioctl 0x%lx"
- " with no size/direction hints",
+ " with no size/direction hints\n",
ARG2);
VG_(message)(Vg_UserMsg,
" This could cause spurious value errors"
- " to appear.");
+ " to appear.\n");
VG_(message)(Vg_UserMsg,
" See README_MISSING_SYSCALL_OR_IOCTL for "
- "guidance on writing a proper wrapper." );
+ "guidance on writing a proper wrapper.\n" );
}
} else {
if ((dir & _VKI_IOC_WRITE) && size > 0)
@@ -4054,10 +4100,10 @@
// BSDX_(__NR_modfnext, sys_modfnext), // 302
BSDX_(__NR_modfind, sys_modfind), // 303
-// BSDX_(__NR_kldload, sys_kldload), // 304
-// BSDX_(__NR_kldunload, sys_kldunload), // 305
-// BSDX_(__NR_kldfind, sys_kldfind), // 306
-// BSDX_(__NR_kldnext, sys_kldnext), // 307
+ BSDX_(__NR_kldload, sys_kldload), // 304
+ BSDX_(__NR_kldunload, sys_kldunload), // 305
+ BSDX_(__NR_kldfind, sys_kldfind), // 306
+ BSDX_(__NR_kldnext, sys_kldnext), // 307
// BSDXY(__NR_kldstat, sys_kldstat), // 308
// BSDX_(__NR_kldfirstmod, sys_kldfirstmod), // 309
@@ -4095,7 +4141,7 @@
BSDX_(__NR_utrace, sys_utrace), // 335
// compat3 sendfile 336
-// BSDXY(__NR_kldsym, sys_kldsym), // 337
+ BSDXY(__NR_kldsym, sys_kldsym), // 337
// BSDX_(__NR_jail, sys_jail), // 338
// unimpl pioctl 339
diff -r ce1acb28953fd6928ccb8f9511e374eab66e8625 -r 7ecd33d57049211e1084fc5e8bf588da49088d75 include/vki/vki-freebsd.h
--- a/include/vki/vki-freebsd.h
+++ b/include/vki/vki-freebsd.h
@@ -2129,6 +2129,17 @@
void *spare[3];
};
+//----------------------------------------------------------------------
+// From sys/linker.h
+//----------------------------------------------------------------------
+
+struct vki_kld_sym_lookup {
+ int version; /* set to sizeof(struct kld_sym_lookup) */
+ char *symname; /* Symbol name we are looking up */
+ unsigned long symvalue;
+ vki_size_t symsize;
+};
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/

54
devel/valgrind-devel/files/missing_fcntls.patch Normal file
View file

@ -0,0 +1,54 @@
diff --git a/coregrind/m_syswrap/syswrap-freebsd.c b/coregrind/m_syswrap/syswrap-freebsd.c
--- a/coregrind/m_syswrap/syswrap-freebsd.c
+++ b/coregrind/m_syswrap/syswrap-freebsd.c
@@ -3278,9 +3278,12 @@ PRE(sys_fcntl)
// These ones use ARG3 as "arg".
case VKI_F_DUPFD:
+ case VKI_F_DUPFD_CLOEXEC:
case VKI_F_SETFD:
case VKI_F_SETFL:
case VKI_F_SETOWN:
+ case VKI_F_READAHEAD:
+ case VKI_F_RDAHEAD:
PRINT("sys_fcntl[ARG3=='arg'] ( %ld, %ld, %ld )", ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "fcntl",
unsigned int, fd, unsigned int, cmd, unsigned long, arg);
@@ -3300,6 +3303,7 @@ PRE(sys_fcntl)
// This one uses ARG3 as "oldd" and ARG4 as "newd".
case VKI_F_DUP2FD:
+ case VKI_F_DUP2FD_CLOEXEC:
PRINT("sys_fcntl[ARG3=='oldd', ARG4=='newd'] ( %ld, %ld, %ld, %ld )",
ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "fcntl",
@@ -3339,6 +3343,15 @@ POST(sys_fcntl)
ML_(record_fd_open_named)(tid, RES);
}
}
+ else if (ARG2 == VKI_F_DUPFD_CLOEXEC) {
+ if (!ML_(fd_allowed)(RES, "fcntl(DUPFD_CLOEXEC)", tid, True)) {
+ VG_(close)(RES);
+ SET_STATUS_Failure( VKI_EMFILE );
+ } else {
+ if (VG_(clo_track_fds))
+ ML_(record_fd_open_named)(tid, RES);
+ }
+ }
}
PRE(sys_ioctl)
diff --git a/include/vki/vki-freebsd.h b/include/vki/vki-freebsd.h
--- a/include/vki/vki-freebsd.h
+++ b/include/vki/vki-freebsd.h
@@ -1554,6 +1554,10 @@ struct vki_dirent {
#define VKI_F_SETLK 12 /* set record locking information */
#define VKI_F_SETLKW 13 /* F_SETLK; wait if blocked */
#define VKI_F_SETLK_REMOTE 14 /* debugging support for remote locks */
+#define VKI_F_READAHEAD 15 /* read ahead */
+#define VKI_F_RDAHEAD 16 /* Darwin compatible read ahead */
+#define VKI_F_DUPFD_CLOEXEC 17 /* Like F_DUPFD, but FD_CLOEXEC is set */
+#define VKI_F_DUP2FD_CLOEXEC 18 /* Like F_DUP2FD, but FD_CLOEXEC is set */
/* for F_[GET|SET]FL */
#define VKI_FD_CLOEXEC 1 /* actually anything with low bit set goes */

30
devel/valgrind-devel/files/patch-coregrind-m_syswrap-syswrap-amd64-freebsd.c Normal file
View file

@ -0,0 +1,30 @@
--- coregrind/m_syswrap/syswrap-amd64-freebsd.c.orig 2015-01-26 16:17:32.000000000 -0400
+++ coregrind/m_syswrap/syswrap-amd64-freebsd.c 2015-08-31 09:51:17.506396000 -0300
@@ -691,6 +691,27 @@
SET_STATUS_Success2( tst->arch.vex.guest_FS_ZERO, tst->arch.vex.guest_RDX );
POST_MEM_WRITE( ARG2, sizeof(void *) );
break;
+ case VKI_AMD64_GET_XFPUSTATE:
+ {
+ UChar fpuState[160];
+ struct vki_amd64_get_xfpustate *xfs = (struct vki_amd64_get_xfpustate *)ARG2;
+ int fpuSaveLen;
+
+ PRINT("sys_amd64_get_xfpustate ( %#lx, %d )", (long unsigned int)xfs->addr, xfs->len);
+ tst = VG_(get_ThreadState)(tid);
+
+ if (xfs->len <= sizeof(fpuState)) {
+ amd64g_dirtyhelper_FXSAVE_ALL_EXCEPT_XMM(
+ (VexGuestAMD64State *)&tst->arch.vex,
+ (HWord)fpuState);
+ VG_(memcpy)(xfs->addr, fpuState, xfs->len);
+ POST_MEM_WRITE( xfs->addr, xfs->len );
+ SET_STATUS_Success ( 0 );
+ } else {
+ SET_STATUS_Failure( VKI_EINVAL );
+ }
+ }
+ break;
default:
VG_(message) (Vg_UserMsg, "unhandled sysarch cmd %ld", ARG1);
VG_(unimplemented) ("unhandled sysarch cmd");

30
devel/valgrind-devel/files/patch-include__vki__vki-freebsd.h
View file

@ -1,6 +1,6 @@
--- ./include/vki/vki-freebsd.h.orig 2014-02-08 15:00:31.591069799 -0600
+++ ./include/vki/vki-freebsd.h 2014-02-08 15:00:39.993068845 -0600
@@ -681,6 +681,7 @@
--- include/vki/vki-freebsd.h.orig 2015-01-26 16:17:32.000000000 -0400
+++ include/vki/vki-freebsd.h 2015-08-31 04:55:29.139189000 -0300
@@ -684,6 +684,7 @@
#define VKI_SOCK_STREAM 1
@ -8,3 +8,27 @@
#include <netinet/tcp.h>
#define VKI_TCP_NODELAY TCP_NODELAY
@@ -1888,11 +1889,23 @@
#define VKI_I386_SET_FSBASE 8
#define VKI_I386_GET_GSBASE 9
#define VKI_I386_SET_GSBASE 10
+#define VKI_I386_SET_XFPUSTATE 11
#define VKI_AMD64_GET_FSBASE 128
#define VKI_AMD64_SET_FSBASE 129
#define VKI_AMD64_GET_GSBASE 130
#define VKI_AMD64_SET_GSBASE 131
+#define VKI_AMD64_GET_XFPUSTATE 132
+
+typedef struct vki_i386_get_xfpustate {
+ unsigned int addr;
+ int len;
+};
+
+typedef struct vki_amd64_get_xfpustate {
+ void *addr;
+ int len;
+};
//----------------------------------------------------------------------
// From sys/module.h

2
devel/valgrind/Makefile
View file

@ -10,7 +10,7 @@ CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bdrewery@FreeBSD.org
COMMENT= Memory debugging and profiling tool
BB_COMMIT= 963c4a777573

22
devel/yaggo/Makefile Normal file
View file

@ -0,0 +1,22 @@
# Created by: Jason Bacon <bacon4000@gmail.com>
# $FreeBSD$
PORTNAME= yaggo
PORTVERSION= 1.5.9
CATEGORIES= devel
MAINTAINER= bacon4000@gmail.com
COMMENT= Generate command line parser using getopt_long
LICENSE= GPLv3
NO_ARCH= yes
USE_RUBY= yes
USE_GITHUB= yes
GH_ACCOUNT= gmarcais
GH_TAGNAME= v${PORTVERSION}
PLIST_FILES= bin/yaggo man/man1/yaggo.1.gz share/doc/yaggo/README.md
.include <bsd.port.mk>

2
devel/yaggo/distinfo Normal file
View file

@ -0,0 +1,2 @@
SHA256 (gmarcais-yaggo-1.5.9-v1.5.9_GH0.tar.gz) = c96f7d5932fad30c88300446cae9a49d35b6a1fcd5a971e02de129c5d7a53bb7
SIZE (gmarcais-yaggo-1.5.9-v1.5.9_GH0.tar.gz) = 42480

24
devel/yaggo/files/patch-Makefile Normal file
View file

@ -0,0 +1,24 @@
--- Makefile.orig 2015-10-14 16:25:43 UTC
+++ Makefile
@@ -1,12 +1,14 @@
-prefix ?= /usr/local
+PREFIX ?= /usr/local
+DESTDIR ?=
+MANPREFIX ?= $(PREFIX)/share
all: bin/create_yaggo_one_file
ruby bin/create_yaggo_one_file ./yaggo
install: all
- mkdir -p $(prefix)/bin
- mkdir -p $(prefix)/share/doc/yaggo
- mkdir -p $(prefix)/share/man/man1
- cp ./yaggo $(prefix)/bin
- cp ./README.md $(prefix)/share/doc/yaggo
- ./yaggo -m $(prefix)/share/man/man1/yaggo.1
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(PREFIX)/share/doc/yaggo
+ mkdir -p $(DESTDIR)$(MANPREFIX)/man/man1
+ cp ./yaggo $(DESTDIR)$(PREFIX)/bin
+ cp ./README.md $(DESTDIR)$(PREFIX)/share/doc/yaggo
+ ./yaggo -m $(DESTDIR)$(MANPREFIX)/man/man1/yaggo.1

3
devel/yaggo/pkg-descr Normal file
View file

@ -0,0 +1,3 @@
Generate command line parser using getopt_long.
WWW: https://github.com/gmarcais/yaggo

2
dns/wdns/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wdns
PORTVERSION= 0.8.0
PORTVERSION= 0.8.1
CATEGORIES= dns
MASTER_SITES= FARSIGHT LOCAL/truckman/farsight

4
dns/wdns/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (wdns-0.8.0.tar.gz) = b944c687e15a9e51da6f214725b248c91096634ff3ad1753858a6af682aca242
SIZE (wdns-0.8.0.tar.gz) = 360042
SHA256 (wdns-0.8.1.tar.gz) = 8b621281229a669906b65abc8f8d8324dd34a9b52aed7a371e70362fd1bacedc
SIZE (wdns-0.8.1.tar.gz) = 381214

2
editors/nano-devel/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nano
PORTVERSION= 2.5.2
PORTVERSION= 2.5.3
CATEGORIES= editors
MASTER_SITES= http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
GNU

4
editors/nano-devel/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (nano-2.5.2.tar.gz) = 89bd6ac5120880d2a95431d8bad22bf92c7ccbf10b8f1716d4ea062f3faeeb41
SIZE (nano-2.5.2.tar.gz) = 1964016
SHA256 (nano-2.5.3.tar.gz) = b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee
SIZE (nano-2.5.3.tar.gz) = 1967760

2
emulators/qmc2/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qmc2
PORTVERSION= 0.60
PORTVERSION= 0.61
CATEGORIES= emulators
MASTER_SITES= SF

4
emulators/qmc2/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (qmc2-0.60.tar.bz2) = 14060d1ff8825d3a8f598ef1e2b5c84fd512ee7bc7a0a9ea2b56646db8535590
SIZE (qmc2-0.60.tar.bz2) = 13451511
SHA256 (qmc2-0.61.tar.bz2) = 75782b789178ec589439974652b5589b5d0bb5a6562624fbdb88bb77a00cfa49
SIZE (qmc2-0.61.tar.bz2) = 13439838

9
emulators/xen-kernel/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= xen
PKGNAMESUFFIX= -kernel
PORTVERSION= 4.5.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
@ -31,10 +31,15 @@ EXTRA_PATCHES= ${FILESDIR}/0001-introduce-a-helper-to-allocate-non-contiguous-me
${FILESDIR}/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p2 \
${FILESDIR}/0006-xen-pvh-enable-mmu_update-hypercall.patch:-p2 \
${FILESDIR}/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch:-p2 \
${FILESDIR}/0001-x86-pvh-use-a-custom-IO-bitmap-for-PVH-hardware-doma.patch:-p2 \
${FILESDIR}/0002-x86-pvh-trap-access-to-sensitive-IO-ports.patch:-p2 \
${FILESDIR}/xsa156-4.5.patch:-p2 \
${FILESDIR}/xsa159.patch:-p2 \
${FILESDIR}/xsa165-4.5.patch:-p2 \
${FILESDIR}/xsa166-4.5.patch:-p2
${FILESDIR}/xsa166-4.5.patch:-p2 \
${FILESDIR}/xsa167-4.6.patch:-p2 \
${FILESDIR}/xsa168.patch:-p2 \
${FILESDIR}/xsa170-4.5.patch:-p2
.include <bsd.port.options.mk>

197
emulators/xen-kernel/files/0001-x86-pvh-use-a-custom-IO-bitmap-for-PVH-hardware-doma.patch Normal file
View file

@ -0,0 +1,197 @@
From 8ddb99287cd18da99a95a9f70904a97b52893599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
Date: Wed, 20 May 2015 13:26:43 +0200
Subject: [PATCH 1/2] x86/pvh: use a custom IO bitmap for PVH hardware domains
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Since a PVH hardware domain has access to the physical hardware create a
custom more permissive IO bitmap. The permissions set on the bitmap are
populated based on the contents of the ioports rangeset.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
xen/arch/x86/hvm/hvm.c | 24 ++++++++++++++++++++++--
xen/arch/x86/hvm/svm/vmcb.c | 2 +-
xen/arch/x86/hvm/vmx/vmcs.c | 4 ++--
xen/arch/x86/setup.c | 28 ++++++++++++++++++++++++++++
xen/common/domain.c | 3 +++
xen/include/asm-x86/hvm/domain.h | 2 ++
xen/include/asm-x86/setup.h | 1 +
7 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 689e402..89423fa 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -77,9 +77,13 @@ integer_param("hvm_debug", opt_hvm_debug_level);
struct hvm_function_table hvm_funcs __read_mostly;
-/* I/O permission bitmap is globally shared by all HVM guests. */
+/*
+ * The I/O permission bitmap is globally shared by all HVM guests except
+ * the hardware domain which needs a more permissive one.
+ */
+#define HVM_IOBITMAP_SIZE (3 * PAGE_SIZE)
unsigned long __attribute__ ((__section__ (".bss.page_aligned")))
- hvm_io_bitmap[3*PAGE_SIZE/BYTES_PER_LONG];
+ hvm_io_bitmap[HVM_IOBITMAP_SIZE / BYTES_PER_LONG];
/* Xen command-line option to enable HAP */
static bool_t __initdata opt_hap_enabled = 1;
@@ -1461,6 +1465,20 @@ int hvm_domain_initialise(struct domain *d)
goto fail1;
d->arch.hvm_domain.io_handler->num_slot = 0;
+ /* Set the default IO Bitmap. */
+ if ( is_hardware_domain(d) )
+ {
+ d->arch.hvm_domain.io_bitmap = _xmalloc(HVM_IOBITMAP_SIZE, PAGE_SIZE);
+ if ( d->arch.hvm_domain.io_bitmap == NULL )
+ {
+ rc = -ENOMEM;
+ goto fail1;
+ }
+ memset(d->arch.hvm_domain.io_bitmap, ~0, HVM_IOBITMAP_SIZE);
+ }
+ else
+ d->arch.hvm_domain.io_bitmap = hvm_io_bitmap;
+
if ( is_pvh_domain(d) )
{
register_portio_handler(d, 0, 0x10003, handle_pvh_io);
@@ -1496,6 +1514,8 @@ int hvm_domain_initialise(struct domain *d)
stdvga_deinit(d);
vioapic_deinit(d);
fail1:
+ if ( is_hardware_domain(d) )
+ xfree(d->arch.hvm_domain.io_bitmap);
xfree(d->arch.hvm_domain.io_handler);
xfree(d->arch.hvm_domain.params);
fail0:
diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c
index 21292bb..6339d2a 100644
--- a/xen/arch/x86/hvm/svm/vmcb.c
+++ b/xen/arch/x86/hvm/svm/vmcb.c
@@ -118,7 +118,7 @@ static int construct_vmcb(struct vcpu *v)
svm_disable_intercept_for_msr(v, MSR_AMD64_LWP_CBADDR);
vmcb->_msrpm_base_pa = (u64)virt_to_maddr(arch_svm->msrpm);
- vmcb->_iopm_base_pa = (u64)virt_to_maddr(hvm_io_bitmap);
+ vmcb->_iopm_base_pa = __pa(v->domain->arch.hvm_domain.io_bitmap);
/* Virtualise EFLAGS.IF and LAPIC TPR (CR8). */
vmcb->_vintr.fields.intr_masking = 1;
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 3123706..355d1b5 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -1032,8 +1032,8 @@ static int construct_vmcs(struct vcpu *v)
}
/* I/O access bitmap. */
- __vmwrite(IO_BITMAP_A, virt_to_maddr((char *)hvm_io_bitmap + 0));
- __vmwrite(IO_BITMAP_B, virt_to_maddr((char *)hvm_io_bitmap + PAGE_SIZE));
+ __vmwrite(IO_BITMAP_A, __pa(d->arch.hvm_domain.io_bitmap));
+ __vmwrite(IO_BITMAP_B, __pa(d->arch.hvm_domain.io_bitmap) + PAGE_SIZE);
if ( cpu_has_vmx_virtual_intr_delivery )
{
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 2b9787a..cd333f9 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1446,6 +1446,8 @@ void __init noreturn __start_xen(unsigned long mbi_p)
dmi_end_boot();
+ setup_io_bitmap(dom0);
+
system_state = SYS_STATE_active;
domain_unpause_by_systemcontroller(dom0);
@@ -1509,6 +1511,32 @@ int __hwdom_init xen_in_range(unsigned long mfn)
return 0;
}
+static int __hwdom_init io_bitmap_cb(unsigned long s, unsigned long e,
+ void *ctx)
+{
+ struct domain *d = ctx;
+ unsigned int i;
+
+ ASSERT(e <= INT_MAX);
+ for ( i = s; i <= e; i++ )
+ __clear_bit(i, d->arch.hvm_domain.io_bitmap);
+
+ return 0;
+}
+
+void __hwdom_init setup_io_bitmap(struct domain *d)
+{
+ int rc;
+
+ if ( has_hvm_container_domain(d) )
+ {
+ bitmap_fill(d->arch.hvm_domain.io_bitmap, 0x10000);
+ rc = rangeset_report_ranges(d->arch.ioport_caps, 0, 0x10000,
+ io_bitmap_cb, d);
+ BUG_ON(rc);
+ }
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 6803c4d..b0e83f5 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -42,6 +42,7 @@
#include <xsm/xsm.h>
#include <xen/trace.h>
#include <xen/tmem.h>
+#include <asm/setup.h>
/* Linux config option: propageted to domain0 */
/* xen_processor_pmbits: xen control Cx, Px, ... */
@@ -219,6 +220,8 @@ static int late_hwdom_init(struct domain *d)
rangeset_swap(d->iomem_caps, dom0->iomem_caps);
#ifdef CONFIG_X86
rangeset_swap(d->arch.ioport_caps, dom0->arch.ioport_caps);
+ setup_io_bitmap(d);
+ setup_io_bitmap(dom0);
#endif
rcu_unlock_domain(dom0);
diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h
index 0f8b19a..bdab45d 100644
--- a/xen/include/asm-x86/hvm/domain.h
+++ b/xen/include/asm-x86/hvm/domain.h
@@ -141,6 +141,8 @@ struct hvm_domain {
*/
uint64_t sync_tsc;
+ unsigned long *io_bitmap;
+
union {
struct vmx_domain vmx;
struct svm_domain svm;
diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h
index 08bc23a..381d9f8 100644
--- a/xen/include/asm-x86/setup.h
+++ b/xen/include/asm-x86/setup.h
@@ -32,6 +32,7 @@ int construct_dom0(
module_t *initrd,
void *(*bootstrap_map)(const module_t *),
char *cmdline);
+void setup_io_bitmap(struct domain *d);
unsigned long initial_images_nrpages(nodeid_t node);
void discard_initial_images(void);
--
2.5.4 (Apple Git-61)

52
emulators/xen-kernel/files/0002-x86-pvh-trap-access-to-sensitive-IO-ports.patch Normal file
View file

@ -0,0 +1,52 @@
From 72d5acdc1d5b83107066e25054f9119e7771cf70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
Date: Wed, 20 May 2015 13:27:23 +0200
Subject: [PATCH 2/2] x86/pvh: trap access to sensitive IO ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is needed so Xen can properly trap 4 byte accesses to 0xcf8 in order to
keep consistency with accesses to 0xcfc.
The access to RTC ports also needs to be trapped in order to keep
consistency, this includes RTC_PORT(0) and RTC_PORT(1) (0x70 and 0x71
respectively).
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
xen/arch/x86/setup.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index cd333f9..2cc9185 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -49,6 +49,7 @@
#include <xen/cpu.h>
#include <asm/nmi.h>
#include <asm/alternative.h>
+#include <asm/mc146818rtc.h>
/* opt_nosmp: If true, secondary processors are ignored. */
static bool_t __initdata opt_nosmp;
@@ -1534,6 +1535,16 @@ void __hwdom_init setup_io_bitmap(struct domain *d)
rc = rangeset_report_ranges(d->arch.ioport_caps, 0, 0x10000,
io_bitmap_cb, d);
BUG_ON(rc);
+ /*
+ * NB: we need to trap accesses to 0xcf8 in order to intercept
+ * 4 byte accesses, that need to be handled by Xen in order to
+ * keep consistency.
+ * Access to 1 byte RTC ports also needs to be trapped in order
+ * to keep consistency with PV.
+ */
+ __set_bit(0xcf8, d->arch.hvm_domain.io_bitmap);
+ __set_bit(RTC_PORT(0), d->arch.hvm_domain.io_bitmap);
+ __set_bit(RTC_PORT(1), d->arch.hvm_domain.io_bitmap);
}
}
--
2.5.4 (Apple Git-61)

77
emulators/xen-kernel/files/xsa167-4.6.patch Normal file
View file

@ -0,0 +1,77 @@
x86/mm: PV superpage handling lacks sanity checks
MMUEXT_{,UN}MARK_SUPER fail to check the input MFN for validity before
dereferencing pointers into the superpage frame table.
get_superpage() has a similar issue.
This is XSA-167.
Reported-by: Qinghao Tang <luodalongde@gmail.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -2624,6 +2624,9 @@ int get_superpage(unsigned long mfn, str
ASSERT(opt_allow_superpage);
+ if ( !mfn_valid(mfn | (L1_PAGETABLE_ENTRIES - 1)) )
+ return -EINVAL;
+
spage = mfn_to_spage(mfn);
y = spage->type_info;
do {
@@ -3401,42 +3404,26 @@ long do_mmuext_op(
}
case MMUEXT_MARK_SUPER:
+ case MMUEXT_UNMARK_SUPER:
{
unsigned long mfn = op.arg1.mfn;
- if ( unlikely(d != pg_owner) )
- rc = -EPERM;
- else if ( mfn & (L1_PAGETABLE_ENTRIES-1) )
- {
- MEM_LOG("Unaligned superpage reference mfn %lx", mfn);
- okay = 0;
- }
- else if ( !opt_allow_superpage )
+ if ( !opt_allow_superpage )
{
MEM_LOG("Superpages disallowed");
rc = -ENOSYS;
}
- else
- rc = mark_superpage(mfn_to_spage(mfn), d);
- break;
- }
-
- case MMUEXT_UNMARK_SUPER:
- {
- unsigned long mfn = op.arg1.mfn;
-
- if ( unlikely(d != pg_owner) )
+ else if ( unlikely(d != pg_owner) )
rc = -EPERM;
- else if ( mfn & (L1_PAGETABLE_ENTRIES-1) )
+ else if ( mfn & (L1_PAGETABLE_ENTRIES - 1) )
{
MEM_LOG("Unaligned superpage reference mfn %lx", mfn);
- okay = 0;
- }
- else if ( !opt_allow_superpage )
- {
- MEM_LOG("Superpages disallowed");
- rc = -ENOSYS;
+ rc = -EINVAL;
}
+ else if ( !mfn_valid(mfn | (L1_PAGETABLE_ENTRIES - 1)) )
+ rc = -EINVAL;
+ else if ( op.cmd == MMUEXT_MARK_SUPER )
+ rc = mark_superpage(mfn_to_spage(mfn), d);
else
rc = unmark_superpage(mfn_to_spage(mfn));
break;

27
emulators/xen-kernel/files/xsa168.patch Normal file
View file

@ -0,0 +1,27 @@
x86/VMX: prevent INVVPID failure due to non-canonical guest address
While INVLPG (and on SVM INVLPGA) don't fault on non-canonical
addresses, INVVPID fails (in the "individual address" case) when passed
such an address.
Since such intercepted INVLPG are effectively no-ops anyway, don't fix
this in vmx_invlpg_intercept(), but instead have paging_invlpg() never
return true in such a case.
This is XSA-168.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
--- a/xen/include/asm-x86/paging.h
+++ b/xen/include/asm-x86/paging.h
@@ -245,7 +245,7 @@ paging_fault(unsigned long va, struct cp
* or 0 if it's safe not to do so. */
static inline int paging_invlpg(struct vcpu *v, unsigned long va)
{
- return paging_get_hostmode(v)->invlpg(v, va);
+ return is_canonical_address(va) && paging_get_hostmode(v)->invlpg(v, va);
}
/* Translate a guest virtual address to the frame number that the

79
emulators/xen-kernel/files/xsa170-4.5.patch Normal file
View file

@ -0,0 +1,79 @@
x86/VMX: sanitize rIP before re-entering guest
... to prevent guest user mode arranging for a guest crash (due to
failed VM entry). (On the AMD system I checked, hardware is doing
exactly the canonicalization being added here.)
Note that fixing this in an architecturally correct way would be quite
a bit more involved: Making the x86 instruction emulator check all
branch targets for validity, plus dealing with invalid rIP resulting
from update_guest_eip() or incoming directly during a VM exit. The only
way to get the latter right would be by not having hardware do the
injection.
Note further that there are a two early returns from
vmx_vmexit_handler(): One (through vmx_failed_vmentry()) leads to
domain_crash() anyway, and the other covers real mode only and can
neither occur with a non-canonical rIP nor result in an altered rIP,
so we don't need to force those paths through the checking logic.
This is XSA-170.
Reported-by: 刘令 <liuling-it@360.cn>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2675,7 +2675,7 @@ void vmx_handle_EOI_induced_exit(struct
void vmx_vmexit_handler(struct cpu_user_regs *regs)
{
unsigned long exit_qualification, exit_reason, idtv_info, intr_info = 0;
- unsigned int vector = 0;
+ unsigned int vector = 0, mode;
struct vcpu *v = current;
__vmread(GUEST_RIP, &regs->rip);
@@ -3219,6 +3219,41 @@ void vmx_vmexit_handler(struct cpu_user_
out:
if ( nestedhvm_vcpu_in_guestmode(v) )
nvmx_idtv_handling();
+
+ /*
+ * VM entry will fail (causing the guest to get crashed) if rIP (and
+ * rFLAGS, but we don't have an issue there) doesn't meet certain
+ * criteria. As we must not allow less than fully privileged mode to have
+ * such an effect on the domain, we correct rIP in that case (accepting
+ * this not being architecturally correct behavior, as the injected #GP
+ * fault will then not see the correct [invalid] return address).
+ * And since we know the guest will crash, we crash it right away if it
+ * already is in most privileged mode.
+ */
+ mode = vmx_guest_x86_mode(v);
+ if ( mode == 8 ? !is_canonical_address(regs->rip)
+ : regs->rip != regs->_eip )
+ {
+ struct segment_register ss;
+
+ gdprintk(XENLOG_WARNING, "Bad rIP %lx for mode %u\n", regs->rip, mode);
+
+ vmx_get_segment_register(v, x86_seg_ss, &ss);
+ if ( ss.attr.fields.dpl )
+ {
+ __vmread(VM_ENTRY_INTR_INFO, &intr_info);
+ if ( !(intr_info & INTR_INFO_VALID_MASK) )
+ hvm_inject_hw_exception(TRAP_gp_fault, 0);
+ /* Need to fix rIP nevertheless. */
+ if ( mode == 8 )
+ regs->rip = (long)(regs->rip << (64 - VADDR_BITS)) >>
+ (64 - VADDR_BITS);
+ else
+ regs->rip = regs->_eip;
+ }
+ else
+ domain_crash(v->domain);
+ }
}
void vmx_vmenter_helper(const struct cpu_user_regs *regs)

2
emulators/xen/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= xen
PORTVERSION= 4.5.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= emulators
MAINTAINER= royger@FreeBSD.org

2
graphics/ImageMagick7/Makefile
View file

@ -37,7 +37,7 @@ COMMENT= Image processing tools (unstable version)
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
DATE= 20160119
DATE= 20160225
WRKSRC= ${WRKDIR}/${PORTNAME}-7.0.0-0
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl

4
graphics/ImageMagick7/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (ImageMagick-7.0.0-0~beta20160119.tar.xz) = 23ebf6b3ef57224242834453f105e3415b4b2e1df74f8b7a4397fddd276b2bba
SIZE (ImageMagick-7.0.0-0~beta20160119.tar.xz) = 8284960
SHA256 (ImageMagick-7.0.0-0~beta20160225.tar.xz) = 35f9ed811415633ab4ed6fa4dd6ada625421e87d38dae98e5afc7d30e2a5e5c6
SIZE (ImageMagick-7.0.0-0~beta20160225.tar.xz) = 8292428

5
graphics/ImageMagick7/pkg-plist
View file

@ -79,12 +79,12 @@ include/ImageMagick-7/MagickCore/fourier.h
include/ImageMagick-7/MagickCore/fx.h
include/ImageMagick-7/MagickCore/gem.h
include/ImageMagick-7/MagickCore/geometry.h
include/ImageMagick-7/MagickCore/hashmap.h
include/ImageMagick-7/MagickCore/histogram.h
include/ImageMagick-7/MagickCore/identify.h
include/ImageMagick-7/MagickCore/image-view.h
include/ImageMagick-7/MagickCore/image.h
include/ImageMagick-7/MagickCore/layer.h
include/ImageMagick-7/MagickCore/linked-list.h
include/ImageMagick-7/MagickCore/list.h
include/ImageMagick-7/MagickCore/locale_.h
include/ImageMagick-7/MagickCore/log.h
@ -591,6 +591,7 @@ man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/Magick++/FormatCharacters.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/Magick++/Future.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/Magick++/Geometry.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/Magick++/Image++.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/Magick++/Image.fig
%%PORTDOCS%%%%DOCSDIR%%-7/www/Magick++/Image.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/Magick++/Image.png
@ -619,7 +620,7 @@ man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/advanced-windows-installation.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/animate.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/Image.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/Image++.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/MagickCore/ImageMagick_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/MagickCore/ImageMagick_8h.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/MagickCore/MagickCore_8h-source.html

2
graphics/R-cran-scales/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= scales
PORTVERSION= 0.3.0
PORTVERSION= 0.4.0
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${PORTVERSION}

4
graphics/R-cran-scales/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (scales_0.3.0.tar.gz) = f4e1b98e3501b3a27b1a86ecc622a4653aff31c9f93248d7b5d428b03ebe6fce
SIZE (scales_0.3.0.tar.gz) = 57030
SHA256 (scales_0.4.0.tar.gz) = 851ef6136339b361b3f843fb73ea89f9112279b9cc126bdb38acde8d24c1c6a7
SIZE (scales_0.4.0.tar.gz) = 57358

2
graphics/feh/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= feh
PORTVERSION= 2.14.1
PORTVERSION= 2.14.2
CATEGORIES= graphics
MASTER_SITES= http://feh.finalrewind.org/ \
LOCAL/uqs

4
graphics/feh/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (feh-2.14.1.tar.bz2) = c0a19ed20ab96bd7030f6bca89a0b277261dd0df0501db76a8eb6955417e9fc2
SIZE (feh-2.14.1.tar.bz2) = 2118511
SHA256 (feh-2.14.2.tar.bz2) = c80f3d3297b3b6ee4898572d19692f5e19eb3066a9ca078c3099d39004a7e0cf
SIZE (feh-2.14.2.tar.bz2) = 2119370

14
graphics/giflib/Makefile
View file

@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= giflib
PORTVERSION= 5.1.1
PORTVERSION= 5.1.2
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}
@ -25,13 +26,14 @@ INSTALL_TARGET= install-strip
.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
.else
CONFIGURE_ENV+= have_xmlto=no
.endif
post-patch:
.if ! ${PORT_OPTIONS:MDOCBOOK} || ! ${PORT_OPTIONS:MDOCS}
${REINPLACE_CMD} \
-e 's|SUBDIRS = lib util doc pic|SUBDIRS = lib util pic|' \
${WRKSRC}/Makefile.in
.if ${OSVERSION} >= 1100072
EXTRA_PATCHES= ${FILESDIR}/extra-patch-unbundle-reallocarray
.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray
.endif
post-install:

4
graphics/giflib/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (giflib-5.1.1.tar.bz2) = 391014aceb21c8b489dc7b0d0b6a917c4e32cc014ce2426d47ca376d02fe2ffc
SIZE (giflib-5.1.1.tar.bz2) = 654389
SHA256 (giflib-5.1.2.tar.bz2) = 76c0a084c3b02f9315ff937b8be6096186002fea26f33e2123081ba2be6e2a7c
SIZE (giflib-5.1.2.tar.bz2) = 638967

24
graphics/giflib/files/extra-patch-hide-reallocarray Normal file
View file

@ -0,0 +1,24 @@
--- lib/dgif_lib.c.orig 2016-01-07 10:44:44 UTC
+++ lib/dgif_lib.c
@@ -41,6 +41,9 @@ static int DGifDecompressInput(GifFileTy
static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf,
GifByteType *NextByte);
+extern void *
+reallocarray(void *optr, size_t nmemb, size_t size) __hidden;
+
/******************************************************************************
Open a new GIF file for read, given by its name.
Returns dynamically allocated GifFileType pointer which serves as the GIF
--- lib/gifalloc.c.orig 2015-07-13 04:05:46 UTC
+++ lib/gifalloc.c
@@ -12,6 +12,9 @@
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+extern void *
+reallocarray(void *optr, size_t nmemb, size_t size) __hidden;
+
/******************************************************************************
Miscellaneous utility functions
******************************************************************************/

27
graphics/giflib/files/extra-patch-unbundle-reallocarray Normal file
View file

@ -0,0 +1,27 @@
--- lib/Makefile.in.orig 2016-01-07 12:54:02 UTC
+++ lib/Makefile.in
@@ -134,7 +134,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libgif_la_LIBADD =
am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \
- gifalloc.lo openbsd-reallocarray.lo gif_err.lo quantize.lo
+ gifalloc.lo gif_err.lo quantize.lo
libgif_la_OBJECTS = $(am_libgif_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -331,7 +331,6 @@ libgif_la_SOURCES = dgif_lib.c \
gif_hash.c \
gif_hash.h \
gifalloc.c \
- openbsd-reallocarray.c \
gif_err.c \
gif_lib_private.h \
quantize.c
@@ -422,7 +421,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openbsd-reallocarray.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@
.c.o:

12
graphics/giflib/files/patch-lib_gif__lib.h Normal file
View file

@ -0,0 +1,12 @@
--- lib/gif_lib.h.orig 2016-01-07 12:51:53 UTC
+++ lib/gif_lib.h
@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap(
GifPixelType ColorTransIn2[]);
extern int GifBitSize(int n);
-extern void *
-reallocarray(void *optr, size_t nmemb, size_t size);
-
/******************************************************************************
Support for the in-core structures allocation (slurp mode).
******************************************************************************/

9
graphics/mapserver/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mapserver
PORTVERSION= 7.0.0
PORTREVISION= 1
PORTVERSION= 7.0.1
CATEGORIES= graphics www geography
MASTER_SITES= http://download.osgeo.org/mapserver/
@ -37,7 +36,7 @@ FRIBIDI_DESC= Fribidi library support
KML_DESC= KML support
WMS_DESC= WMS Server support
WFS_DESC= WFS Server support
WCS_DESC= WCS Server support
WCS_DESC= WCS Server support
.include <bsd.port.options.mk>
@ -200,8 +199,8 @@ do-install:
.endif
post-install:
@${LN} -s ${PREFIX}/lib/libmapserver.so.7.0.0 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.1
@${LN} -s ${PREFIX}/lib/libmapserver.so.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
@${LN} -s ${PREFIX}/lib/libmapserver.so.7.0.0 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
@${LN} -s ${PREFIX}/lib/libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
.if ${PORT_OPTIONS:MPHP}
@${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${PREFIX}/etc/php/extensions.ini"

4
graphics/mapserver/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mapserver-7.0.0.tar.gz) = b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45
SIZE (mapserver-7.0.0.tar.gz) = 2495028
SHA256 (mapserver-7.0.1.tar.gz) = 2c9567e59ae3ebd99bb645740485be6a25798b8b57f93ca3413a3e0369a1bd8f
SIZE (mapserver-7.0.1.tar.gz) = 2606929

14
graphics/mapserver/files/patch-mapimageio.c
View file

@ -1,14 +0,0 @@
--- mapimageio.c.orig 2015-07-24 07:59:36 UTC
+++ mapimageio.c
@@ -1058,7 +1058,11 @@ int readGIF(char *path, rasterBufferObj
} while (recordType != TERMINATE_RECORD_TYPE);
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+ if (DGifCloseFile(image, NULL) == GIF_ERROR) {
+#else
if (DGifCloseFile(image) == GIF_ERROR) {
+#endif
#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
#else

4
graphics/mapserver/pkg-plist
View file

@ -9,8 +9,8 @@ bin/shptreevis
bin/sortshp
bin/tile4ms
lib/libmapserver.so
lib/libmapserver.so.1
lib/libmapserver.so.7.0.0
lib/libmapserver.so.2
lib/libmapserver.so.7.0.1
%%PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so

20
irc/weechat/Makefile
View file

@ -18,8 +18,8 @@ USES= cmake iconv localbase ncurses tar:bzip2
CMAKE_ARGS+= -DENABLE_GUILE=no \
-DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH}
LIB_DEPENDS+= libcurl.so:ftp/curl \
libgcrypt.so:security/libgcrypt
LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl \
libgcrypt.so:${PORTSDIR}/security/libgcrypt
OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA JAVASCRIPT CHARSET BACKTRACE ASPELL \
GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS
@ -37,12 +37,12 @@ PYTHON_DESC= Python scripting language support
RUBY_DESC= Ruby scripting language support
ASPELL_CMAKE_OFF= -DENABLE_ASPELL=no
ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell
BACKTRACE_USES= execinfo
CA_BUNDLE_CMAKE_ON= -DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
CHARSET_CMAKE_OFF= -DENABLE_CHARSET=no
@ -50,11 +50,11 @@ DOCS_CMAKE_ON= -DENABLE_DOC=yes
JAVASCRIPT_CMAKE_OFF= -DENABLE_JAVASCRIPT=no
JAVASCRIPT_CMAKE_ON= -DENABLE_JAVASCRIPT=yes
JAVASCRIPT_LIB_DEPENDS= libv8.so:lang/v8
JAVASCRIPT_LIB_DEPENDS= libv8.so:${PORTSDIR}/lang/v8
GNUTLS_CMAKE_OFF= -DENABLE_GNUTLS=no
GNUTLS_USES= pkgconfig
GNUTLS_LIB_DEPENDS= libgnutls.so.28:security/gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so.28:${PORTSDIR}/security/gnutls
LUA_CMAKE_OFF= -DENABLE_LUA=no
LUA_CMAKE_ON= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
@ -89,10 +89,10 @@ TCL_USES= tcl:85+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
BUILD_DEPENDS+= xsltproc:textproc/libxslt \
docbook-xsl>=0:textproc/docbook-xsl \
asciidoc:textproc/asciidoc \
source-highlight>=3.1.5:textproc/source-highlight
BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
asciidoc:${PORTSDIR}/textproc/asciidoc \
source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
.endif
post-patch:

3
mail/cyrus-imapd24/Makefile
View file

@ -87,15 +87,12 @@ OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE
OPTIONS_DEFAULT+= GSSAPI_BASE
.endif
GSSAPI_BASE_DESC= Use Heimdal in base
GSSAPI_BASE_USES= gssapi
GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
--with-gss_impl=heimdal
GSSAPI_HEIMDAL_DESC= Use Heimdal from ports
GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
--with-gss_impl=heimdal
GSSAPI_MIT_DESC= Use MIT Kerberos V5
GSSAPI_MIT_USES= gssapi:mit
GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
--with-gss_impl=mit

3
mail/cyrus-imapd25/Makefile
View file

@ -100,15 +100,12 @@ OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE
OPTIONS_DEFAULT+= GSSAPI_BASE
.endif
.endif
GSSAPI_BASE_DESC= Use Heimdal in base
GSSAPI_BASE_USES= gssapi
GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
--with-gss_impl=heimdal
GSSAPI_HEIMDAL_DESC= Use Heimdal from ports
GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
--with-gss_impl=heimdal
GSSAPI_MIT_DESC= Use MIT Kerberos V5
GSSAPI_MIT_USES= gssapi:mit
GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
--with-gss_impl=mit

3
mail/dcc-dccd/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= dcc-dccd
PORTVERSION= 1.3.158
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dcc-servers.net/dcc/source/old/ \
ftp://ftp.dcc-servers.net/src/dcc/old/ \
@ -61,7 +62,7 @@ CONFIGURE_ARGS= --with-uid=${DCCUSER} \
ALT_HOME_CONFIGURE_ON= --libexecdir=${PREFIX}/dcc/libexec --with-cgibin=${PREFIX}/dcc/cgi-bin
DCCM_CONFIGURE_ENABLE= dccm
DCCM_USE= rc_subr=dccm
PORTS_SENDMAIL_BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
PORTS_SENDMAIL_BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/libmilter
PORTS_SENDMAIL_CONFIGURE_ON= --with-sendmail=yes
DCCIFD_CONFIGURE_ENABLE= dccifd
DCCIFD_USE= rc_subr=dccifd

4
mail/milter-bogom/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= bogom
PORTVERSION= 1.9.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://www.usebox.net/jjm/bogom/ \
http://blackshell.usebox.net/bogom/
@ -15,7 +15,7 @@ COMMENT= Simple sendmail milter to interface bogofilter
RUN_DEPENDS= bogofilter:${PORTSDIR}/mail/bogofilter
.if !exists(/usr/lib/libmilter.so)
LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/sendmail
LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/libmilter
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
.endif

3
mail/milter-skem/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= skem
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://virtual-estates.net/skem/
@ -10,7 +11,7 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Cache earlier sendmail's verdicts for the relays
.if !exists( /usr/include/libmilter/mfapi.h )
BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail
BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/libmilter
CFLAGS+= -I${LOCALBASE}/include
.endif

4
mail/mimedefang/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= mimedefang
PORTVERSION= 2.78
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://www.mimedefang.org/static/ \
http://fossies.org/linux/misc/
@ -56,7 +56,7 @@ CONFIG_FILES= mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
.include <bsd.port.options.mk>
.if !exists( /usr/include/libmilter/mfapi.h )
BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail
BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/libmilter
.endif
.if exists( ${LOCALBASE}/include/libmilter/mfapi.h )

4
mail/py-milter/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= milter
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail python
MASTER_SITES= SF/${PYPORTNAME}/${PYPORTNAME}/${DISTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -16,7 +16,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
.if !exists(/usr/lib/libmilter.so)
LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/sendmail
LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/libmilter
CFLAGS+= -I${LOCALBASE}/include
.endif

2
math/R-cran-geepack/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= geepack
DISTVERSION= 1.2-0
DISTVERSION= 1.2-0.1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}

4
math/R-cran-geepack/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (geepack_1.2-0.tar.gz) = e4d420e8906eef98ee20f1aba14d5a70b6119725ea7f52ed074425e9b54db0df
SIZE (geepack_1.2-0.tar.gz) = 213737
SHA256 (geepack_1.2-0.1.tar.gz) = 22c99b2cbe17aed6625478530a51d597a2a68ccab4bbca2d16efee49fdc0374a
SIZE (geepack_1.2-0.1.tar.gz) = 213743

3
math/R-cran-gtable/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtable
PORTVERSION= 0.1.2
PORTREVISION= 7
PORTVERSION= 0.2.0
CATEGORIES= math
DISTNAME= ${PORTNAME}_${PORTVERSION}

4
math/R-cran-gtable/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (gtable_0.1.2.tar.gz) = b08ba8e62e0ce05e7a4c07ba3ffa67719161db62438b04f14343f8928d74304d
SIZE (gtable_0.1.2.tar.gz) = 19667
SHA256 (gtable_0.2.0.tar.gz) = 801e4869830ff3da1d38e41f5a2296a54fc10a7419c6ffb108582850c701e76f
SIZE (gtable_0.2.0.tar.gz) = 24157

2
math/R-cran-sp/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sp
DISTVERSION= 1.2-1
DISTVERSION= 1.2-2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}

4
math/R-cran-sp/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (sp_1.2-1.tar.gz) = 2e44f56bf548742caeb019fd121452e5c4f727a78dbc60b646435aee3ca4c4b4
SIZE (sp_1.2-1.tar.gz) = 1227402
SHA256 (sp_1.2-2.tar.gz) = e2a06a2c62c05479dd36f1df899fed5cffe7269b5c40f0b210051d3957ec0404
SIZE (sp_1.2-2.tar.gz) = 1242641

4
math/ipopt/Makefile
View file

@ -21,7 +21,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
CONFIGURE_ENV+= PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig
CONFIGURE_ENV+= PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig \
CXX="${CXX} -B${LOCALBASE}/bin"
CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib"
@ -36,6 +37,7 @@ post-patch::
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g'
post-extract:
@(${ECHO} "Extracting Metis and Mumps ThirdParty libraries ..." )
@(cd ${WRKSRC}/ThirdParty/Metis && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/metis-4.0.3.tar.gz ${EXTRACT_AFTER_ARGS});

5
math/octave-forge-optim/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= octave-forge-optim
PORTVERSION= 1.4.1
PORTREVISION= 1
PORTVERSION= 1.5.0
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
@ -17,6 +16,8 @@ WRKSRC= ${WRKDIR}/${OCTSRC}/src
RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:${PORTSDIR}/math/octave-forge-struct
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
post-build:

4
math/octave-forge-optim/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (octave-forge/optim-1.4.1.tar.gz) = b20828bb1d3ac2685e60e6f2689895953bbe000e048bb9557ac9ae01dfa54beb
SIZE (octave-forge/optim-1.4.1.tar.gz) = 366091
SHA256 (octave-forge/optim-1.5.0.tar.gz) = ab0a2f215ced591e875125940a0a326ed9e4e107ba90f9e7ed660ce770345f9f
SIZE (octave-forge/optim-1.5.0.tar.gz) = 389556

5
math/octave-forge-struct/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= octave-forge-struct
PORTVERSION= 1.0.11
PORTREVISION= 1
PORTVERSION= 1.0.12
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
@ -18,6 +17,8 @@ OCTSRC= ${DISTNAME}
WRKSRC= ${WRKDIR}/${OCTSRC}/src
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
post-build:

4
math/octave-forge-struct/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (octave-forge/struct-1.0.11.tar.gz) = 66bc908c25120d2f830363c482fff814d5d8d089b06e17193e686ccc9efa91d6
SIZE (octave-forge/struct-1.0.11.tar.gz) = 17078
SHA256 (octave-forge/struct-1.0.12.tar.gz) = 4e6832b43b758e2104d9a1a455457c74907bdace69ee43f36cdddca22181a0c6
SIZE (octave-forge/struct-1.0.12.tar.gz) = 55087

Some files were not shown because too many files have changed in this diff Show more