February 2021 - CRUX - lists.crux.nu

Thoughts on making Crux more `alive' and `attractive'.
by Hans Bezemer 16 Mar '24

16 Mar '24

Dear fellow Crux-users, Recently there was some discussion in the IRC channel about how to make crux more `alive' and `attractive'. Being a relative new user I would like to share my thoughts. First of all, Crux has a lot of good things to offer: It's simplicity and script based orientation are unique. The package management through ports is simple but effective. Also there is some good documentation (but may be improved). And (last but not least) there's a friendly and helpful community. When I started out with Crux it took a while before I had everything up and running. Although I had used Arch for some while, went through the LFS-book twice, there was still a lot of ground to make up before I had my laptop configured the same way when using Arch. I had to hone several skills: building my own kernel, creating some udev rules, setting up networking using wpa_supplicant only (I know nm is at hand) and so on. Although the somewhat steep learning curve belongs to the way Crux works, there can be some minor improvements made which may help newcomers finding their way around more easily. First of, maybe Crux can become a rolling distro, with a new iso every month / 2 months. In practice it already seems to be. There are unofficial updated iso's and once you got everything installed everything can be kept up-to-date. As a new user I used the official iso (which is good practice I think), but after building the kernel, running a sysup was a bit of a showstopper. Almost all of the packages needed to be updated. When using the more recent unofficial iso, this is obvious not the case. Secondly, there is a lot of good documentation -especially on the Crux specific parts- but having two sources (Handbook and wiki) is somewhat confusing sometimes. Maybe merge the handbook into the wiki with an entry for installing Crux (like the installation guide on the Arch wiki)? The guide will walk the new user through a basic installation with links to several options (e.q. encrypting harddrive, using different bootloaders). At the end of the guide there can be some links to other entry (how to install packages, e.d.). It would be helpful if there is a basic `how to compile your own kernel'-tutorial. Something along the lines of `make defconfig', enabling audio and video support, untick some of the wlan firmware drivers, etc. Copying the bzImage and System.map and updating the boatloader. Lastly a guide on creating and maintaining your own repo (which is part of the charm of using Crux I think), would be very helpful. Beerman / Tim's guide would be a great starting point IMHO. https://gist.github.com/TimB87/6cf010c0c10d67faf98ae03e62ffb029 As for the documentation, for the most part it's a matter of reorganizing. Maybe a `further reading' section can be added at the end of an entry, with links to useful sources like the Arch wiki / offical kernel documentation and so on. The goal here is to keep it simple (of course ;-)) I'll be happy to help out with (re)writing some parts. What do you think? Would this be helpful? Or are there other / better options? Kind regards, Hans

9 13

ports/contrib (3.6): [notify] libplacebo: make libepoxy a hard dependency
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit c0f449ba196a4ecf380cc712c59d2948114daf2b Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 28 00:42:49 2021 +1100 [notify] libplacebo: make libepoxy a hard dependency diff --git a/libplacebo/.signature b/libplacebo/.signature index 3e6b248f4..c5b1810d2 100644 --- a/libplacebo/.signature +++ b/libplacebo/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33WGdTP4hSv9JV0qhq35Th1DoRIgQew3r41vBvXkQ5NfnYqmuWYvfYn9m72iCWkPZBYxcZUWY9nR+7T41z2tuQU= -SHA256 (Pkgfile) = 77787e8a3f3605ab64bf0b7ab90b29932c1863ab6a02534f0e039931d5d077ab +RWSagIOpLGJF37t492dOeorGwfHSaPCOhE26l9eIb2QIAZLfdRiIUaWkz7J79xNqNCitQqqjzLu8WY/H5InVw0wsC7xaD2I60gE= +SHA256 (Pkgfile) = 69231183387fad8459b18230dc7490722ceca6994e83f196c902c82d653f1c51 SHA256 (.footprint) = be55ff032b8288423bd9ba9dce2223623c29118eb688a8c0e669bb029c01dc35 SHA256 (libplacebo-v3.104.0.tar.gz) = 55559d77d893d3f13f0a15ff6ff3b462451f8996bd3e0b8b6794a65502341aaf diff --git a/libplacebo/Pkgfile b/libplacebo/Pkgfile index 3b0568e65..911c210db 100644 --- a/libplacebo/Pkgfile +++ b/libplacebo/Pkgfile @@ -1,8 +1,7 @@ # Description: Reusable library for GPU-accelerated video/image rendering primitives # URL: https://github.com/haasn/libplacebo # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: lcms2 meson shaderc vulkan-loader python3-mako -# Optional: libepoxy +# Depends on: lcms2 libepoxy shaderc vulkan-loader name=libplacebo version=3.104.0

1 0

ports/contrib (3.6): [notify] libplacebo: 2.72.2 -> 3.104.0 API and soname change, patch/rebuild dependent ports: mpv is patched
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 7aa4ae55f8cb5519b53561332f6a8fc76d9dbe79 Author: Danny Rawlins <contact(a)romster.me> Date: Sat Feb 27 23:39:03 2021 +1100 [notify] libplacebo: 2.72.2 -> 3.104.0 API and soname change, patch/rebuild dependent ports: mpv is patched diff --git a/libplacebo/.footprint b/libplacebo/.footprint index 45bae3cb1..d498e2f0a 100644 --- a/libplacebo/.footprint +++ b/libplacebo/.footprint @@ -10,6 +10,7 @@ drwxr-xr-x root/root usr/include/libplacebo/ -rw-r--r-- root/root usr/include/libplacebo/dummy.h -rw-r--r-- root/root usr/include/libplacebo/filters.h -rw-r--r-- root/root usr/include/libplacebo/gpu.h +-rw-r--r-- root/root usr/include/libplacebo/opengl.h -rw-r--r-- root/root usr/include/libplacebo/renderer.h -rw-r--r-- root/root usr/include/libplacebo/shaders.h drwxr-xr-x root/root usr/include/libplacebo/shaders/ @@ -19,10 +20,12 @@ drwxr-xr-x root/root usr/include/libplacebo/shaders/ -rw-r--r-- root/root usr/include/libplacebo/shaders/sampling.h -rw-r--r-- root/root usr/include/libplacebo/swapchain.h drwxr-xr-x root/root usr/include/libplacebo/utils/ +-rw-r--r-- root/root usr/include/libplacebo/utils/libav.h +-rw-r--r-- root/root usr/include/libplacebo/utils/libav_internal.h -rw-r--r-- root/root usr/include/libplacebo/utils/upload.h -rw-r--r-- root/root usr/include/libplacebo/vulkan.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libplacebo.so -> libplacebo.so.72 --rwxr-xr-x root/root usr/lib/libplacebo.so.72 +lrwxrwxrwx root/root usr/lib/libplacebo.so -> libplacebo.so.104 +-rwxr-xr-x root/root usr/lib/libplacebo.so.104 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libplacebo.pc diff --git a/libplacebo/.signature b/libplacebo/.signature index bfbf26075..3e6b248f4 100644 --- a/libplacebo/.signature +++ b/libplacebo/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38m8ZLbCAfiDnAj1y2h7m6lPZfenxvp+y7R+kST4YShyjcxQTGV/NiCq6PRrR725j95gywPKbiNHMetdS8u7Twc= -SHA256 (Pkgfile) = 1c59477e2bd73e0175e236d0000b792a497a862544dcb86827f92430a308a6b6 -SHA256 (.footprint) = 4bb8793710d63c580ba4d5f55a4d3137ef2fe98f80af4739176dfdf0483874c2 -SHA256 (libplacebo-v2.72.2.tar.gz) = 5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979 +RWSagIOpLGJF33WGdTP4hSv9JV0qhq35Th1DoRIgQew3r41vBvXkQ5NfnYqmuWYvfYn9m72iCWkPZBYxcZUWY9nR+7T41z2tuQU= +SHA256 (Pkgfile) = 77787e8a3f3605ab64bf0b7ab90b29932c1863ab6a02534f0e039931d5d077ab +SHA256 (.footprint) = be55ff032b8288423bd9ba9dce2223623c29118eb688a8c0e669bb029c01dc35 +SHA256 (libplacebo-v3.104.0.tar.gz) = 55559d77d893d3f13f0a15ff6ff3b462451f8996bd3e0b8b6794a65502341aaf diff --git a/libplacebo/Pkgfile b/libplacebo/Pkgfile index 9dda71294..3b0568e65 100644 --- a/libplacebo/Pkgfile +++ b/libplacebo/Pkgfile @@ -5,7 +5,7 @@ # Optional: libepoxy name=libplacebo -version=2.72.2 +version=3.104.0 release=1 source=(https://code.videolan.org/videolan/libplacebo/-/archive/v$version/$…

1 0

ports/opt (3.6): [notify] python: patch 3 security issues: CVE-2019-20907, CVE-2020-26116, and CVE-2021-3177
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 2e2843fede4d0086e93c9b5434b09c44318882c4 Author: Danny Rawlins <contact(a)romster.me> Date: Sat Feb 27 20:55:11 2021 +1100 [notify] python: patch 3 security issues: CVE-2019-20907, CVE-2020-26116, and CVE-2021-3177 diff --git a/python/.signature b/python/.signature index 97bd0a258..71c6b500a 100644 --- a/python/.signature +++ b/python/.signature @@ -1,6 +1,9 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a3K/I66yw0JReBFnr+BMNq9XxrSNdzGhoOvHro1VE9PpDKZ5W+6/jMv+GOb43/y/V28Qbhn8Bm96xWQJlj9AQs= -SHA256 (Pkgfile) = 0bdf8c849eb717a9fb4abaa0f71cf5f2d8dfa5a896740b594febf511f961681d +RWSE3ohX2g5d/SLClB71/t4Fok+TXEN5kW8zj7yJYxYSakqmWJY0a9ymGkcO7fRu33meHIdoa13OYWhUjNZS+zlEoMZChuQqIAc= +SHA256 (Pkgfile) = 4a021c82c4cfa9716295e41571af6f5aea29c8b40ec2003a65e9278833b43ef1 SHA256 (.footprint) = 45f6aea32375cc9cd313a77c570abcd08cbb4a9612d868eedf1e52d06ee062b4 SHA256 (Python-2.7.18.tar.xz) = b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 SHA256 (pyconfig.h) = 081426cb9524c2e156a71bb035c25a67e44d389afc6f7e091bcf86a7f4e2002f +SHA256 (CVE-2019-20907.patch) = 59f8039b26f6a4613847fb4b30a1da612b4c0d5ed3c1cc92f498ebd71a734b04 +SHA256 (CVE-2020-26116.patch) = 290f34ab3e6cdd99fff00ab7b1e01d3e9c4acc36ecb87b7db76207c4cdaf692a +SHA256 (CVE-2021-3177.patch) = db7835b3fa3a2897e531a219127a02bbc902e31f3363f27a456a45ddbb4eca31 diff --git a/python/CVE-2019-20907.patch b/python/CVE-2019-20907.patch new file mode 100644 index 000000000..64da85855 --- /dev/null +++ b/python/CVE-2019-20907.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rishi <rishi_devan(a)mail.com> +Date: Wed, 15 Jul 2020 13:51:00 +0200 +Subject: [PATCH] 00351-cve-2019-20907-fix-infinite-loop-in-tarfile.patch + +00351 # +Avoid infinite loop when reading specially crafted TAR files using the tarfile module +(CVE-2019-20907). +See: https://bugs.python.org/issue39017 +--- + Lib/tarfile.py | 2 ++ + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index adf91d53823..574a6bb279d 100644 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -1400,6 +1400,8 @@ class TarInfo(object): + + length, keyword = match.groups() + length = int(length) ++ if length == 0: ++ raise InvalidHeaderError("invalid header") + value = buf[match.end(2) + 1:match.start(1) + length - 1] + + keyword = keyword.decode("utf8") diff --git a/python/CVE-2020-26116.patch b/python/CVE-2020-26116.patch new file mode 100644 index 000000000..c13655e2e --- /dev/null +++ b/python/CVE-2020-26116.patch @@ -0,0 +1,113 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AMIR <31338382+amiremohamadi(a)users.noreply.github.com> +Date: Sun, 19 Jul 2020 00:46:10 +0430 +Subject: [PATCH] + 00354-cve-2020-26116-http-request-method-crlf-injection-in-httplib.patch + +00354 # +Reject control chars in HTTP method in httplib.putrequest to prevent +HTTP header injection + +Backported from Python 3.5-3.10 (and adjusted for py2's single-module httplib): +- https://bugs.python.org/issue39603 +- https://github.com/python/cpython/pull/18485 (3.10) +- https://github.com/python/cpython/pull/21946 (3.5) + +Co-authored-by: AMIR <31338382+amiremohamadi(a)users.noreply.github.com> +--- + Lib/httplib.py | 16 +++++++++++++ + Lib/test/test_httplib.py | 23 +++++++++++++++++++ + .../2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst | 2 ++ + 3 files changed, 41 insertions(+) + create mode 100644 Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst + +diff --git a/Lib/httplib.py b/Lib/httplib.py +index fcc4152aaf2..a63677477d5 100644 +--- a/Lib/httplib.py ++++ b/Lib/httplib.py +@@ -257,6 +257,10 @@ _contains_disallowed_url_pchar_re = re.compile('[\x00-\x20\x7f-\xff]') + # _is_allowed_url_pchars_re = re.compile(r"^[/!$&'()*+,;=:@%a-zA-Z0-9._~-]+$") + # We are more lenient for assumed real world compatibility purposes. + ++# These characters are not allowed within HTTP method names ++# to prevent http header injection. ++_contains_disallowed_method_pchar_re = re.compile('[\x00-\x1f]') ++ + # We always set the Content-Length header for these methods because some + # servers will otherwise respond with a 411 + _METHODS_EXPECTING_BODY = {'PATCH', 'POST', 'PUT'} +@@ -935,6 +939,8 @@ class HTTPConnection: + else: + raise CannotSendRequest() + ++ self._validate_method(method) ++ + # Save the method for use later in the response phase + self._method = method + +@@ -1020,6 +1026,16 @@ class HTTPConnection: + # On Python 2, request is already encoded (default) + return request + ++ def _validate_method(self, method): ++ """Validate a method name for putrequest.""" ++ # prevent http header injection ++ match = _contains_disallowed_method_pchar_re.search(method) ++ if match: ++ raise ValueError( ++ "method can't contain control characters. %r " ++ "(found at least %r)" ++ % (method, match.group())) ++ + def _validate_path(self, url): + """Validate a url for putrequest.""" + # Prevent CVE-2019-9740. +diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py +index d8a57f73530..e295bb796ec 100644 +--- a/Lib/test/test_httplib.py ++++ b/Lib/test/test_httplib.py +@@ -385,6 +385,28 @@ class HeaderTests(TestCase): + conn.putheader(name, value) + + ++class HttpMethodTests(TestCase): ++ def test_invalid_method_names(self): ++ methods = ( ++ 'GET\r', ++ 'POST\n', ++ 'PUT\n\r', ++ 'POST\nValue', ++ 'POST\nHOST:abc', ++ 'GET\nrHost:abc\n', ++ 'POST\rRemainder:\r', ++ 'GET\rHOST:\n', ++ '\nPUT' ++ ) ++ ++ for method in methods: ++ with self.assertRaisesRegexp( ++ ValueError, "method can't contain control characters"): ++ conn = httplib.HTTPConnection('example.com') ++ conn.sock = FakeSocket(None) ++ conn.request(method=method, url="/") ++ ++ + class BasicTest(TestCase): + def test_status_lines(self): + # Test HTTP status lines +@@ -1010,6 +1032,7 @@ class TunnelTests(TestCase): + @test_support.reap_threads + def test_main(verbose=None): + test_support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest, ++ HttpMethodTests, + HTTPTest, HTTPSTest, SourceAddressTest, + TunnelTests) + +diff --git a/Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst b/Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst +new file mode 100644 +index 00000000000..990affc3edd +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst +@@ -0,0 +1,2 @@ ++Prevent http header injection by rejecting control characters in ++http.client.putrequest(...). diff --git a/python/CVE-2021-3177.patch b/python/CVE-2021-3177.patch new file mode 100644 index 000000000..09be782c0 --- /dev/null +++ b/python/CVE-2021-3177.patch @@ -0,0 +1,179 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Petr Viktorin <pviktori(a)redhat.com> +Date: Mon, 1 Feb 2021 19:29:17 +0100 +Subject: [PATCH] 00357-CVE-2021-3177.patch + +00357 # +CVE-2021-3177: Replace snprintf with Python unicode formatting in ctypes param reprs + +Backport of Python3 commit 916610ef90a0d0761f08747f7b0905541f0977c7: +https://bugs.python.org/issue42938 +https://github.com/python/cpython/pull/24239 +--- + Lib/ctypes/test/test_parameters.py | 43 ++++++++++++++++++++ + Modules/_ctypes/callproc.c | 65 +++++++++++++++++------------- + 2 files changed, 80 insertions(+), 28 deletions(-) + +diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py +index 23c1b6e2259..77300d71ae1 100644 +--- a/Lib/ctypes/test/test_parameters.py ++++ b/Lib/ctypes/test/test_parameters.py +@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestCase): + with self.assertRaises(ZeroDivisionError): + WorseStruct().__setstate__({}, b'foo') + ++ def test_parameter_repr(self): ++ from ctypes import ( ++ c_bool, ++ c_char, ++ c_wchar, ++ c_byte, ++ c_ubyte, ++ c_short, ++ c_ushort, ++ c_int, ++ c_uint, ++ c_long, ++ c_ulong, ++ c_longlong, ++ c_ulonglong, ++ c_float, ++ c_double, ++ c_longdouble, ++ c_char_p, ++ c_wchar_p, ++ c_void_p, ++ ) ++ self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$") ++ self.assertEqual(repr(c_char.from_param('a')), "<cparam 'c' ('a')>") ++ self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$") ++ self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>") ++ self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>") ++ self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>") ++ self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>") ++ self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^<cparam '[li]' $20000$>$") ++ self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' $20000$>$") ++ self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^<cparam '[li]' $20000$>$") ++ self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' $20000$>$") ++ self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' $20000$>$") ++ self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' $20000$>$") ++ self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>") ++ self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>") ++ self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>") ++ self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' $1.5$|'g' at 0x[A-Fa-f0-9]+)>$") ++ self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' $0x[A-Fa-f0-9]+$>$") ++ self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' $0x[A-Fa-f0-9]+$>$") ++ self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' $0x0*12$>$") ++ + ################################################################ + + if __name__ == '__main__': +diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c +index 066fefc0cca..5cc3c4cf685 100644 +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -460,50 +460,62 @@ PyCArg_dealloc(PyCArgObject *self) + static PyObject * + PyCArg_repr(PyCArgObject *self) + { +- char buffer[256]; + switch(self->tag) { + case 'b': + case 'B': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.b); +- break; + case 'h': + case 'H': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.h); +- break; + case 'i': + case 'I': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.i); +- break; + case 'l': + case 'L': +- sprintf(buffer, "<cparam '%c' (%ld)>", ++ return PyString_FromFormat("<cparam '%c' (%ld)>", + self->tag, self->value.l); +- break; + + #ifdef HAVE_LONG_LONG + case 'q': + case 'Q': +- sprintf(buffer, +- "<cparam '%c' (%" PY_FORMAT_LONG_LONG "d)>", ++ return PyString_FromFormat("<cparam '%c' (%lld)>", + self->tag, self->value.q); +- break; + #endif + case 'd': +- sprintf(buffer, "<cparam '%c' (%f)>", +- self->tag, self->value.d); +- break; +- case 'f': +- sprintf(buffer, "<cparam '%c' (%f)>", +- self->tag, self->value.f); +- break; +- ++ case 'f': { ++ PyObject *s = PyString_FromFormat("<cparam '%c' (", self->tag); ++ if (s == NULL) { ++ return NULL; ++ } ++ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); ++ if (f == NULL) { ++ Py_DECREF(s); ++ return NULL; ++ } ++ PyObject *r = PyObject_Repr(f); ++ Py_DECREF(f); ++ if (r == NULL) { ++ Py_DECREF(s); ++ return NULL; ++ } ++ PyString_ConcatAndDel(&s, r); ++ if (s == NULL) { ++ return NULL; ++ } ++ r = PyString_FromString(")>"); ++ if (r == NULL) { ++ Py_DECREF(s); ++ return NULL; ++ } ++ PyString_ConcatAndDel(&s, r); ++ return s; ++ } + case 'c': +- sprintf(buffer, "<cparam '%c' (%c)>", ++ return PyString_FromFormat("<cparam '%c' ('%c')>", + self->tag, self->value.c); +- break; + + /* Hm, are these 'z' and 'Z' codes useful at all? + Shouldn't they be replaced by the functionality of c_string +@@ -512,16 +524,13 @@ PyCArg_repr(PyCArgObject *self) + case 'z': + case 'Z': + case 'P': +- sprintf(buffer, "<cparam '%c' (%p)>", ++ return PyUnicode_FromFormat("<cparam '%c' (%p)>", + self->tag, self->value.p); +- break; + + default: +- sprintf(buffer, "<cparam '%c' at %p>", +- self->tag, self); +- break; ++ return PyString_FromFormat("<cparam '%c' at %p>", ++ (unsigned char)self->tag, (void *)self); + } +- return PyString_FromString(buffer); + } + + static PyMemberDef PyCArgType_members[] = { diff --git a/python/Pkgfile b/python/Pkgfile index 558029c06..6618bbf6e 100644 --- a/python/Pkgfile +++ b/python/Pkgfile @@ -5,13 +5,20 @@ name=python version=2.7.18 -release=2 +release=3 source=(https://www.python.org/ftp/$name/${version::6}/Python-$version.tar.… \ - pyconfig.h) + pyconfig.h \ + CVE-2019-20907.patch \ + CVE-2020-26116.patch \ + CVE-2021-3177.patch) build () { cd Python-$version + patch -p1 -i $SRC/CVE-2019-20907.patch + patch -p1 -i $SRC/CVE-2020-26116.patch + patch -p1 -i $SRC/CVE-2021-3177.patch + # remove 2to3, we use the one from python3 rm -r Lib/lib2to3

1 0

ports/contrib (3.6): [notify] docker: updated to version 20.10.3, fixes for CVE-2021-21284 and CVE-2021-21285
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 086c608a230e6aa05d79f67293e68d92c6d9b949 Author: Matt Housh <jaeger(a)crux.ninja> Date: Fri Feb 26 19:30:29 2021 -0600 [notify] docker: updated to version 20.10.3, fixes for CVE-2021-21284 and CVE-2021-21285 diff --git a/docker/.signature b/docker/.signature index b783c9225..01d741b54 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,10 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3w/j2/gS5+uMMqdut9gFdF5gKMhUKkW0r5tK7Hu/jf8ifj1wXsqF6T/6Y/SaLKbmhaYMW0XK6xD2w+Yu1ENhzQc= -SHA256 (Pkgfile) = 552b0ec3b599719cf42496f4ea969ebc0ef61e3a8b6e76ab2623ea1b55a1b14d +RWSagIOpLGJF35mHgpC8+MumaKm8oKmpQSbAIrOPRPSApwrZSnNFyZDUCo/n4hJsQL62n2uUHtdIzCR3PWqrPcadAuRZ0IllogE= +SHA256 (Pkgfile) = ceba689b70615cb3b5d7f827a2fb08fd334fae2fc0b5d30c6c5e10a3a012be68 SHA256 (.footprint) = ef891bf504df63f9b4413ecccd3a0ce6e4a71b1a42f22e9bb9c36a6a87a2c3fe -SHA256 (moby-20.10.2.tar.gz) = dc4818f0cba2ded2f6f7420a1fda027ddbf6c6c9fe319f84d1311bfe610447ca -SHA256 (cli-20.10.2.tar.gz) = a663f54a158c6b2b23b253b14bf0de56ff035750098e760319de1edb7f4ae76d -SHA256 (docker-man-pages-20.10.2.tar.xz) = ac21f22c2b75d83bba8b662f177d26bb00d3bf7d15160560cd215a127d85ff49 +SHA256 (moby-20.10.3.tar.gz) = 62bb03f197b8a064da568e62639f6834f91c8cfc9273126a978847becc214c31 +SHA256 (cli-20.10.3.tar.gz) = aafba3765d9013cb75810b4f4334525f0e74e82ef073b4df9e8b524f3794e60a +SHA256 (docker-man-pages-20.10.3.tar.xz) = 0beb0fb4ed1a11c6c3e334421df20abcbab0748356aed7722d4265f995200bb4 SHA256 (libnetwork-fa125a3.tar.xz) = 10b51ec4c7048369b92a4f7992ab1a559ba053feb32da6bc69bd69d089c361c2 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e diff --git a/docker/Pkgfile b/docker/Pkgfile index 1a49811cd..4e898cb3a 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -6,7 +6,7 @@ # LIBNETWORK_COMMIT:=fa125a3512ee0f6187721c88582bf8c4378bd4d7 name=docker -version=20.10.2 +version=20.10.3 release=1 source=(https://github.com/moby/moby/archive/v${version}/moby-${version}.ta… \ https://github.com/docker/cli/archive/v${version}/cli-${version}.tar.gz \

1 0

ports/contrib (3.6): [notify] pipewire: exchanged default dependency from alsa-lib to alsa-utils; added a more informative README in markdown format
by crux＠crux.nu 21 Feb '21

21 Feb '21

commit f8f7781a9433748c203598b063a898a3e556e535 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 21 16:16:23 2021 +0000 [notify] pipewire: exchanged default dependency from alsa-lib to alsa-utils; added a more informative README in markdown format diff --git a/pipewire/.signature b/pipewire/.signature index 9b51523ce..2a439198b 100644 --- a/pipewire/.signature +++ b/pipewire/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30BOlCw3Q95AZcV9eSU18LiS9ch+0U1ujUzIg49fWoEvTPEmnQVSpglfnXeGlMkG21HBzQAVTjlBH35fhC2ZtgM= -SHA256 (Pkgfile) = f00e738790b81d6af6358acef87c0874e5d84d07acbe59382a9085c019df4bae +RWSagIOpLGJF38k2F9E2wrdxdTcKERCMA0eN390WIYqaXseWjqqGjv+HePvjlujaSd0D2lvivf5+DUphI20Cc/6H3GJAQDOqSQ0= +SHA256 (Pkgfile) = e90ceba4565434dc812c1c86ba6deb186a0703821f368e7befb15c7be540a735 SHA256 (.footprint) = 7e74c211d0bec1a4c4157a1e1b0ea8d1ef37a17ed4c00eaebd01114c9bff6800 SHA256 (pipewire-0.3.22.tar.gz) = 5db2caf41af79cd9e343d07a3804c63b8b243c1d74e926181058e29771d4b691 diff --git a/pipewire/Pkgfile b/pipewire/Pkgfile index 446f76f30..73729b12f 100644 --- a/pipewire/Pkgfile +++ b/pipewire/Pkgfile @@ -1,7 +1,7 @@ # Description: Server and user space API to deal with multimedia pipelines # URL: https://pipewire.org # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: alsa-lib dbus fdk-aac ffmpeg glib gnutls lame libva libvpx libwebp x264 x265 +# Depends on: alsa-utils dbus fdk-aac ffmpeg glib gnutls lame libva libvpx libwebp x264 x265 # Optional: alsa-ucm-conf bluez gst-plugins-base jack pulseaudio libldac libopenaptx v4l2 vulkan-loader name=pipewire diff --git a/pipewire/README b/pipewire/README index 91b9e3db8..2adfdf924 100644 --- a/pipewire/README +++ b/pipewire/README @@ -1,2 +1,60 @@ -pipewire needs pulseaudio to be built with xorg-libxtst around to have the -pulseaudio portal available +contrib/pipewire how to +==================== + +# Intro +`pipewire` is a modern multimedia server. Quoting gentoo wiki, it's strenghts are: +> - Minimal latency capture/playback of audio and video +> - Real-time multimedia processing +> - Multi-process architecture allowing multimedia content sharing between applications +> - Seamless support for PulseAudio, JACK, ALSA, and GStreamer +> - applications sandboxing support with Flatpak + +Getting `pipewire` to run is relatively easy on `CRUX`. This is a simple guide and relies on further reading upon official and unofficial resources. + +This might also be considered a WIP entry. You can help by sharing your experiences and thoughts. + +# Prerequisites + - working kernel with alsa audio + - `opt/alsa-utils` will be installed by default as a dependency and needs to be configured by the user + - currently, pipewires default config makes use of `opt/alsa-ucm-conf`, consider installing that alongside the default dependency `opt/alsa-utils` + +## Optional prerequisites: + - pipewire needs pulseaudio to be built with xorg-libxtst around to have the pulseaudio portal available + - `prt-get depinst xorg-libxtst && prt-get update -fr pulseaudio` + - please look at `contrib/pipewire/Pkgfile` for further optional dependencies listed and rebuild the package after installing new optional dependencies + +# Running pipewire +`pipewire` will always leverage `alsa`, so you should configure that first. Use `alsactl store` to store those settings, and configure `/etc/rc.conf` to start `/etc/rc.d/alsa` by default. While you are in `rc.conf`, make sure you start `/etc/rc.d/dbus` too, if you haven't already. + +Resources: + - [Official ALSA wiki](https://alsa-project.org/wiki/Main_Page) + - [Gentoo wiki](https://wiki.gentoo.org/wiki/ALSA) + - [Arch wiki](https://wiki.archlinux.org/index.php/Advanced_Linux_Sound_Architectur… + +Currently, pipewires default config format might always change, so it is advised to keep an eye on `rejmerge` to keep your configs updated. +The default config can be modified in directly `/etc/pipewire`. The configuration of `/etc/pipewire` can be copied over to `$XDG_CONFIG_HOME/pipewire-media-session`, which should most likely point you to `$HOME/config/pipewire-media-session`. + +Normally, you wouldn't need to change anything to run `pipewire` as an a/v-server, so in the simplest setup it should suffice to run `/usr/bin/pipewire` from a users shell or script (for example I have this in my `i3` config: `exec "/usr/bin/pipewire"`), just make sure that whatever session you are running will be executed as a `dbus-user-session` too (for example from my `~/.xinitrc`: `exec dbus-run-session -- i3`) + +## Running pipewire-pulse as a pulseaudio-server +If you are a `pulseaudio`-user, make sure it won't autostart with your session. For `pipewire` to handle `pulse-clients`, you will need to run `/usr/bin/pipewire-pulse` as well. Verify that it is working with `pactl info` which should now report: `Server Name: PulseAudio (on PipeWire 0.3.22)`. Now you can use tools like `contrib/pavucontrol` or `contrib/ncpamixer` to control your typical sources and sink settings, ports like `opt/firefox-bin` and whatever else uses `pulseaudio` should work ootb for you too. + +## Running jack applications through pipewire +to be expanded + +# Further configuration and fine-tuning +To help configuring, consider reading through the following resources alongside the extensive comments in the default config: + - [Official pipewire wiki](https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/home) + - [Advanced Configuration notes by jasker5183 (pipewire dev)](https://gitlab.freedesktop.org/jasker5183/test/-/blob/master/Advanced…) + - [Arch wiki](https://wiki.archlinux.org/index.php/PipeWire) + - [Gentoo wiki](https://wiki.gentoo.org/wiki/PipeWire) + +# tl;dr +"I don't have any time to read up on stuff myself, tell me what I need to do right now to get this hot mess!" -some user + - install `prt-get depinst pipewire` + - optional: `prt-get depinst xorg-libxtst pulseaudio` et al + - execute while executing your X11/Wayland-Session: `/usr/bin/pipewire` + - optional: execute in addition to have pulseaudio-server support: `/usr/bin/pipewire-pulse` + +// vim:filetype=markdown +// End of file

1 0

ports/core (3.6): [notify] python: update to 3.9.2
by crux＠crux.nu 19 Feb '21

19 Feb '21

commit e9ca312087a9ccf856b2cae191ff34ce09e3ae9a Author: Juergen Daubert <jue(a)jue.li> Date: Fri Feb 19 18:12:17 2021 +0100 [notify] python: update to 3.9.2 includes two security fixes, see https://docs.python.org/release/3.9.2/whatsnew/changelog.html diff --git a/python3/.footprint b/python3/.footprint index 011413de..70df2269 100644 --- a/python3/.footprint +++ b/python3/.footprint @@ -2307,9 +2307,9 @@ drwxr-xr-x root/root usr/lib/python3.9/lib-dynload/ -rwxr-xr-x root/root usr/lib/python3.9/lib-dynload/zlib.cpython-39-x86_64-linux-gnu.so drwxr-xr-x root/root usr/lib/python3.9/lib2to3/ -rw-r--r-- root/root usr/lib/python3.9/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python3.9/lib2to3/Grammar3.9.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.9/lib2to3/Grammar3.9.2.final.0.pickle -rw-r--r-- root/root usr/lib/python3.9/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python3.9/lib2to3/PatternGrammar3.9.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.9/lib2to3/PatternGrammar3.9.2.final.0.pickle -rw-r--r-- root/root usr/lib/python3.9/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python3.9/lib2to3/__main__.py drwxr-xr-x root/root usr/lib/python3.9/lib2to3/__pycache__/ diff --git a/python3/.signature b/python3/.signature index 087359fe..0a27b045 100644 --- a/python3/.signature +++ b/python3/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqvI9T3P9P3YD+tlO/ouLg2NHxYZ44SviHvtWVe7OKQC44rtccYvRtknJVqBGIlOawWxrIYQnCP1xGYw2VY+P5As= -SHA256 (Pkgfile) = 5f51b9c194eac0172631a2ad1f766e9c410b13d6332abd034342414556219b12 -SHA256 (.footprint) = 535dae110556aa817ef99619926c296abbcf9c43bb0e3adde26571cb4b802f41 -SHA256 (Python-3.9.1.tar.xz) = 991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff +RWRJc1FUaeVeqjp52JIsLvp/ePIUGXU6U3YXQuji1c2//B7hIcGnt3u5NQXd9Fd8aJMq2zwHmT+LysRmZDU8a4m9JW+3olvCWQg= +SHA256 (Pkgfile) = a6f7f6e09eefbda27bb9f4c84d72fb3bcb75ab8223b39c4e568ef74439c96756 +SHA256 (.footprint) = 670f3ba509a38d9bc754a401cef42b3282c84b459f83d178a07715c4c9eeafe8 +SHA256 (Python-3.9.2.tar.xz) = 3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d +SHA256 (mpdecimal-2.5.1.patch) = 8eb389be1babe03a0231001dc16dd2d69a3ea0fbf6b8c976a580787e7ff1594c diff --git a/python3/Pkgfile b/python3/Pkgfile index 2484c6eb..39122566 100644 --- a/python3/Pkgfile +++ b/python3/Pkgfile @@ -1,16 +1,19 @@ # Description: Python interpreter, version 3. -# URL: https://www.python.org/ -# Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: bzip2 expat gdbm libffi libnsl libtirpc mpdecimal sqlite3 xz +# URL: https://www.python.org/ +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Depends on: bzip2 expat gdbm libffi libnsl libtirpc mpdecimal sqlite3 xz name=python3 -version=3.9.1 +version=3.9.2 release=1 -source=(https://www.python.org/ftp/python/${version%rc*}/Python-$version.tar.xz) +source=(https://www.python.org/ftp/python/${version%rc*}/Python-$version.tar.xz + mpdecimal-2.5.1.patch) build() { cd Python-$version + patch -p1 -i $SRC/mpdecimal-2.5.1.patch + # Ensure that we are using the system copy of various libraries rm -r Modules/expat rm -r Modules/_ctypes/{darwin,libffi}* diff --git a/python3/mpdecimal-2.5.1.patch b/python3/mpdecimal-2.5.1.patch new file mode 100644 index 00000000..47e427c6 --- /dev/null +++ b/python3/mpdecimal-2.5.1.patch @@ -0,0 +1,45 @@ +From dd436be488bdca2123d12d1e148d85cb6f98be5f Mon Sep 17 00:00:00 2001 +From: Stefan Krah <skrah(a)bytereef.org> +Date: Sun, 10 Jan 2021 16:35:48 +0100 +Subject: [PATCH] Portability fixes. + +--- + Modules/_decimal/_decimal.c | 4 ++-- + setup.py | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c +index 664d45a90481d..bbd540bc376e2 100644 +--- a/Modules/_decimal/_decimal.c ++++ b/Modules/_decimal/_decimal.c +@@ -3295,7 +3295,7 @@ dec_format(PyObject *dec, PyObject *args) + } + else { + size_t n = strlen(spec.dot); +- if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) { ++ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.dot[0]))) { + /* fix locale dependent non-ascii characters */ + dot = dotsep_as_utf8(spec.dot); + if (dot == NULL) { +@@ -3304,7 +3304,7 @@ dec_format(PyObject *dec, PyObject *args) + spec.dot = PyBytes_AS_STRING(dot); + } + n = strlen(spec.sep); +- if (n > 1 || (n == 1 && !isascii((uchar)spec.sep[0]))) { ++ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.sep[0]))) { + /* fix locale dependent non-ascii characters */ + sep = dotsep_as_utf8(spec.sep); + if (sep == NULL) { +diff --git a/setup.py b/setup.py +index ddc0bd067d4e4..c547a68664e8c 100644 +--- a/setup.py ++++ b/setup.py +@@ -2199,7 +2199,7 @@ def detect_decimal(self): + undef_macros = [] + if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): + include_dirs = [] +- libraries = [':libmpdec.so.2'] ++ libraries = ['mpdec'] + sources = ['_decimal/_decimal.c'] + depends = ['_decimal/docstrings.h'] + else:

1 0

ports/opt (3.6): [notify] php: security update to 7.4.15
by crux＠crux.nu 18 Feb '21

18 Feb '21

commit c21c1d9e5fce6f4b84f5f4554ff182fde7c0d124 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Feb 18 17:53:43 2021 +0100 [notify] php: security update to 7.4.15 diff --git a/mod_php/.signature b/mod_php/.signature index 04c8b38b9..2b4e34674 100644 --- a/mod_php/.signature +++ b/mod_php/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ewvFRiKsKMUNK3wpjNl/UZgSA5IgX2Nx0p9c8d3Op8n4T5rJB3uMXbpwxW5+7Y65ZrWjw/haGkX2Ce5t1Tgxg0= -SHA256 (Pkgfile) = e08ae79ef40e9f3e220ced8dc4e24001f93f15141e2f1d21f7327b0352d2d6c2 +RWSE3ohX2g5d/WeVL2SjSoGQiP/dG3JWhYTKwI/Mwgcrq9Sc3zZLDVcXktqF2Kacbe2pwnKNbf4vol1LY0E4g6lq45c/xJfX+Aw= +SHA256 (Pkgfile) = e5e29afa32aedba948f8b616c9d5e714a537b0d3173b660241d7bfd81fcbb5fd SHA256 (.footprint) = 431a1cd161b066612e0916398d648fbdb211d5fd502017fda989467c8a81f861 -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index 0a69816c4..38ca5bbec 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: apache libpcre2 name=mod_php -version=7.4.14 +version=7.4.15 release=1 source=(https://php.net/distributions/php-$version.tar.xz) diff --git a/php-fcgi/.signature b/php-fcgi/.signature index e7b16f711..2b96273bf 100644 --- a/php-fcgi/.signature +++ b/php-fcgi/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/U9C5vUEZEhKehEk5Kzn+tuISKAI9+nG6hJh2sMucH573mzDDI1WYa2X7qd4DBqIN3fRyKHaND3NV2mKKYrnCAQ= -SHA256 (Pkgfile) = 075acb557f93faf0c78e91790642321ded686e0a7de60d0d7c90ee8276f91157 +RWSE3ohX2g5d/RaYE+yl4Eqvua02likhXPPO2Kmo3b27u3GqgQ51/1wWG+czL2d/cIV7G0rJWLKTKWb41KQDzdlb27/2hz84Fw4= +SHA256 (Pkgfile) = e837971c83a6ba75d0e621b2e4a3ffb58945fa9df920ec34d0f35f83583e413b SHA256 (.footprint) = 073d817f449e60b58f4c904bd4ef54ddad9bd0ab946ee178956622bf76d5501b -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 SHA256 (php-fcgi) = 058feaf2d8ad8ed61a4191512eb2151b8ed87fd92ce469ee8bab1812c0cb6471 diff --git a/php-fcgi/Pkgfile b/php-fcgi/Pkgfile index f74a7efd0..933c2f369 100644 --- a/php-fcgi/Pkgfile +++ b/php-fcgi/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre2 libxml2 name=php-fcgi -version=7.4.14 +version=7.4.15 release=1 source=(https://php.net/distributions/php-$version.tar.xz php-fcgi) diff --git a/php-fpm/.signature b/php-fpm/.signature index ed64f33ef..c96de3c5a 100644 --- a/php-fpm/.signature +++ b/php-fpm/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XSSMNT2i3HdQl/2GJoMGpNZwDmJm6uvOfs83dVeEabWdKDV8hXDR7WBfXKALpuizCLf9NrtsWrT8I0NLdJbrAg= -SHA256 (Pkgfile) = 247739e27dbf8044d2ec974ce36ddfeb963cd3aa28cd1de1adc12f3d4774d746 +RWSE3ohX2g5d/er6YSNWtBt9qAbG5cBG8c1gALun50fdUPAi9uuR7xMSGrwGT9SE0q29cqM5qbeL13YwhdOinzYAj+bV/Cxj3AM= +SHA256 (Pkgfile) = ca6b8ed688002dfc30a59525522764511df31aa17cebf5973697685d9dcb0abf SHA256 (.footprint) = a26b7d8af42742c284dd40e96fb4c4d1ba451ac9bf4f714c8f12fb6975ffa5fe -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 SHA256 (php-fpm) = a1fde2295e819a33d492cfdeca8d4e0e8de08b8d051c95c4758ba01da38354b7 diff --git a/php-fpm/Pkgfile b/php-fpm/Pkgfile index 3b8747f98..112e5f9c5 100644 --- a/php-fpm/Pkgfile +++ b/php-fpm/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre2 libxml2 name=php-fpm -version=7.4.14 +version=7.4.15 release=1 source=(https://php.net/distributions/php-$version.tar.xz php-fpm) diff --git a/php-ftp/.signature b/php-ftp/.signature index 07449a0b9..f76b2c6a7 100644 --- a/php-ftp/.signature +++ b/php-ftp/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/co7aRyQH14JOr+1toHPVyd7hnqZ5kyG5iwGCM571be49INLDuGaASHeZfDRYInvce+u29o+ZYHx0gasz63FMw8= -SHA256 (Pkgfile) = 8c1c30cfbd6e7ffaad00e91beb1b73af80eef9b514ce71c7e721edcb4374eead +RWSE3ohX2g5d/ZB2QeRHwTBSzdalJvMf6sZfPgV3/xwUTOVD3EWYPT8wv9/O8k8JnWJ8RIomCAQQviwdtyYjlKxgRZzJBoNWYgI= +SHA256 (Pkgfile) = f94ae17b6e9611b9d066ea915e68a4e93658c79d45a51ce1340bdcc582fba1df SHA256 (.footprint) = 4b6e9e791f10bb007a541c6a4cfe6a189d549592939bdf3e04c5bd0f25a4bfa0 -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-ftp/Pkgfile b/php-ftp/Pkgfile index b4b60257b..8685f6261 100644 --- a/php-ftp/Pkgfile +++ b/php-ftp/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=php-ftp -version=7.4.14 +version=7.4.15 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-gd/.signature b/php-gd/.signature index 8159bb2d7..76dfb0d9e 100644 --- a/php-gd/.signature +++ b/php-gd/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WC+T2LkO97++4qUvIskBUdzObVimKB2wxCJ4mX1cpCf4rX4bStnRgejefb3SL51t1y8cyT33UDQn5mMD74ypwQ= -SHA256 (Pkgfile) = ca8b7c68200c0cc7ec5676ef984cc8722668c931ffdcd3d952e2e8b23bea4b48 +RWSE3ohX2g5d/aR2u7SgRFDWnSZhlVUL+sfV01Ouc5TKJcP7fv6YMkT7lEp76U31J6kl5LYGcVDnLUsgGV/C2AmF6QQrF8BENQY= +SHA256 (Pkgfile) = 5a467dab9766e7f1d0cad53f2a55fbd0fffcb95a111d00cc7b384cf74037769e SHA256 (.footprint) = 09e41333252c613bbc54155a95e91919aedf35e3fe90607f941528ac9f1a39bb -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-gd/Pkgfile b/php-gd/Pkgfile index 230495eef..8dc49a041 100644 --- a/php-gd/Pkgfile +++ b/php-gd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libgd name=php-gd -version=7.4.14 +version=7.4.15 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-gettext/.signature b/php-gettext/.signature index 6d1cfe3e5..cadcad71f 100644 --- a/php-gettext/.signature +++ b/php-gettext/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VZrtv3r3MDC+7KhoxPYGnIUqcFSrwLbYY+Dw11MCRv0o0tdoezYGeycOj/TMUdi8HU3KBgN8Emg9n1OE7qDpgg= -SHA256 (Pkgfile) = f560c2831aff594a9253a92f49649b037f72e5f56239fb53bb72dce203a1576f +RWSE3ohX2g5d/Yk0QyTxGAfAi5oEGv0ZAQ3bQQFVSQEscQBoXUqyzujcn/Q+edGJEUi1BQ4BwTYQAl6gHRSJm1/dBsY8+yAzggU= +SHA256 (Pkgfile) = c5884c33f0f3a84bceeea08bc438de36a4ae188ef66f804520bbd036b37cf4a9 SHA256 (.footprint) = f2188408bdd37cf12c2eb9ef545b934e6a10d8faf52d3b961cd6c7649bdfaf9a -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-gettext/Pkgfile b/php-gettext/Pkgfile index 1677fe570..55cfa46e5 100644 --- a/php-gettext/Pkgfile +++ b/php-gettext/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=php-gettext -version=7.4.14 +version=7.4.15 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-mbstring/.signature b/php-mbstring/.signature index 4f27ccabf..317460a7c 100644 --- a/php-mbstring/.signature +++ b/php-mbstring/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VfrPmMYbQQVs9fsKrurwGS4lk+WhDVUJKQA4wvme/c5arei7cJ8P/VRew3fR2ZRij9bqlq5LPE0oYqlpv3e6gI= -SHA256 (Pkgfile) = 9faf53892bc9ed2bf9bd8cfa61d61066b0981e585675255b85a6b9bff33b653d +RWSE3ohX2g5d/YxpwZZezdE/i1mbxNPM68D4iyknDz0pAReaEPNLp0HHSJ1yO/SIFficPTDFVQMyV4TX6R4V48LvOSQSR/UaGAU= +SHA256 (Pkgfile) = ea8f578ba41e54cce898a5ff442f12b442f2e2403d41cfa4ab009f06972b8f29 SHA256 (.footprint) = 4a444295762f936750fb32f977171aecc73d9347bf51bace13d7f9dfc200812e -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-mbstring/Pkgfile b/php-mbstring/Pkgfile index 3065f408a..1f6e5fe63 100644 --- a/php-mbstring/Pkgfile +++ b/php-mbstring/Pkgfile @@ -4,7 +4,7 @@ # Depends on: oniguruma name=php-mbstring -version=7.4.14 +version=7.4.15 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-mysql/.signature b/php-mysql/.signature index 5728ba069..e16c43128 100644 --- a/php-mysql/.signature +++ b/php-mysql/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Rz2YKTjgiWhheYEg2F0Gb7uTonl62J7VV/0GTY+nfSfki+rHNRuUT4ZxpdXi32SQHjwjgJLmyqVIKFU6Bsw4QY= -SHA256 (Pkgfile) = 1326688fed47e878ab17a84913fc72de25d5653a3437c7774ac4eada6fa14eb8 +RWSE3ohX2g5d/RiGqI0DWVXKFaPBwgbpH20sgLbCUfwLpDp9Uy9VxnbEOM6l5f/YL+sgGEotvYPPReHeWUxd7b9At0cbdJgWTQU= +SHA256 (Pkgfile) = 1482b2face414c68ed852e4bb8c7d999fb1911a16a858092a51aedea4a61fc34 SHA256 (.footprint) = 0500f66a60a1c3d5951694c22f29e7e34a6dbc8e5a1487119ff56db1ea7cdda3 -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-mysql/Pkgfile b/php-mysql/Pkgfile index 9554f9e08..7b5af3163 100644 --- a/php-mysql/Pkgfile +++ b/php-mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mysql name=php-mysql -version=7.4.14 +version=7.4.15 release=1 source=(https://php.net/distributions/php-$version.tar.xz) diff --git a/php-sockets/.signature b/php-sockets/.signature index 7a75cbb0b..c4d4de76a 100644 --- a/php-sockets/.signature +++ b/php-sockets/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bN4FSspicE20wHvhtM2Kdqj4lGQ5eaOwQClqvOJIC8PbfWcofvBzksL+0MhBf8pw8Ozp+9vezbJXhyznmmR9wk= -SHA256 (Pkgfile) = e8b0d2b035aec5de0a288c80ad9ff3629f5e69c6d6ccc2e5b45adef044385253 +RWSE3ohX2g5d/YNKP9zu6jQBadvpHDNKHKoNC+0cileO/DAttkW46IcHRw3nB0N3WpctCmIpU7xwRORb7kb8bcqPZFpY/5nHCwI= +SHA256 (Pkgfile) = 0b61bc531b370aa4dd7d5bd95b8ffb7c3b7b7aeb85457be1861403a7264f7e6b SHA256 (.footprint) = 1a0e33807dcda8d11408be8b6356860cac8daea5a94d4e9a87e535fbf778f04e -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-sockets/Pkgfile b/php-sockets/Pkgfile index 58a4154df..64c85b1b6 100644 --- a/php-sockets/Pkgfile +++ b/php-sockets/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=php-sockets -version=7.4.14 +version=7.4.15 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-sqlite3/.signature b/php-sqlite3/.signature index 4c5e7a2b0..ab72efc14 100644 --- a/php-sqlite3/.signature +++ b/php-sqlite3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ezP2QQaZEXo8MuCbdFcbUUdjy5G3leyb501QH0pkMalFfts8pTU1zGEaywYGxVLyTaeAzRxBbsxMHv16T0/PQs= -SHA256 (Pkgfile) = 7adc04e099d82bbba1ede3985bc3693df84e4e76cb7f0a60e725704510615213 +RWSE3ohX2g5d/dY+E5vsaCqyPwxRrWeRWpZtW2xUqm4XFDtBIOdcHUvImaGGguTFhrwCjyxfKCX+24pIn6LCF3FV2qI5VaVumAQ= +SHA256 (Pkgfile) = 379f59dbe06264624d1084b23b862a77e851e1e76afe62461bf985379323e220 SHA256 (.footprint) = e626528b1bc2b3ce187cc979172f24c489075e0bc584aeb1d082b2f7197d6e49 -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-sqlite3/Pkgfile b/php-sqlite3/Pkgfile index a475a3454..fe7f60041 100644 --- a/php-sqlite3/Pkgfile +++ b/php-sqlite3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: sqlite3 name=php-sqlite3 -version=7.4.14 +version=7.4.15 release=1 source=(https://php.net/distributions/php-$version.tar.xz) diff --git a/php-zip/.signature b/php-zip/.signature index 582c1fb6d..4dacc8bc2 100644 --- a/php-zip/.signature +++ b/php-zip/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UTFuFYyOT6rOwS7qQVy6Wr93B7wM0BrAvlhG2BU1uhqWO4HUekie59P27DxX3PCcIiKFJL6quIsd0+MJdEZvQI= -SHA256 (Pkgfile) = bbfc2f8e5c0a2d9fcaccbb5b2c5ab58ae7aae36fb6630f264e18417f1d4f1de3 +RWSE3ohX2g5d/fiC8Npepkjb6ZsIsPIKXSULBhFNDuE7AYHbMHjao6rAPrfXw1mP8nHo5bHfwAQFHspDA7osIvZwayKGxh/wsQI= +SHA256 (Pkgfile) = 82c89ae71495cd8136af4bf9fdbaf3104041f958420b1381ba570e9931c1cb1d SHA256 (.footprint) = 0ba08044c2d47be4c86015de875a10f15dfee8367b932c5466a0212da28e4203 -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php-zip/Pkgfile b/php-zip/Pkgfile index 6c441359c..328bb2b98 100644 --- a/php-zip/Pkgfile +++ b/php-zip/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libzip name=php-zip -version=7.4.14 +version=7.4.15 release=1 source=(https://www.php.net/distributions/php-$version.tar.xz) diff --git a/php/.signature b/php/.signature index d5f8d9eda..a4d9b8b78 100644 --- a/php/.signature +++ b/php/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dN5XiHg0+lamUeFyGjX512Z6fP2CCKhAjZ4ZdEKmwNCCPyi8vkEV6axEkZzIBNYDM21MGmRotgDbXj96i1+PgQ= -SHA256 (Pkgfile) = 6e5cdf45c4c55b462664176eeab95f6c5a70c311b3e7d3177a3e0fe71788fecb +RWSE3ohX2g5d/YnCKLNZ5l7+4ki6ORHihRrfUK8DG460eVqwKf08GfG/eYxd3zSdeoyuazo6hS46wtIjF6leULts9lvfghk5KAA= +SHA256 (Pkgfile) = ca1884657f65644db3182cb2b2ee947d950c5073d74a79e5d107e3639a7f8c5d SHA256 (.footprint) = e758686f584e052d2ba7c2b3a13d35acdab52873afd260bc64c8032d7ff3812b -SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SHA256 (php-7.4.15.tar.xz) = 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 diff --git a/php/Pkgfile b/php/Pkgfile index cb1930106..272a1715b 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: bzip2 libpcre2 libxml2 curl db gdbm name=php -version=7.4.14 +version=7.4.15 release=1 source=(https://php.net/distributions/php-$version.tar.xz)

1 0

ports/core (3.6): [notify] openssl: update to 1.1.1j
by crux＠crux.nu 17 Feb '21

17 Feb '21

commit 7861127117f055622998970891c09e09a7f04916 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Feb 17 12:27:55 2021 +0100 [notify] openssl: update to 1.1.1j includes security fixes, see https://www.openssl.org/news/openssl-1.1.1-notes.html diff --git a/openssl/.footprint b/openssl/.footprint index 3a2d44b9..4c383857 100644 --- a/openssl/.footprint +++ b/openssl/.footprint @@ -876,6 +876,7 @@ lrwxrwxrwx root/root usr/share/man/man3/DH_check_params_ex.3ssl.gz -> DH_generat lrwxrwxrwx root/root usr/share/man/man3/DH_check_pub_key_ex.3ssl.gz -> DH_generate_parameters.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/DH_clear_flags.3ssl.gz -> DH_get0_pqg.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/DH_compute_key.3ssl.gz -> DH_generate_key.3ssl.gz +lrwxrwxrwx root/root usr/share/man/man3/DH_compute_key_padded.3ssl.gz -> DH_generate_key.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/DH_free.3ssl.gz -> DH_new.3ssl.gz -rw-r--r-- root/root usr/share/man/man3/DH_generate_key.3ssl.gz -rw-r--r-- root/root usr/share/man/man3/DH_generate_parameters.3ssl.gz @@ -1990,6 +1991,7 @@ lrwxrwxrwx root/root usr/share/man/man3/OCSP_REQUEST_free.3ssl.gz -> OCSP_REQUES -rw-r--r-- root/root usr/share/man/man3/OCSP_REQUEST_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/OCSP_REQ_CTX_add1_header.3ssl.gz -> OCSP_sendreq_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/OCSP_REQ_CTX_free.3ssl.gz -> OCSP_sendreq_new.3ssl.gz +lrwxrwxrwx root/root usr/share/man/man3/OCSP_REQ_CTX_i2d.3ssl.gz -> OCSP_sendreq_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/OCSP_REQ_CTX_set1_req.3ssl.gz -> OCSP_sendreq_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/OCSP_RESPBYTES_free.3ssl.gz -> X509_dup.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/OCSP_RESPBYTES_new.3ssl.gz -> X509_dup.3ssl.gz diff --git a/openssl/.signature b/openssl/.signature index 79fdae87..118ded8d 100644 --- a/openssl/.signature +++ b/openssl/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqrYFulDdqtwCuV6O7FXaBe06lR3+/XEqJEWdeLwKWtmsufCyBvv32G2w9PUUXKDxsKb2mHFh7j0oorELmTHGigg= -SHA256 (Pkgfile) = 6e86f70d42df0759838d57f1d666deda1457225aec8e751b2e7a815e7e74e85d -SHA256 (.footprint) = 86c0ff81fc94b4d28fe30c13756551d47b86e5c2c170d82351b52d87fcd811a1 -SHA256 (openssl-1.1.1i.tar.gz) = e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 +RWRJc1FUaeVeqj3QIxoyNWHAP2/CntMA0fw1OBcWCfdrxyiSSZqsCk8qBbhP0Ga7cURAYk594hfG+kRSctUpwvuTYoO7KU2zFQU= +SHA256 (Pkgfile) = 53b8d8fb656eb3426c906e65bd40297432cee70f6dce2f2ad6c427bbd19e8a83 +SHA256 (.footprint) = 7fbd0ae90c541c56f9317a6623d14d12aec1cb89226799717f45f32a76bdcd6b +SHA256 (openssl-1.1.1j.tar.gz) = aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf SHA256 (mksslcert.sh) = d01cfd061b792f4f7444429582c5c9e83aaa7fc63cafd05669fd3f2970dff779 diff --git a/openssl/Pkgfile b/openssl/Pkgfile index cebece8d..7b10c6d3 100644 --- a/openssl/Pkgfile +++ b/openssl/Pkgfile @@ -1,28 +1,29 @@ # Description: Secure Sockets Layer and Transport Layer Security tools -# URL: https://www.openssl.org/ -# Maintainer: CRUX System Team, core-ports at crux dot nu +# URL: https://www.openssl.org/ +# Maintainer: CRUX System Team, core-ports at crux dot nu name=openssl -version=1.1.1i +version=1.1.1j release=1 source=(https://www.openssl.org/source/$name-$version.tar.gz \ - mksslcert.sh) + mksslcert.sh) build() { - cd $name-$version + cd $name-$version - ./config --prefix=/usr \ - --libdir=lib \ - --openssldir=/etc/ssl \ - shared \ - enable-ec_nistp_64_gcc_128 + ./config \ + --prefix=/usr \ + --libdir=lib \ + --openssldir=/etc/ssl \ + shared \ + enable-ec_nistp_64_gcc_128 - sed -i "s|-O3|$CFLAGS|" Makefile + sed -i "s|-O3|$CFLAGS|" Makefile - make depend - make - make MANSUFFIX=ssl DESTDIR=$PKG install_sw install_ssldirs install_man_docs + make depend + make + make MANSUFFIX=ssl DESTDIR=$PKG install_sw install_ssldirs install_man_docs - find $PKG -name "*fips*" -delete - install -D -m 755 $SRC/mksslcert.sh $PKG/usr/bin/mksslcert + find $PKG -name "*fips*" -delete + install -D -m 755 $SRC/mksslcert.sh $PKG/usr/bin/mksslcert }

1 0

ports/contrib (3.6): [notify] libfm: 1.3.1 -> 1.3.2 be sure to update libfm force install it then force install libfm-extra, or remove libfm and update libfm-extra first to avoid a file conflict
by crux＠crux.nu 14 Feb '21

14 Feb '21

commit 0904d138d2054b15a9779a25f30d825f3643c49c Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 14 21:23:15 2021 +1100 [notify] libfm: 1.3.1 -> 1.3.2 be sure to update libfm force install it then force install libfm-extra, or remove libfm and update libfm-extra first to avoid a file conflict diff --git a/libfm/.footprint b/libfm/.footprint index 622207f0b..dd20c5999 100644 --- a/libfm/.footprint +++ b/libfm/.footprint @@ -7,94 +7,90 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/libfm-pref-apps -rwxr-xr-x root/root usr/bin/lxshortcut drwxr-xr-x root/root usr/include/ -lrwxrwxrwx root/root usr/include/libfm -> libfm-1.0 -drwxr-xr-x root/root usr/include/libfm-1.0/ --rw-r--r-- root/root usr/include/libfm-1.0/fm-action.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-actions.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-app-chooser-combo-box.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-app-chooser-dlg.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-app-info.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-app-menu-view.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-archiver.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-bookmarks.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-cell-renderer-pixbuf.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-cell-renderer-text.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-clipboard.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-config.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-deep-count-job.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-dir-list-job.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-dir-tree-model.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-dir-tree-view.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-dnd-auto-scroll.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-dnd-dest.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-dnd-src.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-dummy-monitor.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-extra.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-info-job.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-info.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-launcher.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-menu.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-ops-job-change-attr.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-ops-job-delete.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-ops-job-xfer.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-ops-job.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file-properties.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-file.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-folder-config.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-folder-model.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-folder-view.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-folder.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-gtk-file-launcher.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-gtk-marshal.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-gtk-utils.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-gtk.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-icon-pixbuf.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-icon.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-job.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-list.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-marshal.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-menu-tool-item.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-mime-type.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-module.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-monitor.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-nav-history.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-path-bar.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-path-entry.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-path.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-places-model.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-places-view.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-progress-dlg.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-seal.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-side-pane.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-simple-job.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-sortable.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-standard-view.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-tab-label.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-templates.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-terminal.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-thumbnail-loader.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-thumbnail.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-thumbnailer.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-utils.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-version.h --rw-r--r-- root/root usr/include/libfm-1.0/fm-xml-file.h --rw-r--r-- root/root usr/include/libfm-1.0/fm.h +drwxr-xr-x root/root usr/include/libfm/ +-rw-r--r-- root/root usr/include/libfm/fm-action.h +-rw-r--r-- root/root usr/include/libfm/fm-actions.h +-rw-r--r-- root/root usr/include/libfm/fm-app-chooser-combo-box.h +-rw-r--r-- root/root usr/include/libfm/fm-app-chooser-dlg.h +-rw-r--r-- root/root usr/include/libfm/fm-app-info.h +-rw-r--r-- root/root usr/include/libfm/fm-app-menu-view.h +-rw-r--r-- root/root usr/include/libfm/fm-archiver.h +-rw-r--r-- root/root usr/include/libfm/fm-bookmarks.h +-rw-r--r-- root/root usr/include/libfm/fm-cell-renderer-pixbuf.h +-rw-r--r-- root/root usr/include/libfm/fm-cell-renderer-text.h +-rw-r--r-- root/root usr/include/libfm/fm-clipboard.h +-rw-r--r-- root/root usr/include/libfm/fm-config.h +-rw-r--r-- root/root usr/include/libfm/fm-deep-count-job.h +-rw-r--r-- root/root usr/include/libfm/fm-dir-list-job.h +-rw-r--r-- root/root usr/include/libfm/fm-dir-tree-model.h +-rw-r--r-- root/root usr/include/libfm/fm-dir-tree-view.h +-rw-r--r-- root/root usr/include/libfm/fm-dnd-auto-scroll.h +-rw-r--r-- root/root usr/include/libfm/fm-dnd-dest.h +-rw-r--r-- root/root usr/include/libfm/fm-dnd-src.h +-rw-r--r-- root/root usr/include/libfm/fm-dummy-monitor.h +-rw-r--r-- root/root usr/include/libfm/fm-file-info-job.h +-rw-r--r-- root/root usr/include/libfm/fm-file-info.h +-rw-r--r-- root/root usr/include/libfm/fm-file-launcher.h +-rw-r--r-- root/root usr/include/libfm/fm-file-menu.h +-rw-r--r-- root/root usr/include/libfm/fm-file-ops-job-change-attr.h +-rw-r--r-- root/root usr/include/libfm/fm-file-ops-job-delete.h +-rw-r--r-- root/root usr/include/libfm/fm-file-ops-job-xfer.h +-rw-r--r-- root/root usr/include/libfm/fm-file-ops-job.h +-rw-r--r-- root/root usr/include/libfm/fm-file-properties.h +-rw-r--r-- root/root usr/include/libfm/fm-file.h +-rw-r--r-- root/root usr/include/libfm/fm-folder-config.h +-rw-r--r-- root/root usr/include/libfm/fm-folder-model.h +-rw-r--r-- root/root usr/include/libfm/fm-folder-view.h +-rw-r--r-- root/root usr/include/libfm/fm-folder.h +-rw-r--r-- root/root usr/include/libfm/fm-gtk-file-launcher.h +-rw-r--r-- root/root usr/include/libfm/fm-gtk-marshal.h +-rw-r--r-- root/root usr/include/libfm/fm-gtk-utils.h +-rw-r--r-- root/root usr/include/libfm/fm-gtk.h +-rw-r--r-- root/root usr/include/libfm/fm-icon-pixbuf.h +-rw-r--r-- root/root usr/include/libfm/fm-icon.h +-rw-r--r-- root/root usr/include/libfm/fm-job.h +-rw-r--r-- root/root usr/include/libfm/fm-list.h +-rw-r--r-- root/root usr/include/libfm/fm-marshal.h +-rw-r--r-- root/root usr/include/libfm/fm-menu-tool-item.h +-rw-r--r-- root/root usr/include/libfm/fm-mime-type.h +-rw-r--r-- root/root usr/include/libfm/fm-module.h +-rw-r--r-- root/root usr/include/libfm/fm-monitor.h +-rw-r--r-- root/root usr/include/libfm/fm-nav-history.h +-rw-r--r-- root/root usr/include/libfm/fm-path-bar.h +-rw-r--r-- root/root usr/include/libfm/fm-path-entry.h +-rw-r--r-- root/root usr/include/libfm/fm-path.h +-rw-r--r-- root/root usr/include/libfm/fm-places-model.h +-rw-r--r-- root/root usr/include/libfm/fm-places-view.h +-rw-r--r-- root/root usr/include/libfm/fm-progress-dlg.h +-rw-r--r-- root/root usr/include/libfm/fm-seal.h +-rw-r--r-- root/root usr/include/libfm/fm-side-pane.h +-rw-r--r-- root/root usr/include/libfm/fm-simple-job.h +-rw-r--r-- root/root usr/include/libfm/fm-sortable.h +-rw-r--r-- root/root usr/include/libfm/fm-standard-view.h +-rw-r--r-- root/root usr/include/libfm/fm-tab-label.h +-rw-r--r-- root/root usr/include/libfm/fm-templates.h +-rw-r--r-- root/root usr/include/libfm/fm-terminal.h +-rw-r--r-- root/root usr/include/libfm/fm-thumbnail-loader.h +-rw-r--r-- root/root usr/include/libfm/fm-thumbnail.h +-rw-r--r-- root/root usr/include/libfm/fm-thumbnailer.h +-rw-r--r-- root/root usr/include/libfm/fm-utils.h +-rw-r--r-- root/root usr/include/libfm/fm.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libfm-extra.a --rwxr-xr-x root/root usr/lib/libfm-extra.la -lrwxrwxrwx root/root usr/lib/libfm-extra.so -> libfm-extra.so.4.1.2 -lrwxrwxrwx root/root usr/lib/libfm-extra.so.4 -> libfm-extra.so.4.1.2 --rwxr-xr-x root/root usr/lib/libfm-extra.so.4.1.2 -rw-r--r-- root/root usr/lib/libfm-gtk.a -rwxr-xr-x root/root usr/lib/libfm-gtk.la -lrwxrwxrwx root/root usr/lib/libfm-gtk.so -> libfm-gtk.so.4.1.2 -lrwxrwxrwx root/root usr/lib/libfm-gtk.so.4 -> libfm-gtk.so.4.1.2 --rwxr-xr-x root/root usr/lib/libfm-gtk.so.4.1.2 +lrwxrwxrwx root/root usr/lib/libfm-gtk.so -> libfm-gtk.so.4.1.3 +lrwxrwxrwx root/root usr/lib/libfm-gtk.so.4 -> libfm-gtk.so.4.1.3 +-rwxr-xr-x root/root usr/lib/libfm-gtk.so.4.1.3 +-rw-r--r-- root/root usr/lib/libfm-gtk3.a +-rwxr-xr-x root/root usr/lib/libfm-gtk3.la +lrwxrwxrwx root/root usr/lib/libfm-gtk3.so -> libfm-gtk3.so.4.1.3 +lrwxrwxrwx root/root usr/lib/libfm-gtk3.so.4 -> libfm-gtk3.so.4.1.3 +-rwxr-xr-x root/root usr/lib/libfm-gtk3.so.4.1.3 -rw-r--r-- root/root usr/lib/libfm.a -rwxr-xr-x root/root usr/lib/libfm.la -lrwxrwxrwx root/root usr/lib/libfm.so -> libfm.so.4.1.2 -lrwxrwxrwx root/root usr/lib/libfm.so.4 -> libfm.so.4.1.2 --rwxr-xr-x root/root usr/lib/libfm.so.4.1.2 +lrwxrwxrwx root/root usr/lib/libfm.so -> libfm.so.4.1.3 +lrwxrwxrwx root/root usr/lib/libfm.so.4 -> libfm.so.4.1.3 +-rwxr-xr-x root/root usr/lib/libfm.so.4.1.3 drwxr-xr-x root/root usr/lib/libfm/ drwxr-xr-x root/root usr/lib/libfm/modules/ -rwxr-xr-x root/root usr/lib/libfm/modules/gtk-fileprop-x-desktop.so @@ -104,8 +100,8 @@ drwxr-xr-x root/root usr/lib/libfm/modules/ -rwxr-xr-x root/root usr/lib/libfm/modules/vfs-menu.so -rwxr-xr-x root/root usr/lib/libfm/modules/vfs-search.so drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libfm-extra.pc -rw-r--r-- root/root usr/lib/pkgconfig/libfm-gtk.pc +-rw-r--r-- root/root usr/lib/pkgconfig/libfm-gtk3.pc -rw-r--r-- root/root usr/lib/pkgconfig/libfm.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ diff --git a/libfm/.signature b/libfm/.signature index 233c906b0..fb885dab2 100644 --- a/libfm/.signature +++ b/libfm/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31ATmTyvEs8eswuN4t4If+BL1P6x6PwetEdTktKvhFw4imMDE1Bw2X5D3dVziVm42/vCyU1P5q3UMFejCIRdmA8= -SHA256 (Pkgfile) = 8e57fa8adffdc537dcb873cbcde98b1443df373e8b58ac1711b4bd71e3fad851 -SHA256 (.footprint) = c42534b3c8a14abbe041cd2b63d3531d84beb600c91b96ddc78fdf05c19a2d9b -SHA256 (libfm-1.3.1.tar.xz) = 96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4 +RWSagIOpLGJF35Q/ujkC1PyuFof7xFuhlu9vEELHOae0mLL11eV4levPcKfze1sTMBoGBWX8p+ARhzkaFhYDgCnDh8GJGqsoPgE= +SHA256 (Pkgfile) = fb4b584af3478b0c4df037cd47d61123aee8e7e8afb422b4ca4a3a64accd4ea0 +SHA256 (.footprint) = fc655dd07430e96baca62c9b582dddd1cb8e0139443ea320f5105b8e1ecb6ca0 +SHA256 (libfm-1.3.2.tar.xz) = a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5 diff --git a/libfm/Pkgfile b/libfm/Pkgfile index 8949491eb..a11a37e96 100644 --- a/libfm/Pkgfile +++ b/libfm/Pkgfile @@ -1,21 +1,24 @@ # Description: Library for file management. # URL: https://wiki.lxde.org/en/PCManFM # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gtk menu-cache xorg-libxdamage +# Depends on: gtk gtk3 menu-cache xorg-libxdamage libfm-extra name=libfm -version=1.3.1 -release=2 +version=1.3.2 +release=1 source=(https://downloads.sourceforge.net/pcmanfm/$name-$version.tar.xz) build() { cd $name-$version - # https://github.com/lxde/libfm/issues/35 sed -i 's/create=xarchiver --add-to %F/create=xarchiver --compress %F/' data/archivers.list - autoreconf -fi + cd - + cp -r $name-$version gtk3 + cp -r $name-$version gtk2 + + cd $SRC/gtk2 ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -29,12 +32,25 @@ build() { make make DESTDIR=$PKG install + cd $SRC/gtk3 + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-gnu-ld \ + --disable-nls \ + --disable-gtk-doc-html \ + --with-gtk=3 + + make + make DESTDIR=$PKG install + rm -r $PKG/usr/share/locale - if [[ -h $PKG/usr/include/libfm/libfm-1.0 ]]; then - rm -r $PKG/usr/include/libfm - cd $PKG/usr/include/ - ln -s libfm-1.0 libfm - fi -} + rm -r $PKG/usr/include/libfm + mv $PKG/usr/include/libfm-1.0/ $PKG/usr/include/libfm + # In libfm-extra + rm -r $PKG/usr/include/libfm/fm-{extra,version,xml-file}.h \ + $PKG/usr/lib/libfm-extra.* \ + $PKG/usr/lib/pkgconfig/libfm-extra.pc +}

1 0