*/*: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2017-10-26 21:08:54 +02:00
parent 181dcc7144
commit c2856eda6d
166 changed files with 4536 additions and 387 deletions

View file

@ -1,7 +1,6 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 1
CATEGORIES= archivers
MASTERDIR= ${.CURDIR}/../../lang/php70

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cfitsio
PORTVERSION= 3.410
PORTVERSION= 3.420
CATEGORIES= astro
MASTER_SITES= http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \
http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1483380083
SHA256 (cfitsio3410.tar.gz) = a556ac7ea1965545dcb4d41cfef8e4915eeb8c0faa1b52f7ff70870f8bb5734c
SIZE (cfitsio3410.tar.gz) = 4755428
TIMESTAMP = 1508948875
SHA256 (cfitsio3420.tar.gz) = 6c10aa636118fa12d9a5e2e66f22c6436fb358da2af6dbf7e133c142e2ac16b8
SIZE (cfitsio3420.tar.gz) = 4836004

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= stress-ng
PORTVERSION= 0.08.17
PORTVERSION= 0.08.18
CATEGORIES= benchmarks
MASTER_SITES= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1507723934
SHA256 (stress-ng-0.08.17.tar.gz) = 37cc73e42f5bdb0e0571ba88f6a69b8f05ee28e51afcafc2231c1058b1a5dd18
SIZE (stress-ng-0.08.17.tar.gz) = 447422
TIMESTAMP = 1508927013
SHA256 (stress-ng-0.08.18.tar.gz) = a0d64b2b45c66cf48601ac51423dcd0c492a401244b9404ce7cbfb1e2dba0b84
SIZE (stress-ng-0.08.18.tar.gz) = 448997

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pysam
PORTVERSION= 0.11.2.2
DISTVERSION= 0.12.0.1
CATEGORIES= biology python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1497058301
SHA256 (pysam-0.11.2.2.tar.gz) = 9cd66406eaff40986302e9e1edc5872538f0fed9623aa8ceb15f9b80bbabfe03
SIZE (pysam-0.11.2.2.tar.gz) = 2505937
TIMESTAMP = 1508995006
SHA256 (pysam-0.12.0.1.tar.gz) = 04837bf0b1313e57d50076f228463262b9982c410b973eb184c033528f83d523
SIZE (pysam-0.12.0.1.tar.gz) = 2672020

View file

@ -3,7 +3,7 @@
PORTNAME= kicad
PORTVERSION= 4.0.7
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= cad
@ -18,7 +18,6 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libpixman-1.so:x11/pixman \
libpng.so:graphics/png \
libcurl.so:ftp/curl
RUN_DEPENDS= xpdf:graphics/xpdf
CONFLICTS= kicad-devel-r201*
@ -63,12 +62,9 @@ DOXYGEN_PORTDOCS= doxygen
pre-configure:
${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|' \
-e 's|/usr/local|${PREFIX}|' \
-e 's|/usr/bin/evince|${LOCALBASE}/bin/xpdf|' \
-e 's|/usr/bin/kpdf|${LOCALBASE}/bin/okular|' \
-e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \
-e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \
-e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
${WRKSRC}/common/gestfich.cpp
${REINPLACE_CMD} -e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
${WRKSRC}/common/pgm_base.cpp
post-install-DOCS-on:
(cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})

View file

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= mysqlwsrep
PORTVERSION?= 5.7.18
PORTVERSION?= 5.7.20
DISTVERSIONPREFIX?= wsrep_
DISTVERSIONSUFFIX?= -25.12
PORTREVISION?= 1
DISTVERSIONSUFFIX?= -25.13
CATEGORIES= databases ipv6
MASTER_SITES+= SF/boost/boost/1.59.0:boost
PKGNAMESUFFIX= 57-server

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1501158272
SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
SIZE (boost_1_59_0.tar.gz) = 83709983
SHA256 (codership-mysql-wsrep-wsrep_5.7.18-25.12_GH0.tar.gz) = d40457fd71401d1600386482f2bc0d6258d3b853a051ba47d8b64d5a95e5efc8
SIZE (codership-mysql-wsrep-wsrep_5.7.18-25.12_GH0.tar.gz) = 51679003
SHA256 (codership-mysql-wsrep-wsrep_5.7.20-25.13_GH0.tar.gz) = 2c55bbbdc7dc1799ffd39a63bbfcfd1a9b8ae76b674016f7d00988887ecab095
SIZE (codership-mysql-wsrep-wsrep_5.7.20-25.13_GH0.tar.gz) = 51921340

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= psycopg2
PORTVERSION= 2.7.3.1
PORTVERSION= 2.7.3.2
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP \
http://initd.org/psycopg/tarballs/PSYCOPG-${PORTVERSION:R:S|.|-|}/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1503844738
SHA256 (psycopg2-2.7.3.1.tar.gz) = 9b7b16e26448b43cf167f785d8b5345007731ebf153a510e12dae826800caa65
SIZE (psycopg2-2.7.3.1.tar.gz) = 425069
TIMESTAMP = 1508946466
SHA256 (psycopg2-2.7.3.2.tar.gz) = 5c3213be557d0468f9df8fe2487eaf2990d9799202c5ff5cb8d394d09fad9b2a
SIZE (psycopg2-2.7.3.2.tar.gz) = 425107

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= queries
PORTVERSION= 1.10.0
PORTVERSION= 1.10.1
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1507105732
SHA256 (queries-1.10.0.tar.gz) = decb07f20e2deffcedcb759840800bce4d2fd42a9e338cddaa61155b5a11a193
SIZE (queries-1.10.0.tar.gz) = 17401
TIMESTAMP = 1508949346
SHA256 (queries-1.10.1.tar.gz) = 698d190f8f3fc78d72e15a1a0ff29459b849f6f849f770081c0edae9a92a2d55
SIZE (queries-1.10.1.tar.gz) = 17380

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
PORTVERSION= 2.10.5
PORTVERSION= 2.10.6
CATEGORIES= databases python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,2 +1,3 @@
SHA256 (andymccurdy-redis-py-2.10.5_GH0.tar.gz) = 159835ac5f09822bb3c578bdf848b9d137a67c2e4ae4b7aa05390dac33087def
SIZE (andymccurdy-redis-py-2.10.5_GH0.tar.gz) = 86029
TIMESTAMP = 1508148992
SHA256 (andymccurdy-redis-py-2.10.6_GH0.tar.gz) = e28e24539d6590a8b88498f2d30f7fe3e2be1171d7a91fe1fa6c5b6982519015
SIZE (andymccurdy-redis-py-2.10.6_GH0.tar.gz) = 94869

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= globalid
PORTVERSION= 0.4.0
PORTVERSION= 0.4.1
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -rails5

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1493510705
SHA256 (rubygem/globalid-0.4.0.gem) = dd89ccd9be91e5c26861f3a93648b581673c74e8255c62fe53baeacf31e05fb2
SIZE (rubygem/globalid-0.4.0.gem) = 12800
TIMESTAMP = 1508946554
SHA256 (rubygem/globalid-0.4.1.gem) = 68e8481a1b71cab635a5746c8a73b74e646f62f2dac29f228e7f8610dbcb550b
SIZE (rubygem/globalid-0.4.1.gem) = 12800

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= globalid
PORTVERSION= 0.4.0
PORTVERSION= 0.4.1
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -rails50

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1492420910
SHA256 (rubygem/globalid-0.4.0.gem) = dd89ccd9be91e5c26861f3a93648b581673c74e8255c62fe53baeacf31e05fb2
SIZE (rubygem/globalid-0.4.0.gem) = 12800
TIMESTAMP = 1508946554
SHA256 (rubygem/globalid-0.4.1.gem) = 68e8481a1b71cab635a5746c8a73b74e646f62f2dac29f228e7f8610dbcb550b
SIZE (rubygem/globalid-0.4.1.gem) = 12800

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= globalid
PORTVERSION= 0.4.0
PORTVERSION= 0.4.1
CATEGORIES= databases rubygems
MASTER_SITES= RG

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1492420910
SHA256 (rubygem/globalid-0.4.0.gem) = dd89ccd9be91e5c26861f3a93648b581673c74e8255c62fe53baeacf31e05fb2
SIZE (rubygem/globalid-0.4.0.gem) = 12800
TIMESTAMP = 1508946554
SHA256 (rubygem/globalid-0.4.1.gem) = 68e8481a1b71cab635a5746c8a73b74e646f62f2dac29f228e7f8610dbcb550b
SIZE (rubygem/globalid-0.4.1.gem) = 12800

View file

@ -10,18 +10,22 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= User interface builder for Gtk+ 2
LICENSE= GPLv2+ LGPL21+
LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.GPL
LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPL
CONFLICTS= glade-3.*
PORTSCOUT= ignore
INSTALLS_ICONS= yes
USE_GNOME= gtk20 intltool libxml2 gnomedocutils
USES= gmake gettext libtool pathfix desktop-file-utils pkgconfig tar:xz
USES= gmake gettext libtool pathfix desktop-file-utils \
localbase:ldflags pkgconfig tar:xz
INSTALLS_OMF= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
DOCSDIR= ${PREFIX}/share/doc/gladeui

View file

@ -5,4 +5,4 @@ these can be loaded by applications dynamically as needed.
This version of Glade targets Gtk+ 2.
WWW: http://glade.gnome.org/
WWW: https://glade.gnome.org/

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gogland-eap
PORTVERSION= 173.3188.63
PORTVERSION= 173.3415.23
CATEGORIES= devel java
MASTER_SITES= https://download.jetbrains.com/go/ \
http://download.jetbrains.com/go/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1508446157
SHA256 (gogland-173.3188.63.tar.gz) = 8fb72d485ec5e79e76ce800b091eea6b78e9752d32f5fbc0922789e18f9b405a
SIZE (gogland-173.3188.63.tar.gz) = 209402151
TIMESTAMP = 1509018126
SHA256 (gogland-173.3415.23.tar.gz) = 31a13e26729d5288d200f24e295d5009b3260a8b4fe42bfce25c192c8d579127
SIZE (gogland-173.3415.23.tar.gz) = 209703562

View file

@ -77,7 +77,6 @@ share/applications/gogland-eap.desktop
%%DATADIR%%/lib/kotlin-reflect.jar
%%DATADIR%%/lib/kotlin-runtime.jar
%%DATADIR%%/lib/log4j.jar
%%DATADIR%%/lib/lz4-java-1.3.jar
%%DATADIR%%/lib/markdownj-core-0.4.2-SNAPSHOT.jar
%%DATADIR%%/lib/microba.jar
%%DATADIR%%/lib/miglayout-core-5.0.jar
@ -100,7 +99,7 @@ share/applications/gogland-eap.desktop
%%DATADIR%%/lib/snakeyaml-1.17.jar
%%DATADIR%%/lib/snappy-in-java-0.5.1.jar
%%DATADIR%%/lib/sqlite-jdbc-3.16.1.jar
%%DATADIR%%/lib/streamex-0.6.2.jar
%%DATADIR%%/lib/streamex-0.6.5.jar
%%DATADIR%%/lib/swingx-core-1.6.2.jar
%%DATADIR%%/lib/trang-core.jar
%%DATADIR%%/lib/trilead-ssh2.jar
@ -155,7 +154,7 @@ share/applications/gogland-eap.desktop
%%DATADIR%%/plugins/CSS/lib/resources_en.jar
%%DATADIR%%/plugins/DatabaseTools/lib/database-impl.jar
%%DATADIR%%/plugins/DatabaseTools/lib/database-openapi.jar
%%DATADIR%%/plugins/DatabaseTools/lib/dekaf-single-2.0.0.312.jar
%%DATADIR%%/plugins/DatabaseTools/lib/dekaf-single-2.0.0.336.jar
%%DATADIR%%/plugins/DatabaseTools/lib/jdbc-console.jar
%%DATADIR%%/plugins/DatabaseTools/lib/resources_en.jar
%%DATADIR%%/plugins/DatabaseTools/lib/unidecode-0.0.7.jar
@ -212,6 +211,7 @@ share/applications/gogland-eap.desktop
%%DATADIR%%/plugins/JavaScriptLanguage/helpers/base-test-reporter/intellij-tree.js
%%DATADIR%%/plugins/JavaScriptLanguage/helpers/base-test-reporter/intellij-util.js
%%DATADIR%%/plugins/JavaScriptLanguage/helpers/jest-intellij/lib/jest-intellij-jasmine.js
%%DATADIR%%/plugins/JavaScriptLanguage/helpers/jest-intellij/lib/jest-intellij-stdin-fix.js
%%DATADIR%%/plugins/JavaScriptLanguage/helpers/jest-intellij/lib/jest-intellij-test-results-processor.js
%%DATADIR%%/plugins/JavaScriptLanguage/helpers/node_modules/semver/LICENSE
%%DATADIR%%/plugins/JavaScriptLanguage/helpers/node_modules/semver/README.md
@ -283,6 +283,7 @@ share/applications/gogland-eap.desktop
%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/websql.d.ts
%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/xpath.d.ts
%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/js-language-service.js
%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/typescript/ide-watcher.js
%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/typescript/logger-impl.js
%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/typescript/out-path-process.js
%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/typescript/service-loader.js
@ -319,6 +320,8 @@ share/applications/gogland-eap.desktop
%%DATADIR%%/plugins/copyright/lib/copyright.jar
%%DATADIR%%/plugins/editorconfig/lib/editorconfig-core-java.jar
%%DATADIR%%/plugins/editorconfig/lib/editorconfig.jar
%%DATADIR%%/plugins/fileWatcher/lib/fileWatcher.jar
%%DATADIR%%/plugins/fileWatcher/lib/resources_en.jar
%%DATADIR%%/plugins/git4idea/lib/git4idea-rt.jar
%%DATADIR%%/plugins/git4idea/lib/git4idea.jar
%%DATADIR%%/plugins/git4idea/lib/resources_en.jar

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ksql
PORTVERSION= 0.0.9
PORTVERSION= 0.1.3
CATEGORIES= devel databases
MASTER_SITES= http://kristaps.bsd.lv/ksql/snapshots/
@ -10,10 +10,17 @@ COMMENT= Lazy man's wrapper for the SQLite C API
LICENSE= ISCL
LIB_DEPENDS= libsqlite3.so:databases/sqlite3
BUILD_DEPENDS= ${LOCALBASE}/include/sqlite3.h:databases/sqlite3
USES= localbase
MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}"
ALL_TARGET= libksql.a
USES= localbase
HAS_CONFIGURE= yes
post-patch:
@${REINPLACE_CMD} 's@^PREFIX="/usr/local"@PREFIX="${STAGEDIR}${PREFIX}"@' \
${WRKSRC}/configure
do-test:
@cd ${WRKSRC} && ./test
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1488715533
SHA256 (ksql-0.0.9.tar.gz) = 052706ece35ca780be87ec2b645d91e62366d3bc8ee7acad50ddb12a35b2da08
SIZE (ksql-0.0.9.tar.gz) = 11669
TIMESTAMP = 1509036776
SHA256 (ksql-0.1.3.tar.gz) = 0ea524f9ef62b5fea662042416b0d599f042a1f8e8876f9602eb9587f80f610d
SIZE (ksql-0.1.3.tar.gz) = 33868

View file

@ -2,6 +2,7 @@ include/ksql.h
lib/libksql.a
man/man3/ksql.3.gz
man/man3/ksql_alloc.3.gz
man/man3/ksql_alloc_child.3.gz
man/man3/ksql_bind_double.3.gz
man/man3/ksql_close.3.gz
man/man3/ksql_exec.3.gz
@ -12,5 +13,7 @@ man/man3/ksql_stmt_alloc.3.gz
man/man3/ksql_stmt_double.3.gz
man/man3/ksql_stmt_free.3.gz
man/man3/ksql_stmt_reset.3.gz
man/man3/ksql_trace.3.gz
man/man3/ksql_trans_commit.3.gz
man/man3/ksql_trans_open.3.gz
man/man3/ksql_untrace.3.gz

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libbson
PORTVERSION= 1.8.0
PORTVERSION= 1.8.1
CATEGORIES= devel
MAINTAINER= ports@bsdserwis.com

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1507302875
SHA256 (mongodb-libbson-1.8.0_GH0.tar.gz) = 36ab53f7be8c3d4f788ee822fe5c61ca06297d8fd6da289b00c2243cb8e7ed47
SIZE (mongodb-libbson-1.8.0_GH0.tar.gz) = 4123991
TIMESTAMP = 1508858982
SHA256 (mongodb-libbson-1.8.1_GH0.tar.gz) = 723e47244751e79dcc80fb8dd6f8cb096433bac8494bcfaf464191b6dcbf2d3e
SIZE (mongodb-libbson-1.8.1_GH0.tar.gz) = 4124283

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mongo-c-driver
PORTVERSION= 1.8.0
PORTVERSION= 1.8.1
CATEGORIES= devel
MAINTAINER= ports@bsdserwis.com
@ -17,7 +17,8 @@ LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
USE_GITHUB= yes
GH_ACCOUNT= mongodb
USES= cmake:noninja pkgconfig
USES= cmake:outsource pkgconfig
#USES= cmake:noninja pkgconfig
USE_LDCONFIG= yes
LDFLAGS+= -pthread

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1507309734
SHA256 (mongodb-mongo-c-driver-1.8.0_GH0.tar.gz) = 603f88b4774c4258a00679df1f427621a817901829052454b43629e599974b0c
SIZE (mongodb-mongo-c-driver-1.8.0_GH0.tar.gz) = 2891810
TIMESTAMP = 1508859086
SHA256 (mongodb-mongo-c-driver-1.8.1_GH0.tar.gz) = 610c74fad07bc232071c37439c224049e767a3f081538be7c7783711f0bad806
SIZE (mongodb-mongo-c-driver-1.8.1_GH0.tar.gz) = 2892108

View file

@ -0,0 +1,45 @@
This patch fixed the following build error. It can be removed in later
release since upstream removed compression checks.
Reference: https://github.com/sunpoet/mongo-c-driver/commit/d35a67a404e3311257b7ad331e4f12d69ce5ec04
--- CMakeFiles/test-libmongoc.dir/tests/test-mongoc-topology.c.o ---
/wrkdirs/usr/ports/devel/mongo-c-driver/work/mongo-c-driver-1.8.1/tests/test-mongoc-topology.c:348:34: error: no member named 'compressors' in 'struct _mongoc_server_description_t'
BSON_ASSERT (bson_empty (&sd->compressors));
~~ ^
/usr/local/include/libbson-1.0/bson.h:65:26: note: expanded from macro 'bson_empty'
#define bson_empty(b) (((b)->len == 5) || !bson_get_data ((b))[4])
^
/usr/local/include/libbson-1.0/bson-macros.h:192:26: note: expanded from macro 'BSON_ASSERT'
if (!(BSON_LIKELY (test))) { \
^~~~
/usr/local/include/libbson-1.0/bson-macros.h:231:45: note: expanded from macro 'BSON_LIKELY'
#define BSON_LIKELY(x) __builtin_expect (!!(x), 1)
^
/wrkdirs/usr/ports/devel/mongo-c-driver/work/mongo-c-driver-1.8.1/tests/test-mongoc-topology.c:348:34: error: no member named 'compressors' in 'struct _mongoc_server_description_t'
BSON_ASSERT (bson_empty (&sd->compressors));
~~ ^
/usr/local/include/libbson-1.0/bson.h:65:60: note: expanded from macro 'bson_empty'
#define bson_empty(b) (((b)->len == 5) || !bson_get_data ((b))[4])
^
/usr/local/include/libbson-1.0/bson-macros.h:192:26: note: expanded from macro 'BSON_ASSERT'
if (!(BSON_LIKELY (test))) { \
^~~~
/usr/local/include/libbson-1.0/bson-macros.h:231:45: note: expanded from macro 'BSON_LIKELY'
#define BSON_LIKELY(x) __builtin_expect (!!(x), 1)
^
2 errors generated.
*** [CMakeFiles/test-libmongoc.dir/tests/test-mongoc-topology.c.o] Error code 1
--- tests/test-mongoc-topology.c.orig 2017-10-11 23:52:36 UTC
+++ tests/test-mongoc-topology.c
@@ -345,7 +345,9 @@ _test_topology_invalidate_server (bool p
BSON_ASSERT (bson_empty (&sd->hosts));
BSON_ASSERT (bson_empty (&sd->passives));
BSON_ASSERT (bson_empty (&sd->arbiters));
+#ifdef MONGOC_ENABLE_COMPRESSION
BSON_ASSERT (bson_empty (&sd->compressors));
+#endif
mongoc_server_stream_cleanup (server_stream);

View file

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= nimble
PORTVERSION= 0.8.2
DISTVERSIONPREFIX= v
DISTVERSION= 0.8.8
CATEGORIES= devel
MAINTAINER= ports@nicandneal.net

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1484059070
SHA256 (nim-lang-nimble-v0.8.2_GH0.tar.gz) = 5cfdebdeddf5cf7d32c7b1b047a99d660de4e3a29e29ce7a3216020dc4f301cd
SIZE (nim-lang-nimble-v0.8.2_GH0.tar.gz) = 60624
TIMESTAMP = 1508838468
SHA256 (nim-lang-nimble-v0.8.8_GH0.tar.gz) = 4a849370f58af0d6fe940c15536ab9487f75517c695dd845f84ad96e71f2f4bd
SIZE (nim-lang-nimble-v0.8.8_GH0.tar.gz) = 71661

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pybind11
PORTVERSION= 2.1.1
DISTVERSION= 2.2.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1495609711
SHA256 (pybind11-2.1.1.tar.gz) = c169a384ea046a1672ac83e9aed30660133e9bad3afd82fa99b794df7b416f6d
SIZE (pybind11-2.1.1.tar.gz) = 101039
TIMESTAMP = 1508993967
SHA256 (pybind11-2.2.1.tar.gz) = a96a924fae6e2721efbf24f47561284fd1ea0b655619a8621c4423036183b824
SIZE (pybind11-2.2.1.tar.gz) = 130770

View file

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= python-gist
PORTVERSION= 0.4.7
DISTVERSIONPREFIX= v
DISTVERSION= 0.5.1
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -24,7 +24,7 @@ USE_GITHUB= yes
GH_ACCOUNT= jdowner
GH_PROJECT= gist
USES= python
USES= python:2.7-3.5
USE_PYTHON= autoplist distutils
NO_ARCH= yes

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1485998853
SHA256 (jdowner-gist-v0.4.7_GH0.tar.gz) = 41e9762780e71ca35c0080a55df4d9425a2ed71d1658e2ab22478a8731c1b91a
SIZE (jdowner-gist-v0.4.7_GH0.tar.gz) = 17698
TIMESTAMP = 1508994548
SHA256 (jdowner-gist-v0.5.1_GH0.tar.gz) = 17042f05db4385a5babda77ae5742f9066bcf95149ddc05aeaea863a5f047746
SIZE (jdowner-gist-v0.5.1_GH0.tar.gz) = 17817

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-core
PORTVERSION= 2.10.70
PORTVERSION= 2.10.71
CATEGORIES= devel rubygems
MASTER_SITES= RG

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1508857053
SHA256 (rubygem/aws-sdk-core-2.10.70.gem) = d41dac9109a193bc8a72fecadb1d1bc71337dda3d2ad48e5ac563976a0f24b94
SIZE (rubygem/aws-sdk-core-2.10.70.gem) = 1077760
TIMESTAMP = 1508946575
SHA256 (rubygem/aws-sdk-core-2.10.71.gem) = e239fa3ebb0c81eb091b3ea78ef059e95fd26d7cd713446fbe463074b93cde87
SIZE (rubygem/aws-sdk-core-2.10.71.gem) = 1078784

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-resources
PORTVERSION= 2.10.70
PORTVERSION= 2.10.71
CATEGORIES= devel rubygems
MASTER_SITES= RG

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1508857060
SHA256 (rubygem/aws-sdk-resources-2.10.70.gem) = bc31ca9ecdb1bb5840b3dddb67948473b1cc1be6b4b94962a38bd0a6f4a81918
SIZE (rubygem/aws-sdk-resources-2.10.70.gem) = 48640
TIMESTAMP = 1508946581
SHA256 (rubygem/aws-sdk-resources-2.10.71.gem) = dc182d76a2d9e7b5b0b61d7743aed04cdc84f0edd05f25ddbe8ce68d95c59327
SIZE (rubygem/aws-sdk-resources-2.10.71.gem) = 48640

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk
PORTVERSION= 2.10.70
PORTVERSION= 2.10.71
CATEGORIES= devel rubygems
MASTER_SITES= RG

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1508857066
SHA256 (rubygem/aws-sdk-2.10.70.gem) = 380784754f11a7dbbb12de4839fbdccfc7b3d89575beee9a41abc28871e084a9
SIZE (rubygem/aws-sdk-2.10.70.gem) = 4608
TIMESTAMP = 1508946588
SHA256 (rubygem/aws-sdk-2.10.71.gem) = df7f5388aa4e61a6d34f940539c774b831ce70ad44d02d6cee32c4b3160d68b6
SIZE (rubygem/aws-sdk-2.10.71.gem) = 4608

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= et-orbi
PORTVERSION= 1.0.7
PORTVERSION= 1.0.8
CATEGORIES= devel rubygems
MASTER_SITES= RG

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1507363048
SHA256 (rubygem/et-orbi-1.0.7.gem) = 19519e3574220a7bbd8ffad6ea07b41429d15758e9d6fd233eae76657de2d951
SIZE (rubygem/et-orbi-1.0.7.gem) = 12800
TIMESTAMP = 1508946474
SHA256 (rubygem/et-orbi-1.0.8.gem) = a9aabc209a45b52b30db7562d069f335e9c6bdd69c7b50d811559d69de1cf193
SIZE (rubygem/et-orbi-1.0.8.gem) = 12800

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rake
PORTVERSION= 12.1.0
PORTVERSION= 12.2.1
CATEGORIES= devel rubygems
MASTER_SITES= RG

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1505293242
SHA256 (rubygem/rake-12.1.0.gem) = 5cbb774dfd1c31c4ef19e365728b8a9ecb8b0b74349496c32e3a993aee7dd855
SIZE (rubygem/rake-12.1.0.gem) = 84480
TIMESTAMP = 1508947557
SHA256 (rubygem/rake-12.2.1.gem) = 7d412aa225feb3b360ba89ac160ce9d5c6775693fc073a40b3ac434670764c21
SIZE (rubygem/rake-12.2.1.gem) = 84992

View file

@ -12,6 +12,7 @@
SUBDIR += bind9-devel
SUBDIR += bind910
SUBDIR += bind911
SUBDIR += bind912
SUBDIR += bind99
SUBDIR += bindgraph
SUBDIR += bundy

282
dns/bind912/Makefile Normal file
View file

@ -0,0 +1,282 @@
# $FreeBSD$
# pkg-help formatted with fmt 59 63
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0
.else
# dns/bind9xx here
PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
.if defined(BIND_TOOLS_SLAVE)
PKGNAMESUFFIX= -tools
.else
PKGNAMESUFFIX= 912
.endif
DISTNAME= ${PORTNAME}-${ISCVERSION}
MAINTAINER= mat@FreeBSD.org
.if defined(BIND_TOOLS_SLAVE)
COMMENT= Command line tools from BIND: delv, dig, host, nslookup...
.else
COMMENT= BIND DNS suite with updated DNSSEC and DNS64
.endif
LICENSE= MPL
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.12.0b1
USES= cpe libedit
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
.if ${ISCVERSION:M*-*}
CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}
.endif
LIB_DEPENDS= libxml2.so:textproc/libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--disable-symtable \
--with-randomdev=/dev/random \
--with-libxml2=${LOCALBASE} \
--with-readline="-L${LOCALBASE}/lib -ledit" \
--with-dlopen=yes \
--sysconfdir=${ETCDIR}
ETCDIR= ${PREFIX}/etc/namedb
CONFLICTS= bind99 bind910 bind9-devel
.if defined(BIND_TOOLS_SLAVE)
CONFIGURE_ARGS+= --disable-shared
CONFLICTS+= bind911
.else
USE_RC_SUBR= named
SUB_FILES= pkg-message named.conf
CONFLICTS+= bind-tools
.endif # BIND_TOOLS_SLAVE
MAKE_JOBS_UNSAFE= yes
PORTDOCS= *
OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON
OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \
FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
OPTIONS_RADIO= CRYPTO GOSTDEF
OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11
OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1
.if !defined(BIND_TOOLS_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP
OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
START_LATE
OPTIONS_GROUP= DLZ
OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
.endif # BIND_TOOLS_SLAVE
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_SUB= yes
CRYPTO_DESC= Choose which crypto engine to use
DLZ_BDB_DESC= DLZ BDB driver
DLZ_DESC= Dynamically Loadable Zones
DLZ_FILESYSTEM_DESC= DLZ filesystem driver
DLZ_LDAP_DESC= DLZ LDAP driver
DLZ_MYSQL_DESC= DLZ MySQL driver (no threading)
DLZ_POSTGRESQL_DESC= DLZ Postgres driver
DLZ_STUB_DESC= DLZ stub driver
DNSTAP_DESC= Provides fast passive logging of DNS messages
FILTER_AAAA_DESC= Enable filtering of AAAA records
FIXED_RRSET_DESC= Enable fixed rrset ordering
GEOIP_DESC= Allow geographically based ACL.
GOSTDEF_DESC= Enable GOST ciphers, needs SSL
GOST_ASN1_DESC= GOST using ASN.1
GOST_DESC= GOST raw keys (new default)
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
GSSAPI_NONE_DESC= Disable
LARGE_FILE_DESC= 64-bit file support
LMDB_DESC= Use LMDB for zone management
MINCACHE_DESC= Use the mincachettl patch
NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**)
PORTREVISION_DESC= Show PORTREVISION in the version string
PYTHON_DESC= Build with Python utilities
QUERYTRACE_DESC= Enable the very verbose query tracelogging
RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records
RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules
SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation
SSL_DESC= Build with OpenSSL (Required for DNSSEC)
START_LATE_DESC= Start BIND late in the boot process (see help)
DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes
DLZ_BDB_USES= bdb
DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes
DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes
DLZ_LDAP_USE= openldap=yes
DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes
DLZ_MYSQL_PREVENTS= THREADS
DLZ_MYSQL_USES= mysql
DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes
DLZ_POSTGRESQL_USES= pgsql
DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes
DNSTAP_CONFIGURE_ENABLE= dnstap
DNSTAP_IMPLIES= THREADS
DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
libprotobuf-c.so:devel/protobuf-c
FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa
FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset
GEOIP_CONFIGURE_WITH= geoip
GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
GOST_ASN1_CONFIGURE_ON= --with-gost=asn1
GOST_CONFIGURE_ON= --with-gost
GSSAPI_BASE_CONFIGURE_ON= \
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_BASE_USES= gssapi
GSSAPI_HEIMDAL_CONFIGURE_ON= \
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_HEIMDAL_USES= gssapi:heimdal
GSSAPI_MIT_CONFIGURE_ON= \
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_MIT_USES= gssapi:mit
GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
IDN_CONFIGURE_OFF= --without-idn
IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit
IDN_USES= iconv
IPV6_CONFIGURE_ENABLE= ipv6
JSON_CONFIGURE_WITH= libjson
JSON_LIB_DEPENDS= libjson-c.so:devel/json-c
LARGE_FILE_CONFIGURE_ENABLE= largefile
LMDB_CONFIGURE_WITH= lmdb
LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl
NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11
NATIVE_PKCS11_IMPLIES= THREADS
PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD}
PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
PYTHON_USES= python
QUERYTRACE_CONFIGURE_ENABLE= querytrace
RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname
RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip
SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1"
SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl
SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
SSL_USES= ssl
START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \
NAMED_BEFORE="LOGIN"
START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
NAMED_BEFORE="SERVERS"
THREADS_CONFIGURE_ENABLE= threads
.include <bsd.port.pre.mk>
.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1}
CONFIGURE_ARGS+= --without-gost
.endif
.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base
BROKEN= OpenSSL from the base system does not support GOST, add \
DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \
that needs SSL.
.endif
post-patch:
.if defined(BIND_TOOLS_SLAVE)
@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-e 's#isc-config.sh installdirs#installdirs#' \
-e 's#.*INSTALL.*isc-config.*##' \
-e 's#.*INSTALL.*bind.keys.*##' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \
-e 's#^ .*check confgen ##' \
${WRKSRC}/bin/Makefile.in
.else
. for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
rndc/rndc.8
@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
${WRKSRC}/bin/${FILE}
. endfor
.endif
.if !defined(BIND_TOOLS_SLAVE)
. if ${PORTREVISION:N0}
post-patch-PORTREVISION-on:
@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
${WRKSRC}/version
. endif
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
${MKDIR} ${STAGEDIR}${ETCDIR}
. for i in dynamic master slave working
@${MKDIR} ${STAGEDIR}${ETCDIR}/$i
. endfor
${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master
${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master
${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
${STAGEDIR}${ETCDIR}/rndc.conf.sample
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
.endif # BIND_TOOLS_SLAVE
# Can't use USE_PYTHON=autoplist
post-install-PYTHON-on:
@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
.include <bsd.port.post.mk>

3
dns/bind912/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1508945823
SHA256 (bind-9.12.0b1.tar.gz) = 640549c74d5e1d6e1be3fdee37c5664185becdc8aeda334aeb38afa0b57c9c3c
SIZE (bind-9.12.0b1.tar.gz) = 9249247

View file

@ -0,0 +1,24 @@
# $FreeBSD$
#
# mtree -deU -f files/BIND.chroot.dist -p tmp
# mtree -cjnb -k uname,gname,mode -p tmp
/set type=file uname=root gname=wheel mode=0755
. type=dir
dev type=dir mode=0555
..
etc type=dir
..
/set type=file uname=bind gname=bind mode=0755
var type=dir uname=root gname=wheel
dump type=dir
..
log type=dir
..
run type=dir
named type=dir
..
..
stats type=dir
..
..

View file

@ -0,0 +1,20 @@
# $FreeBSD$
#
# mtree -deU -f files/BIND.etc.dist -p tmp
# mtree -cjnb -k uname,gname,mode -p tmp
/set type=file uname=root gname=wheel mode=0755
. type=dir
etc type=dir
/set type=file uname=bind gname=wheel mode=0755
namedb type=dir uname=root
dynamic type=dir
..
master type=dir uname=root
..
slave type=dir
..
working type=dir
..
..
..

View file

@ -0,0 +1,11 @@
; $FreeBSD$
$TTL 3h
@ SOA @ nobody.localhost. 42 1d 12h 1w 3h
; Serial, Refresh, Retry, Expire, Neg. cache TTL
@ NS @
; Silence a BIND warning
@ A 127.0.0.1

View file

@ -0,0 +1,79 @@
--- bin/named/config.c.orig 2017-10-16 07:38:34 UTC
+++ bin/named/config.c
@@ -178,12 +178,14 @@ options {\n\
max-recursion-queries 75;\n\
max-stale-ttl 604800; /* 1 week */\n\
message-compression yes;\n\
+ min-cache-ttl 0; /* no minimal, zero is allowed */\n\
# min-roots <obsolete>;\n\
minimal-any false;\n\
minimal-responses no-auth-recursive;\n\
notify-source *;\n\
notify-source-v6 *;\n\
nsec3-test-zone no;\n\
+ override-cache-ttl 0; /* do not override */\n\
provide-ixfr true;\n\
query-source address *;\n\
query-source-v6 address *;\n\
--- bin/named/server.c.orig 2017-10-16 07:38:34 UTC
+++ bin/named/server.c
@@ -4044,6 +4044,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
+ result = named_config_get(maps, "override-cache-ttl", &obj);
+ INSIST(result == ISC_R_SUCCESS);
+ view->overridecachettl = cfg_obj_asuint32(obj);
+
+ obj = NULL;
+ result = named_config_get(maps, "min-cache-ttl", &obj);
+ INSIST(result == ISC_R_SUCCESS);
+ view->mincachettl = cfg_obj_asuint32(obj);
+
+ obj = NULL;
result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
--- lib/dns/include/dns/view.h.orig 2017-10-16 07:38:34 UTC
+++ lib/dns/include/dns/view.h
@@ -145,6 +145,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t sendcookie;
dns_ttl_t maxcachettl;
+ dns_ttl_t mincachettl;
+ dns_ttl_t overridecachettl;
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2017-10-16 07:38:34 UTC
+++ lib/dns/resolver.c
@@ -5747,6 +5747,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
+ * Enforce the configure cache TTL override.
+ */
+ if (res->view->overridecachettl)
+ rdataset->ttl = res->view->overridecachettl;
+
+ /*
+ * Enforce the configure minimum cache TTL.
+ */
+ if (rdataset->ttl < res->view->mincachettl)
+ rdataset->ttl = res->view->mincachettl;
+
+ /*
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2017-10-16 07:38:34 UTC
+++ lib/isccfg/namedconf.c
@@ -1918,6 +1918,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
+ { "override-cache-ttl", &cfg_type_uint32, 0 },
+ { "min-cache-ttl", &cfg_type_uint32, 0 },
{ "max-cache-ttl", &cfg_type_uint32, 0 },
{ "max-clients-per-query", &cfg_type_uint32, 0 },
{ "max-ncache-ttl", &cfg_type_uint32, 0 },

View file

@ -0,0 +1,11 @@
; $FreeBSD$
$TTL 3h
localhost. SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
; Serial, Refresh, Retry, Expire, Neg. cache TTL
NS localhost.
A 127.0.0.1
AAAA ::1

View file

@ -0,0 +1,13 @@
; $FreeBSD$
$TTL 3h
@ SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
; Serial, Refresh, Retry, Expire, Neg. cache TTL
NS localhost.
1.0.0 PTR localhost.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 PTR localhost.

View file

@ -0,0 +1,380 @@
// $FreeBSD$
//
// Refer to the named.conf(5) and named(8) man pages, and the documentation
// in /usr/local/share/doc/bind for more details.
//
// If you are going to set up an authoritative server, make sure you
// understand the hairy details of how DNS works. Even with
// simple mistakes, you can break connectivity for affected parties,
// or cause huge amounts of useless Internet traffic.
options {
// All file and path names are relative to the chroot directory,
// if any, and should be fully qualified.
directory "%%ETCDIR%%/working";
pid-file "/var/run/named/pid";
dump-file "/var/dump/named_dump.db";
statistics-file "/var/stats/named.stats";
// If named is being used only as a local resolver, this is a safe default.
// For named to be accessible to the network, comment this option, specify
// the proper IP address, or delete this option.
listen-on { 127.0.0.1; };
// If you have IPv6 enabled on this system, uncomment this option for
// use as a local resolver. To give access to the network, specify
// an IPv6 address, or the keyword "any".
// listen-on-v6 { ::1; };
// These zones are already covered by the empty zones listed below.
// If you remove the related empty zones below, comment these lines out.
disable-empty-zone "255.255.255.255.IN-ADDR.ARPA";
disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
// If you've got a DNS server around at your upstream provider, enter
// its IP address here, and enable the line below. This will make you
// benefit from its cache, thus reduce overall DNS traffic in the Internet.
/*
forwarders {
127.0.0.1;
};
*/
// If the 'forwarders' clause is not empty the default is to 'forward first'
// which will fall back to sending a query from your local server if the name
// servers in 'forwarders' do not have the answer. Alternatively you can
// force your name server to never initiate queries of its own by enabling the
// following line:
// forward only;
// If you wish to have forwarding configured automatically based on
// the entries in /etc/resolv.conf, uncomment the following line and
// set named_auto_forward=yes in /etc/rc.conf. You can also enable
// named_auto_forward_only (the effect of which is described above).
// include "%%ETCDIR%%/auto_forward.conf";
/*
Modern versions of BIND use a random UDP port for each outgoing
query by default in order to dramatically reduce the possibility
of cache poisoning. All users are strongly encouraged to utilize
this feature, and to configure their firewalls to accommodate it.
AS A LAST RESORT in order to get around a restrictive firewall
policy you can try enabling the option below. Use of this option
will significantly reduce your ability to withstand cache poisoning
attacks, and should be avoided if at all possible.
Replace NNNNN in the example with a number between 49160 and 65530.
*/
// query-source address * port NNNNN;
};
// If you enable a local name server, don't forget to enter 127.0.0.1
// first in your /etc/resolv.conf so this server will be queried.
// Also, make sure to enable it in /etc/rc.conf.
// The traditional root hints mechanism. Use this, OR the slave zones below.
zone "." { type hint; file "%%ETCDIR%%/named.root"; };
/* Slaving the following zones from the root name servers has some
significant advantages:
1. Faster local resolution for your users
2. No spurious traffic will be sent from your network to the roots
3. Greater resilience to any potential root server failure/DDoS
On the other hand, this method requires more monitoring than the
hints file to be sure that an unexpected failure mode has not
incapacitated your server. Name servers that are serving a lot
of clients will benefit more from this approach than individual
hosts. Use with caution.
To use this mechanism, uncomment the entries below, and comment
the hint zone above.
As documented at http://dns.icann.org/services/axfr/ these zones:
"." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and a few others
are available for AXFR from these servers on IPv4 and IPv6:
xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org
*/
/*
zone "." {
type slave;
file "%%ETCDIR%%/slave/root.slave";
masters {
192.0.32.132; // lax.xfr.dns.icann.org
2620:0:2d0:202::132; // lax.xfr.dns.icann.org
192.0.47.132; // iad.xfr.dns.icann.org
2620:0:2830:202::132; // iad.xfr.dns.icann.org
};
notify no;
};
zone "arpa" {
type slave;
file "%%ETCDIR%%/slave/arpa.slave";
masters {
192.0.32.132; // lax.xfr.dns.icann.org
2620:0:2d0:202::132; // lax.xfr.dns.icann.org
192.0.47.132; // iad.xfr.dns.icann.org
2620:0:2830:202::132; // iad.xfr.dns.icann.org
};
notify no;
};
zone "in-addr.arpa" {
type slave;
file "%%ETCDIR%%/slave/in-addr.arpa.slave";
masters {
192.0.32.132; // lax.xfr.dns.icann.org
2620:0:2d0:202::132; // lax.xfr.dns.icann.org
192.0.47.132; // iad.xfr.dns.icann.org
2620:0:2830:202::132; // iad.xfr.dns.icann.org
};
notify no;
};
zone "ip6.arpa" {
type slave;
file "%%ETCDIR%%/slave/ip6.arpa.slave";
masters {
192.0.32.132; // lax.xfr.dns.icann.org
2620:0:2d0:202::132; // lax.xfr.dns.icann.org
192.0.47.132; // iad.xfr.dns.icann.org
2620:0:2830:202::132; // iad.xfr.dns.icann.org
};
notify no;
};
*/
/* Serving the following zones locally will prevent any queries
for these zones leaving your network and going to the root
name servers. This has two significant advantages:
1. Faster local resolution for your users
2. No spurious traffic will be sent from your network to the roots
*/
// RFCs 1912, 5735 and 6303 (and BCP 32 for localhost)
zone "localhost" { type master; file "%%ETCDIR%%/master/localhost-forward.db"; };
zone "127.in-addr.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; };
zone "255.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// RFC 1912-style zone for IPv6 localhost address (RFC 6303)
zone "0.ip6.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; };
// "This" Network (RFCs 1912, 5735 and 6303)
zone "0.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// Private Use Networks (RFCs 1918, 5735 and 6303)
zone "10.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// Shared Address Space (RFC 6598)
zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// Link-local/APIPA (RFCs 3927, 5735 and 6303)
zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IETF protocol assignments (RFCs 5735 and 5736)
zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303)
zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IPv6 Example Range for Documentation (RFCs 3849 and 6303)
zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// Router Benchmark Testing (RFCs 2544 and 5735)
zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IANA Reserved - Old Class E Space (RFC 5735)
zone "240.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "241.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "242.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "243.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "244.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "245.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "246.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "247.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "248.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "249.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "250.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "251.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "252.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "253.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "254.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IPv6 Unassigned Addresses (RFC 4291)
zone "1.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "3.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "4.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "5.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "6.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "7.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "8.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "9.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "a.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "b.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "c.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "d.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "e.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "0.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "1.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "2.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "3.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "4.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "5.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "6.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "7.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "8.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "9.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "a.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "b.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "0.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "1.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "2.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "3.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "4.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "5.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "6.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "7.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IPv6 ULA (RFCs 4193 and 6303)
zone "c.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "d.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IPv6 Link Local (RFCs 4291 and 6303)
zone "8.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "9.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "a.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "b.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303)
zone "c.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "d.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "e.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
zone "f.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
// IP6.INT is Deprecated (RFC 4159)
zone "ip6.int" { type master; file "%%ETCDIR%%/master/empty.db"; };
// NB: Do not use the IP addresses below, they are faked, and only
// serve demonstration/documentation purposes!
//
// Example slave zone config entries. It can be convenient to become
// a slave at least for the zone your own domain is in. Ask
// your network administrator for the IP address of the responsible
// master name server.
//
// Do not forget to include the reverse lookup zone!
// This is named after the first bytes of the IP address, in reverse
// order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6.
//
// Before starting to set up a master zone, make sure you fully
// understand how DNS and BIND work. There are sometimes
// non-obvious pitfalls. Setting up a slave zone is usually simpler.
//
// NB: Don't blindly enable the examples below. :-) Use actual names
// and addresses instead.
/* An example dynamic zone
key "exampleorgkey" {
algorithm hmac-md5;
secret "sf87HJqjkqh8ac87a02lla==";
};
zone "example.org" {
type master;
allow-update {
key "exampleorgkey";
};
file "%%ETCDIR%%/dynamic/example.org";
};
*/
/* Example of a slave reverse zone
zone "1.168.192.in-addr.arpa" {
type slave;
file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa";
masters {
192.168.1.1;
};
};
*/

406
dns/bind912/files/named.in Normal file
View file

@ -0,0 +1,406 @@
#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: named
# REQUIRE: %%NAMED_REQUIRE%%
# BEFORE: %%NAMED_BEFORE%%
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable BIND:
# named_enable (bool): Run named, the DNS server (or NO).
# named_program (str): Path to named, if you want a different one.
# named_conf (str): Path to the configuration file
# named_flags (str): Use this for flags OTHER than -u and -c
# named_uid (str): User to run named as
# named_chrootdir (str): Chroot directory (or "" not to auto-chroot it)
# Historically, was /var/named
# named_chroot_autoupdate (bool): Automatically install/update chrooted
# components of named.
# named_symlink_enable (bool): Symlink the chrooted pid file
# named_wait (bool): Wait for working name service before exiting
# named_wait_host (str): Hostname to check if named_wait is enabled
# named_auto_forward (str): Set up forwarders from /etc/resolv.conf
# named_auto_forward_only (str): Do "forward only" instead of "forward first"
%%NATIVE_PKCS11%%# named_pkcs11_engine (str): Path to the PKCS#11 library to use.
#
. /etc/rc.subr
name=named
desc="named BIND startup script"
rcvar=named_enable
load_rc_config ${name}
extra_commands=reload
start_precmd=named_prestart
start_postcmd=named_poststart
reload_cmd=named_reload
stop_cmd=named_stop
stop_postcmd=named_poststop
named_enable=${named_enable:-"NO"}
named_program=${named_program:-"%%PREFIX%%/sbin/named"}
named_conf=${named_conf:-"%%ETCDIR%%/named.conf"}
named_flags=${named_flags:-""}
named_uid=${named_uid:-"bind"}
named_chrootdir=${named_chrootdir:-""}
named_chroot_autoupdate=${named_chroot_autoupdate:-"YES"}
named_symlink_enable=${named_symlink_enable:-"YES"}
named_wait=${named_wait:-"NO"}
named_wait_host=${named_wait_host:-"localhost"}
named_auto_forward=${named_auto_forward:-"NO"}
named_auto_forward_only=${named_auto_forward_only:-"NO"}
%%NATIVE_PKCS11%%named_pkcs11_engine=${named_pkcs11_engine:-""}
# Not configuration variables but having them here keeps rclint happy
required_dirs="${named_chrootdir}"
_named_confdirroot="${named_conf%/*}"
_named_confdir="${named_chrootdir}${_named_confdirroot}"
_named_program_root="${named_program%/sbin/named}"
_openssl_engines="%%LOCALBASE%%/lib/engines"
# Needed if named.conf and rndc.conf are moved or if rndc.conf is used
rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"}
rndc_key=${rndc_key:-"$_named_confdir/rndc.key"}
# If running in a chroot cage, ensure that the appropriate files
# exist inside the cage, as well as helper symlinks into the cage
# from outside.
#
# As this is called after the is_running and required_dir checks
# are made in run_rc_command(), we can safely assume ${named_chrootdir}
# exists and named isn't running at this point (unless forcestart
# is used).
#
chroot_autoupdate()
{
local file
# If it's the first time around, fiddle with things and move the
# current configuration to the chroot.
if [ -d ${_named_confdirroot} -a ! -d ${_named_confdir} ]; then
warn "named chroot: Moving current configuration in the chroot!"
install -d ${_named_confdir%/*}
mv ${_named_confdirroot} ${_named_confdir}
fi
# Create (or update) the chroot directory structure
#
if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.dist ]; then
mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.dist \
-p ${named_chrootdir}
else
warn "%%PREFIX%%/etc/mtree/BIND.chroot.dist missing,"
warn "${named_chrootdir} directory structure not updated"
fi
if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.local.dist ]; then
mkdir -p ${named_chrootdir}%%PREFIX%%
mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.local.dist \
-p ${named_chrootdir}%%PREFIX%%
else
warn "%%PREFIX%%/etc/mtree/BIND.chroot.local.dist missing,"
warn "${named_chrootdir}%%PREFIX%% directory structure not updated"
fi
# Create (or update) the configuration directory symlink
#
if [ ! -L "${_named_confdirroot}" ]; then
if [ -d "${_named_confdirroot}" ]; then
warn "named chroot: ${_named_confdirroot} is a directory!"
elif [ -e "${_named_confdirroot}" ]; then
warn "named chroot: ${_named_confdirroot} exists!"
else
ln -s ${_named_confdir} ${_named_confdirroot}
fi
else
# Make sure it points to the right place.
ln -shf ${_named_confdir} ${_named_confdirroot}
fi
# Mount a devfs in the chroot directory if needed
#
if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
umount ${named_chrootdir}/dev 2>/dev/null
devfs_domount ${named_chrootdir}/dev devfsrules_hide_all
devfs -m ${named_chrootdir}/dev rule apply path null unhide
devfs -m ${named_chrootdir}/dev rule apply path random unhide
else
if [ -c ${named_chrootdir}/dev/null -a \
-c ${named_chrootdir}/dev/random ]; then
info "named chroot: using pre-mounted devfs."
else
err 1 "named chroot: devfs cannot be mounted from " \
"within a jail. Thus a chrooted named cannot " \
"be run from within a jail. Either mount the " \
"devfs with null and random from the host, or " \
"run named without chrooting it, set " \
"named_chrootdir=\"\" in /etc/rc.conf."
fi
fi
# If OpenSSL from ports, then the engines should be present in the
# chroot, named loads them after chrooting.
if [ -d ${_openssl_engines} ]; then
# FIXME when 8.4 is gone see if
# security.jail.param.allow.mount.nullfs can be used.
if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then
mkdir -p ${named_chrootdir}${_openssl_engines}
mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines}
else
warn "named chroot: cannot nullfs mount OpenSSL" \
"engines into the chroot, will copy the shared" \
"libraries instead."
mkdir -p ${named_chrootdir}${_openssl_engines}
cp -f ${_openssl_engines}/*.so ${named_chrootdir}${_openssl_engines}
fi
fi
# Copy and/or update key files to the chroot /etc
#
for file in localtime protocols services; do
if [ -r /etc/${file} ] && \
! cmp -s /etc/${file} "${named_chrootdir}/etc/${file}"; then
cp -p /etc/${file} "${named_chrootdir}/etc/${file}"
fi
done
}
# Make symlinks to the correct pid file
#
make_symlinks()
{
checkyesno named_symlink_enable &&
ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
}
named_poststart()
{
make_symlinks
if checkyesno named_wait; then
until ${_named_program_root}/bin/host ${named_wait_host} >/dev/null 2>&1; do
echo " Waiting for nameserver to resolve ${named_wait_host}"
sleep 1
done
fi
}
named_reload()
{
# This is a one line function, but ${named_program} is not defined early
# enough to be there when the reload_cmd variable is defined up there.
rndc reload
}
find_pidfile()
{
if get_pidfile_from_conf pid-file ${named_conf}; then
pidfile="${_pidfile_from_conf}"
else
pidfile="/var/run/named/pid"
fi
}
named_stop()
{
find_pidfile
# This duplicates an undesirably large amount of code from the stop
# routine in rc.subr in order to use rndc to shut down the process,
# and to give it a second chance in case rndc fails.
rc_pid=$(check_pidfile ${pidfile} ${command})
if [ -z "${rc_pid}" ]; then
[ -n "${rc_fast}" ] && return 0
_run_rc_notrunning
return 1
fi
echo 'Stopping named.'
if rndc stop; then
wait_for_pids ${rc_pid}
else
echo -n 'rndc failed, trying kill: '
kill -TERM ${rc_pid}
wait_for_pids ${rc_pid}
fi
}
named_poststop()
{
if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then
# if using OpenSSL from ports, unmount OpenSSL engines, if they
# were not mounted but only copied, do nothing.
if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then
umount ${named_chrootdir}${_openssl_engines}
fi
# unmount /dev
if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
umount ${named_chrootdir}/dev 2>/dev/null || true
else
warn "named chroot:" \
"cannot unmount devfs from inside jail!"
fi
fi
}
create_file()
{
if [ -e "$1" ]; then
unlink $1
fi
install -o root -g wheel -m 0644 /dev/null $1
}
rndc()
{
if [ -z "${rndc_flags}" ]; then
if [ -s "${rndc_conf}" ] ; then
rndc_flags="-c ${rndc_conf}"
elif [ -s "${rndc_key}" ] ; then
rndc_flags="-k ${rndc_key}"
else
rndc_flags=""
fi
fi
${_named_program_root}/sbin/rndc ${rndc_flags} "$@"
}
named_prestart()
{
find_pidfile
if [ -n "${named_pidfile}" ]; then
warn 'named_pidfile: now determined from the conf file'
fi
piddir=`/usr/bin/dirname ${pidfile}`
if [ ! -d ${piddir} ]; then
install -d -o ${named_uid} -g ${named_uid} ${piddir}
fi
command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}"
%%NATIVE_PKCS11%% if [ -z "${named_pkcs11_engine}"]; then
%%NATIVE_PKCS11%% err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use"
%%NATIVE_PKCS11%% elif [ ! -f ${named_pkcs11_engine} ]; then
%%NATIVE_PKCS11%% err 3 "named_pkcs11_engine the PKCS#11 engine's library you want to use doesn't exist"
%%NATIVE_PKCS11%% else
%%NATIVE_PKCS11%% mkdir -p ${named_chrootdir}${named_pkcs11_engine%/*}
%%NATIVE_PKCS11%% cp -p ${named_pkcs11_engine} ${named_chrootdir}${named_pkcs11_engine}
%%NATIVE_PKCS11%% command_args="-E ${named_pkcs11_engine} ${command_args}"
%%NATIVE_PKCS11%% fi
local line nsip firstns
# Is the user using a sandbox?
#
if [ -n "${named_chrootdir}" ]; then
rc_flags="${rc_flags} -t ${named_chrootdir}"
checkyesno named_chroot_autoupdate && chroot_autoupdate
else
named_symlink_enable=NO
fi
# Create an rndc.key file for the user if none exists
#
confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \
-c ${_named_confdir}/rndc.key"
if [ -s "${_named_confdir}/rndc.conf" ]; then
unset confgen_command
fi
if [ -s "${_named_confdir}/rndc.key" ]; then
case `stat -f%Su ${_named_confdir}/rndc.key` in
root|${named_uid}) ;;
*) ${confgen_command} ;;
esac
else
${confgen_command}
fi
local checkconf
checkconf="${_named_program_root}/sbin/named-checkconf"
if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then
checkconf="${checkconf} -t ${named_chrootdir}"
fi
# Create a forwarder configuration based on /etc/resolv.conf
if checkyesno named_auto_forward; then
if [ ! -s /etc/resolv.conf ]; then
warn "named_auto_forward enabled, but no /etc/resolv.conf"
# Empty the file in case it is included in named.conf
[ -s "${_named_confdir}/auto_forward.conf" ] &&
create_file ${_named_confdir}/auto_forward.conf
${checkconf} ${named_conf} ||
err 3 'named-checkconf for ${named_conf} failed'
return
fi
create_file /var/run/naf-resolv.conf
create_file /var/run/auto_forward.conf
echo ' forwarders {' > /var/run/auto_forward.conf
while read line; do
case "${line}" in
'nameserver '*|'nameserver '*)
nsip=${line##nameserver[ ]}
if [ -z "${firstns}" ]; then
if [ ! "${nsip}" = '127.0.0.1' ]; then
echo 'nameserver 127.0.0.1'
echo " ${nsip};" >> /var/run/auto_forward.conf
fi
firstns=1
else
[ "${nsip}" = '127.0.0.1' ] && continue
echo " ${nsip};" >> /var/run/auto_forward.conf
fi
;;
esac
echo ${line}
done < /etc/resolv.conf > /var/run/naf-resolv.conf
echo ' };' >> /var/run/auto_forward.conf
echo '' >> /var/run/auto_forward.conf
if checkyesno named_auto_forward_only; then
echo " forward only;" >> /var/run/auto_forward.conf
else
echo " forward first;" >> /var/run/auto_forward.conf
fi
if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then
unlink /var/run/naf-resolv.conf
else
[ -e /etc/resolv.conf ] && unlink /etc/resolv.conf
mv /var/run/naf-resolv.conf /etc/resolv.conf
fi
if cmp -s ${_named_confdir}/auto_forward.conf \
/var/run/auto_forward.conf; then
unlink /var/run/auto_forward.conf
else
[ -e "${_named_confdir}/auto_forward.conf" ] &&
unlink ${_named_confdir}/auto_forward.conf
mv /var/run/auto_forward.conf \
${_named_confdir}/auto_forward.conf
fi
else
# Empty the file in case it is included in named.conf
[ -s "${_named_confdir}/auto_forward.conf" ] &&
create_file ${_named_confdir}/auto_forward.conf
fi
${checkconf} ${named_conf} || err 3 "named-checkconf for ${named_conf} failed"
}
run_rc_command "$1"

View file

@ -0,0 +1,96 @@
;
; $FreeBSD$
;
; This file holds the information on root name servers needed to
; initialize cache of Internet domain name servers
; (e.g. reference this file in the "cache . <file>"
; configuration file of BIND domain name servers).
;
; This file is made available by InterNIC
; under anonymous FTP as
; file /domain/named.cache
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
; last update: April 11, 2017
; related version of root zone: 2017041101
;
; formerly NS.INTERNIC.NET
;
. 3600000 NS A.ROOT-SERVERS.NET.
A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30
;
; FORMERLY NS1.ISI.EDU
;
. 3600000 NS B.ROOT-SERVERS.NET.
B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b
;
; FORMERLY C.PSI.NET
;
. 3600000 NS C.ROOT-SERVERS.NET.
C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c
;
; FORMERLY TERP.UMD.EDU
;
. 3600000 NS D.ROOT-SERVERS.NET.
D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13
D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d
;
; FORMERLY NS.NASA.GOV
;
. 3600000 NS E.ROOT-SERVERS.NET.
E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e
;
; FORMERLY NS.ISC.ORG
;
. 3600000 NS F.ROOT-SERVERS.NET.
F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f
;
; FORMERLY NS.NIC.DDN.MIL
;
. 3600000 NS G.ROOT-SERVERS.NET.
G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d
;
; FORMERLY AOS.ARL.ARMY.MIL
;
. 3600000 NS H.ROOT-SERVERS.NET.
H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53
H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53
;
; FORMERLY NIC.NORDU.NET
;
. 3600000 NS I.ROOT-SERVERS.NET.
I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53
;
; OPERATED BY VERISIGN, INC.
;
. 3600000 NS J.ROOT-SERVERS.NET.
J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30
;
; OPERATED BY RIPE NCC
;
. 3600000 NS K.ROOT-SERVERS.NET.
K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1
;
; OPERATED BY ICANN
;
. 3600000 NS L.ROOT-SERVERS.NET.
L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42
;
; OPERATED BY WIDE
;
. 3600000 NS M.ROOT-SERVERS.NET.
M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35
; End of file

View file

@ -0,0 +1,11 @@
--- bin/tests/system/dlzexternal/Makefile.in.orig 2016-11-01 20:46:42 UTC
+++ bin/tests/system/dlzexternal/Makefile.in
@@ -31,7 +31,7 @@ OBJS =
@BIND9_MAKE_RULES@
CFLAGS = @CFLAGS@ @SO_CFLAGS@
-SO_LDFLAGS = @LDFLAGS@ @SO_LDFLAGS@
+SO_LDFLAGS = @SO_LDFLAGS@
driver.@SO@: ${SO_OBJS}
${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ driver.@O@

View file

@ -0,0 +1,90 @@
--- configure.orig 2017-10-16 07:38:34 UTC
+++ configure
@@ -14420,27 +14420,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
- "-lgssapi_krb5" \
- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
- "-lgssapi" \
- "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \
- "-lgss -lkrb5"
+ "$($KRB5CONFIG gssapi --libs)"; \
do
- # Note that this does not include $saved_libs, because
- # on FreeBSD machines this configure script has added
- # -L/usr/local/lib to LIBS, which can make the
- # -lgssapi_krb5 test succeed with shared libraries even
- # when you are trying to build with KTH in /usr/lib.
- if test "/usr" = "$use_gssapi"
- then
- LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
- else
- LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
- fi
+ LIBS="$TRY_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
$as_echo_n "checking linking as $TRY_LIBS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14483,47 +14465,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
- #
- # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib
- # but MIT in /usr/local/lib and trying to build with KTH.
- # /usr/local/lib can end up earlier on the link lines.
- # Like most kludges, this one is not only inelegant it
- # is also likely to be the wrong thing to do at least as
- # many times as it is the right thing. Something better
- # needs to be done.
- #
- if test "/usr" = "$use_gssapi" -a \
- -f /usr/local/lib/libkrb5.a; then
- FIX_KTH_VS_MIT=yes
- fi
-
- case "$FIX_KTH_VS_MIT" in
- yes)
- case "$enable_static_linking" in
- yes) gssapi_lib_suffix=".a" ;;
- *) gssapi_lib_suffix=".so" ;;
- esac
-
- for lib in $LIBS; do
- case $lib in
- -L*)
- ;;
- -l*)
- new_lib=`echo $lib |
- sed -e s%^-l%$use_gssapi/lib/lib% \
- -e s%$%$gssapi_lib_suffix%`
- NEW_LIBS="$NEW_LIBS $new_lib"
- ;;
- *)
- as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5
- ;;
- esac
- done
- LIBS="$NEW_LIBS"
- ;;
- esac
-
- DST_GSSAPI_INC="-I$use_gssapi/include"
+ DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)"
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
@@ -23113,7 +23055,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
- bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db"
+ bdb_incdirs="/db6 /db5 /db48"
# include a blank element first
for d in "" $bdb_incdirs
do

View file

@ -0,0 +1,28 @@
**********************************************************************
* _ _____ _____ _____ _ _ _____ ___ ___ _ _ *
* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | *
* / _ \ | | | | | _| | \| | | | | | | | | \| | *
* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | *
* /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| *
* *
* BIND requires configuration of rndc, including a "secret" key. *
* The easiest, and most secure way to configure rndc is to run *
* 'rndc-confgen -a' to generate the proper conf file, with a new *
* random key, and appropriate file permissions. *
* *
* The %%PREFIX%%/etc/rc.d/named script will do that for you. *
* *
* If using syslog to log the BIND9 activity, and using a *
* chroot'ed installation, you will need to tell syslog to *
* install a log socket in the BIND9 chroot by running: *
* *
* # sysrc altlog_proglist+=named *
* *
* And then restarting syslogd with: service syslogd restart *
* *
* *
* THIS IS A DEVELOPMENT VERSION IF BIND, IT WILL EAT YOUR DATA *
* *
* *
* *
**********************************************************************

15
dns/bind912/pkg-descr Normal file
View file

@ -0,0 +1,15 @@
BIND version 9 is a major rewrite of nearly all aspects of the underlying BIND
architecture. Some of the important features of BIND 9 are:
DNS Security: DNSSEC (signed zones), TSIG (signed DNS requests)
IP version 6: Answers DNS queries on IPv6 sockets, IPv6 resource records (AAAA)
Experimental IPv6 Resolver Library
DNS Protocol Enhancements: IXFR, DDNS, Notify, EDNS0
Improved standards conformance
Views: One server process can provide multiple "views" of the DNS namespace,
e.g. an "inside" view to certain clients, and an "outside" view to others.
Multiprocessor Support
See the CHANGES file for more information on new features.
WWW: https://www.isc.org/software/bind

30
dns/bind912/pkg-help Normal file
View file

@ -0,0 +1,30 @@
NATIVE_PKCS11
When using the NATIVE_PKCS11 option, BIND will use the PKCS#11
engine specified by the named_pkcss11_engine variable in
/etc/rc.conf for *all* crypto operations.
This is primarily intended to be used in an authoritative
case.
If BIND is also operating as a validating resolver,
NATIVE_PKCS11 should not be used, because the HSM will be
used for all crypto, including DNSSEC validations, and the
HSM is likely to be slower than the CPU for this purpose.
Additionally, the HSM might not support all of the PKCS#11
API functions needed for signature verification.
GOST
If using a chrooted instance of BIND on FreeBSD 8.x and 9.x,
the OpenSSL engines MUST be accessible from within the chroot.
If BIND is chrooted in /var/named, this can be achieved by
either copying content of /usr/local/lib/engines into
/var/named/usr/local/lib/engines, or by creating that directory
and adding this line to /etc/fstab:
/usr/local/lib/engines /var/named/usr/local/lib/engines nullfs ro 0 0
START_LATE
Most of the time, BIND needs to start early in the boot
process. Enable this if BIND starts too early for you and
you need it to start later.

360
dns/bind912/pkg-plist Normal file
View file

@ -0,0 +1,360 @@
bin/arpaname
bin/bind9-config
bin/delv
bin/dig
%%DNSTAP%%bin/dnstap-read
bin/host
bin/isc-config.sh
bin/mdig
bin/named-rrchecker
bin/nslookup
bin/nsupdate
@sample etc/mtree/BIND.chroot.dist.sample
@sample etc/mtree/BIND.chroot.local.dist.sample
%%ETCDIR%%/bind.keys
%%ETCDIR%%/master/empty.db
%%ETCDIR%%/master/localhost-forward.db
%%ETCDIR%%/master/localhost-reverse.db
@sample %%ETCDIR%%/named.conf.sample
%%ETCDIR%%/named.root
%%ETCDIR%%/rndc.conf.sample
include/bind9/check.h
include/bind9/getaddresses.h
include/bind9/version.h
include/dns/acl.h
include/dns/adb.h
include/dns/badcache.h
include/dns/bit.h
include/dns/byaddr.h
include/dns/cache.h
include/dns/callbacks.h
include/dns/catz.h
include/dns/cert.h
include/dns/client.h
include/dns/clientinfo.h
include/dns/compress.h
include/dns/db.h
include/dns/dbiterator.h
include/dns/dbtable.h
include/dns/diff.h
include/dns/dispatch.h
include/dns/dlz.h
include/dns/dlz_dlopen.h
include/dns/dns64.h
include/dns/dnsrps.h
include/dns/dnssec.h
include/dns/dnstap.h
%%DNSTAP%%include/dns/dnstap.pb-c.h
include/dns/ds.h
include/dns/dsdigest.h
include/dns/dyndb.h
include/dns/ecdb.h
include/dns/ecs.h
include/dns/edns.h
include/dns/enumclass.h
include/dns/enumtype.h
include/dns/events.h
include/dns/fixedname.h
include/dns/forward.h
include/dns/geoip.h
include/dns/ipkeylist.h
include/dns/iptable.h
include/dns/journal.h
include/dns/keydata.h
include/dns/keyflags.h
include/dns/keytable.h
include/dns/keyvalues.h
include/dns/lib.h
include/dns/librpz.h
include/dns/log.h
include/dns/lookup.h
include/dns/master.h
include/dns/masterdump.h
include/dns/message.h
include/dns/name.h
include/dns/ncache.h
include/dns/nsec.h
include/dns/nsec3.h
include/dns/nta.h
include/dns/opcode.h
include/dns/order.h
include/dns/peer.h
include/dns/portlist.h
include/dns/private.h
include/dns/rbt.h
include/dns/rcode.h
include/dns/rdata.h
include/dns/rdataclass.h
include/dns/rdatalist.h
include/dns/rdataset.h
include/dns/rdatasetiter.h
include/dns/rdataslab.h
include/dns/rdatastruct.h
include/dns/rdatatype.h
include/dns/request.h
include/dns/resolver.h
include/dns/result.h
include/dns/rootns.h
include/dns/rpz.h
include/dns/rriterator.h
include/dns/rrl.h
include/dns/sdb.h
include/dns/sdlz.h
include/dns/secalg.h
include/dns/secproto.h
include/dns/soa.h
include/dns/ssu.h
include/dns/stats.h
include/dns/tcpmsg.h
include/dns/time.h
include/dns/timer.h
include/dns/tkey.h
include/dns/tsec.h
include/dns/tsig.h
include/dns/ttl.h
include/dns/types.h
include/dns/update.h
include/dns/validator.h
include/dns/version.h
include/dns/view.h
include/dns/xfrin.h
include/dns/zone.h
include/dns/zonekey.h
include/dns/zt.h
include/dst/dst.h
include/dst/gssapi.h
include/dst/lib.h
include/dst/result.h
include/irs/context.h
include/irs/dnsconf.h
include/irs/netdb.h
include/irs/platform.h
include/irs/resconf.h
include/irs/types.h
include/irs/version.h
include/isc/aes.h
include/isc/app.h
include/isc/assertions.h
include/isc/atomic.h
include/isc/backtrace.h
include/isc/base32.h
include/isc/base64.h
include/isc/bind9.h
include/isc/boolean.h
include/isc/buffer.h
include/isc/bufferlist.h
include/isc/commandline.h
include/isc/condition.h
include/isc/counter.h
include/isc/crc64.h
include/isc/dir.h
include/isc/entropy.h
include/isc/errno.h
include/isc/error.h
include/isc/event.h
include/isc/eventclass.h
include/isc/file.h
include/isc/formatcheck.h
include/isc/fsaccess.h
include/isc/fuzz.h
include/isc/hash.h
include/isc/heap.h
include/isc/hex.h
include/isc/hmacmd5.h
include/isc/hmacsha.h
include/isc/ht.h
include/isc/httpd.h
include/isc/int.h
include/isc/interfaceiter.h
include/isc/iterated_hash.h
include/isc/json.h
include/isc/keyboard.h
include/isc/lang.h
include/isc/lex.h
include/isc/lfsr.h
include/isc/lib.h
include/isc/list.h
include/isc/log.h
include/isc/magic.h
include/isc/md5.h
include/isc/mem.h
include/isc/meminfo.h
include/isc/msgcat.h
include/isc/msgs.h
include/isc/mutex.h
include/isc/mutexblock.h
include/isc/net.h
include/isc/netaddr.h
include/isc/netdb.h
include/isc/netscope.h
include/isc/offset.h
include/isc/once.h
include/isc/ondestroy.h
include/isc/os.h
include/isc/parseint.h
include/isc/platform.h
include/isc/pool.h
include/isc/portset.h
include/isc/print.h
include/isc/queue.h
include/isc/quota.h
include/isc/radix.h
include/isc/random.h
include/isc/ratelimiter.h
include/isc/refcount.h
include/isc/regex.h
include/isc/region.h
include/isc/resource.h
include/isc/result.h
include/isc/resultclass.h
include/isc/rwlock.h
include/isc/safe.h
include/isc/serial.h
include/isc/sha1.h
include/isc/sha2.h
include/isc/sockaddr.h
include/isc/socket.h
include/isc/stat.h
include/isc/stats.h
include/isc/stdio.h
include/isc/stdlib.h
include/isc/stdtime.h
include/isc/strerror.h
include/isc/string.h
include/isc/symtab.h
include/isc/syslog.h
include/isc/task.h
include/isc/taskpool.h
include/isc/thread.h
include/isc/time.h
include/isc/timer.h
include/isc/tm.h
include/isc/types.h
include/isc/util.h
include/isc/version.h
include/isc/xml.h
include/isccc/alist.h
include/isccc/base64.h
include/isccc/cc.h
include/isccc/ccmsg.h
include/isccc/events.h
include/isccc/lib.h
include/isccc/result.h
include/isccc/sexpr.h
include/isccc/symtab.h
include/isccc/symtype.h
include/isccc/types.h
include/isccc/util.h
include/isccc/version.h
include/isccfg/aclconf.h
include/isccfg/cfg.h
include/isccfg/dnsconf.h
include/isccfg/grammar.h
include/isccfg/log.h
include/isccfg/namedconf.h
include/isccfg/version.h
include/ns/client.h
include/ns/interfacemgr.h
include/ns/lib.h
include/ns/listenlist.h
include/ns/log.h
include/ns/notify.h
include/ns/query.h
include/ns/server.h
include/ns/sortlist.h
include/ns/stats.h
include/ns/types.h
include/ns/update.h
include/ns/version.h
include/ns/xfrout.h
include/pk11/constants.h
include/pk11/internal.h
include/pk11/pk11.h
include/pk11/result.h
include/pk11/site.h
include/pkcs11/cryptoki.h
include/pkcs11/eddsa.h
include/pkcs11/pkcs11.h
include/pkcs11/pkcs11f.h
include/pkcs11/pkcs11t.h
lib/libbind9.a
lib/libdns.a
lib/libirs.a
lib/libisc.a
lib/libisccc.a
lib/libisccfg.a
lib/libns.a
man/man1/arpaname.1.gz
man/man1/bind9-config.1.gz
man/man1/delv.1.gz
man/man1/dig.1.gz
%%DNSTAP%%man/man1/dnstap-read.1.gz
man/man1/host.1.gz
man/man1/isc-config.sh.1.gz
man/man1/mdig.1.gz
man/man1/named-rrchecker.1.gz
man/man1/nslookup.1.gz
man/man1/nsupdate.1.gz
man/man5/named.conf.5.gz
man/man5/rndc.conf.5.gz
man/man8/ddns-confgen.8.gz
man/man8/dnssec-cds.8.gz
%%PYTHON%%man/man8/dnssec-checkds.8.gz
%%PYTHON%%man/man8/dnssec-coverage.8.gz
man/man8/dnssec-dsfromkey.8.gz
man/man8/dnssec-importkey.8.gz
man/man8/dnssec-keyfromlabel.8.gz
man/man8/dnssec-keygen.8.gz
%%PYTHON%%man/man8/dnssec-keymgr.8.gz
man/man8/dnssec-revoke.8.gz
man/man8/dnssec-settime.8.gz
man/man8/dnssec-signzone.8.gz
man/man8/dnssec-verify.8.gz
man/man8/genrandom.8.gz
man/man8/isc-hmac-fixup.8.gz
man/man8/named-checkconf.8.gz
man/man8/named-checkzone.8.gz
man/man8/named-compilezone.8.gz
man/man8/named-journalprint.8.gz
%%LMDB%%man/man8/named-nzd2nzf.8.gz
man/man8/named.8.gz
man/man8/nsec3hash.8.gz
%%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
%%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
%%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz
%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
man/man8/rndc-confgen.8.gz
man/man8/rndc.8.gz
man/man8/tsig-keygen.8.gz
sbin/ddns-confgen
sbin/dnssec-cds
%%PYTHON%%sbin/dnssec-checkds
%%PYTHON%%sbin/dnssec-coverage
sbin/dnssec-dsfromkey
sbin/dnssec-importkey
sbin/dnssec-keyfromlabel
sbin/dnssec-keygen
%%PYTHON%%sbin/dnssec-keymgr
sbin/dnssec-revoke
sbin/dnssec-settime
sbin/dnssec-signzone
sbin/dnssec-verify
sbin/genrandom
sbin/isc-hmac-fixup
sbin/named
sbin/named-checkconf
sbin/named-checkzone
sbin/named-compilezone
sbin/named-journalprint
%%LMDB%%sbin/named-nzd2nzf
sbin/nsec3hash
%%NATIVE_PKCS11%%sbin/pkcs11-destroy
%%NATIVE_PKCS11%%sbin/pkcs11-keygen
%%NATIVE_PKCS11%%sbin/pkcs11-list
%%NATIVE_PKCS11%%sbin/pkcs11-tokens
sbin/rndc
sbin/rndc-confgen
sbin/tsig-keygen
@dir(bind,bind,) %%ETCDIR%%/dynamic
@dir(bind,bind,) %%ETCDIR%%/slave
@dir(bind,bind,) %%ETCDIR%%/working

View file

@ -3,7 +3,7 @@
PORTNAME= recursor
PORTVERSION= 4.0.6
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
PKGNAMEPREFIX= powerdns-

View file

@ -2,7 +2,7 @@
PORTNAME= powerdns
PORTVERSION= 4.0.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mg
PORTVERSION= 20170828
PORTVERSION= 20171014
CATEGORIES= editors
MASTER_SITES= http://homepage.boetes.org/software/mg/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1503997231
SHA256 (mg-20170828.tar.gz) = 1f8886ab62e9abfeed7fafbb5ea71685450a34c5d0a243461bd2c5425161368d
SIZE (mg-20170828.tar.gz) = 141028
TIMESTAMP = 1509015261
SHA256 (mg-20171014.tar.gz) = 51519698f3f44acd984d7805e4e315ded50c15aba8222521f88756fd67745341
SIZE (mg-20171014.tar.gz) = 141045

View file

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
#PORTREVISION= 1
PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@ -25,8 +25,8 @@ MAINTAINER= office@FreeBSD.org
#Frequent Patch submitters should (optionally) sign the Apache iCLA
COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version)
LICENSE= APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL11 \
PSFL TWAIN W3C
LICENSE= APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL10 \
MPL11 PSFL TWAIN W3C
LICENSE_COMB= multi
LICENSE_NAME_ADOBE= Adobe Systems Incorporated license
LICENSE_NAME_ICU= ICU License
@ -39,6 +39,7 @@ LICENSE_FILE_BSD4CLAUSE= ${WRKSRC}/LICENSE_BSD4CLAUSE
LICENSE_FILE_BSL= ${WRKSRC}/LICENSE_BSL
LICENSE_FILE_ICU= ${WRKSRC}/LICENSE_ICU
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE_MIT
LICENSE_FILE_MPL10= ${WRKSRC}/LICENSE_MPL10
LICENSE_FILE_MPL11= ${WRKSRC}/LICENSE_MPL11
LICENSE_FILE_PSFL= ${WRKSRC}/LICENSE_PSFL
LICENSE_FILE_TWAIN= ${WRKSRC}/LICENSE_TWAIN
@ -97,6 +98,8 @@ RUN_DEPENDS= \
${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \
${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf
CONFLICTS_INSTALL= apache-openoffice-4*
AOOVERSION1= 4
AOOVERSION2= 2
AOOVERSION3= 0
@ -263,6 +266,7 @@ SUB_LIST= EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \
CONFIGURE_ARGS+= \
--with-unix-wrapper=${EXECBASE} \
--with-alloc=system \
--with-ant-home=${LOCALBASE}/share/java/apache-ant \
--with-system-apache-commons=yes \
--with-commons-lang-jar=${JAVALIBDIR}/commons-lang3.jar \
--with-system-apr \
@ -288,6 +292,7 @@ CONFIGURE_ARGS+= \
--with-external-dict-dir=${LOCALBASE}/share/hunspell \
--with-system-hyphen \
--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
--with-jdk-home=${JAVA_HOME} \
--with-system-jpeg \
--with-junit=${JAVALIBDIR}/junit.jar \
--with-system-libtextcat \
@ -362,18 +367,20 @@ post-extract:
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL}
${SED} -e '\|^For main/i18npool/source/breakiterator|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU}
${SED} -e '\|^For Multi-Dimensional Data|,/^__/p' \
${SED} -e '\|^For Multi-Dimensional Data|,/^__/p' \
-e '\|^For XSLT MathML Library|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT}
${SED} -e '\|^For XMLSec Library|,/^__/p' \
${SED} -e '\|^For XMLSec Library|,/^__/p' \
-e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
${SED} -e '\|^For Graphite|,$$d' \
${SED} -e '\|^For Saxon|,/^__/p' \
-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
${SED} -e '\|^For Saxon|,$$d' \
${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL11}
${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
${SED} -e '\|^For main/twain|,/^__/p' \
${SED} -e '\|^For main/twain|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
${SED} -e '\|^For main/MathMLDTD|,/^__/p' \
${SED} -e '\|^For main/MathMLDTD|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C}
post-patch:

View file

@ -2,7 +2,6 @@
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD$
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG}
pre-fetch:

View file

@ -0,0 +1,215 @@
Index: comphelper/source/container/embeddedobjectcontainer.cxx
===================================================================
--- comphelper/source/container/embeddedobjectcontainer.cxx (revision 1813062)
+++ comphelper/source/container/embeddedobjectcontainer.cxx (working copy)
@@ -127,7 +127,7 @@
pImpl = new EmbedImpl;
pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
pImpl->mbOwnsStorage = true;
- pImpl->mbUserAllowsLinkUpdate = false;
+ pImpl->mbUserAllowsLinkUpdate = true;
pImpl->mpTempObjectContainer = 0;
}
@@ -136,7 +136,7 @@
pImpl = new EmbedImpl;
pImpl->mxStorage = rStor;
pImpl->mbOwnsStorage = false;
- pImpl->mbUserAllowsLinkUpdate = false;
+ pImpl->mbUserAllowsLinkUpdate = true;
pImpl->mpTempObjectContainer = 0;
}
@@ -145,7 +145,7 @@
pImpl = new EmbedImpl;
pImpl->mxStorage = rStor;
pImpl->mbOwnsStorage = false;
- pImpl->mbUserAllowsLinkUpdate = false;
+ pImpl->mbUserAllowsLinkUpdate = true;
pImpl->mpTempObjectContainer = 0;
pImpl->m_xModel = xModel;
}
Index: sc/source/core/data/documen2.cxx
===================================================================
--- sc/source/core/data/documen2.cxx (revision 1813062)
+++ sc/source/core/data/documen2.cxx (working copy)
@@ -229,7 +229,10 @@
if ( eMode == SCDOCMODE_DOCUMENT )
{
if ( pDocShell )
- pLinkManager = new sfx2::LinkManager( pDocShell );
+ {
+ pLinkManager = new sfx2::LinkManager(pDocShell);
+ pLinkManager->SetAutoAskUpdateAllLinks();
+ }
xPoolHelper = new ScPoolHelper( this );
@@ -269,6 +272,7 @@
if ( bAutoCalc && !pLinkManager && pShell)
{
pLinkManager = new sfx2::LinkManager( pShell );
+ pLinkManager->SetAutoAskUpdateAllLinks();
}
return pLinkManager;
}
Index: sfx2/inc/sfx2/linkmgr.hxx
===================================================================
--- sfx2/inc/sfx2/linkmgr.hxx (revision 1813062)
+++ sfx2/inc/sfx2/linkmgr.hxx (working copy)
@@ -54,6 +54,13 @@
SvLinkSources aServerTbl;
SfxObjectShell *pPersist; // LinkMgr has to be deallocated before SfxObjectShell
+
+ sal_Bool mAutoAskUpdateAllLinks;
+ sal_Bool mUpdateAsked;
+ sal_Bool mAllowUpdate;
+
+ sal_Bool GetUserAllowsLinkUpdate(Window *pParent);
+ void SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows);
protected:
sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType,
const String* pName = 0 );
@@ -104,6 +111,10 @@
SvLinkSourceRef CreateObj( SvBaseLink* );
+
+ // Automatically ask user about update all links, on first insert
+ void SetAutoAskUpdateAllLinks();
+
void UpdateAllLinks( sal_Bool bAskUpdate = sal_True,
sal_Bool bCallErrHdl = sal_True,
sal_Bool bUpdateGrfLinks = sal_False,
Index: sfx2/source/appl/linkmgr2.cxx
===================================================================
--- sfx2/source/appl/linkmgr2.cxx (revision 1813062)
+++ sfx2/source/appl/linkmgr2.cxx (working copy)
@@ -65,11 +65,12 @@
SV_IMPL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr )
LinkManager::LinkManager(SfxObjectShell* p)
- : pPersist( p )
+ : pPersist(p),
+ mUpdateAsked(sal_False),
+ mAutoAskUpdateAllLinks(sal_False)
{
}
-
LinkManager::~LinkManager()
{
SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
@@ -157,6 +158,12 @@
SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink );
pLink->SetLinkManager( this );
aLinkTbl.Insert( pTmp, aLinkTbl.Count() );
+ Window *parent = GetPersist()->GetDialogParent();
+ if (mAutoAskUpdateAllLinks)
+ {
+ SetUserAllowsLinkUpdate(pLink, GetUserAllowsLinkUpdate(parent));
+ }
+
return sal_True;
}
@@ -268,7 +275,36 @@
return bRet;
}
+void LinkManager::SetAutoAskUpdateAllLinks()
+{
+ mAutoAskUpdateAllLinks = sal_True;
+}
+sal_Bool LinkManager::GetUserAllowsLinkUpdate(Window *pParentWin)
+{
+ if (!mUpdateAsked)
+ {
+ if (QueryBox(pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId(STR_QUERY_UPDATE_LINKS)).Execute() == RET_YES)
+ mAllowUpdate = sal_True;
+ else
+ mAllowUpdate = sal_False;
+ mUpdateAsked = sal_True;
+ }
+ return mAllowUpdate;
+}
+
+void LinkManager::SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows)
+{
+ SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
+
+ if (pShell)
+ {
+ comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
+ rEmbeddedObjectContainer.setUserAllowsLinkUpdate(allows);
+ }
+}
+
+
void LinkManager::UpdateAllLinks(
sal_Bool bAskUpdate,
sal_Bool /*bCallErrHdl*/,
@@ -312,26 +348,20 @@
if( !pLink->IsVisible() ||
( !bUpdateGrfLinks && OBJECT_CLIENT_GRF == pLink->GetObjType() ))
continue;
-
- if( bAskUpdate )
+
+ sal_Bool allows = sal_True;
+
+ if (bAskUpdate)
{
- int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute();
- SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
+ allows = GetUserAllowsLinkUpdate(pParentWin);
+ }
- if(pShell)
- {
- comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
- rEmbeddedObjectContainer.setUserAllowsLinkUpdate(RET_YES == nRet);
- }
+ SetUserAllowsLinkUpdate(pLink, allows);
+ bAskUpdate = sal_False; // one time is OK
- if (RET_YES != nRet)
- {
- return; // nothing should be updated
- }
- bAskUpdate = sal_False; // one time is OK
- }
+ if (allows)
+ pLink->Update();
- pLink->Update();
}
}
Index: sw/source/filter/ww8/ww8scan.cxx
===================================================================
--- sw/source/filter/ww8/ww8scan.cxx (revision 1813062)
+++ sw/source/filter/ww8/ww8scan.cxx (working copy)
@@ -6467,6 +6467,12 @@
if( nMax )
{
+ // Check size consistency
+ if(nMax > nFFn)
+ {
+ throw std::out_of_range("WW8 beyond end of buffer");
+ }
+
// allocate Index Array
pFontA = new WW8_FFN[ nMax ];
p = pFontA;
@@ -6585,6 +6591,7 @@
// Zeiger auf Ursprungsarray einen Font nach hinten setzen
pVer8 = (WW8_FFN_Ver8*)( ((sal_uInt8*)pVer8) + pVer8->cbFfnM1 + 1 );
+
}
}
}

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= wine
PORTVERSION= 2.18
PORTREVISION= 2
PORTVERSION= 2.19
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/

View file

@ -1,13 +1,13 @@
TIMESTAMP = 1508307316
SHA256 (freebsd:10:x86:64/i386-wine-devel-2.18_2,1.txz) = 8aeeed57c309c8b266e63d70c07a030a26d8434ca865a1568e77b58287b4bb2e
SIZE (freebsd:10:x86:64/i386-wine-devel-2.18_2,1.txz) = 59358332
SHA256 (freebsd:10:x86:64/i386-wine-staging-2.18_2,1.txz) = 42b7e09de9b74648d4c033a87b8cfb3b4e5ad4f2c1aa6ee342e27085fe23b57e
SIZE (freebsd:10:x86:64/i386-wine-staging-2.18_2,1.txz) = 62012936
SHA256 (freebsd:11:x86:64/i386-wine-devel-2.18_2,1.txz) = 6bd0914e8f32dfdfbd6de0452efe089126bcbda022b27a1f306243783ca27b4b
SIZE (freebsd:11:x86:64/i386-wine-devel-2.18_2,1.txz) = 59033220
SHA256 (freebsd:11:x86:64/i386-wine-staging-2.18_2,1.txz) = 6b4fb4ae780e2c8f1c6e2815421b1cbdddfd962d8e9d33efdbdfc1d65403fac5
SIZE (freebsd:11:x86:64/i386-wine-staging-2.18_2,1.txz) = 61619540
SHA256 (freebsd:12:x86:64/i386-wine-devel-2.18_2,1.txz) = 34fb57f81bb59d69701fb8c5cfffb392c174f03f3d30fdedc6fd131d701bcbd6
SIZE (freebsd:12:x86:64/i386-wine-devel-2.18_2,1.txz) = 58532932
SHA256 (freebsd:12:x86:64/i386-wine-staging-2.18_2,1.txz) = ff2bf09700b45063488f66a68481a334ad7048c74fe7a5ba30539f86a0cab3e6
SIZE (freebsd:12:x86:64/i386-wine-staging-2.18_2,1.txz) = 61136100
TIMESTAMP = 1509035736
SHA256 (freebsd:10:x86:64/i386-wine-devel-2.19,1.txz) = 46a67417c598b7075592d029a39cca99d86758ee87c7fdc590e2e2f9d1c086c8
SIZE (freebsd:10:x86:64/i386-wine-devel-2.19,1.txz) = 59378396
SHA256 (freebsd:10:x86:64/i386-wine-staging-2.19,1.txz) = cdf1fc33df18991df8d25efd7da19b45d8cdd0ded35938eae1f0db85257d0bf8
SIZE (freebsd:10:x86:64/i386-wine-staging-2.19,1.txz) = 62037972
SHA256 (freebsd:11:x86:64/i386-wine-devel-2.19,1.txz) = 3f717765eef8d3fe7d074be534cf3b96c886e6d472bb4aceba0e66fb9fae1f93
SIZE (freebsd:11:x86:64/i386-wine-devel-2.19,1.txz) = 59045396
SHA256 (freebsd:11:x86:64/i386-wine-staging-2.19,1.txz) = 56f8c1ef070b8b0949f2127e79160993531022b19f891f3a4d71d8781ed4fa5c
SIZE (freebsd:11:x86:64/i386-wine-staging-2.19,1.txz) = 61642360
SHA256 (freebsd:12:x86:64/i386-wine-devel-2.19,1.txz) = 56e4d775d6e7f27ca5770e0b791cf37d356415f3931eaf5864ebdb824fe1a659
SIZE (freebsd:12:x86:64/i386-wine-devel-2.19,1.txz) = 58539448
SHA256 (freebsd:12:x86:64/i386-wine-staging-2.19,1.txz) = 9c9319ecb9c823380a6b91502f53334b151507caffc818e2ccae3813a8851a8f
SIZE (freebsd:12:x86:64/i386-wine-staging-2.19,1.txz) = 61163724

View file

@ -117,6 +117,7 @@ include/wine/windows/amvideo.idl
%%STAGING%%include/wine/windows/apiset.h
include/wine/windows/appcompatapi.h
include/wine/windows/appmgmt.h
include/wine/windows/appmodel.h
include/wine/windows/asptlb.h
include/wine/windows/asptlb.idl
include/wine/windows/asynot.idl
@ -1044,6 +1045,7 @@ lib32/wine/advpack.dll.so
lib32/wine/amstream.dll.so
lib32/wine/api-ms-win-appmodel-identity-l1-1-0.dll.so
lib32/wine/api-ms-win-appmodel-runtime-l1-1-1.dll.so
lib32/wine/api-ms-win-appmodel-runtime-l1-1-2.dll.so
lib32/wine/api-ms-win-core-apiquery-l1-1-0.dll.so
lib32/wine/api-ms-win-core-appcompat-l1-1-1.dll.so
lib32/wine/api-ms-win-core-appinit-l1-1-0.dll.so
@ -1439,6 +1441,7 @@ lib32/wine/fakedlls/advpack.dll
lib32/wine/fakedlls/amstream.dll
lib32/wine/fakedlls/api-ms-win-appmodel-identity-l1-1-0.dll
lib32/wine/fakedlls/api-ms-win-appmodel-runtime-l1-1-1.dll
lib32/wine/fakedlls/api-ms-win-appmodel-runtime-l1-1-2.dll
lib32/wine/fakedlls/api-ms-win-core-apiquery-l1-1-0.dll
lib32/wine/fakedlls/api-ms-win-core-appcompat-l1-1-1.dll
lib32/wine/fakedlls/api-ms-win-core-appinit-l1-1-0.dll

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= wine
PORTVERSION= 2.0.2
PORTREVISION= 1
PORTVERSION= 2.0.3
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/

View file

@ -1,7 +1,7 @@
TIMESTAMP = 1508307352
SHA256 (freebsd:10:x86:64/i386-wine-2.0.2_1,1.txz) = df6f5ca628b1537cec837e2a56bba7347afc9ef27d1b38cd474616cc27132e6f
SIZE (freebsd:10:x86:64/i386-wine-2.0.2_1,1.txz) = 58769360
SHA256 (freebsd:11:x86:64/i386-wine-2.0.2_1,1.txz) = feb982de4343a2e39591782422bc27bd8fe8fd5aa8aa95349a025ea6a31a3113
SIZE (freebsd:11:x86:64/i386-wine-2.0.2_1,1.txz) = 58436732
SHA256 (freebsd:12:x86:64/i386-wine-2.0.2_1,1.txz) = abbfd906b77c24dd85d428a4ce9b5ed1a4075ca1614a5b0c21ef1b3fc5f3460f
SIZE (freebsd:12:x86:64/i386-wine-2.0.2_1,1.txz) = 57923672
TIMESTAMP = 1509032743
SHA256 (freebsd:10:x86:64/i386-wine-2.0.3,1.txz) = 996fd7bdeeef88faa68cf51ab788a5c6f5394c669df9d5df92ba707224f4f6b5
SIZE (freebsd:10:x86:64/i386-wine-2.0.3,1.txz) = 58777800
SHA256 (freebsd:11:x86:64/i386-wine-2.0.3,1.txz) = e9db79fadef6bad7cb7987b04e7de8d9b7351f66dddac2a7aa5c0995e64c81d9
SIZE (freebsd:11:x86:64/i386-wine-2.0.3,1.txz) = 58436368
SHA256 (freebsd:12:x86:64/i386-wine-2.0.3,1.txz) = 9ede9f625ccf7a0d35932037ff31fc67e68c62f0a3d3f9d70356896960cd25a7
SIZE (freebsd:12:x86:64/i386-wine-2.0.3,1.txz) = 57971936

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Net-FTPSSL
PORTVERSION= 0.38
PORTVERSION= 0.39
CATEGORIES= ftp perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1491036891
SHA256 (Net-FTPSSL-0.38.tar.gz) = 3220483144d1acfdef0722081d478863b4afcc63b49555d59b6dc3245ae93cd6
SIZE (Net-FTPSSL-0.38.tar.gz) = 107543
TIMESTAMP = 1508946546
SHA256 (Net-FTPSSL-0.39.tar.gz) = 7a24ae743d749947f374d339185104031db55d6177b537326561965cf382902f
SIZE (Net-FTPSSL-0.39.tar.gz) = 107741

View file

@ -1,18 +1,18 @@
# $FreeBSD$
PORTNAME= libetonyek
PORTVERSION= 0.1.6
PORTREVISION= 8
PORTVERSION= 0.1.7
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
MASTER_SITES= LODEV
MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= 01
MAINTAINER= office@FreeBSD.org
COMMENT= Library to interpret and import Apple Keynote presentations
LICENSE= LGPL21 MPL
LICENSE_COMB= dual
LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/mdds-1.2/mdds/global.hpp:devel/mdds \
${LOCALBASE}/include/glm/glm.hpp:math/glm
@ -21,26 +21,19 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
liblangtag.so:devel/liblangtag \
libxml2.so:textproc/libxml2
OPTIONS_DEFINE= TEST
CONFIGURE_ARGS= --disable-werror --without-docs
CONFIGURE_ARGS= --disable-tests --disable-werror --without-docs
CPPFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
GNU_CONFIGURE= yes
USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig tar:xz
USES= autoreconf compiler:c++11-lib gmake libtool pathfix \
pkgconfig tar:xz
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit
TEST_CONFIGURE_OFF= --disable-tests
.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MTEST}
post-build:
@cd ${WRKSRC}/src/test && ${MAKE_CMD} check
.if ${OSREL:R} < 11
EXTRA_PATCHES= ${PATCHDIR}/extrapatch-libc++-memory
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1478385570
SHA256 (libetonyek-0.1.6.tar.xz) = df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078
SIZE (libetonyek-0.1.6.tar.xz) = 1243364
TIMESTAMP = 1508950047
SHA256 (libetonyek-0.1.7.tar.xz) = 69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac
SIZE (libetonyek-0.1.7.tar.xz) = 1256232

File diff suppressed because it is too large Load diff

View file

@ -1,33 +0,0 @@
--- configure.ac.orig 2016-01-12 18:21:19 UTC
+++ configure.ac
@@ -24,8 +24,8 @@ AC_LANG([C++])
# Configure options
# =================
AC_ARG_WITH([mdds],
- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
- [], [with_mdds="1.0"])
+ AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]),
+ [], [with_mdds="1.2"])
# ===========================
# Find required base packages
@@ -47,7 +47,7 @@ AC_PROG_SED
AM_MISSING_PROG([GPERF], [gperf])
-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
+AS_IF([test "$with_mdds" = "1.2"], [AX_CXX_COMPILE_STDCXX_11([noext])])
# ===============
# Find librevenge
@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS])
# =========
# Find mdds
# =========
-AS_IF([test "$with_mdds" = "1.0"], [
- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
+AS_IF([test "$with_mdds" = "1.2"], [
+ PKG_CHECK_MODULES([MDDS], [mdds-1.2])
], [
PKG_CHECK_MODULES([MDDS], [mdds])
AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])

View file

@ -1,4 +1,4 @@
Libetonyek is library providing ability to interpret and import
Apple Keynote presentations into various applications.
WWW: http://www.freedesktop.org/wiki/Software/libetonyek
WWW: https://wiki.documentfoundation.org/DLP/Libraries/libetonyek

View file

@ -11,5 +11,5 @@ include/libetonyek-0.1/libetonyek/EtonyekDocument.h
include/libetonyek-0.1/libetonyek/libetonyek.h
lib/libetonyek-0.1.so
lib/libetonyek-0.1.so.1
lib/libetonyek-0.1.so.1.0.6
lib/libetonyek-0.1.so.1.0.7
libdata/pkgconfig/libetonyek-0.1.pc

View file

@ -4,7 +4,7 @@
;;
esac
;;
+ *freebsd*)
+ *freebsd*|dragonfly)
+ PANO_WIN32_RESOURCE=
+ HSYS=freebsd
+ HCPU="${target_cpu}"

View file

@ -3,7 +3,7 @@
PORTNAME?= opencv
PORTVERSION= 2.4.13.1
PORTREVISION?= 8
PORTREVISION?= 9
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
@ -141,7 +141,7 @@ CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off
LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv
BUILD_DEPENDS+= ${PYNUMPY}
RUN_DEPENDS+= ${PYNUMPY}
USES+= python:2.7
USES+= fortran python:2.7
CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On
. for module in apps java stitching superres videostab
CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off

View file

@ -1,7 +1,7 @@
# Created by: Martin Matuska <mm@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -2,7 +2,7 @@
PORTNAME= sdl2_image
PORTVERSION= 2.0.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
DISTNAME= SDL2_image-${PORTVERSION}

View file

@ -0,0 +1,27 @@
Fixed security vulnerability in XCF image loader (thanks Yves!)
https://hg.libsdl.org/SDL_image/rev/318484db0705
--- IMG_xcf.c.orig 2016-01-03 05:52:28 UTC
+++ IMG_xcf.c
@@ -251,6 +251,7 @@ static Uint32 Swap32 (Uint32 v) {
}
static void xcf_read_property (SDL_RWops * src, xcf_prop * prop) {
+ Uint32 len;
prop->id = SDL_ReadBE32 (src);
prop->length = SDL_ReadBE32 (src);
@@ -274,7 +275,12 @@ static void xcf_read_property (SDL_RWops * src, xcf_pr
break;
case PROP_COMPRESSION:
case PROP_COLOR:
- SDL_RWread (src, &prop->data, prop->length, 1);
+ if (prop->length > sizeof(prop->data)) {
+ len = sizeof(prop->data);
+ } else {
+ len = prop->length;
+ }
+ SDL_RWread(src, &prop->data, len, 1);
break;
case PROP_VISIBLE:
prop->data.visible = SDL_ReadBE32 (src);

View file

@ -3,7 +3,7 @@
PORTNAME= sdl_image
PORTVERSION= 1.2.12
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
DISTNAME= SDL_image-${PORTVERSION}

View file

@ -0,0 +1,27 @@
Fixed security vulnerability in XCF image loader (thanks Yves!)
https://hg.libsdl.org/SDL_image/rev/318484db0705
--- IMG_xcf.c.orig 2012-01-21 01:51:33 UTC
+++ IMG_xcf.c
@@ -251,6 +251,7 @@ static Uint32 Swap32 (Uint32 v) {
}
static void xcf_read_property (SDL_RWops * src, xcf_prop * prop) {
+ Uint32 len;
prop->id = SDL_ReadBE32 (src);
prop->length = SDL_ReadBE32 (src);
@@ -274,7 +275,12 @@ static void xcf_read_property (SDL_RWops * src, xcf_pr
break;
case PROP_COMPRESSION:
case PROP_COLOR:
- SDL_RWread (src, &prop->data, prop->length, 1);
+ if (prop->length > sizeof(prop->data)) {
+ len = sizeof(prop->data);
+ } else {
+ len = prop->length;
+ }
+ SDL_RWread(src, &prop->data, len, 1);
break;
case PROP_VISIBLE:
prop->data.visible = SDL_ReadBE32 (src);

View file

@ -3,6 +3,7 @@
PORTNAME= wildfly10
PORTVERSION= 10.1.0
PORTREVISION= 1
CATEGORIES= java www
MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
DISTNAME= wildfly-${WILDFLY_VERSION}

View file

@ -38,6 +38,7 @@ load_rc_config $name
start_cmd="%%APP_SHORTNAME%%_start"
stop_cmd="%%APP_SHORTNAME%%_stop"
pidfile="%%PID_FILE%%"
status_cmd="%%APP_SHORTNAME%%_status"
WILDFLY_HOME="%%APP_HOME%%"
#minimal requirements must be set for our javavmwrapper
@ -51,8 +52,8 @@ export JAVA_VERSION
install -d -o ${%%APP_SHORTNAME%%_user} ${%%APP_SHORTNAME%%_logdir}
fi
echo "Making sure all writeable dirs belongs to proper user/group"
chown -R ${%%APP_SHORTNAME%%_user}:${%%APP_SHORTNAME%%_group} ${WILDFLY_HOME}/standalone
echo "%%APP_SHORTNAME%%: making sure all writeable dirs belong to proper user/group"
chown -R ${%%APP_SHORTNAME%%_user}:${%%APP_SHORTNAME%%_group} ${WILDFLY_HOME}/standalone
echo "Starting %%APP_SHORTNAME%%."
daemon -u ${%%APP_SHORTNAME%%_user} ${WILDFLY_HOME}/bin/standalone.sh ${%%APP_SHORTNAME%%_args} >> ${%%APP_SHORTNAME%%_log_stdout} 2>> ${%%APP_SHORTNAME%%_log_stderr}
@ -80,6 +81,7 @@ export JAVA_VERSION
sleep ${%%APP_SHORTNAME%%_sleep}
killall ${%%APP_SHORTNAME%%_additional_killall}
fi
rm ${pidfile}
fi
}

View file

@ -3,6 +3,7 @@
PORTNAME= wildfly90
PORTVERSION= 9.0.2
PORTREVISION= 1
CATEGORIES= java www
MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
DISTNAME= wildfly-${WILDFLY_VERSION}

View file

@ -38,6 +38,7 @@ load_rc_config $name
start_cmd="%%APP_SHORTNAME%%_start"
stop_cmd="%%APP_SHORTNAME%%_stop"
pidfile="%%PID_FILE%%"
status_cmd="%%APP_SHORTNAME%%_status"
WILDFLY_HOME="%%APP_HOME%%"
#minimal requirements must be set for our javavmwrapper
@ -51,6 +52,8 @@ export JAVA_VERSION
install -d -o ${%%APP_SHORTNAME%%_user} ${%%APP_SHORTNAME%%_logdir}
fi
echo "%%APP_SHORTNAME%%: making sure all writeable dirs belong to proper user/group"
chown -R ${%%APP_SHORTNAME%%_user}:${%%APP_SHORTNAME%%_group} ${WILDFLY_HOME}/standalone
echo "Starting %%APP_SHORTNAME%%."
daemon -u ${%%APP_SHORTNAME%%_user} ${WILDFLY_HOME}/bin/standalone.sh ${%%APP_SHORTNAME%%_args} >> ${%%APP_SHORTNAME%%_log_stdout} 2>> ${%%APP_SHORTNAME%%_log_stderr}
@ -78,6 +81,7 @@ export JAVA_VERSION
sleep ${%%APP_SHORTNAME%%_sleep}
killall ${%%APP_SHORTNAME%%_additional_killall}
fi
rm ${pidfile}
fi
}

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