January 2017 - crux-commits

ports/opt (3.2): postfix: 2.11.8 -> 2.11.9
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit a8205a7d8ce886c1dd56abf1160caf7a85fa38be Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Jan 25 01:58:14 2017 +0100 postfix: 2.11.8 -> 2.11.9 diff --git a/postfix/.md5sum b/postfix/.md5sum index cf73f7e..cabb7c5 100644 --- a/postfix/.md5sum +++ b/postfix/.md5sum @@ -1,4 +1,4 @@ be543b65525f544386a2d8395ea19cdf aliases -cbc473f2aaf3d78f500287f370c91324 postfix-2.11.8.tar.gz +e498003a3ab5348b51df7db61bc00ed5 postfix-2.11.9.tar.gz 8bee559587e2ccbaf0aadd88b6ca339a postfix.patch d18be5c17604f9c712a28339ff0f61cb postfix.rc diff --git a/postfix/Pkgfile b/postfix/Pkgfile index 98d6622..2e078b1 100644 --- a/postfix/Pkgfile +++ b/postfix/Pkgfile @@ -5,7 +5,7 @@ # Depends on: cyrus-sasl name=postfix -version=2.11.8 +version=2.11.9 release=1 source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/$name-$ver… \ aliases postfix.rc postfix.patch)

1 0

ports/opt (3.2): llvm: include patch for red icons on radeon hardware
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 77f586bee9f7f68c44752cb869143cad05258d71 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Jan 25 00:29:56 2017 +0100 llvm: include patch for red icons on radeon hardware diff --git a/llvm/.md5sum b/llvm/.md5sum index cf2a68b..a7d6e60 100644 --- a/llvm/.md5sum +++ b/llvm/.md5sum @@ -1,2 +1,3 @@ +7b8219e2b0d15e96a09dbe8bc2614777 0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch 3259018a7437e157f3642df80f1983ea llvm-3.9.1.src.tar.xz fcd6954a7fbd05687990e59e87131c3e llvm-config.h diff --git a/llvm/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch b/llvm/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch new file mode 100644 index 0000000..f9ec68c --- /dev/null +++ b/llvm/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch @@ -0,0 +1,120 @@ +From d6b5bd6f44e8091a4c4870f1c52921c25a4f8cca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny(a)gentoo.org> +Date: Sat, 21 Jan 2017 12:35:36 +0100 +Subject: [PATCH] Revert "AMDGPU: Fix an interaction between WQM and polygon + stippling" + +https://bugs.gentoo.org/603858 +--- + lib/Target/AMDGPU/SIInstructions.td | 1 - + lib/Target/AMDGPU/SIWholeQuadMode.cpp | 7 +++++ + test/CodeGen/AMDGPU/wqm.ll | 49 +++-------------------------------- + 3 files changed, 11 insertions(+), 46 deletions(-) + +diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td +index dde5f2fc6b4..18b7d5d62ef 100644 +--- a/lib/Target/AMDGPU/SIInstructions.td ++++ b/lib/Target/AMDGPU/SIInstructions.td +@@ -2029,7 +2029,6 @@ def SI_RETURN : PseudoInstSI < + let hasSideEffects = 1; + let SALU = 1; + let hasNoSchedulingInfo = 1; +- let DisableWQM = 1; + } + + let Uses = [EXEC], Defs = [EXEC, VCC, M0], +diff --git a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +index 1534d582569..b200c153df0 100644 +--- a/lib/Target/AMDGPU/SIWholeQuadMode.cpp ++++ b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +@@ -219,6 +219,13 @@ char SIWholeQuadMode::scanInstructions(MachineFunction &MF, + markInstruction(MI, Flags, Worklist); + GlobalFlags |= Flags; + } ++ ++ if (WQMOutputs && MBB.succ_empty()) { ++ // This is a prolog shader. Make sure we go back to exact mode at the end. ++ Blocks[&MBB].OutNeeds = StateExact; ++ Worklist.push_back(&MBB); ++ GlobalFlags |= StateExact; ++ } + } + + return GlobalFlags; +diff --git a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll +index 41e42645788..809a7ba9b82 100644 +--- a/test/CodeGen/AMDGPU/wqm.ll ++++ b/test/CodeGen/AMDGPU/wqm.ll +@@ -17,18 +17,17 @@ main_body: + ;CHECK-LABEL: {{^}}test2: + ;CHECK-NEXT: ; %main_body + ;CHECK-NEXT: s_wqm_b64 exec, exec ++;CHECK: image_sample + ;CHECK-NOT: exec +-define amdgpu_ps void @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { ++;CHECK: _load_dword v0, ++define amdgpu_ps float @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { + main_body: + %c.1 = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %c, <8 x i32> %rsrc, <4 x i32> %sampler, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) + %c.2 = bitcast <4 x float> %c.1 to <4 x i32> + %c.3 = extractelement <4 x i32> %c.2, i32 0 + %gep = getelementptr float, float addrspace(1)* %ptr, i32 %c.3 + %data = load float, float addrspace(1)* %gep +- +- call void @llvm.SI.export(i32 15, i32 1, i32 1, i32 0, i32 1, float %data, float undef, float undef, float undef) +- +- ret void ++ ret float %data + } + + ; ... but disabled for stores (and, in this simple case, not re-enabled). +@@ -415,46 +414,6 @@ entry: + ret void + } + +-; Must return to exact at the end of a non-void returning shader, +-; otherwise the EXEC mask exported by the epilog will be wrong. This is true +-; even if the shader has no kills, because a kill could have happened in a +-; previous shader fragment. +-; +-; CHECK-LABEL: {{^}}test_nonvoid_return: +-; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec +-; CHECK: s_wqm_b64 exec, exec +-; +-; CHECK: s_and_b64 exec, exec, [[LIVE]] +-; CHECK-NOT: exec +-define amdgpu_ps <4 x float> @test_nonvoid_return() nounwind { +- %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- %tex.i = bitcast <4 x float> %tex to <4 x i32> +- %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- ret <4 x float> %dtex +-} +- +-; CHECK-LABEL: {{^}}test_nonvoid_return_unreachable: +-; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec +-; CHECK: s_wqm_b64 exec, exec +-; +-; CHECK: s_and_b64 exec, exec, [[LIVE]] +-; CHECK-NOT: exec +-define amdgpu_ps <4 x float> @test_nonvoid_return_unreachable(i32 inreg %c) nounwind { +-entry: +- %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- %tex.i = bitcast <4 x float> %tex to <4 x i32> +- %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) +- +- %cc = icmp sgt i32 %c, 0 +- br i1 %cc, label %if, label %else +- +-if: +- store volatile <4 x float> %dtex, <4 x float>* undef +- unreachable +- +-else: +- ret <4 x float> %dtex +-} + + declare void @llvm.amdgcn.image.store.v4i32(<4 x float>, <4 x i32>, <8 x i32>, i32, i1, i1, i1, i1) #1 + declare void @llvm.amdgcn.buffer.store.f32(float, <4 x i32>, i32, i32, i1, i1) #1 +-- +2.11.0 + diff --git a/llvm/Pkgfile b/llvm/Pkgfile index abac07e..684f9b5 100644 --- a/llvm/Pkgfile +++ b/llvm/Pkgfile @@ -6,9 +6,9 @@ name=llvm version=3.9.1 -release=2 +release=3 source=(http://llvm.org/releases/$version/$name-$version.src.tar.xz \ - llvm-config.h) + llvm-config.h 0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch) build() { export CC=gcc @@ -16,6 +16,8 @@ build() { cd $name-$version.src + patch -p1 -i $SRC/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch + mkdir build cd build

1 0

ports/contrib (3.2): nginx: updated to version 1.11.9
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit a7bf5363f04f73fabd32969b79a0f0924dae81af Author: Matt Housh <jaeger(a)crux.ninja> Date: Tue Jan 24 15:08:49 2017 -0600 nginx: updated to version 1.11.9 diff --git a/nginx/.md5sum b/nginx/.md5sum index 497e8a9..2e3c8ea 100644 --- a/nginx/.md5sum +++ b/nginx/.md5sum @@ -1,3 +1,3 @@ -8f68f49b6db510e567bba9e0c271a3ac nginx-1.11.8.tar.gz +7aeca793819c2b8df134c0b1cfe98361 nginx-1.11.9.tar.gz 93b358681200fe294581cb559d529aee nginx.conf 06712aa2b72397850b0725f2e9d20627 nginx.rc diff --git a/nginx/Pkgfile b/nginx/Pkgfile index 362b76e..63c8b4e 100644 --- a/nginx/Pkgfile +++ b/nginx/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre zlib openssl name=nginx -version=1.11.8 +version=1.11.9 release=1 source=(http://nginx.org/download/$name-$version.tar.gz \ $name.conf $name.rc)

1 0

ports/xorg (3.3): signature update
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit e7e5e83543e02f0f8e4b4aa908c97be63b99d923 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 13:02:47 2017 +0100 signature update diff --git a/libinput/.signature b/libinput/.signature index ca7128a..a4e3db7 100644 --- a/libinput/.signature +++ b/libinput/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndAoBp3dLSiD0ajvHha+fqo11i4aqtGqF26ljVXF1XXtQS58ZblYOIbsFiAAk9PaBMqck7R0soqun4xlANJokog8= -SHA256 (Pkgfile) = 1613d1d284a04644f676795f7854b54d9d8e2ccbd02903cc11015d808e57ab89 -SHA256 (.footprint) = 78c38f102b993addd47d8e80fcf24071d21630cf828ed01f989ea229a997676f -SHA256 (libinput-1.5.4.tar.xz) = 6f9ad1ede468bd54ec4469b8a4eb93a6f62f7fe6480c7a43e36c5d58cc2822b7 +RWTSGWF5Q7TndHNk+KOJczGffjwSCM6PCeKtcsgXIYPXpBpq4QTkglsDa2nJnY90IcF9k4M1wnm4xi2yUS9lMwniO/xGNTSqwQw= +SHA256 (Pkgfile) = 4f7487a739e65e2eab93ee7dd31d7b29af211d0daba2a540c50d4ef852db7a62 +SHA256 (.footprint) = 2f17ffb89f65eb3713d21f68748b9c01201c6d7463ce91196f2949425f1ce0e6 +SHA256 (libinput-1.6.0.tar.xz) = b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832

1 0

ports/xorg (3.3): Merge branch '3.2' into 3.3
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 2483431fb0063f9f9a60a8f9cf739f83cb10606a Merge: b7bd71f 78a37e1 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 13:01:48 2017 +0100 Merge branch '3.2' into 3.3

1 0

ports/xorg (3.3): libinput: update to 1.6.0
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 78a37e11599ea8c70403cc99d6a8665eee22a51a Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:50:18 2017 +0100 libinput: update to 1.6.0 diff --git a/libinput/.footprint b/libinput/.footprint index 5ee7914..d846e31 100644 --- a/libinput/.footprint +++ b/libinput/.footprint @@ -17,9 +17,9 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libinput.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libinput.la -lrwxrwxrwx root/root usr/lib/libinput.so -> libinput.so.10.10.5 -lrwxrwxrwx root/root usr/lib/libinput.so.10 -> libinput.so.10.10.5 --rwxr-xr-x root/root usr/lib/libinput.so.10.10.5 +lrwxrwxrwx root/root usr/lib/libinput.so -> libinput.so.10.11.2 +lrwxrwxrwx root/root usr/lib/libinput.so.10 -> libinput.so.10.11.2 +-rwxr-xr-x root/root usr/lib/libinput.so.10.11.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libinput.pc drwxr-xr-x root/root usr/share/ diff --git a/libinput/.md5sum b/libinput/.md5sum index d4f27ef..b265dd7 100644 --- a/libinput/.md5sum +++ b/libinput/.md5sum @@ -1 +1 @@ -e9c9975487b8a1885a8a864c40bf26be libinput-1.5.4.tar.xz +ed9b435d411462d24d88a87728f6c9d6 libinput-1.6.0.tar.xz diff --git a/libinput/Pkgfile b/libinput/Pkgfile index 5d70781..f03d7f1 100644 --- a/libinput/Pkgfile +++ b/libinput/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mtdev xorg-libevdev name=libinput -version=1.5.4 +version=1.6.0 release=1 source=(http://www.freedesktop.org/software/$name/$name-$version.tar.xz)

1 0

ports/opt (3.3): Merge branch '3.2' into 3.3
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 3c2fb35e61af1ab4b3c27c743a667619ef444c96 Merge: 414904d 21baf0e Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:56:33 2017 +0100 Merge branch '3.2' into 3.3

1 0

ports/opt (3.3): signature update
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 21f6955f36ecf2fbaf664ed25fb6240b7a938a24 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 13:00:48 2017 +0100 signature update diff --git a/aspell-en/.signature b/aspell-en/.signature index 6119914..bcfb3aa 100644 --- a/aspell-en/.signature +++ b/aspell-en/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/S0tfzgGHUa6Hx/mtzPoNHNWd7xUW9EBmz8Lt5mcHYRlr4EZWtHGnS6m5P5UbQ/rv9YnERZkStb7zl2BagQfQAA= -SHA256 (Pkgfile) = a0bd45b14208ea8aa7f00c995f54381707b1c2fa44ca7bed479a82cd2cca05fb +RWSE3ohX2g5d/ewHnrDWH8UuDAPrA8sTWFs2BRLZH0NoCfmkjxr4ITierCNG+HkRI8QdQgUpKVNbYcwPVZB9Ds7OhCSxOJ+meQU= +SHA256 (Pkgfile) = 074f560bb0ef7b0a62213284f1e09da982f20fd21a9f2178a4b19bd657c9201c SHA256 (.footprint) = 650aaccec5c129116fccdba6af148716f1b66a339b22fd2751d25e92d9b27a9f -SHA256 (aspell6-en-2016.11.20-0.tar.bz2) = 5ca6da8b850c36c2f718d51c653e2f8f68b612f29b5c20d99f704b01a1952691 +SHA256 (aspell6-en-2017.01.22-0.tar.bz2) = 93c73fae3eab5ea3ca6db3cea8770715a820f1b7d6ea2b932dd66a17f8fd55e1 diff --git a/dar/.signature b/dar/.signature index f4bad02..90d8013 100644 --- a/dar/.signature +++ b/dar/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QfZPitrae51FDYsalpBneD9IuqgOUICoCUTl9fFYlA2gM9lgtNTeABouFwkINmpR6N9nq8sL601woY7TlB8oAA= -SHA256 (Pkgfile) = 6d7d67c3cbe5faefd481d07f1c2065902e2f1b9e946bc2b9beba92ee24cb4cf1 -SHA256 (.footprint) = 2af6749ff2039e80cd030416f336642d3a9a3c24c2d962fd398775e09014beee -SHA256 (dar-2.5.8.tar.gz) = 4f2968bb6f769ccfc4db880db4e3bd5596565b4674fa92000d2a17c7bdd4e825 +RWSE3ohX2g5d/Z/nxC0gUqNxpF4H2nB2QQSCB9eBOZLycF4GAnIZX17mhP6MV45ezjwSIPQJ8lAtvgsO/lSzymDZMq2vU+nMAQI= +SHA256 (Pkgfile) = 69782f9bc877448ce7ffb68d30b3a2fb80020e01a4ea5df29e2093af325ae214 +SHA256 (.footprint) = db05e35dda7f4073c5fc77502d335f0f69f32e2dfcb788a3a36528de6766dbf3 +SHA256 (dar-2.5.9.tar.gz) = 6973614afa970d095719bf43d91855c450d0fa5dcf0a45b580055625500ba92e SHA256 (darrc) = 7464ac1d22ebec6c950fd23b8f133d99911c2b3df25be770e6aa5f8af723e26c diff --git a/nfs-utils/.signature b/nfs-utils/.signature index 0020537..cb455ae 100644 --- a/nfs-utils/.signature +++ b/nfs-utils/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ajyIPyqFZf54U4XQkvkcPWS0zS1jgNZSlx3fnIOmVCr6gcufzoaoUwhoh7KVzsoc3/zZdjjqBOmGzLOgeFtjAQ= -SHA256 (Pkgfile) = 072097198c6fbf6e563b436a6714be74e59fdd176cc66e578989b834703d91c0 -SHA256 (.footprint) = 45f628b16aaf8de5d0f13983aa6102211758a25fe777570f67e300693bfa4862 -SHA256 (nfs-utils-1.3.4.tar.bz2) = c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590 +RWSE3ohX2g5d/R3FHmg5Xwgjvaf0hormsvOCMztbM7+b1JktbaLN3bNJfG5JcElnmSHg0au6Ew22a5Zq8XMc/WigW53hMbY9mg4= +SHA256 (Pkgfile) = 59c519b7e03b8fb983492f0c4166792e81e126426b44c3dc5f84e5f98968efb0 +SHA256 (.footprint) = 1ac58010bfc9c02a6dea6aaa174c7fd358ba5158e4591a636121f61a5ddc0f7a +SHA256 (nfs-utils-2.1.1.tar.bz2) = 0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09 SHA256 (exports) = 9556615724e66fbe6e7a2bfd740db4c5399a6abafab8cce868975f6926548eec SHA256 (idmapd.conf) = 2759ea36eff3397c39b534ee34752e02f60976160d66570ae19dbbbb5c00ee53 SHA256 (nfs) = 3ab2824ff5cbe4498faf6cbbbea19793d96bd80c48b9c18c0939938b18ab0217

1 0

ports/opt (3.3): nfs-utils: update to 2.1.1
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 21baf0ee9fb2e7dc9712349c391dd0deb3250608 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:48:28 2017 +0100 nfs-utils: update to 2.1.1 diff --git a/nfs-utils/.footprint b/nfs-utils/.footprint index 6341362..7a27828 100644 --- a/nfs-utils/.footprint +++ b/nfs-utils/.footprint @@ -2,6 +2,7 @@ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/exports drwxr-xr-x root/root etc/exports.d/ -rw-r--r-- root/root etc/idmapd.conf +-rw-r--r-- root/root etc/nfs.conf -rw-r--r-- root/root etc/nfsmount.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/nfs @@ -39,8 +40,10 @@ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/exports.5.gz -rw-r--r-- root/root usr/share/man/man5/nfs.5.gz +-rw-r--r-- root/root usr/share/man/man5/nfs.conf.5.gz -rw-r--r-- root/root usr/share/man/man5/nfsmount.conf.5.gz drwxr-xr-x root/root usr/share/man/man7/ +-rw-r--r-- root/root usr/share/man/man7/nfs.systemd.7.gz -rw-r--r-- root/root usr/share/man/man7/nfsd.7.gz drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/blkmapd.8.gz @@ -75,4 +78,3 @@ drwx------ nobody/root var/lib/nfs/sm.bak/ drwx------ nobody/root var/lib/nfs/sm/ -rw------- nobody/root var/lib/nfs/state (EMPTY) drwxr-xr-x root/root var/lib/nfs/v4recovery/ --rw-r--r-- root/root var/lib/nfs/xtab (EMPTY) diff --git a/nfs-utils/.md5sum b/nfs-utils/.md5sum index 787a34d..cedb05a 100644 --- a/nfs-utils/.md5sum +++ b/nfs-utils/.md5sum @@ -1,7 +1,7 @@ c5ccf58f5f9f57aba75c8b72219eb6e6 exports 167ea3a16eb6f33b3642e920147bb265 idmapd.conf 49054b601b8277e86cafae36911cba46 nfs -2fabdadb8ff415a1eafcfb12ab1bf781 nfs-utils-1.3.4.tar.bz2 +1157abcfaa8670f990f408cf280426b4 nfs-utils-2.1.1.tar.bz2 6981419f23fbe0a0ef3b44eb2efac8fd nfsclient eb907aa29567365aef517b7948dc9aa0 nfsserver dfe1c59368b5846316ebcf3b32666c54 rpc.idmapd diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile index d40b448..1f6e400 100644 --- a/nfs-utils/Pkgfile +++ b/nfs-utils/Pkgfile @@ -4,7 +4,7 @@ # Depends on: util-linux eudev libcap rpcbind libnfsidmap libevent keyutils sqlite3 name=nfs-utils -version=1.3.4 +version=2.1.1 release=1 source=(http://downloads.sourceforge.net/project/nfs/$name/$version/$name-$… exports idmapd.conf @@ -29,7 +29,7 @@ build () { install -m 644 $SRC/{exports,idmapd.conf} $PKG/etc/ install -m 644 utils/mount/nfsmount.conf $PKG/etc/ - sed -i '/Defaultvers=/s/^# *//' $PKG/etc/nfsmount.conf + install -m 644 nfs.conf $PKG/etc/ install -d $PKG/var/lib/nfs/{rpc_pipefs,v4recovery,nfsdcltrack} install -d $PKG/etc/exports.d diff --git a/nfs-utils/nfssvc_setfds.patch b/nfs-utils/nfssvc_setfds.patch deleted file mode 100644 index e9604f1..0000000 --- a/nfs-utils/nfssvc_setfds.patch +++ /dev/null @@ -1,57 +0,0 @@ -On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote: -> Probably stopped working with "rpc.nfsd: Squelch DNS errors when -> using --host option". -> -> getaddrinfo(3) returns a list of addresses, some of which are -> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even -> on kernels which do not support IPv6, there may be at least one -> IPv6 address in the list. -> -> nfssvc_setfds() then loops over this list. The error handling -> in nfssvc_setfds() causes the loop to exit if the socket(2) -> call fails. It should "continue" if the error is EAFNOSUPPORT. -> In fact, that xlog notice can also be removed. -> -> I'm traveling this week. Is this enough for you to generate a -> fix? - -Yes, that works: - ---- -From: Christoph Hellwig <hch(a)lst.de> -Subject: nfsd: ignore unsupported address types in nfssvc_setfds - -Just continue and try a different record returned from getaddrinfo -if the kernel does not support an address family. This fixes nfsd -startup on kernels without IPv6 support. - -Suggested-by: Chuck Lever <chuck.lever(a)oracle.com> -Signed-off-by: Christoph Hellwig <hch(a)lst.de> - -diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c -index a2b11d8..fc11d23 100644 ---- a/utils/nfsd/nfssvc.c -+++ b/utils/nfsd/nfssvc.c -@@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port) - sockfd = socket(addr->ai_family, addr->ai_socktype, - addr->ai_protocol); - if (sockfd < 0) { -- if (errno == EAFNOSUPPORT) -- xlog(L_NOTICE, "address family %s not " -- "supported by protocol %s", -- family, proto); -- else -+ if (errno != EAFNOSUPPORT) { - xlog(L_ERROR, "unable to create %s %s socket: " - "errno %d (%m)", family, proto, errno); -- rc = errno; -- goto error; -+ rc = errno; -+ goto error; -+ } -+ addr = addr->ai_next; -+ continue; - } - #ifdef IPV6_SUPPORTED - if (addr->ai_family == AF_INET6 && ---

1 0

ports/opt (3.3): dar: update to 2.5.9
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit f6065493fba24dfcb68504b248251dd14f0cbe2e Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:46:23 2017 +0100 dar: update to 2.5.9 diff --git a/dar/.footprint b/dar/.footprint index 433332d..5b00fbb 100644 --- a/dar/.footprint +++ b/dar/.footprint @@ -97,9 +97,9 @@ drwxr-xr-x root/root usr/include/dar/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libdar64.a -rwxr-xr-x root/root usr/lib/libdar64.la -lrwxrwxrwx root/root usr/lib/libdar64.so -> libdar64.so.5000.8.4 -lrwxrwxrwx root/root usr/lib/libdar64.so.5000 -> libdar64.so.5000.8.4 --rwxr-xr-x root/root usr/lib/libdar64.so.5000.8.4 +lrwxrwxrwx root/root usr/lib/libdar64.so -> libdar64.so.5000.9.0 +lrwxrwxrwx root/root usr/lib/libdar64.so.5000 -> libdar64.so.5000.9.0 +-rwxr-xr-x root/root usr/lib/libdar64.so.5000.9.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libdar64.pc drwxr-xr-x root/root usr/share/ diff --git a/dar/.md5sum b/dar/.md5sum index 164b1c6..32d496e 100644 --- a/dar/.md5sum +++ b/dar/.md5sum @@ -1,2 +1,2 @@ -7fd88ae795e05e68b012e24694cff220 dar-2.5.8.tar.gz +6448517104fc3afda1e245307a6905a9 dar-2.5.9.tar.gz f453ca0df13e48ca72095f9ef71529c9 darrc diff --git a/dar/Pkgfile b/dar/Pkgfile index 82a3f09..efbf732 100644 --- a/dar/Pkgfile +++ b/dar/Pkgfile @@ -4,7 +4,7 @@ # Depends on: attr, lzo, zlib, bzip2, xz, libgcrypt name=dar -version=2.5.8 +version=2.5.9 release=1 source=(http://downloads.sourceforge.net/project/dar/dar/$version/$name-$ve… \ darrc)

1 0