Merge branch '3.4' into 3.5
This commit is contained in:
commit
31c1de4324
@ -1,5 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/XvAXdfltKsDR5/zTOMPs/nuv0Wlosx1BrqeJISRUx6V3gXmBezrJDZ80xYUFAt/0r0YqB8WQl0RGcdj2dlzVgM=
|
||||
SHA256 (Pkgfile) = b66aa72a04c36c8eb54f9d129e3ddec73127e0e3519e42e8b56feb6c72d2a8de
|
||||
RWSE3ohX2g5d/eyQPIm1VlVu0g2F1FGLAo32hzB1z/idYlKK1fUWWlava5olIB4o5GWXl4dVHzCChoDJBbJjLfGKMWGHA4CKRgY=
|
||||
SHA256 (Pkgfile) = e20c098a65efd401bf1581e1a5fe5073a82a54343da8aed8115a558a75f16cf2
|
||||
SHA256 (.footprint) = aa85bfc686cf873efffd292c55eae8016e161bd8074d4f3490539f6089eead23
|
||||
SHA256 (ccache-3.4.3.tar.xz) = 297e55a7622578395c1d5cfa163cc61e345ed69c52aaf94a9583634046c15f4a
|
||||
SHA256 (ccache-3.7.1.tar.xz) = 66fc121a2a33968f9ec428e02f48ff4b8896fbabb759e9c09352267014dcbe65
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
# Optional: clang-ccache-bindings
|
||||
|
||||
name=ccache
|
||||
version=3.4.3
|
||||
version=3.7.1
|
||||
release=1
|
||||
source=(https://samba.org/ftp/$name/$name-$version.tar.xz)
|
||||
source=(https://github.com/$name/$name/releases/download/v$version/$name-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
@ -34,6 +34,7 @@ drwxr-xr-x root/root usr/include/libcroco-0.6/libcroco/
|
||||
-rw-r--r-- root/root usr/include/libcroco-0.6/libcroco/libcroco-config.h
|
||||
-rw-r--r-- root/root usr/include/libcroco-0.6/libcroco/libcroco.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libcroco-0.6.a
|
||||
-rwxr-xr-x root/root usr/lib/libcroco-0.6.la
|
||||
lrwxrwxrwx root/root usr/lib/libcroco-0.6.so -> libcroco-0.6.so.3.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libcroco-0.6.so.3 -> libcroco-0.6.so.3.0.1
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/fwZViqkMWKr8lYT0Z8y0weDlmXmkofzkEvGkKgsPnY5JqJ8+3/6RzeffgKLcCQGATDgc/lDA/2ynjmv7XewyQ4=
|
||||
SHA256 (Pkgfile) = 32c8bcd2c87af6696dd4d5b4d08e495dfe2089e261cd354515ce67f423a0f84e
|
||||
SHA256 (.footprint) = 0452e44277c156db6cb063c404c2864c2357d2b3b35f5e15356e5ef2dbb4f497
|
||||
RWSE3ohX2g5d/bBxB1/+nPXfkQrJXWqILoYqqB1fCKyWMqxGb1MR9H/X8w9etuY4xL1vRcScqfzZo2O5Bqy2OBdj750AMALzhwc=
|
||||
SHA256 (Pkgfile) = d4769f1616587cf6a7ddbb9b74dba580d2a9c69ce0a815546f0f5aa000bfb12f
|
||||
SHA256 (.footprint) = 2d6f2ec7fe8d4be0c9d3abe9c6a6110e99b16fa8a78049e53c1baf4b4c76d6eb
|
||||
SHA256 (libcroco-0.6.13.tar.xz) = 767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
name=libcroco
|
||||
version=0.6.13
|
||||
release=1
|
||||
release=2
|
||||
source=(https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
@ -13,7 +13,6 @@ build() {
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--disable-static \
|
||||
--disable-gtk-doc
|
||||
|
||||
make
|
||||
|
||||
@ -11,14 +11,16 @@ drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/gdk-pixbuf-2.0/
|
||||
drwxr-xr-x root/root usr/lib/gdk-pixbuf-2.0/2.10.0/
|
||||
drwxr-xr-x root/root usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
|
||||
-rw-r--r-- root/root usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a
|
||||
-rwxr-xr-x root/root usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
|
||||
-rwxr-xr-x root/root usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
|
||||
drwxr-xr-x root/root usr/lib/girepository-1.0/
|
||||
-rw-r--r-- root/root usr/lib/girepository-1.0/Rsvg-2.0.typelib
|
||||
-rw-r--r-- root/root usr/lib/librsvg-2.a
|
||||
-rwxr-xr-x root/root usr/lib/librsvg-2.la
|
||||
lrwxrwxrwx root/root usr/lib/librsvg-2.so -> librsvg-2.so.2.44.13
|
||||
lrwxrwxrwx root/root usr/lib/librsvg-2.so.2 -> librsvg-2.so.2.44.13
|
||||
-rwxr-xr-x root/root usr/lib/librsvg-2.so.2.44.13
|
||||
lrwxrwxrwx root/root usr/lib/librsvg-2.so -> librsvg-2.so.2.44.14
|
||||
lrwxrwxrwx root/root usr/lib/librsvg-2.so.2 -> librsvg-2.so.2.44.14
|
||||
-rwxr-xr-x root/root usr/lib/librsvg-2.so.2.44.14
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/librsvg-2.0.pc
|
||||
drwxr-xr-x root/root usr/share/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/fIfWYU8oJ03GIM/st2hHkgO6V9ryWQ73ZiPFW8Okw7wi4pyT6gzk1l0LBiT0jQ9GiyNId35vVeqU+IIQAQvnQU=
|
||||
SHA256 (Pkgfile) = 22c2752ed2d04a36c735431c255036053c95c6f8a2c5f8cefb6dbbcee8b0317e
|
||||
SHA256 (.footprint) = fb96dc06b7caa179bb5eaff0cffa0008263c95e38e08e9e5845051ec591cd4f4
|
||||
SHA256 (librsvg-2.44.13.tar.xz) = d2d660bf0c6441d019ae7a7ba96b789facbfb14dc97818908ee03e15ba6bcb8f
|
||||
RWSE3ohX2g5d/VOnxc7bLfV9Dix7ms2uu8bF4qlcz1JBCd3sHHQwy8Q3/BFIej6hOobNrxxRJOZ3xVG8n1olaz19Ig6/tS9f0QI=
|
||||
SHA256 (Pkgfile) = 0546df1b029dd376c0a1d683ae82758465131fa6834c3c3d6aa94a9830a73d2f
|
||||
SHA256 (.footprint) = 920485eb8431a6d259b9159abe34585b8468478da58b27150803cc15509c328e
|
||||
SHA256 (librsvg-2.44.14.tar.xz) = 6a85a7868639cdd4aa064245cc8e9d864dad8b8e9a4a8031bb09a4796bc4e303
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: gdk-pixbuf libcroco pango rust-bin
|
||||
|
||||
name=librsvg
|
||||
version=2.44.13
|
||||
version=2.44.14
|
||||
release=1
|
||||
source=(https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz)
|
||||
|
||||
@ -13,7 +13,6 @@ build() {
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--disable-static \
|
||||
--disable-gtk-doc
|
||||
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
|
||||
|
||||
@ -7,6 +7,7 @@ drwxr-xr-x root/root etc/exports.d/
|
||||
drwxr-xr-x root/root etc/rc.d/
|
||||
-rwxr-xr-x root/root etc/rc.d/nfs
|
||||
-rwxr-xr-x root/root etc/rc.d/nfsclient
|
||||
-rwxr-xr-x root/root etc/rc.d/nfsdcld
|
||||
-rwxr-xr-x root/root etc/rc.d/nfsserver
|
||||
-rwxr-xr-x root/root etc/rc.d/rpc.idmapd
|
||||
-rwxr-xr-x root/root etc/rc.d/rpc.mountd
|
||||
@ -15,8 +16,8 @@ drwxr-xr-x root/root etc/rc.d/
|
||||
drwxr-xr-x root/root sbin/
|
||||
-r-s--x--x root/root sbin/mount.nfs
|
||||
lrwxrwxrwx root/root sbin/mount.nfs4 -> mount.nfs
|
||||
-rwxr-xr-x root/root sbin/nfsdcld
|
||||
-rwxr-xr-x root/root sbin/nfsdcltrack
|
||||
-rwxr-xr-x root/root sbin/osd_login
|
||||
lrwxrwxrwx root/root sbin/umount.nfs -> mount.nfs
|
||||
lrwxrwxrwx root/root sbin/umount.nfs4 -> mount.nfs
|
||||
drwxr-xr-x root/root usr/
|
||||
@ -76,6 +77,7 @@ drwxr-xr-x root/root usr/share/man/man8/
|
||||
-rw-r--r-- root/root usr/share/man/man8/mountstats.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/nfsconf.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/nfsd.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/nfsdcld.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/nfsdcltrack.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/nfsidmap.8.gz
|
||||
-rw-r--r-- root/root usr/share/man/man8/nfsiostat.8.gz
|
||||
@ -94,6 +96,7 @@ drwxr-xr-x root/root var/
|
||||
drwxr-xr-x root/root var/lib/
|
||||
drwxr-xr-x nobody/root var/lib/nfs/
|
||||
-rw-r--r-- root/root var/lib/nfs/etab (EMPTY)
|
||||
drwxr-xr-x root/root var/lib/nfs/nfsdcld/
|
||||
drwxr-xr-x root/root var/lib/nfs/nfsdcltrack/
|
||||
-rw-r--r-- root/root var/lib/nfs/rmtab (EMPTY)
|
||||
drwxr-xr-x root/root var/lib/nfs/rpc_pipefs/
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/eLH6aBvIhg9+bCQkfry5xuqvqR7GPpQ2IKc70lYdTsmw0ofwXeQFef8FpP8mhrIzyQOAzm7ivmHTwto+dUCAwQ=
|
||||
SHA256 (Pkgfile) = 33063499fba0e39b11edb8f3c226fd3a7a25d55b7022445630be00f93a018a08
|
||||
SHA256 (.footprint) = 05d8594f7869ef649d07d5bb567a01285ca73b66a100115dc89d88e19919ebb5
|
||||
SHA256 (nfs-utils-2.3.3.tar.xz) = f68b34793831b05f1fd5760d6bdec92772c7684177586a99a61e7b444f336322
|
||||
RWSE3ohX2g5d/fLC+G7VhbvFQdbZY1XGu29jJE1T6mOxWvp5uzOFB2egNuBUcDCtzMfdBENvfXtBAKRHz26TYQazR0NDixiYvA0=
|
||||
SHA256 (Pkgfile) = bbc8ef05ee5628d697218a1f8428278f64cd1edf46137ff093946eb4dfb9441c
|
||||
SHA256 (.footprint) = 6e26f43089fdf8b1b3b0608168cd4a7e30c14f89b43ea353b57405619ecc40da
|
||||
SHA256 (nfs-utils-2.3.4.tar.xz) = f8328ba386087a9926edd89f78a319ff55418a0e734dbf5f50350f465f0896cd
|
||||
SHA256 (exports) = 9556615724e66fbe6e7a2bfd740db4c5399a6abafab8cce868975f6926548eec
|
||||
SHA256 (idmapd.conf) = 2759ea36eff3397c39b534ee34752e02f60976160d66570ae19dbbbb5c00ee53
|
||||
SHA256 (nfs) = 3ab2824ff5cbe4498faf6cbbbea19793d96bd80c48b9c18c0939938b18ab0217
|
||||
SHA256 (nfsclient) = 325ba4b960f290fa1431f5c6145417832902e49d39203fe896012376bae1452e
|
||||
SHA256 (nfsserver) = 66ab1f3f85bfc56ede050c7f094ba7b2897b7ffd96a2fe9a5cd377d9b473655a
|
||||
SHA256 (nfsserver) = dd2b16473db568c0e3375d0b5f215adafa1015ca029b94b654b1f0b48c9fb3fa
|
||||
SHA256 (rpc.idmapd) = 93b32d0f4f33544a3bbd82e1f4a52e218dad48f7c06dfe08521d47d7c6a4cf96
|
||||
SHA256 (rpc.statd) = d60fde1af3250ac8d9b66246ce04d133f133da7e31f4df8969781acb21f34c2f
|
||||
SHA256 (rpc.statd) = 764b99273b59839d44a7e05c20d863206df06f5e7e5cb5cedf9da1db624395b9
|
||||
SHA256 (rpc.mountd) = a6aaaadc054df03a9e6500fdf8b2fc6669d78825daff2c68e52e4d9eb2e0509c
|
||||
SHA256 (rpc.nfsd) = 12d0936472011db6928e5c0526ac510217a0601863a012e8a1ea565e3c1721de
|
||||
SHA256 (nfsdcld) = 5dcefb370bcfb79c0091b27021281aea8b372a6078cd55f549729d4402746be4
|
||||
SHA256 (mountd_segfault.patch) = 2cff9229583cc98782631b4dbd32c612340eaafc5d330e112484ee95ca8e13bc
|
||||
|
||||
@ -1,37 +1,40 @@
|
||||
# Description: NFS utilities
|
||||
# URL: http://nfs.sourceforge.net/
|
||||
# Maintainer: Juergen Daubert, jue at crux dot nu
|
||||
# Depends on: util-linux libcap rpcbind libevent keyutils sqlite3
|
||||
# Depends on: libdevmapper util-linux libcap rpcbind libevent keyutils sqlite3
|
||||
|
||||
name=nfs-utils
|
||||
version=2.3.3
|
||||
version=2.3.4
|
||||
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)
|
||||
nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd nfsdcld
|
||||
mountd_segfault.patch)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/mountd_segfault.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--with-statedir=/var/lib/nfs \
|
||||
--without-tcp-wrappers \
|
||||
--disable-gss \
|
||||
--enable-libmount-mount
|
||||
--enable-libmount-mount
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
install -d $PKG/etc/rc.d
|
||||
|
||||
install -m 755 $SRC/nfs{,client,server} $PKG/etc/rc.d/
|
||||
install -m 755 $SRC/nfs{,client,server,dcld} $PKG/etc/rc.d/
|
||||
install -m 755 $SRC/rpc.* $PKG/etc/rc.d/
|
||||
install -m 644 $SRC/{exports,idmapd.conf} $PKG/etc/
|
||||
|
||||
install -m 644 utils/mount/nfsmount.conf $PKG/etc/
|
||||
install -m 644 nfs.conf $PKG/etc/
|
||||
|
||||
install -d $PKG/var/lib/nfs/{rpc_pipefs,v4recovery,nfsdcltrack}
|
||||
install -d $PKG/var/lib/nfs/{rpc_pipefs,v4recovery,nfsdcltrack,nfsdcld}
|
||||
install -d $PKG/etc/exports.d
|
||||
|
||||
# force rpc.statd to run as user nobody
|
||||
|
||||
92
nfs-utils/mountd_segfault.patch
Normal file
92
nfs-utils/mountd_segfault.patch
Normal file
@ -0,0 +1,92 @@
|
||||
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 */
|
||||
36
nfs-utils/nfsdcld
Normal file
36
nfs-utils/nfsdcld
Normal file
@ -0,0 +1,36 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# /etc/rc.d/rpc.statd: start/stop statd daemon
|
||||
#
|
||||
|
||||
SSD=/sbin/start-stop-daemon
|
||||
PROG=/sbin/nfsdcld
|
||||
PID=/var/run/nfsdcld
|
||||
OPTS="--foreground"
|
||||
|
||||
case $1 in
|
||||
start)
|
||||
$SSD --start -bmC --pidfile $PID --exec $PROG -- $OPTS
|
||||
;;
|
||||
stop)
|
||||
$SSD --stop --remove-pidfile --retry 10 --pidfile $PID
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
$0 start
|
||||
;;
|
||||
status)
|
||||
$SSD --status --pidfile $PID
|
||||
case $? in
|
||||
0) echo "$PROG is running with pid $(cat $PID)" ;;
|
||||
1) echo "$PROG is not running but the pid file $PID exists" ;;
|
||||
3) echo "$PROG is not running" ;;
|
||||
4) echo "Unable to determine the program status" ;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 [start|stop|restart|status]"
|
||||
;;
|
||||
esac
|
||||
|
||||
# End of file
|
||||
@ -12,11 +12,13 @@ start)
|
||||
/etc/rc.d/rpc.mountd start
|
||||
/etc/rc.d/rpc.nfsd start
|
||||
/usr/sbin/sm-notify
|
||||
/etc/rc.d/nfsdcld start
|
||||
;;
|
||||
stop)
|
||||
/etc/rc.d/rpc.nfsd stop
|
||||
/etc/rc.d/rpc.mountd stop
|
||||
/usr/sbin/exportfs -au
|
||||
/etc/rc.d/nfsdcld stop
|
||||
/bin/umount $NFSD
|
||||
;;
|
||||
restart)
|
||||
@ -26,6 +28,7 @@ restart)
|
||||
status)
|
||||
/etc/rc.d/rpc.mountd status
|
||||
/etc/rc.d/rpc.nfsd status
|
||||
/etc/rc.d/nfsdcld status
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 [start|stop|restart|status]"
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
SSD=/sbin/start-stop-daemon
|
||||
PROG=/usr/sbin/rpc.statd
|
||||
NAME=rpc.statd
|
||||
PID=/var/run/rpc.statd.pid
|
||||
OPTS="--no-notify"
|
||||
|
||||
@ -13,14 +14,14 @@ start)
|
||||
$SSD --start --pidfile $PID --exec $PROG -- $OPTS
|
||||
;;
|
||||
stop)
|
||||
$SSD --stop --retry 10 --pidfile $PID
|
||||
$SSD --stop --retry 10 --pidfile $PID --name $NAME
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
$0 start
|
||||
;;
|
||||
status)
|
||||
$SSD --status --pidfile $PID
|
||||
$SSD --status --pidfile $PID --name $NAME
|
||||
case $? in
|
||||
0) echo "$PROG is running with pid $(cat $PID)" ;;
|
||||
1) echo "$PROG is not running but the pid file $PID exists" ;;
|
||||
|
||||
57
spirv-headers/.footprint
Normal file
57
spirv-headers/.footprint
Normal file
@ -0,0 +1,57 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/include/spirv/
|
||||
drwxr-xr-x root/root usr/include/spirv/1.0/
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/GLSL.std.450.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/OpenCL.std.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/extinst.glsl.std.450.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/extinst.opencl.std.100.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.core.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.cs
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.hpp
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.hpp11
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.lua
|
||||
-rw-r--r-- root/root usr/include/spirv/1.0/spirv.py
|
||||
drwxr-xr-x root/root usr/include/spirv/1.1/
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/GLSL.std.450.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/OpenCL.std.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/extinst.glsl.std.450.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/extinst.opencl.std.100.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.core.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.cs
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.hpp
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.hpp11
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.lua
|
||||
-rw-r--r-- root/root usr/include/spirv/1.1/spirv.py
|
||||
drwxr-xr-x root/root usr/include/spirv/1.2/
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/GLSL.std.450.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/OpenCL.std.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/extinst.glsl.std.450.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/extinst.opencl.std.100.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.core.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.cs
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.h
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.hpp
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.hpp11
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.json
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.lua
|
||||
-rw-r--r-- root/root usr/include/spirv/1.2/spirv.py
|
||||
-rw-r--r-- root/root usr/include/spirv/spir-v.xml
|
||||
drwxr-xr-x root/root usr/include/spirv/unified1/
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/GLSL.std.450.h
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/OpenCL.std.h
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.glsl.std.450.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/extinst.opencl.std.100.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.core.grammar.json
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.cs
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.h
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.hpp
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.hpp11
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.json
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.lua
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spirv.py
|
||||
-rw-r--r-- root/root usr/include/spirv/unified1/spv.d
|
||||
5
spirv-headers/.signature
Normal file
5
spirv-headers/.signature
Normal file
@ -0,0 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/SnjsQaB/i2Q7Vc3L3l9aufQFDNNBMnA218wNk9u3amSYT0+0JfObgj0mAFY+cdDp7o/8EjzFLs/z4Q9kv7BtAY=
|
||||
SHA256 (Pkgfile) = 60eaf74976096fe55d24a55423bcf88a40987c517915e154b83cad4ac4b767f3
|
||||
SHA256 (.footprint) = 547b12eb161ed91b68663dc1abf26abc5e9181184a9234de73a06905705677fc
|
||||
SHA256 (SPIRV-Headers-1.4.1.tar.gz) = a244f0629f75eb450e090cd773d30e22367cb231e964c7492588eb9000201fd1
|
||||
24
spirv-headers/Pkgfile
Normal file
24
spirv-headers/Pkgfile
Normal file
@ -0,0 +1,24 @@
|
||||
# Description: SPIR-V Headers
|
||||
# URL: https://www.khronos.org/registry/spir-v/
|
||||
# Maintainer: Danny Rawlins, crux at romster dot me
|
||||
# Depends on: cmake
|
||||
|
||||
name=spirv-headers
|
||||
version=1.4.1
|
||||
release=1
|
||||
source=(https://github.com/KhronosGroup/SPIRV-Headers/archive/$version/SPIRV-Headers-$version.tar.gz)
|
||||
|
||||
build() {
|
||||
cd SPIRV-Headers-$version
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
|
||||
cmake .. \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DSPIRV_HEADERS_SKIP_EXAMPLES=ON
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
27
spirv-tools/.footprint
Normal file
27
spirv-tools/.footprint
Normal file
@ -0,0 +1,27 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/spirv-as
|
||||
-rwxr-xr-x root/root usr/bin/spirv-cfg
|
||||
-rwxr-xr-x root/root usr/bin/spirv-dis
|
||||
-rwxr-xr-x root/root usr/bin/spirv-lesspipe.sh
|
||||
-rwxr-xr-x root/root usr/bin/spirv-link
|
||||
-rwxr-xr-x root/root usr/bin/spirv-opt
|
||||
-rwxr-xr-x root/root usr/bin/spirv-reduce
|
||||
-rwxr-xr-x root/root usr/bin/spirv-stats
|
||||
-rwxr-xr-x root/root usr/bin/spirv-val
|
||||
drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/include/spirv-tools/
|
||||
-rw-r--r-- root/root usr/include/spirv-tools/instrument.hpp
|
||||
-rw-r--r-- root/root usr/include/spirv-tools/libspirv.h
|
||||
-rw-r--r-- root/root usr/include/spirv-tools/libspirv.hpp
|
||||
-rw-r--r-- root/root usr/include/spirv-tools/linker.hpp
|
||||
-rw-r--r-- root/root usr/include/spirv-tools/optimizer.hpp
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libSPIRV-Tools-link.a
|
||||
-rw-r--r-- root/root usr/lib/libSPIRV-Tools-opt.a
|
||||
-rw-r--r-- root/root usr/lib/libSPIRV-Tools-reduce.a
|
||||
-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so
|
||||
-rw-r--r-- root/root usr/lib/libSPIRV-Tools.a
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools-shared.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools.pc
|
||||
5
spirv-tools/.signature
Normal file
5
spirv-tools/.signature
Normal file
@ -0,0 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/e+Jknelcns7QNKVa4YXWG062jDItqdH0oOMcagitbcz8KoSczfeXNsdTih74IqXy8ZC5C+Im0lOFy/2N9Qe/wo=
|
||||
SHA256 (Pkgfile) = ef3fd3b58da53ab3e0e9bc022f1ab4e02edb0bfdb4ce293733765facd9ca8d6f
|
||||
SHA256 (.footprint) = 7eedf8b657a2884ff56545bbbd6b3fe09a193d07ed7c65683e6a9f0a8f78e0ce
|
||||
SHA256 (SPIRV-Tools-v2019.2.tar.gz) = 1fde9d2a0df920a401441cd77253fc7b3b9ab0578eabda8caaaceaa6c7638440
|
||||
26
spirv-tools/Pkgfile
Normal file
26
spirv-tools/Pkgfile
Normal file
@ -0,0 +1,26 @@
|
||||
# Description: API and commands for processing SPIR-V modules
|
||||
# URL: https://www.khronos.org/vulkan/
|
||||
# Maintainer: Danny Rawlins, crux at romster dot me
|
||||
# Depends on: python3 spirv-headers
|
||||
|
||||
name=spirv-tools
|
||||
version=2019.2
|
||||
release=2
|
||||
source=(https://github.com/KhronosGroup/SPIRV-Tools/archive//v$version/SPIRV-Tools-v$version.tar.gz)
|
||||
|
||||
build() {
|
||||
cd SPIRV-Tools-$version
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
|
||||
cmake .. \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DSPIRV_WERROR=Off \
|
||||
-DSPIRV-Headers_SOURCE_DIR=/usr
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
@ -13,6 +13,7 @@ drwxr-xr-x root/root usr/include/vte-0.0/vte/
|
||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vtetypebuiltins.h
|
||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vteversion.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libvte.a
|
||||
-rwxr-xr-x root/root usr/lib/libvte.la
|
||||
lrwxrwxrwx root/root usr/lib/libvte.so -> libvte.so.9.2800.2
|
||||
lrwxrwxrwx root/root usr/lib/libvte.so.9 -> libvte.so.9.2800.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/XASETbfNMlKPDF9nZrkOC3amWYcxJ6k3oHc6bjGuUiOLrUxyjCFPtC5G8Lk0/tGTb8MFlFHjT/ymJUxdFvWTwI=
|
||||
SHA256 (Pkgfile) = cd4e291b461d068871f20ce9ae391bd64b95762424a09e1282aa2498defeeceb
|
||||
SHA256 (.footprint) = 11f2a585afcf0f939ea666b375e0d123bef960ca92d2a7bf806e6c2421dc98ec
|
||||
RWSE3ohX2g5d/dRap28ffr3R/fxTDQliUq0Q+Mq8S202AYWHiEjayAHCLBEapf5bd7ripf7xMxLE023kD/pTR5CuwvTHnW4jPQw=
|
||||
SHA256 (Pkgfile) = 63195ea3f7c988557ffe0369bd12451c7cee69640e88ec27e76db1c36ac28722
|
||||
SHA256 (.footprint) = 16dd1fa9f2926caa8c3b8639d82c00bf2e21625aea3f1d0930a000cf9e6012aa
|
||||
SHA256 (vte-0.28.2.tar.xz) = 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae
|
||||
SHA256 (vte-0.30.1-alt-meta.patch) = 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6
|
||||
SHA256 (vte-0.28.2-interix.patch) = 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
name=vte
|
||||
version=0.28.2
|
||||
release=3
|
||||
release=4
|
||||
source=(https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz
|
||||
$name-0.30.1-alt-meta.patch
|
||||
$name-0.28.2-interix.patch
|
||||
@ -34,7 +34,6 @@ build() {
|
||||
--prefix=/usr \
|
||||
--libexecdir=/usr/lib/$name \
|
||||
--disable-deprecation \
|
||||
--disable-static \
|
||||
--disable-debugging \
|
||||
--disable-python \
|
||||
--disable-gtk-doc \
|
||||
|
||||
@ -19,10 +19,11 @@ drwxr-xr-x root/root usr/include/vte-2.91/vte/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/girepository-1.0/
|
||||
-rw-r--r-- root/root usr/lib/girepository-1.0/Vte-2.91.typelib
|
||||
-rw-r--r-- root/root usr/lib/libvte-2.91.a
|
||||
-rwxr-xr-x root/root usr/lib/libvte-2.91.la
|
||||
lrwxrwxrwx root/root usr/lib/libvte-2.91.so -> libvte-2.91.so.0.5400.3
|
||||
lrwxrwxrwx root/root usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.5400.3
|
||||
-rwxr-xr-x root/root usr/lib/libvte-2.91.so.0.5400.3
|
||||
lrwxrwxrwx root/root usr/lib/libvte-2.91.so -> libvte-2.91.so.0.5600.3
|
||||
lrwxrwxrwx root/root usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.5600.3
|
||||
-rwxr-xr-x root/root usr/lib/libvte-2.91.so.0.5600.3
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/vte-2.91.pc
|
||||
drwxr-xr-x root/root usr/share/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/YpQsoKgbp8QkoMnRmdVA6OKOVmkQrMxyRfIDiPsJdylrujT7hMFP6W5Fa4+1IDR4oWoQLKUKJoaNqoqmZ97NwQ=
|
||||
SHA256 (Pkgfile) = bf2164038e2c914d7e33ed867b6049440917fd6985f6b3ea0417351c81d9849a
|
||||
SHA256 (.footprint) = 6722b9505c92b810fd9015b3d513cbecee633bf2f5eeb86dcdad3576081fc975
|
||||
SHA256 (vte-0.54.3.tar.xz) = 693682145025c2af72d1070afaecba111351e747b4ba8f4a9d246b139f44ebfd
|
||||
RWSE3ohX2g5d/ZLbLK4MyNzJToRcJc9Fu14vC8jpmR4f2E4p3OhxONxYusQZfO13ybnMdXnIYT4K0sLOQ7CoqSwhBIeMvXwcFQw=
|
||||
SHA256 (Pkgfile) = 5cbde55fe6a23aae93f1a47195d656f8304189079a052e8460bf8ed652ab1aa1
|
||||
SHA256 (.footprint) = eabcc2bb8712dbea53f1404581358d50f61f23c79839a2c400b9af8154d6a610
|
||||
SHA256 (vte-0.56.3.tar.xz) = 17a1d4bc8848f1d2acfa4c20aaa24b9bac49f057b8909c56d3dafec2e2332648
|
||||
|
||||
@ -5,19 +5,18 @@
|
||||
# Optional: vala
|
||||
|
||||
name=vte3
|
||||
version=0.54.3
|
||||
version=0.56.3
|
||||
release=1
|
||||
source=(https://download.gnome.org/sources/vte/${version%.*}/vte-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
cd vte-$version
|
||||
|
||||
[ -e '/usr/bin/vala' ] || PKGMK_VTE+=' --enable-vala=no'
|
||||
prt-get isinst vala || PKGMK_VTE+=' --enable-vala=no'
|
||||
|
||||
./configure ${PKGMK_VTE} \
|
||||
--prefix=/usr \
|
||||
--libexecdir=/usr/lib/vte \
|
||||
--disable-static \
|
||||
--disable-gtk-doc
|
||||
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
|
||||
Loading…
Reference in New Issue
Block a user