diff options
Diffstat (limited to 'dns')
30 files changed, 120 insertions, 50 deletions
diff --git a/dns/dnscap/Makefile b/dns/dnscap/Makefile index 66b2dc7ca92c..f86d51774e3b 100644 --- a/dns/dnscap/Makefile +++ b/dns/dnscap/Makefile @@ -1,5 +1,5 @@ PORTNAME= dnscap -PORTVERSION= 2.4.0 +PORTVERSION= 2.4.1 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.dns-oarc.net/files/dnscap/ \ diff --git a/dns/dnscap/distinfo b/dns/dnscap/distinfo index edf98e7b0e67..3c89b96c46c4 100644 --- a/dns/dnscap/distinfo +++ b/dns/dnscap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750954122 -SHA256 (dnscap-2.4.0.tar.gz) = 1e568a2e417a3df68efd20c2534c7ec352cf8329ac861cbe301982f62893ef01 -SIZE (dnscap-2.4.0.tar.gz) = 833066 +TIMESTAMP = 1751208128 +SHA256 (dnscap-2.4.1.tar.gz) = 524e1883bd9115a669d80fb2a0a0e596ce681fd5fbec39fa5240b86b085837e4 +SIZE (dnscap-2.4.1.tar.gz) = 835899 diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 96ca52b022e8..027ec8c2b4a2 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.91 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/files/patch-src_util.c b/dns/dnsmasq/files/patch-src_util.c new file mode 100644 index 000000000000..a50483debfeb --- /dev/null +++ b/dns/dnsmasq/files/patch-src_util.c @@ -0,0 +1,73 @@ +commit 15841f187d2b208a6113d4e2d479d3af4275bb1c +Author: Simon Kelley <simon@thekelleys.org.uk> +Date: Sun Jun 22 23:04:36 2025 +0100 + + Fix issue with fast file-descriptor close on *BSD. + + This fixes a problem introduced in 8a5fe8ce6bb6c2bd81f237a0f4a2583722ffbd1c + + On BSD, fdescfs is normally mounted at /dev/fd. However + if it is NOT mounted, devfs creates a directory at /dev/fd + which contains (only) the file descriptors 0,1 and 2. + + Under these conditions, opendir() will succeed, and + if we proceed we will fail to close extant + file descriptors which should be closed. + + Check that there is a filesystem mounted at /dev/fd + by checking that the device changes between /dev/fd + and /dev. If if doesn't, fall back to the dumb path. + + Thanks to Roman Bogorodskiy for spotting the problem + and helping with diagnosis. + +--- src/util.c.orig 2025-03-14 15:09:35 UTC ++++ src/util.c +@@ -34,6 +34,10 @@ + #include <sys/utsname.h> + #endif + ++#ifdef HAVE_BSD_NETWORK ++#include <libgen.h> ++#endif ++ + /* SURF random number generator */ + + static u32 seed[32]; +@@ -831,9 +835,34 @@ void close_fds(long max_fd, int spare1, int spare2, in + #endif + + #ifdef FDESCFS +- DIR *d; ++ DIR *d = NULL; + +- if ((d = opendir(FDESCFS))) ++# ifdef HAVE_BSD_NETWORK ++ dev_t dirdev = 0; ++ char fdescfs[] = FDESCFS; /* string must be writable */ ++ struct stat statbuf; ++ ++ /* On BSD, fdescfs is normally mounted at /dev/fd. However ++ if it is NOT mounted, devfs creates a directory at /dev/fd ++ which contains (only) the file descriptors 0,1 and 2. ++ ++ Under these conditions, opendir() will succeed, and ++ if we proceed we will fail to close extant ++ file descriptors which should be closed. ++ ++ Check that there is a filesystem mounted at /dev/fd ++ by checking that the device changes between /dev/fd ++ and /dev. If if doesn't, fall back to the dumb path. */ ++ ++ if (stat(fdescfs, &statbuf) != -1) ++ dirdev = statbuf.st_dev; ++ ++ if (stat(dirname(fdescfs), &statbuf) != -1 && ++ dirdev != statbuf.st_dev) ++# endif ++ d = opendir(FDESCFS); ++ ++ if (d) + { + struct dirent *de; + diff --git a/dns/dnstracer-rs/Makefile b/dns/dnstracer-rs/Makefile index feb4ce0fdaa2..7e273134bc4f 100644 --- a/dns/dnstracer-rs/Makefile +++ b/dns/dnstracer-rs/Makefile @@ -1,5 +1,6 @@ PORTNAME= dnstracer DISTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= CRATESIO PKGNAMESUFFIX= -rs diff --git a/dns/dog/Makefile b/dns/dog/Makefile index 53b63a291104..50da93179a91 100644 --- a/dns/dog/Makefile +++ b/dns/dog/Makefile @@ -1,7 +1,7 @@ PORTNAME= dog DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 -PORTREVISION= 42 +PORTREVISION= 43 CATEGORIES= dns net MAINTAINER= lcook@FreeBSD.org diff --git a/dns/doh-proxy/Makefile b/dns/doh-proxy/Makefile index 4f5a7ae95bbc..4e521141f908 100644 --- a/dns/doh-proxy/Makefile +++ b/dns/doh-proxy/Makefile @@ -1,5 +1,6 @@ PORTNAME= doh-proxy DISTVERSION= 0.9.12 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT} diff --git a/dns/encrypted-dns-server/Makefile b/dns/encrypted-dns-server/Makefile index 2fa828e9f1f8..fff8d11a3d09 100644 --- a/dns/encrypted-dns-server/Makefile +++ b/dns/encrypted-dns-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= encrypted-dns-server DISTVERSION= 0.9.6 -PORTREVISION= 27 +PORTREVISION= 28 CATEGORIES= dns MAINTAINER= felix@userspace.com.au diff --git a/dns/p5-Mozilla-PublicSuffix/Makefile b/dns/p5-Mozilla-PublicSuffix/Makefile index 7953f04e7ca9..924704f55ac4 100644 --- a/dns/p5-Mozilla-PublicSuffix/Makefile +++ b/dns/p5-Mozilla-PublicSuffix/Makefile @@ -1,7 +1,7 @@ PORTNAME= Mozilla-PublicSuffix PORTVERSION= 1.0.7 DISTVERSIONPREFIX= v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= dns perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/dns/p5-Zonemaster-Backend/Makefile b/dns/p5-Zonemaster-Backend/Makefile index ac7082f2f549..a5f0acdf7d63 100644 --- a/dns/p5-Zonemaster-Backend/Makefile +++ b/dns/p5-Zonemaster-Backend/Makefile @@ -1,5 +1,5 @@ PORTNAME= Zonemaster-Backend -DISTVERSION= 11.4.0 +DISTVERSION= 11.5.0 CATEGORIES= dns perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ZNMSTR diff --git a/dns/p5-Zonemaster-Backend/distinfo b/dns/p5-Zonemaster-Backend/distinfo index 53abd39cadf1..ff2690290f17 100644 --- a/dns/p5-Zonemaster-Backend/distinfo +++ b/dns/p5-Zonemaster-Backend/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1741172279 -SHA256 (Zonemaster-Backend-11.4.0.tar.gz) = b847fd38b4fced78f969ae4c37218965e93194219de121739c9ec1350f133db0 -SIZE (Zonemaster-Backend-11.4.0.tar.gz) = 141754 +TIMESTAMP = 1751121803 +SHA256 (Zonemaster-Backend-11.5.0.tar.gz) = d928a665ca0815e63008df72738d35b46fc884e4905abfe3c52b496666278386 +SIZE (Zonemaster-Backend-11.5.0.tar.gz) = 142609 diff --git a/dns/p5-Zonemaster-Backend/pkg-plist b/dns/p5-Zonemaster-Backend/pkg-plist index 5c777af17484..8ff21419b052 100644 --- a/dns/p5-Zonemaster-Backend/pkg-plist +++ b/dns/p5-Zonemaster-Backend/pkg-plist @@ -48,9 +48,6 @@ etc/rc.d/zm_testagent %%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/patch/patch_postgresql_db_zonemaster_backend_ver_8.0.0.pl %%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/patch/patch_sqlite_db_zonemaster_backend_ver_8.0.0.pl %%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/tmpfiles.conf -%%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/travis_mysql_backend_config.ini -%%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/travis_postgresql_backend_config.ini -%%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/travis_sqlite_backend_config.ini %%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/zm-rpcapi.lsb %%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/zm-rpcapi.service %%SITE_PERL%%/auto/share/dist/Zonemaster-Backend/zm-testagent.lsb diff --git a/dns/p5-Zonemaster-CLI/Makefile b/dns/p5-Zonemaster-CLI/Makefile index dd49806ebafe..58ea1503e9d1 100644 --- a/dns/p5-Zonemaster-CLI/Makefile +++ b/dns/p5-Zonemaster-CLI/Makefile @@ -1,6 +1,6 @@ PORTNAME= Zonemaster-CLI DISTVERSIONPREFIX= v -DISTVERSION= 7.2.0 +DISTVERSION= 8.0.0 CATEGORIES= dns perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ZNMSTR diff --git a/dns/p5-Zonemaster-CLI/distinfo b/dns/p5-Zonemaster-CLI/distinfo index 22ca0810d396..9f73bb66277c 100644 --- a/dns/p5-Zonemaster-CLI/distinfo +++ b/dns/p5-Zonemaster-CLI/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1741171972 -SHA256 (Zonemaster-CLI-v7.2.0.tar.gz) = 36cc0e051af4d98d9eccf5c7de20ca508f183cb8240e65440cae75de0cbea5fb -SIZE (Zonemaster-CLI-v7.2.0.tar.gz) = 79825 +TIMESTAMP = 1751121812 +SHA256 (Zonemaster-CLI-v8.0.0.tar.gz) = d640f73354cd2e1c2fd19cda5f451a92dc78b0d027d068d2fa90dd0b022933b3 +SIZE (Zonemaster-CLI-v8.0.0.tar.gz) = 84289 diff --git a/dns/p5-Zonemaster-CLI/pkg-plist b/dns/p5-Zonemaster-CLI/pkg-plist index 472c413d3754..20e135850031 100644 --- a/dns/p5-Zonemaster-CLI/pkg-plist +++ b/dns/p5-Zonemaster-CLI/pkg-plist @@ -1,5 +1,6 @@ bin/zonemaster-cli %%SITE_PERL%%/Zonemaster/CLI.pm +%%SITE_PERL%%/Zonemaster/CLI/TestCaseSet.pm %%SITE_PERL%%/auto/share/dist/Zonemaster-CLI/GNUmakefile %%SITE_PERL%%/auto/share/dist/Zonemaster-CLI/locale/da/LC_MESSAGES/Zonemaster-CLI.mo %%SITE_PERL%%/auto/share/dist/Zonemaster-CLI/locale/es/LC_MESSAGES/Zonemaster-CLI.mo @@ -10,3 +11,4 @@ bin/zonemaster-cli %%SITE_PERL%%/auto/share/dist/Zonemaster-CLI/locale/sv/LC_MESSAGES/Zonemaster-CLI.mo %%PERL5_MAN1%%/zonemaster-cli.1.gz %%PERL5_MAN3%%/Zonemaster::CLI.3.gz +%%PERL5_MAN3%%/Zonemaster::CLI::TestCaseSet.3.gz diff --git a/dns/p5-Zonemaster-Engine/Makefile b/dns/p5-Zonemaster-Engine/Makefile index fbccb89b4dc4..619bf7e9e3ec 100644 --- a/dns/p5-Zonemaster-Engine/Makefile +++ b/dns/p5-Zonemaster-Engine/Makefile @@ -1,6 +1,6 @@ PORTNAME= Zonemaster-Engine DISTVERSIONPREFIX= v -DISTVERSION= 7.1.0 +DISTVERSION= 8.0.0 CATEGORIES= dns perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ZNMSTR diff --git a/dns/p5-Zonemaster-Engine/distinfo b/dns/p5-Zonemaster-Engine/distinfo index 447285d1408d..98f132ebea14 100644 --- a/dns/p5-Zonemaster-Engine/distinfo +++ b/dns/p5-Zonemaster-Engine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1741172254 -SHA256 (Zonemaster-Engine-v7.1.0.tar.gz) = 847fe5b7a1685a9bc295d54e6fd6d53794aed2a1eec5e1f1f845b1488a00dbfb -SIZE (Zonemaster-Engine-v7.1.0.tar.gz) = 12112401 +TIMESTAMP = 1751121821 +SHA256 (Zonemaster-Engine-v8.0.0.tar.gz) = 7f1aa6d99f54c3690c8f4840006bed31b65b5eed786bbfac8a0762bffc9c2b73 +SIZE (Zonemaster-Engine-v8.0.0.tar.gz) = 13363161 diff --git a/dns/p5-Zonemaster-LDNS/Makefile b/dns/p5-Zonemaster-LDNS/Makefile index 3edba4daea0b..f62008dea2b8 100644 --- a/dns/p5-Zonemaster-LDNS/Makefile +++ b/dns/p5-Zonemaster-LDNS/Makefile @@ -1,5 +1,5 @@ PORTNAME= Zonemaster-LDNS -DISTVERSION= 4.1.0 +DISTVERSION= 5.0.0 CATEGORIES= dns perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ZNMSTR diff --git a/dns/p5-Zonemaster-LDNS/distinfo b/dns/p5-Zonemaster-LDNS/distinfo index 5f74001c1ef1..a262e6735755 100644 --- a/dns/p5-Zonemaster-LDNS/distinfo +++ b/dns/p5-Zonemaster-LDNS/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734681539 -SHA256 (Zonemaster-LDNS-4.1.0.tar.gz) = 96e32efbedaeb79feef1a33cb2b98af43f1c520fe162a151a457f8b4e5bbed70 -SIZE (Zonemaster-LDNS-4.1.0.tar.gz) = 762661 +TIMESTAMP = 1751121827 +SHA256 (Zonemaster-LDNS-5.0.0.tar.gz) = f875b04766649873b062079579c760594a4b50e7656d37d21888fe8335a39dff +SIZE (Zonemaster-LDNS-5.0.0.tar.gz) = 762411 diff --git a/dns/pear-Net_DNS21/Makefile b/dns/pear-Net_DNS21/Makefile index 6fdc9a1f0448..f4c5cab1a08e 100644 --- a/dns/pear-Net_DNS21/Makefile +++ b/dns/pear-Net_DNS21/Makefile @@ -20,4 +20,6 @@ USE_GITHUB= yes GH_ACCOUNT= mikepultz GH_PROJECT= netdns2 +PORTSCOUT= limit:^1\. + .include <bsd.port.mk> diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index 6a15997078e1..fab4f26f26a8 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -1,6 +1,6 @@ PORTNAME= recursor DISTVERSION= 5.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns MASTER_SITES= https://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- diff --git a/dns/public_suffix_list/Makefile b/dns/public_suffix_list/Makefile index e834fbb0fb61..2b52e20dde0c 100644 --- a/dns/public_suffix_list/Makefile +++ b/dns/public_suffix_list/Makefile @@ -1,5 +1,5 @@ PORTNAME= public_suffix_list -PORTVERSION= 20250612 +PORTVERSION= 20250626 CATEGORIES= dns MAINTAINER= sunpoet@FreeBSD.org @@ -21,7 +21,7 @@ SLAVEDIRS= dns/p5-Mozilla-PublicSuffix dns/py-publicsuffix dns/py-publicsuffix2 USE_GITHUB= yes GH_ACCOUNT= publicsuffix GH_PROJECT= list -GH_TAGNAME= a01fe52 +GH_TAGNAME= 9ae5519 do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ diff --git a/dns/public_suffix_list/distinfo b/dns/public_suffix_list/distinfo index 209fb9d6ef52..225ad42ee033 100644 --- a/dns/public_suffix_list/distinfo +++ b/dns/public_suffix_list/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749813012 -SHA256 (publicsuffix-list-20250612-a01fe52_GH0.tar.gz) = 71f06ed4130805b8b775c425d6d064b0af6ba5a9e2bbb017fb02a2bfe1011aa1 -SIZE (publicsuffix-list-20250612-a01fe52_GH0.tar.gz) = 298343 +TIMESTAMP = 1751375027 +SHA256 (publicsuffix-list-20250626-9ae5519_GH0.tar.gz) = d0dd2f2d337db778279a3c32b2963e2bacac3b8b3dba43a6a3539c06ea2c45fd +SIZE (publicsuffix-list-20250626-9ae5519_GH0.tar.gz) = 298490 diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile index 62f4135a94ff..b6b2a579431d 100644 --- a/dns/py-dnspython/Makefile +++ b/dns/py-dnspython/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -USES= python:3.9+ -USE_PYTHON= autoplist concurrent cython pep517 +USES= python +USE_PYTHON= autoplist concurrent cython pep517 pytest BINARY_ALIAS= git=false NO_ARCH= yes @@ -40,12 +40,6 @@ DOQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aioquic>=1.0.0:www/py-aioquic@${PY_FLAVO IDNA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.1:dns/py-idna@${PY_FLAVOR} TRIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}trio>=0.14:net/py-trio@${PY_FLAVOR} -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3900 -IGNORE= requires Python 3.9 or later -.endif - post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} ${STAGEDIR}${EXAMPLESDIR} @@ -53,4 +47,4 @@ post-install-EXAMPLES-on: do-test: cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} utest.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/dns/py-publicsuffix/Makefile b/dns/py-publicsuffix/Makefile index 13d35aa8d345..60d31cac65d7 100644 --- a/dns/py-publicsuffix/Makefile +++ b/dns/py-publicsuffix/Makefile @@ -1,6 +1,6 @@ PORTNAME= publicsuffix PORTVERSION= 1.1.0 -PORTREVISION= 90 +PORTREVISION= 91 CATEGORIES= dns python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/dns/py-publicsuffix2/Makefile b/dns/py-publicsuffix2/Makefile index 7b0cb53b2cf8..4870990af2e1 100644 --- a/dns/py-publicsuffix2/Makefile +++ b/dns/py-publicsuffix2/Makefile @@ -1,6 +1,6 @@ PORTNAME= publicsuffix2 PORTVERSION= 2.20191221 -PORTREVISION= 64 +PORTREVISION= 65 CATEGORIES= dns python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/dns/py-publicsuffixlist/Makefile b/dns/py-publicsuffixlist/Makefile index e8e4599fcf0f..eb6e05a50321 100644 --- a/dns/py-publicsuffixlist/Makefile +++ b/dns/py-publicsuffixlist/Makefile @@ -1,5 +1,5 @@ PORTNAME= publicsuffixlist -PORTVERSION= 1.0.2.20250617 +PORTVERSION= 1.0.2.20250627 CATEGORIES= dns python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/dns/py-publicsuffixlist/distinfo b/dns/py-publicsuffixlist/distinfo index 8b675678aefc..d958757cfc28 100644 --- a/dns/py-publicsuffixlist/distinfo +++ b/dns/py-publicsuffixlist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750188120 -SHA256 (publicsuffixlist-1.0.2.20250617.tar.gz) = 5042d7fc63f572f92632936efb3ce6432c1a2a464f24fd43f25af742618790e6 -SIZE (publicsuffixlist-1.0.2.20250617.tar.gz) = 105467 +TIMESTAMP = 1751208168 +SHA256 (publicsuffixlist-1.0.2.20250627.tar.gz) = 0302e18d3a2338430be2f53fc66bfdf4cdd38ed6172405f501c8c266ebb9f03b +SIZE (publicsuffixlist-1.0.2.20250627.tar.gz) = 105569 diff --git a/dns/rubygem-public_suffix/Makefile b/dns/rubygem-public_suffix/Makefile index 2e7e275b188a..ff1d136a0279 100644 --- a/dns/rubygem-public_suffix/Makefile +++ b/dns/rubygem-public_suffix/Makefile @@ -1,6 +1,6 @@ PORTNAME= public_suffix PORTVERSION= 6.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns rubygems MASTER_SITES= RG diff --git a/dns/rubygem-public_suffix_service/Makefile b/dns/rubygem-public_suffix_service/Makefile index f70937228877..639bc0b7c610 100644 --- a/dns/rubygem-public_suffix_service/Makefile +++ b/dns/rubygem-public_suffix_service/Makefile @@ -1,6 +1,6 @@ PORTNAME= public_suffix_service PORTVERSION= 0.9.1 -PORTREVISION= 101 +PORTREVISION= 102 CATEGORIES= dns rubygems MASTER_SITES= RG |