Merge branch '3.4' into 3.5

This commit is contained in:
Juergen Daubert 2019-06-23 14:51:06 +02:00
commit 790c830ded
36 changed files with 188 additions and 177 deletions

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Z0AjiJ9UEngfHId0VSssJgo9egTbUqOYfMQkWjavxjPF2ST9PX6pDsoJOTq3b1PS5Qer/idAJJe8GpGVncYpgA=
SHA256 (Pkgfile) = 3b2d270cad5d6d51c485b32e9a418189bcb63414b86ccdbe4496bfa903cadccc
RWSE3ohX2g5d/dbaT5RausfMD3fsVI04EZka2TR91yOo9bInv4Vh1j+J/gzAg9fraZ+9vYbNHAP0SnZYrH51GBv9mCxoWJ/IHQc=
SHA256 (Pkgfile) = 33e5cd47ac0309715e853cd39e60ffa29bbbdfe3e653f1f82e855c918df34e7a
SHA256 (.footprint) = 57a65621a531177c2925ca3ba37032a5b8428f59f1755450f040260bab290ab8
SHA256 (cups-filters-1.24.0.tar.xz) = f7dce385e3050b2f270a9a1c0aad9de1351446fa74cf0e6768cbeb5af4382412
SHA256 (cups-filters-1.25.0.tar.xz) = 8119149a8b61466e94c141205a5a9d2de798fe7a932a260ce2d66f8f30d351d1
SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b

View File

@ -4,7 +4,7 @@
# Depends on: ghostscript poppler qpdf mupdf
name=cups-filters
version=1.24.0
version=1.25.0
release=1
source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz
cups-browsed)

View File

@ -8,9 +8,9 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libexpat.a
-rwxr-xr-x root/root usr/lib/libexpat.la
lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.6.8
lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.6.8
-rwxr-xr-x root/root usr/lib/libexpat.so.1.6.8
lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.6.9
lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.6.9
-rwxr-xr-x root/root usr/lib/libexpat.so.1.6.9
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/expat.pc
drwxr-xr-x root/root usr/share/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/eKIlD5PKIRS+3Z5cUVJSylm6UyxkgAC3cxgD14Ej/3v0d+3vTVS+lls8/Lx66NPewfi8DoC8qv4IwN0ejc8Sw0=
SHA256 (Pkgfile) = 5f302b6796bef37a5bca3ced42b71c3ba17626bd8c30d92ea0761e0590b0b6cc
SHA256 (.footprint) = 400c4d7dc008935d6c45ecb4eed994b33a02dfdd66a473ec5286b46d4adcc45d
SHA256 (expat-2.2.6.tar.bz2) = 17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2
RWSE3ohX2g5d/eGpOxmexXAoN/H5OhJ24ZfMvp6nRROLEI8shFnmTd8TUA9gW/RDTtw/iUuiOSQc19GldGEVFKz9ztvKs9ZRnQU=
SHA256 (Pkgfile) = 7762b900b6c013d7ff0e7e65c3d5a1c8557a65a7d9c5d278458009ff589b115f
SHA256 (.footprint) = d8399d5d71091cc5484da331af861af583ad832b8099ba145d6cb775c52d7d47
SHA256 (expat-2.2.7.tar.bz2) = cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18

View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=expat
version=2.2.6
version=2.2.7
release=1
source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
@ -14,6 +14,7 @@ build() {
make
make DESTDIR=$PKG install
install -D -m 0644 doc/xmlwf.1 $PKG/usr/share/man/man1/xmlwf.1
rm -r $PKG/usr/share/doc
}

View File

@ -10,8 +10,8 @@ drwxr-xr-x root/root usr/include/fuse3/
-rw-r--r-- root/root usr/include/fuse3/fuse_opt.h
drwxr-xr-x root/root usr/lib/
lrwxrwxrwx root/root usr/lib/libfuse3.so -> libfuse3.so.3
lrwxrwxrwx root/root usr/lib/libfuse3.so.3 -> libfuse3.so.3.5.0
-rwxr-xr-x root/root usr/lib/libfuse3.so.3.5.0
lrwxrwxrwx root/root usr/lib/libfuse3.so.3 -> libfuse3.so.3.6.1
-rwxr-xr-x root/root usr/lib/libfuse3.so.3.6.1
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/fuse3.pc
drwxr-xr-x root/root usr/sbin/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bEuq/zVazEHAkhXmwTW22XqzrSnrZCvSDBhAOBmDMBm1FeEareQz7lsP4JafMNE4ZTmOXF1EGBcbjZXOWrLOg8=
SHA256 (Pkgfile) = 65c4385f353f94b284db9f9ae80afde4e93bed28b7d0329f99564d48db3a7b31
SHA256 (.footprint) = 28790493629c34c1b3325f81d0a669eada065b5ab303beda6ea66bf9f349aa5e
SHA256 (fuse-3.5.0.tar.xz) = 75bfee6b730145483d18238b50daccde4c1b8133fa1703367fbf8088d0666bf0
RWSE3ohX2g5d/eGu9vkeDkVMhXT61TRzvs1MxUszGvgONCYvXKLf1NGfZrZf31b/az9GCuKsgp+z4z2zFjeka7/j5Q/7ijjstAM=
SHA256 (Pkgfile) = 8954e53bb3fba30466ba4abeaa7dbbb29363fa29bae0312111de11510e78f1e9
SHA256 (.footprint) = 59e41ea4e985f7494c30f94f93c7aaf9b8e7c1d1cd54226fbc77f690d0a61f3f
SHA256 (fuse-3.6.1.tar.xz) = 6dc3b702f2d13187ff4adb8bcbdcb913ca0510ce0020e4d87bdeb4d794173704

View File

@ -4,7 +4,7 @@
# Depends on: meson ninja
name=fuse3
version=3.5.0
version=3.6.1
release=1
source=(https://github.com/libfuse/libfuse/releases/download/fuse-$version/fuse-$version.tar.xz)

View File

@ -4,9 +4,9 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libunbound.a
-rw-r--r-- root/root usr/lib/libunbound.la
lrwxrwxrwx root/root usr/lib/libunbound.so -> libunbound.so.8.1.1
lrwxrwxrwx root/root usr/lib/libunbound.so.8 -> libunbound.so.8.1.1
-rwxr-xr-x root/root usr/lib/libunbound.so.8.1.1
lrwxrwxrwx root/root usr/lib/libunbound.so -> libunbound.so.8.1.2
lrwxrwxrwx root/root usr/lib/libunbound.so.8 -> libunbound.so.8.1.2
-rwxr-xr-x root/root usr/lib/libunbound.so.8.1.2
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man3/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/a7QXIXlXrV6sVFaISATWez8Ux/N6rSy3iqG9y4JXZfk9gqjQZL05Y5F5V8bpe3Dy2EYujOW+yHLo3d1wca0NgA=
SHA256 (Pkgfile) = 9f71a39b514e404e2066a396e7d9dbb4e1bdcdeb1081816eea71e79d838a3465
SHA256 (.footprint) = 9291b783a5bd15467656272b9cb8ce7cfb64ce91cd30f12c7e3296202acf690e
SHA256 (unbound-1.9.1.tar.gz) = c3c0bf9b86ccba4ca64f93dd4fe7351308ab54293f297a67de5a8914c1dc59c5
RWSE3ohX2g5d/XKHzqccCQ0YU92+R5ME6ldJdi78PQc0Hh9o2TooPcig/Slz5aiKhipLVoAff2o+KV5bNQqW0dVw31yV/3/OmwU=
SHA256 (Pkgfile) = 51263b416d65f7e9ebf74298ac2b90858d6bebd19541c0cfed3cbdf5403e0830
SHA256 (.footprint) = 5b79edf37ef82e8079744a58d31cfb95aa386eb9975359e9c2a2cf3e1bb1edd4
SHA256 (unbound-1.9.2.tar.gz) = 6f7acec5cf451277fcda31729886ae7dd62537c4f506855603e3aa153fcb6b95

View File

@ -4,7 +4,7 @@
# Depends on: expat openssl
name=libunbound
version=1.9.1
version=1.9.2
release=1
source=(https://unbound.net/downloads/unbound-$version.tar.gz)

View File

@ -110,6 +110,7 @@ drwxr-xr-x root/root usr/share/mc/skins/
-rw-r--r-- root/root usr/share/mc/skins/darkfar.ini
-rw-r--r-- root/root usr/share/mc/skins/default.ini
-rw-r--r-- root/root usr/share/mc/skins/double-lines.ini
-rw-r--r-- root/root usr/share/mc/skins/featured-plus.ini
-rw-r--r-- root/root usr/share/mc/skins/featured.ini
-rw-r--r-- root/root usr/share/mc/skins/gotar.ini
-rw-r--r-- root/root usr/share/mc/skins/gray-green-purple256.ini

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/TVwRF3JF4D8NcQoo6h/WvQm8e1Tugu6puZOkXAlINgxc2DFDh1c93tvMKkhHZT3v4QZCSVuYY5SfmjkcLmMbwU=
SHA256 (Pkgfile) = 3ffe83d0e4cb41838425a84ba47f051ecea3f2943646ef2841b7da0d8b0599d0
SHA256 (.footprint) = 7129896dc6f31182c4163c0556e2a295e0b0678eb981ee2d4f87208716d787e9
SHA256 (mc-4.8.22.tar.xz) = ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318
RWSE3ohX2g5d/eBbdLqct0jpLlnMm8pa6l4Zsf/1uWmyAdmzE2Ny/9LxAYx2uax4ZHE0ktRYUb5W8PxGGQ7HKYdNTqBbX7eyCwA=
SHA256 (Pkgfile) = 214c0550abcf4fc0aac5664fc52cd614d12731c13ff577b77b4e8a80c14495fc
SHA256 (.footprint) = b62c7ace826e2de8f24badc4ae86b5dcfb85461c6789efb4356155017a1742de
SHA256 (mc-4.8.23.tar.xz) = dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c

View File

@ -1,10 +1,10 @@
# Description: GNU Midnight Commander
# URL: http://www.midnight-commander.org
# Maintainer: Juergen Daubert, jue at crux dot nu
# Depends on: util-linux glib
# Depends on: glib
name=mc
version=4.8.22
version=4.8.23
release=1
source=(http://ftp.osuosl.org/pub/midnightcommander/$name-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/aneouKk/uWTkGG/XdLHactY2zaet18ye0IzhSjGuRRT445yUf2AC9tDW9lBaJ0eaRXn5eWvNk15qGDyuKMNfwY=
SHA256 (Pkgfile) = 6a5277b1757a798ea09c09281e13a1732509177b73d7bf3564ba27867e136c37
RWSE3ohX2g5d/d8QTTrNCEGjmvE1HKNzNUkQg/8wAqU+/xENXwm+bctbckseYLO0WZWKFl8Pbq4QzfLtRzEtQ2APEuCGgo8n/QY=
SHA256 (Pkgfile) = e96f1137bb1971be8835b88c37d30f7343359b7086a2f99aeac81d0ccd5ecf28
SHA256 (.footprint) = 8f1a2e9de5356a2b6aa51f4a18ab85acc097ed244b77a142c735ba1f2a9b92c8
SHA256 (mutt-1.12.0.tar.gz) = ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f
SHA256 (mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c

View File

@ -4,7 +4,7 @@
# Depends on: gdbm openssl zlib
name=mutt
version=1.12.0
version=1.12.1
release=1
source=(https://bitbucket.org/mutt/mutt/downloads/$name-$version.tar.gz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/TbNBP6V9X+ga3k7EafgHsxxjXm2PeD0QwNX6sG8dZAujc468QH4E36oMM5o6HDS1kT+fpbd5TzV37uKsDWCPQI=
SHA256 (Pkgfile) = 5f0a1578da96436e778ace181b0787497bf87adc22e5e1f3ab5fc4f683a22d36
RWSE3ohX2g5d/doG7waghzTj6vifdZ89K/jk7J91S2U98/5/c3Ce8cMMeqxrQa7WnBdmyKG+zmggyzOp8Ns6Utgz+MW2PFkUaw0=
SHA256 (Pkgfile) = f8993c00e849a34c3f8f737b596e2b7c497721a6ffcc2406a35bf6e1c39adfd8
SHA256 (.footprint) = 6e65065e8bbaadfad31d89a3ec1820c7408848209b67edc34c5d1643df89ac1e
SHA256 (nano-4.2.tar.xz) = 1143defce62e391b241252ffdb6e5c1ded56cfe26d46ee81b796abe0ccc45df9
SHA256 (nano-4.3.tar.xz) = 00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81

View File

@ -1,11 +1,10 @@
# Description: GNU pico clone (a tiny text editor)
# URL: http://www.nano-editor.org
# Maintainer: Juergen Daubert, jue at crux dot nu
# Packager: Simone Rota, sip at crux dot nu
# Depends on: file ncurses
name=nano
version=4.2
version=4.3
release=1
source=(http://www.nano-editor.org/dist/v${version%.*}/$name-$version.tar.xz)

View File

@ -1,8 +1,8 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/fLC+G7VhbvFQdbZY1XGu29jJE1T6mOxWvp5uzOFB2egNuBUcDCtzMfdBENvfXtBAKRHz26TYQazR0NDixiYvA0=
SHA256 (Pkgfile) = bbc8ef05ee5628d697218a1f8428278f64cd1edf46137ff093946eb4dfb9441c
RWSE3ohX2g5d/X66FtaM1kx9wW3dMjhJXq64+qGbNpWbt/tAjAXN+tjUzNqCW117ZZZBRjJBrq/n+sWIXjdmZF5i/r5tPj6GfQE=
SHA256 (Pkgfile) = 1f2af8c42f3e577e753b73955e9973f3b8fa760403347432ce6021bae0963982
SHA256 (.footprint) = 6e26f43089fdf8b1b3b0608168cd4a7e30c14f89b43ea353b57405619ecc40da
SHA256 (nfs-utils-2.3.4.tar.xz) = f8328ba386087a9926edd89f78a319ff55418a0e734dbf5f50350f465f0896cd
SHA256 (nfs-utils-2.4.1.tar.xz) = 85274ada94479b1beba9f8eeffd19f477c53a6710b9998d1192c807854087736
SHA256 (exports) = 9556615724e66fbe6e7a2bfd740db4c5399a6abafab8cce868975f6926548eec
SHA256 (idmapd.conf) = 2759ea36eff3397c39b534ee34752e02f60976160d66570ae19dbbbb5c00ee53
SHA256 (nfs) = 3ab2824ff5cbe4498faf6cbbbea19793d96bd80c48b9c18c0939938b18ab0217
@ -12,5 +12,4 @@ SHA256 (rpc.idmapd) = 93b32d0f4f33544a3bbd82e1f4a52e218dad48f7c06dfe08521d47d7c6
SHA256 (rpc.statd) = 764b99273b59839d44a7e05c20d863206df06f5e7e5cb5cedf9da1db624395b9
SHA256 (rpc.mountd) = a6aaaadc054df03a9e6500fdf8b2fc6669d78825daff2c68e52e4d9eb2e0509c
SHA256 (rpc.nfsd) = 12d0936472011db6928e5c0526ac510217a0601863a012e8a1ea565e3c1721de
SHA256 (nfsdcld) = 5dcefb370bcfb79c0091b27021281aea8b372a6078cd55f549729d4402746be4
SHA256 (mountd_segfault.patch) = 2cff9229583cc98782631b4dbd32c612340eaafc5d330e112484ee95ca8e13bc
SHA256 (nfsdcld) = 97f6078e72ac4c796652f89cfd76a224f71c3f987b3a67a7e18fe1fe4caf39b6

View File

@ -4,18 +4,16 @@
# Depends on: libdevmapper util-linux libcap rpcbind libevent keyutils sqlite3
name=nfs-utils
version=2.3.4
version=2.4.1
release=1
source=(https://www.kernel.org/pub/linux/utils/$name/$version/$name-$version.tar.xz
exports idmapd.conf
nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld
mountd_segfault.patch)
nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld)
build () {
cd $name-$version
patch -p1 -i $SRC/mountd_segfault.patch
CONFIG_SHELL=/bin/bash \
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-statedir=/var/lib/nfs \

View File

@ -1,92 +0,0 @@
From linux-nfs Tue May 14 15:10:15 2019
From: Chuck Lever <chuck.lever () oracle ! com>
Date: Tue, 14 May 2019 15:10:15 +0000
To: linux-nfs
Subject: [PATCH v2] Fix mountd segfault
Message-Id: <20190514150755.12543.64896.stgit () oracle-102 ! nfsv4bat ! org>
X-MARC-Message: https://marc.info/?l=linux-nfs&m=155784661918502
After commit 8f459a072f93 ("Remove abuse of ai_canonname") the
ai_canonname field in addrinfo structs returned from
host_reliable_addrinfo() is always NULL. This results in mountd
segfaults when there are netgroups or hostname wildcards in
/etc/exports.
Add an extra DNS query in check_wildcard() and check_netgroup() to
obtain the client's canonical hostname instead of dereferencing
the NULL pointer.
Reported-by: Mark Wagner <mark@lanfear.net>
Fixes: 8f459a072f93 ("Remove abuse of ai_canonname")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
Changes since v1:
- Added similar fix for check_netgroup
- Restructured exit/error paths in check_wildcard
support/export/client.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/support/export/client.c b/support/export/client.c
index a1fba01..ea4f89d 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -608,24 +608,36 @@ check_subnetwork(const nfs_client *clp, const struct addrinfo *ai)
static int
check_wildcard(const nfs_client *clp, const struct addrinfo *ai)
{
- char *cname = clp->m_hostname;
- char *hname = ai->ai_canonname;
+ char *hname, *cname = clp->m_hostname;
struct hostent *hp;
char **ap;
+ int match;
- if (wildmat(hname, cname))
- return 1;
+ match = 0;
+
+ hname = host_canonname(ai->ai_addr);
+ if (hname == NULL)
+ goto out;
+
+ if (wildmat(hname, cname)) {
+ match = 1;
+ goto out;
+ }
/* See if hname aliases listed in /etc/hosts or nis[+]
* match the requested wildcard */
hp = gethostbyname(hname);
if (hp != NULL) {
for (ap = hp->h_aliases; *ap; ap++)
- if (wildmat(*ap, cname))
- return 1;
+ if (wildmat(*ap, cname)) {
+ match = 1;
+ goto out;
+ }
}
- return 0;
+out:
+ free(hname);
+ return match;
}
/*
@@ -645,11 +657,9 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
match = 0;
- hname = strdup(ai->ai_canonname);
- if (hname == NULL) {
- xlog(D_GENERAL, "%s: no memory for strdup", __func__);
+ hname = host_canonname(ai->ai_addr);
+ if (hname == NULL)
goto out;
- }
/* First, try to match the hostname without
* splitting off the domain */

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# /etc/rc.d/rpc.statd: start/stop statd daemon
# /etc/rc.d/rpc.statd: start/stop NFSv4 Client Tracking Daemon
#
SSD=/sbin/start-stop-daemon

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/SLWuX/relrwEk2s5VkN61lkCkY85YBZTACmGyX8a4WamnR2JIlF7p8vXq+QH07t1ztmF4QHdB16ZVX4sTR24QE=
SHA256 (Pkgfile) = 74fe215da021a2681abc2c2f04529766e11bdb224d7e92ac9613812aee0b772f
RWSE3ohX2g5d/ShQPFBV6iDwnfBpeJyIg4HpTQkA3HUIWGFcumLoL49G2Uxy9I87trEw6wjciiV2sAh5LSDIF38fFKBkXaNlrQA=
SHA256 (Pkgfile) = 320a3ac718e17d8e436ce2bc1a2f6f3757ccbe3e87a4a7245a7aeca44e5348fa
SHA256 (.footprint) = e7c1c5de89399eb933cfdad3ceff7b6500a1726c7d8388d9ee9dfabcef8545bf
SHA256 (nsd-4.1.27.tar.gz) = 1bab5f30406cabac2f2cc95f8af6dfe20581646a75a70c091845e04d325f4eea
SHA256 (README) = 4d6bcd19bb192cce8477c055dc1a96de6596caf60bdbcd4bd26965bfd1da2038
SHA256 (nsd-4.2.0.tar.gz) = 51df1ca44a00e588c09ff0696e588c13566ce889b50d953896d8b6e507eda74c
SHA256 (README) = 0dcc9d869c404b81deb9713e40f5d60e9b1e144c8f59b0ce4c633f3f1139eb8e
SHA256 (pre-install) = 3082d6ae0dc1d1e60942e91a2db33019b2b53c62a06d12db2be52b2a1524ea27

View File

@ -4,7 +4,7 @@
# Depends on: openssl
name=nsd
version=4.1.27
version=4.2.0
release=1
source=(http://www.nlnetlabs.nl/downloads/nsd/$name-$version.tar.gz
README pre-install)

View File

@ -1,11 +1,11 @@
README for nsd 3.2.x
README for nsd 4.x.x
REQUIREMENTS
PRE-INSTALL
1. Create a user/group nsd with a unused id < 99:
wq
'groupadd -r nsd'
'useradd -r -g nsd -d /var/lib/nsd -s /bin/false nsd'
'passwd -l nsd'

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/QDgiptFvWXozAA7XFFqWJDYCTM7pZP3n4IJDNy5bRmjQVLO8qNT5gVOirn8tyc+pmJpzR2pmORDzwU38eh/fAY=
SHA256 (Pkgfile) = 156ea6c4645559fbd119187ec17b5a78edbc1e890050c52cfd2a454785543ddd
RWSE3ohX2g5d/T762CbAiJpsHWVVz8UlQ5WfvGPJnY7iAJVtFYKHeu8CW4FDEYud1UYQMw5xslC8AZ4XxCbt+NyoN0nOKC0NGQ8=
SHA256 (Pkgfile) = 432f848f2a7827bdf1fc6b1af19ab76618c38687287ed6b57eec57ab49a89752
SHA256 (.footprint) = 08cf98030de64943f300c568760e2ab802447de7dddbd6d0c2b74945a2fb463d
SHA256 (scite415.tgz) = aa98ad3186325ef33bd548a94d6eb58c5612644f6994dd04036875bc84aa9c51
SHA256 (scite417.tgz) = 8fc0a4c615056440df553db00f9a20926935c4c5e5ce6d4671def20753834c96

View File

@ -4,7 +4,7 @@
# Depends on: gtk
name=scite
version=4.1.5
version=4.1.7
release=1
source=(http://downloads.sourceforge.net/project/scintilla/SciTE/$version/$name${version//./}.tgz)

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/WbdhqzE2CabO6fpUkisOpjACh88xz+Y5sQ6FF73NbVROV5BDcRdfZEGTpzge2BkEOwTXNnJXffypbVYPafsAAs=
SHA256 (Pkgfile) = 71de075850ac2fa9e1723c858c48bc9108ee2dc544b6eb5d86714eda796fe30a
RWSE3ohX2g5d/WTU8TiaeWS0OXG3aptDvHPrZyZnZmMf8KJ/yOlmLr9vyBkFMIX292a/Ni1Y+zZnELDMalOFHcqQtRuTi2L9OQ8=
SHA256 (Pkgfile) = 9e750e3229f04d3a4d76ded2d348daa0de49ebb35f51544ac095db6175408be9
SHA256 (.footprint) = f83e6abdfdb94cb68ef512ba0ef5d19a1e180887f2cf7c92d2916af0ec7b1e51
SHA256 (stunnel-5.54.tar.gz) = 5e8588a6c274b46b1d63e1b50f0725f4908dec736f6588eb48d1eb3d20c87902
SHA256 (stunnel-5.55.tar.gz) = 90de69f41c58342549e74c82503555a6426961b29af3ed92f878192727074c62
SHA256 (stunnel.conf) = ef09041fd68530a6029826678eb22db30a80d8a77308ee361b12aa466f7daa28
SHA256 (stunnel) = c6e5c2bcfd87b709bbc24b5c24a603b43bc9440e125eeaf283a11daadc78cbd7

View File

@ -4,7 +4,7 @@
# Depends on: openssl zlib
name=stunnel
version=5.54
version=5.55
release=1
source=(https://www.stunnel.org/downloads/$name-$version.tar.gz \
$name.conf $name)

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RKh4TGGkkdglhlKsYxZr6WFDKm6o07BZc5UlcRIfysjrWjjz0T4bGKemwUV2eeXr7116nGxMbwJPFQ4ADvuwQc=
SHA256 (Pkgfile) = 7c299553156f58b4b63726d9eddfceb527ca84fc55728bb4b76882cda9ab4b15
RWSE3ohX2g5d/V4OB8yoTeWo2j0h21u/P85euLVdeX2Xt19Z4gBN/7TSBw4InW3RUMtGN+VR/9FsUBQQRKCW4qEUc1XtSHDOygE=
SHA256 (Pkgfile) = c56790c34aa57b0a2538eede948616dba0bac4d13381ffa2f23b36ab439f6c19
SHA256 (.footprint) = d00adb73926ccd556c7d37d069fab96f98fc85d028fbc291ddc9c9a9fee0e931
SHA256 (subversion-1.9.9.tar.bz2) = 8dfdbe573b582d8eb2c328cca2aacff3795b54bb39eb7fd831e3ce05991f81d2
SHA256 (subversion-1.9.10.tar.bz2) = ae28c656535c8b817f469e6ee6951e9840ea2d64c7ff0e98c728638bb45c9cd7
SHA256 (apr-1.7.patch) = f7b6ccd807a15e899a592a53b256f70a7651e2078453d12e0242658a180a8d64

View File

@ -1,17 +1,20 @@
# Description: A version control system (CVS replacement)
# URL: http://subversion.apache.org
# Maintainer: Jose V Beneyto, sepen at crux dot nu
# Packager: Simone Rota, sip at crux dot nu
# Depends on: serf
# URL: http://subversion.apache.org
# Maintainer: UNMAINTAINED
# Depends on: serf
name=subversion
version=1.9.9
version=1.9.10
release=1
source=(https://www.apache.org/dist/$name/$name-$version.tar.bz2)
source=(https://www.apache.org/dist/$name/$name-$version.tar.bz2
apr-1.7.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/apr-1.7.patch
./autogen.sh
./configure --prefix=/usr \
--with-apr=/usr \
--with-apr-util=/usr \

101
subversion/apr-1.7.patch Normal file
View File

@ -0,0 +1,101 @@
From d67979e61f8659af05fd4d0384a2db33645df83d Mon Sep 17 00:00:00 2001
From: Stefan Sperling <stsp@apache.org>
Date: Fri, 12 Apr 2019 09:27:33 +0000
Subject: [PATCH] Get rid of apr_int64_t format string check in swig py
configure.
This check relied on APR implementation details and broke with APR 1.7.0.
Rather than trying to guess a perfect format string to use, just use the
largest possible format and cast the argument accordingly.
Should fix build against APR 1.7.0 and later.
Suggested by: brane
* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT.
* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(svn_swig_py_client_blame_receiver_func): Stop relying on the
SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and
acast to PY_LONG_LONG instead.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1857391 13f79535-47bb-0310-9956-ffa450edef68
---
build/ac-macros/swig.m4 | 35 -------------------
.../swig/python/libsvn_swig_py/swigutil_py.c | 9 +++--
2 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
index 55501fb882f..29638727363 100644
--- a/build/ac-macros/swig.m4
+++ b/build/ac-macros/swig.m4
@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG,
ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
])
SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
-
- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
- dnl thus the egrep patterns have a + in them.
- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
- [svn_cv_pycfmt_apr_int64_t], [
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="L"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="l"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="i"])
- fi
- ])
- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
- fi
- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
- ["$svn_cv_pycfmt_apr_int64_t"],
- [Define to the Python/C API format character suitable]
- [ for apr_int64_t])
fi
if test "$PERL" != "none"; then
diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
index 2c90a6a464d..abe5a2ab64c 100644
--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
@@ -46,7 +46,7 @@
#include "svn_mergeinfo.h"
#include "svn_types.h"
-#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */
+#include "svn_private_config.h"
#include "swig_python_external_runtime.swg"
#include "swigutil_py.h"
@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton,
svn_swig_py_acquire_py_lock();
if ((result = PyObject_CallFunction(receiver,
- (char *)
- (SVN_APR_INT64_T_PYCFMT "lsssO&"),
- line_no, revision, author, date, line,
- make_ob_pool, pool)) == NULL)
+ (char *)"LlsssO&",
+ (PY_LONG_LONG)line_no, revision, author,
+ date, line, make_ob_pool, pool)) == NULL)
{
err = callback_exception_error();
}

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/QIcUDb5AtRdkHNXauB87UbJvJNE8ADoqn4N+iWklDFttqx49jFa70zAjSOr1Xr8UWiZ26xaiI/Ko5F7iuKLBwY=
SHA256 (Pkgfile) = e9572a0ed26428f2faffd2434729e8ce9911201972a39dbd8138e06c434547cc
RWSE3ohX2g5d/c9Uko2CiV87FIFO5RI3QnA6k40FWIbbV4q9lmPg/DBT84x8D7hadaGco9jndT1G0dzuDPQweYNt3iHB2nRjmQ4=
SHA256 (Pkgfile) = 2f6c608fd4c000b64835ed40d7563ee33f886816d596898bfd20eed716d50eef
SHA256 (.footprint) = 55dae6262dda05e002b80b843c0e57553a93a9e770d86630d104c04e3efaced7
SHA256 (unbound-1.9.1.tar.gz) = c3c0bf9b86ccba4ca64f93dd4fe7351308ab54293f297a67de5a8914c1dc59c5
SHA256 (unbound-1.9.2.tar.gz) = 6f7acec5cf451277fcda31729886ae7dd62537c4f506855603e3aa153fcb6b95
SHA256 (unbound) = 54c94f1813c00c7faac51bde904b879b73d043e87c49cf8aff63de565368a095

View File

@ -4,7 +4,7 @@
# Depends on: openssl expat
name=unbound
version=1.9.1
version=1.9.2
release=1
source=(https://unbound.net/downloads/$name-$version.tar.gz
unbound)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/WwuCrJrstM6B+kHx4VXkww/KgKg5f63lh/mexsluV71x1/QVEWmSaeshW5oy9GUcKnrwSrpyJFFWc3SZr1gKgE=
SHA256 (Pkgfile) = c21daa22e4ebe1f15de1c80565bcdf01d5646f5e91611a7407e4219826543885
RWSE3ohX2g5d/RMIEJ+nsPFxAWFNv3rXizILyoEzKlRpWvx02UfmF8icWxOg1guSfheuNQl4m1/vc58n25CBgSUJAibqlgJ0WQM=
SHA256 (Pkgfile) = 4a758b129e15777a29268d0d1a2bf7bfce05dee4c386000bee56f040955d61d1
SHA256 (.footprint) = 088320b1f1f562656da70993b637917de5d36c71004a3136af89c7ca093cf871
SHA256 (whois_5.4.2.tar.xz) = eee33a3b3a56912fbf115a7dd24ed60314e2707a3ad6aa604ca2752c1ed01f57
SHA256 (whois_5.4.3.tar.xz) = fefa84029f70985db19743e51c4a8b318a169426babeaa824a27110c26090fc3

View File

@ -4,7 +4,7 @@
# Packager: Olle Gustafsson, ogg at linux dot se
name=whois
version=5.4.2
version=5.4.3
release=1
source=(http://ftp.debian.org/debian/pool/main/w/$name/$name\_$version.tar.xz)